Combine print/cups-base, print/cups-client and print/cups-image into

print/cups and update it to 2.1.3. Also remove print/cups-pstoraster, improve print/cups-filters, print/foomatic-* and update print/hplip to 3.16.2. Long description: First some background. When you hand a file to cups it sets up a chain of filter programs that converts the file to something a printer understands. Each filter has a cost associated with it and cups tries to find the cheapest chain. Costs used to be configured in such a way that files were first converted to PostScript. This could then be manipulated further (e.g. putting multiple pages on one sheet) before finally being sent to a PostScript printer or another filter like pstoraster which produces a raster format understood by non-PostScript printer drivers. Nowadays most filters have been moved from cups to cups-filters and they have been configured to use PDF as an intermediate format instead of PostScript. Merging of cups-base, cups-client and cups-image into print/cups: - cups-image provides a library to work with the cups raster format. It is only used to implement filters and printer drivers and these only exist in the context of a cups server so there's no need to separate this from cups-base. - cups-client provides a library that allows applications to print via cups. It is possible to use the library to access a remote cups server without running a local cups server, but such a setup is discouraged and the configuration file to set this up has been marked deprecated. It is better to run a local cups server and let that talk to the remote cups server because then you have the benefits of local job queuing in case the remote server is down or busy. Given this and the fact that without filters cups-base is now smaller than it used to be it makes sense to merge the ports. The patch also adds options IPPTOOL, DOCS and NLS which when disabled make the new cups package smaller than the current cups-client package. Merging the ports also prevents problems with options like ZEROCONF being configured differently in both ports. - print/cups was a metaport that depended on cups-base and some filters. There isn't really a need for such a metaport so cups-base can be renamed to cups. The filters can be depended on by printer drivers such as hplip if they need them. Additional changes to the new print/cups: - Clean up the patches. They seem to have been regenerated with post-patch changes included. - Add a patch to prevent intermediate conversion to PDF when a PostScript file is sent to a PostScript printer when cups-filters is installed. - Fix the PAM configuration file. - Add a patch to let the server search /usr/local/share/ppd like on Linux so other ports don't have to add links to it. - Remove ulpt(4) helper scripts. The port uses libusb with ugen(4). - Remove support for mDNSResponder. cups-filters only supports Avahi. - Combine ICONS and XDG_OPEN options into an X11 option to support WITHOUT_X11. - Optionally depend on colord for ICC profile support. - Various smaller changes. Changes to print/cups-filters: - Let the cups_browsed rc.d script depend on cupsd and avahi_daemon instead of LOGIN. - Development of foomatic-filters has been moved to cups-filters so let this port install foomatic related files and add foomatic-filters to CONFLICTS. - Fix location of liblouis tables. - Add patch to fix ICC support. Changes to print/cups-pstoraster: This port is essentially an old version of Ghostscript plus a cups filter. It's no longer developed. This commit removes it and changes existing dependencies to print/cups-filters which depends on print/ghostscript* and includes a gstoraster filter that can handle both PostScript and PDF. Changes to print/foomatic-db*: Remove old MASTER_SITES and dependencies and eliminate PKGNAMEPREFIX. Changes to print/foomatic-filters: Install beh backend with its original name again and add cups-filters to CONFLICTS. Changes to print/hplip: - Stop installing hpijs/foomatic-rip support. This is no longer supported upstream. - Stop installing hpcups PPDs. These are now automatically generated. The bundled PPDs are generated for an older version of cups. - Rename the QT option to X11 to support WITHOUT_X11. - Simplify the patches now that ports are installed in a staging area. - Add a patch to set SO_REUSEPORT (next to SO_REUSEADDR) on the mDNS socket like avahi-daemon does. This fixes Zeroconf support for HP network printers. PR: 207746 Exp-run by: antoine Approved by: portmgr (antoine)
svn path=/head/; revision=410825
2016-03-11 11:53:42 +00:00 · 2016-03-11 11:53:42 +00:00 · 59272d1017 · 2021-03-31 03:12:20 +00:00
commit 59272d1017
parent fc9825be88
139 changed files with 1677 additions and 4424 deletions
--- a/5
+++ b/5
@ -8227,4 +8227,7 @@ devel/p5-DateTime-Event-SolarTerm|devel/p5-DateTime-Astro|2016-03-07|Has been pa
 devel/p5-DateTime-Util-Astro|devel/p5-DateTime-Astro|2016-03-07|Has been part of DateTime-Astro for a long time
 security/regripperplugins||2016-03-07|Merged into security/regripper
 textproc/elasticsearch-plugin-marvel2|textproc/elasticsearch2-plugin-marvel|2016-03-10|Rename to match other Elasticsearch 2 plugins
-print/cups||2016-03-11|Deleted to be replaced by print/cups-base
+print/cups-base|print/cups|2016-03-11|Merged
+print/cups-client|print/cups|2016-03-11|Merged
+print/cups-image|print/cups|2016-03-11|Merged
+print/cups-pstoraster|print/cups-filters|2016-03-11|Obsolete
--- a/18
+++ b/18
@ -5,6 +5,24 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20160311:
+  AFFECTS: print/hplip
+  AUTHOR: tijl@FreeBSD.org
+
+  HPLIP has been updated to verion 3.16.2.  As part of the update support
+  for the hpijs/foomatic-rip filter has been dropped.  This has long been
+  unsupported upstream.  If you used this filter with your printer you'll
+  have to reconfigure it.
+
+20160311:
+  AFFECTS: print/cups-base, print/cups-client, print/cups-image
+  AUTHOR: tijl@FreeBSD.org
+
+  The cups-base, cups-client and cups-image packages have been combined
+  into one cups package.  If you build your own ports the easiest way to
+  update is to delete these packages first and then build and install
+  print/cups.
+
 20160306:
  AFFECTS: net-mgmt/yaf
  AUTHOR: pi@FreeBSD.org
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@ -2,6 +2,7 @@

 .include "${.CURDIR}/Makefile.common"

+PORTREVISION=	1
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
@ -113,7 +114,7 @@ VERBOSE_DESC=	Increase build verbosity
 WEBDAV_DESC=	Enable webdav protocol

 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups

 GNOME_CONFIGURE_ENABLE=	dbus gconf lockdown
 GNOME_IMPLIES=	GTK2
--- a/editors/libreoffice4/Makefile
+++ b/editors/libreoffice4/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libreoffice
 PORTVERSION=	4.3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/ \
 		http://dev-www.libreoffice.org/extern/:ext \
@ -217,7 +217,7 @@ TEST_DESC=	Run all regression tests
 VERBOSE_DESC=	Increase build verbosity
 WEBDAV_DESC=	Enable webdav protocol

-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 CUPS_CONFIGURE_ENABLE=	cups

 DEBUG_CONFIGURE_ON=	--enable-crashdump --enable-dbgutil --enable-debug
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors java
 MASTER_SITES=	APACHE/openoffice/${PORTVERSION}/source \
 		http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@ -146,7 +146,7 @@ WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 CCACHE_DESC=		Mimimize compile time of C/C++ programs

 CUPS_CONFIGURE_ENABLE=		cups
-CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups

 GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
 GNOME_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
@ -158,7 +158,7 @@ WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
 CCACHE_DESC=		Mimimize compile time of C/C++ programs

 CUPS_CONFIGURE_ENABLE=		cups
-CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=		libcups.so:${PORTSDIR}/print/cups

 GNOME_CONFIGURE_ENABLE=		dbus gconf lockdown
 GNOME_LIB_DEPENDS=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	wine
 DISTVERSION=	1.9.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@ -64,7 +65,7 @@ GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine

 CUPS_CONFIGURE_WITH=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups

 DOSBOX_RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox

--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	wine
 DISTVERSION=	1.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@ -63,7 +63,7 @@ MONO_DESC=	Bundle Mono MSI package for Wine
 PORTSCOUT=	limitw:1,even

 CUPS_CONFIGURE_WITH=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups

 DOSBOX_RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox

--- a/games/pythonsudoku/Makefile
+++ b/games/pythonsudoku/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pythonsudoku
 PORTVERSION=	0.13
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/Python%20Sudoku/${PORTVERSION}/ \
 		SF/nemysisfreebsdp/games/:icons
@ -18,7 +18,7 @@ COMMENT=	Text and graphical program to create or resolve Sudokus
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
 RUN_DEPENDS=	${PYGAME} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	darktable
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/

@ -86,7 +87,7 @@ OPENEXR_CMAKE_OFF=	-DUSE_OPENEXR:BOOL=OFF
 OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
 OPENJPEG_CMAKE_OFF=	-DUSE_OPENJPEG:BOOL=OFF

-PRINT_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+PRINT_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 PRINT_CMAKE_OFF=	-DBUILD_PRINT:BOOL=OFF

 RAWSPEED_CMAKE_OFF=	-DDONT_USE_RAWSPEED:BOOL=ON
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	epdfview
 PORTVERSION=	0.1.8
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	FRUGALWARE/xapps-extra/${PORTNAME} \
 		ftp://ftp.slackware.com/.1/blfs/conglomeration/${PORTNAME}/ \
@ -29,7 +29,7 @@ OPTIONS_DEFINE=	CUPS NLS
 OPTIONS_SUB=	yes

 CUPS_CONFIGURE_WITH=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups

 NLS_USES=	gettext
 NLS_CPPFLAGS=	-I${LOCALBASE}/include
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	oyranos
 PORTVERSION=	0.9.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|}

@ -18,7 +18,7 @@ LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw \
 		libcairo.so:${PORTSDIR}/graphics/cairo \
 		libyajl.so:${PORTSDIR}/devel/yajl \
 		libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libcups.so:${PORTSDIR}/print/cups-client \
+		libcups.so:${PORTSDIR}/print/cups \
 		libxdot.so:${PORTSDIR}/graphics/graphviz \
 		liblcms.so:${PORTSDIR}/graphics/lcms \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@ -22,7 +22,7 @@ LICENSE_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

 BUILD_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
-		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
+		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		dejavu>0:${PORTSDIR}/x11-fonts/dejavu
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@ -74,7 +74,7 @@ LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
-		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
+		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups
 RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper \
 		dejavu>0:${PORTSDIR}/x11-fonts/dejavu

--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@ -29,7 +29,7 @@ COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
 LICENSE=	GPLv2

 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client \
+		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups \
 		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	freerdp
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net comms ipv6

 MAINTAINER=	ports@FreeBSD.org
@ -33,7 +33,7 @@ ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 ALSA_CMAKE_ON=		-DWITH_ALSA=ON
 ALSA_CMAKE_OFF=		-DWITH_ALSA=OFF

-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 CUPS_CMAKE_ON=		-DWITH_CUPS=ON
 CUPS_CMAKE_OFF=		-DWITH_CUPS=OFF

--- a/net/opennx/Makefile
+++ b/net/opennx/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opennx
 PORTVERSION=	0.16.0.729
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CI-source

@ -13,10 +13,9 @@ COMMENT=	Open source drop in replacement for NoMachine's NX client
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
-		cups-base>0:${PORTSDIR}/print/cups-base
-RUN_DEPENDS=	cups-base>0:${PORTSDIR}/print/cups-base
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+BUILD_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
+		libcurl.so:${PORTSDIR}/ftp/curl \
 		libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient

 WRKSRC=		${WRKDIR}/${PORTNAME}-0.16
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@ -2,7 +2,7 @@

 PORTNAME=		${SAMBA_BASENAME}36
 PORTVERSION=		3.6.25
-PORTREVISION?=		2
+PORTREVISION?=		3
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre
 DISTNAME=		${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
@ -195,7 +195,7 @@ SAMBA_WANT_LDAP=	yes
 .endif

 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 SUB_LIST+=		CUPS=""
 .else
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=		${SAMBA4_BASENAME}41
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
@ -273,7 +273,7 @@ CONFIGURE_ARGS+=	--disable-dnssd
 .endif

 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
--- a/net/samba42/Makefile
+++ b/net/samba42/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=		${SAMBA4_BASENAME}42
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
@ -279,7 +279,7 @@ CONFIGURE_ARGS+=	--disable-dnssd
 .endif

 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
--- a/net/samba43/Makefile
+++ b/net/samba43/Makefile
@ -3,7 +3,7 @@

 PORTNAME?=		${SAMBA4_BASENAME}43
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
@ -275,7 +275,7 @@ CONFIGURE_ARGS+=	--disable-dnssd
 .endif

 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=		libcups.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups --enable-iprint
 .else
 CONFIGURE_ARGS+=	--disable-cups --disable-iprint
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	x2goclient
 PORTVERSION=	4.0.5.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://code.x2go.org/releases/source/x2goclient/

@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 # Avoid clash with libssh from base
 BUILD_DEPENDS=	${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
 		libssh.so:${PORTSDIR}/security/libssh
 RUN_DEPENDS=	nxproxy:${PORTSDIR}/net/nxproxy \
 		x2goclient-cli:${PORTSDIR}/net/x2goclient-cli
--- a/print/Makefile
+++ b/print/Makefile
@ -23,16 +23,13 @@
    SUBDIR += catdvi
    SUBDIR += cdlabelgen
    SUBDIR += cloudprint
-    SUBDIR += cups-base
+    SUBDIR += cups
    SUBDIR += cups-bjnp
-    SUBDIR += cups-client
    SUBDIR += cups-cloud-print
    SUBDIR += cups-filters
    SUBDIR += cups-fxlinuxprint
-    SUBDIR += cups-image
    SUBDIR += cups-pdf
    SUBDIR += cups-pk-helper
-    SUBDIR += cups-pstoraster
    SUBDIR += cups-smb-backend
    SUBDIR += deforaos-pdfviewer
    SUBDIR += detex
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@ -1,317 +0,0 @@
-# Created by: Alan Eldridge <alane@geeksrus.net>
-# $FreeBSD$
-
-PORTNAME=	cups
-PORTVERSION=	2.0.3
-DISTVERSIONSUFFIX=	-source
-#PORTREVISION=	defined further
-CATEGORIES=	print
-MASTER_SITES=	http://www.cups.org/software/${DISTVERSION}/ \
-		EASYSW/${PORTNAME}/${DISTVERSION}
-PKGNAMESUFFIX=	${CUPS_SUFFIX}${PKGNAMESUFFIX2}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Common UNIX Printing System: ${COMMENT2}
-
-LICENSE=	GPLv2
-
-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-
-CONFLICTS=	LPRng-[0-9]*
-
-USES+=		cpe gmake iconv pkgconfig tar:bzip2
-CPE_VENDOR=	apple
-DESTDIRNAME=	DSTROOT
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-DSOFLAGS=	-Wl,-rpath,${PREFIX}/lib ${LDFLAGS} ${LIBS}
-CONFIGURE_ENV=	DSOFLAGS="${DSOFLAGS}"
-CONFIGURE_ARGS+=	--localstatedir=/var			\
-			--disable-gssapi			\
-			--with-cups-user=${USERS}		\
-			--with-cups-group=${GROUPS}		\
-			--with-system-groups=${CUPSSYSGRP}	\
-			--with-docdir=${DOCSDIR}		\
-			--with-menudir=${DESKTOPDIR}		\
-			--with-domainsocket=${CUPS_SOCKET}	\
-			--with-cachedir=${CUPS_CACHEDIR}	\
-			--with-pam-module="unix"		\
-			--enable-gnutls
-
-CUPS_CACHEDIR?=	/var/db/cups
-CUPS_SPOOLDIR=	/var/spool/cups
-CUPS_SOCKET?=	/var/run/cups.sock
-CUPS_PDFTOPS?=	${LOCALBASE}/libexec/xpdf/pdftops
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
-CUPSSYSGRP=	wheel
-# GROUPS/USERS does not work here
-GROUPS=	cups
-USERS=		cups
-
-OPTIONS_SUB=		yes
-.if defined(CUPS_CLIENT)
-PORTREVISION=	2
-LICENSE=	LGPL21
-CUPS_SUFFIX=	-client
-OPTIONS_RADIO=		ZEROCONF
-OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
-OPTIONS_DEFAULT+=	MDNSRESPONDER
-.elif defined(CUPS_IMAGE)
-PORTREVISION=	2
-CUPS_SUFFIX=	-image
-LICENSE=	LGPL21
-.else
-PORTREVISION=	5
-CUPS_SUFFIX=	-base
-# No DOCS option.  Files are needed by web interface.
-OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
-OPTIONS_GROUP=		WEB
-OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
-OPTIONS_RADIO=		ZEROCONF
-OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
-OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS
-.endif
-
-ICONS_DESC=		Desktop icons
-LIBUSB_DESC=		USB support
-WEB_DESC=		Interpreters for web interfaces
-XDG_OPEN_DESC=		Build with XDG_OPEN as browser
-ZEROCONF_DESC=		Zeroconf support
-
-.include <bsd.port.options.mk>
-
-.if defined(CUPS_CLIENT)
-COMMENT2=	Library cups
-INSTALL_WRKSRC=	${WRKSRC}/cups
-PLIST=		${MASTERDIR}/pkg-plist.client
-LIBS+=		${ICONV_LIB}
-USE_LDCONFIG=	yes
-PKGMESSAGE=	${NONEXISTENT}
-DESCR=		${MASTERDIR}/pkg-descr.client
-.elif defined(CUPS_IMAGE)
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/${PKGCATEGORY}/cups-client \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libtiff.so:${PORTSDIR}/graphics/tiff
-# force build if old cups is installed.
-BUILD_DEPENDS+=	cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client
-USES+=		jpeg
-COMMENT2=	Library cupsimage
-INSTALL_WRKSRC=	${WRKSRC}/filter
-PLIST=		${MASTERDIR}/pkg-plist.image
-USE_LDCONFIG=	yes
-PKGMESSAGE=	${NONEXISTENT}
-DESCR=		${MASTERDIR}/pkg-descr.image
-.else
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/${PKGCATEGORY}/cups-client \
-		libcupsimage.so:${PORTSDIR}/${PKGCATEGORY}/cups-image
-# force build if old cups is installed.
-BUILD_DEPENDS+=	cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client
-BUILD_DEPENDS+=	cups-image${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-image
-COMMENT2=	Server
-USE_RC_SUBR=	cupsd
-PLIST_SUB+=	CACHEDIR="${CUPS_CACHEDIR}"
-BROKEN_ia64=	stack-protector not supported on ia64
-.endif
-
-.if defined(CUPS_OVERWRITE_BASE)
-PLIST_SUB+=		OVERWRITE=""
-CONFIGURE_ARGS+=	--with-printcap=/etc/printcap
-.else
-PLIST_SUB+=		OVERWRITE="@comment "
-CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
-.endif
-
-# Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it
-# will set the path of the interpreter to "no" and set it's existence to TRUE.
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
-. if ${PORT_OPTIONS:MJAVA}
-CONFIGURE_ARGS+=	--with-java=${JAVA}
-USE_JAVA=		yes
-. endif
-
-. if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL}
-USES+=			perl5
-. endif
-
-. if ${PORT_OPTIONS:MPHP}
-CONFIGURE_ARGS+=	--with-php=${LOCALBASE}/bin/php-cgi
-USE_PHP=		yes
-USE_PHP_BUILD=		yes
-WANT_PHP_CGI=		yes
-. endif
-
-. if ${PORT_OPTIONS:MPYTHON}
-CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
-USES+=			python
-. endif
-
-. if ${PORT_OPTIONS:MLIBPAPER}
-CONFIGURE_ARGS+=	--enable-libpaper
-LIB_DEPENDS+=		libpaper.so:${PORTSDIR}/print/libpaper
-. endif
-
-. if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=	--enable-pam
-. else
-CONFIGURE_ARGS+=	--disable-pam
-. endif
-
-. if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=		libdbus-1.so:${PORTSDIR}/devel/dbus
-CONFIGURE_ARGS+=	--enable-dbus
-. else
-CONFIGURE_ARGS+=	--disable-dbus
-. endif
-
-. if ${PORT_OPTIONS:MXDG_OPEN}
-RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
-. endif
-
-. if ${PORT_OPTIONS:MLIBUSB}
-CONFIGURE_ARGS+=	--enable-libusb
-PLIST_SUB+=		LIBUSB=""
-. else
-CONFIGURE_ARGS+=	--disable-libusb
-PLIST_SUB+=		LIBUSB="@comment "
-. endif
-
-. if ${PORT_OPTIONS:MICONS}
-INSTALLS_ICONS=	yes
-CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
-. endif
-
-SUB_FILES+=	ulpt-cupsd.conf ulpt-cupsd.sh
-.endif
-
-.if !defined(CUPS_IMAGE)
-. if ${PORT_OPTIONS:MMDNSRESPONDER}
-LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
-CONFIGURE_ARGS+=	--enable-dnssd
-CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include
-CONFIGURE_ARGS+=	--disable-avahi
-SUB_LIST+=		ZEROCONF="mdnsd"
-. elif ${PORT_OPTIONS:MAVAHI}
-CONFIGURE_ARGS+=	--enable-avahi
-CONFIGURE_ARGS+=	--disable-dnssd
-LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
-SUB_LIST+=		ZEROCONF="avahi_daemon"
-. else
-CONFIGURE_ARGS+=	--disable-dnssd
-CONFIGURE_ARGS+=	--disable-avahi
-SUB_LIST+=		ZEROCONF=""
-. endif
-.endif
-
-.if ${OSVERSION} < 1000036 && ${ARCH} == i386
-LIBS+=		-lssp_nonshared
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if empty(ICONV_LIB)
-CONFIGURE_ENV+=	ac_cv_search_libiconv_open=no
-.endif
-
-post-patch:
-.if ${ARCH} == "amd64"
-	@${REINPLACE_CMD} -e 's|@PIEFLAGS@||' ${WRKSRC}/Makedefs.in
-.endif
-.if ${PORT_OPTIONS:MMDNSRESPONDER}
-	@${REINPLACE_CMD} -e 's|Darwin|FreeBSD|' \
-		${WRKSRC}/backend/Makefile
-.endif
-.if  ${PORT_OPTIONS:MXDG_OPEN}
-	@${REINPLACE_CMD} -e 's|htmlview|xdg-open|' ${WRKSRC}/desktop/cups.desktop.in
-.endif
-	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
-	@${REINPLACE_CMD} -e 's|/etc/cups|${LOCALBASE}/etc/cups|g' ${WRKSRC}/man/*.man*
-	@${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
-		-e 's|-D_LARGEFILE64_SOURCE||g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|\.default|.sample|'\
-		${WRKSRC}/cgi-bin/admin.c\
-		${WRKSRC}/CHANGES-1.3.txt\
-		${WRKSRC}/conf/Makefile\
-		${WRKSRC}/packaging/cups.list.in\
-		${WRKSRC}/packaging/cups.spec\
-		${WRKSRC}/packaging/cups.spec.in
-.if defined(CUPS_CLIENT)
-	@${REINPLACE_CMD} \
-		-e 's|cups test|cups|' \
-		-e 's|cups filter |cups |' \
-		-e 's|driver ppdc scheduler||' \
-		-e 's|$$.PHPDIR. $$.FONTS.||' \
-		${WRKSRC}/Makefile
-.elif defined(CUPS_IMAGE)
-	@${REINPLACE_CMD} \
-		-e 's|cups test||' \
-		-e 's|cups filter |filter |' \
-		-e 's|driver ppdc scheduler||' \
-		-e 's|$$.PHPDIR. $$.FONTS.||' \
-		${WRKSRC}/Makefile
-.else
-	@${REINPLACE_CMD} \
-		-e 's|cups test|test|' \
-		-e 's|cups filter driver|driver|' \
-		-e '/cd cups/d' \
-		-e 's|$$.INSTALL_SCRIPT. cups-config|echo skip: cups-config|' \
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} \
-		-e 's|cups-config.$$.MAN1EXT. ||' \
-		${WRKSRC}/man/Makefile
-.endif
-
-post-configure:
-.if defined(CUPS_CLIENT)
-	@${REINPLACE_CMD} \
-		-e 's|filter .* templates||' \
-		${WRKSRC}/Makedefs
-.elif defined(CUPS_IMAGE)
-	@${REINPLACE_CMD} \
-		-e 's|filter .* templates|filter|' \
-		${WRKSRC}/Makedefs
-.else
-	@${REINPLACE_CMD} \
-		-e 's|filter backend|backend|' \
-		-e 's|/etc/pam.d|${LOCALBASE}/etc/pam.d|'\
-		${WRKSRC}/Makedefs
-.endif
-
-.if !defined(CUPS_CLIENT)
-pre-build:
-	${CP} -p ${LOCALBASE}/lib/libcups.a ${WRKSRC}/cups/
-	${CP} -p ${LOCALBASE}/lib/libcups.so ${WRKSRC}/cups/
-	${CP} -p ${LOCALBASE}/lib/libcups.so.2 ${WRKSRC}/cups/
-.if !defined(CUPS_IMAGE)
-	${CP} -p ${LOCALBASE}/lib/libcupsimage.so ${WRKSRC}/filter/
-	${CP} -p ${LOCALBASE}/lib/libcupsimage.so.2 ${WRKSRC}/filter/
-.endif
-.endif
-
-post-install:
-	${CHMOD} u+w ${STAGEDIR}${PREFIX}/lib/*.so.*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
-	${CHMOD} u-w ${STAGEDIR}${PREFIX}/lib/*.so.*
-.if defined(CUPS_CLIENT)
-	${INSTALL_SCRIPT} ${WRKSRC}/cups-config ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/cups/libcups.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/man/cups-config.man ${STAGEDIR}${PREFIX}/man/man1/cups-config.1
-.elif defined(CUPS_IMAGE)
-.else
-	${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups
-	${MKDIR} ${STAGEDIR}${ETCDIR}/
-.for f in cupsd.conf mime.convs mime.types snmp.conf
-	test -f ${STAGEDIR}${ETCDIR}/${f} && ${RM} -f ${STAGEDIR}${ETCDIR}/${f} || ${TRUE}
-	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
-.endfor
-	@${MV} ${STAGEDIR}${ETCDIR}/cups-files.conf ${STAGEDIR}${ETCDIR}/cups-files.conf.sample
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKDIR}/ulpt-cupsd.conf ${STAGEDIR}${EXAMPLESDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${STAGEDIR}${PREFIX}/sbin/
-.endif
-
-.include <bsd.port.post.mk>
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@ -1,2 +0,0 @@
-SHA256 (cups-2.0.3-source.tar.bz2) = bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881
-SIZE (cups-2.0.3-source.tar.bz2) = 8797220
--- a/print/cups-base/files/patch-conf-Makefile
+++ b/print/cups-base/files/patch-conf-Makefile
@ -1,34 +0,0 @@
--- conf/Makefile.orig	2013-05-29 11:51:34 UTC
-+++ conf/Makefile
-@@ -77,7 +77,7 @@ install-data:
- 			$(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \
- 		fi ; \
- 	done
-	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default
-+	$(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.sample
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/mime
- 	for file in $(REPLACE); do \
- 		if test -r $(DATADIR)/mime/$$file ; then \
-@@ -90,10 +90,10 @@ install-data:
- 	done
- 	-if test x$(PAMDIR) != x; then \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
-		if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
-+		if test -r $(BUILDROOT)$(PAMDIR)/cups.sample ; then \
-+			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.sample.N ; \
- 		else \
-			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
-+			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.sample ; \
- 		fi ; \
- 	fi
- 
-@@ -124,7 +124,7 @@ install-libs:
- #
- 
- uninstall:
-	for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \
-+	for file in $(KEEP) $(REPLACE) cupsd.conf.sample; do \
- 		$(RM) $(SERVERROOT)/$$file; \
- 	done
- 	-$(RMDIR) $(SERVERROOT)
--- a/print/cups-base/files/patch-configure
+++ b/print/cups-base/files/patch-configure
@ -1,51 +0,0 @@
--- configure.orig	2015-02-09 19:38:35 UTC
-+++ configure
-@@ -586,6 +586,7 @@ ac_unique_file="cups/cups.h"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-+#include <netinet/in.h>
- #ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
-@@ -5382,6 +5383,13 @@ $as_echo "yes" >&6; }
- 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
- 			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
- 			USBQUIRKS="\$(DATADIR)/usb"
-+		elif test -f /usr/lib/libusb.so; then
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+			$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
-+
-+			LIBUSB="-lusb"
-+			USBQUIRKS="\$(DATADIR)/usb"
- 		else
- 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -5663,7 +5671,7 @@ $as_echo "yes" >&6; }
- 		CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
- 		SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`"
- 		DBUS_NOTIFIER="dbus"
-		DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
-+		DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1` -pthread"
- 		SAVELIBS="$LIBS"
- 		LIBS="$LIBS $DBUS_NOTIFIERLIBS"
- 		ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append"
-@@ -8646,7 +8654,7 @@ fi
- 		fi
- 
- 		# Find the PAM configuration directory, if any...
-		for dir in /private/etc/pam.d /etc/pam.d; do
-+		for dir in /usr/local/etc/pam.d /etc/pam.d; do
- 			if test -d $dir; then
- 				PAMDIR=$dir
- 				break;
-@@ -8899,7 +8907,7 @@ fi
- 
- LARGEFILE=""
- if test x$enable_largefile != xno; then
-	LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
-+	LARGEFILE="-D_LARGEFILE_SOURCE "
- 
- 	if test x$ac_cv_sys_large_files = x1; then
- 		LARGEFILE="$LARGEFILE -D_LARGE_FILES"
--- a/print/cups-base/files/patch-data-Makefile
+++ b/print/cups-base/files/patch-data-Makefile
@ -1,25 +0,0 @@
--- data/Makefile.orig	2013-05-29 11:51:34 UTC
-+++ data/Makefile
-@@ -86,14 +86,14 @@ install:	all install-data install-header
- #
- 
- install-data:
-	$(INSTALL_DIR) -m 755 $(DATADIR)/banners
-	for file in $(BANNERS); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/banners; \
-	done
-	$(INSTALL_DIR) -m 755 $(DATADIR)/data
-	for file in $(DATAFILES); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/data; \
-	done
-+#	$(INSTALL_DIR) -m 755 $(DATADIR)/banners
-+#	for file in $(BANNERS); do \
-+#		$(INSTALL_DATA) $$file $(DATADIR)/banners; \
-+#	done
-+#	$(INSTALL_DIR) -m 755 $(DATADIR)/data
-+#	for file in $(DATAFILES); do \
-+#		$(INSTALL_DATA) $$file $(DATADIR)/data; \
-+#	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/model
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/ppdc
- 	for file in $(PPDCFILES); do \
--- a/print/cups-base/files/patch-data_cups.pam
+++ b/print/cups-base/files/patch-data_cups.pam
@ -1,7 +0,0 @@
--- data/cups.pam.orig	2006-06-23 00:14:22 UTC
-+++ data/cups.pam
-@@ -1,2 +1,2 @@
-auth	required	/lib/security/pam_pwdb.so nullok shadow
-account	required	/lib/security/pam_pwdb.so
-+auth	include		system
-+account	include		system
--- a/print/cups-base/files/patch-scheduler_Makefile
+++ b/print/cups-base/files/patch-scheduler_Makefile
@ -1,20 +0,0 @@
--- scheduler/Makefile.orig	2014-10-21 11:55:01 UTC
-+++ scheduler/Makefile
-@@ -172,7 +172,7 @@ install-data:
- 	$(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
- 	echo Creating $(CACHEDIR)...
- 	$(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR)
-	if test "x$(INITDIR)" != x; then \
-+	if test "x$(xxINITDIR)" != x; then \
- 		echo Installing init scripts...; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
- 		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-@@ -184,7 +184,7 @@ install-data:
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
- 		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
- 	fi
-	if test "x$(INITDDIR)" != x; then \
-+	if test "x$(xxINITDDIR)" != x; then \
- 		echo Installing init script...; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR); \
- 		$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR); \
--- a/print/cups-base/files/ulpt-cupsd.conf.in
+++ b/print/cups-base/files/ulpt-cupsd.conf.in
@ -1,38 +0,0 @@
-# /usr/local/etc/devd/cups.conf
-#
-# $FreeBSD$
-#
-# Tell cups to pause and unpause the printer when it arrives and departs.
-#
-
-attach 110 {
-device-name "unlpt[0-9]+";
-action "%%PREFIX%%/sbin/ulpt-cupsd.sh enable $device-name";
-};
-
-attach 110 {
-device-name "ulpt[0-9]+";
-action "%%PREFIX%%/sbin/ulpt-cupsd.sh enable $device-name";
-};
-
-attach 110 {
-device-name "lpt[0-9]+";
-action "%%PREFIX%%/sbin/ulpt-cupsd.sh enable $device-name";
-};
-
-detach 110 {
-device-name "unlpt[0-9]+";
-action "%%PREFIX%%/sbin/ulpt-cupsd.sh disable $device-name";
-};
-
-detach 110 {
-device-name "ulpt[0-9]+";
-action "%%PREFIX%%/sbin/ulpt-cupsd.sh disable $device-name";
-};
-
-detach 110 {
-device-name "lpt[0-9]+";
-action "%%PREFIX%%/sbin/ulpt-cupsd.sh disable $device-name";
-};
-
-# eof
--- a/print/cups-base/files/ulpt-cupsd.sh.in
+++ b/print/cups-base/files/ulpt-cupsd.sh.in
@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-usage() {
-	echo "$0: usage:" >&2
-	echo "$0 [enable|disable] devicename" >&2
-	exit 1
-}
-
-if [ -z "$2" ]; then
-	usage
-fi
-
-printer="$(awk -v DEVICENAME="$2" '
-/^<(Default)?Printer[[:space:]]/ { 
-	if (match($0, /[^[:space:]>]+>/)) {
-		PRINTER=substr($0, RSTART, RLENGTH - 1);
-	}
-}
-/^<\/(Default)?Printer/ {
-	PRINTER=""
-}
-match($0, "DeviceURI[[:space:]]+usb:/dev/" DEVICENAME "\$") {
-	print PRINTER
-}
-' %%PREFIX%%/etc/cups/printers.conf)"
-
-if [ -z "$printer" ]; then
-	# nothing to do
-	exit 0
-fi
-
-case "$1" in
-enable)
-	chown cups:cups "/dev/$2"
-	%%PREFIX%%/sbin/cupsenable "$printer"
-	;;
-disable)
-	%%PREFIX%%/sbin/cupsdisable "$printer"
-	;;
-*)
-	usage
-	;;
-esac
-exit 0
-# eof
--- a/print/cups-base/pkg-descr
+++ b/print/cups-base/pkg-descr
@ -1,21 +0,0 @@
-CUPS provides a portable printing layer for UNIX-based operating
-systems. It has been developed by Easy Software Products to promote a
-standard printing solution for all UNIX vendors and users. 
-
-CUPS uses the Internet Printing Protocol ("IPP") as the basis for
-managing print jobs and queues. The Line Printer Daemon ("LPD") Server
-Message Block ("SMB"), and AppSocket (a.k.a. JetDirect) protocols are
-also supported with reduced functionality. CUPS adds network printer
-browsing and PostScript Printer Description ("PPD") based printing
-options to support real-world printing under UNIX.
-
-CUPS provides the System V and Berkeley command-line interfaces.
-
-CUPS also supports a customized version of GNU Ghostscript (currently based
-off GNU Ghostscript 5.50) and an image file RIP that are used to support
-non-PostScript printers. Sample drivers for HP and EPSON printers are included
-that use these filters. This software is available in the cups-pstoraster
-port.
-
-WWW: http://www.cups.org/
-[original text by greid@ukug.uk.freebsd.org]
--- a/print/cups-base/pkg-descr.client
+++ b/print/cups-base/pkg-descr.client
@ -1,3 +0,0 @@
-This provides libcups for applications to access CUPS.
-
-WWW: http://www.cups.org/
--- a/print/cups-base/pkg-descr.image
+++ b/print/cups-base/pkg-descr.image
@ -1,3 +0,0 @@
-This provides libcupsimage for applications to process CUPS raster files.
-
-WWW: http://www.cups.org/
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@ -1,42 +0,0 @@
-======================================================================
-
-To enable printing with local printer you need to give group 'cups'
-r/w access to printer device:
-
-1) Add following to /etc/devfs.rules (create if it doesn't exist):
-
-[system=10]
-# FreeBSD 7.x
-add path 'unlpt*' mode 0660 group cups
-add path 'ulpt*' mode 0660 group cups
-add path 'lpt*' mode 0660 group cups
-# FreeBSD 8.x
-add path 'usb*' mode 0770 group cups
-add path 'ugen*' mode 0660 group cups
-
-2) And following to /etc/rc.conf:
-
-devfs_system_ruleset="system"
-
-3) Restart devfs: /etc/rc.d/devfs restart
-
-If your system supports 'devd' you can copy
-$PREFIX/share/examples/cups/ulpt-cupsd.conf to $PREFIX/etc/devd/
-
-To enable printing under Gimp and MS-Windows clients do the following:
-
-1) Uncomment application/octet-stream line in mime.types
-2) Uncomment application/octet-stream line in mime.convs
-3) Restart cupsd
-
-If you are using libusb, it is important that no device driver, e.g.
-ulpt(4) is attached to the device you wish to use. In this case please
-ensure the cups user and group has read/write access to /dev/ugen*
-
-If you are using a USB printer wtih FreeBSD 8.0 or later, you will
-need to find the proper /dev/usb/* device pointed at by the /dev/ugen*
-entry. Follow the instructions for devfs.rules as above, but append a 
-rule similar to the following for a printer attached as /dev/ugen0.2:
-
-add path 'usb/0.2.*' mode 0660 group cups
-======================================================================
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@ -1,669 +0,0 @@
-%%OVERWRITE%%@exec if test -e /usr/bin/lp; then chmod -h 0 /usr/bin/lp; fi
-%%OVERWRITE%%@exec if test -e /usr/bin/lpq; then chmod -h 0 /usr/bin/lpq; fi
-%%OVERWRITE%%@exec if test -e /usr/bin/lpr; then chmod -h 0 /usr/bin/lpr; fi
-%%OVERWRITE%%@exec if test -e /usr/bin/lprm; then chmod -h 0 /usr/bin/lprm; fi
-%%OVERWRITE%%@exec if test -e /usr/sbin/lpc; then chmod -h 0 /usr/sbin/lpc; fi
-%%OVERWRITE%%@unexec if test -e /usr/bin/lp; then chmod -h 0555 /usr/bin/lp; fi
-%%OVERWRITE%%@unexec if test -e /usr/bin/lpq; then chmod -h 06555 /usr/bin/lpq; fi
-%%OVERWRITE%%@unexec if test -e /usr/bin/lpr; then chmod -h 06555 /usr/bin/lpr; fi
-%%OVERWRITE%%@unexec if test -e /usr/bin/lprm; then chmod -h 06555 /usr/bin/lprm; fi
-%%OVERWRITE%%@unexec if test -e /usr/sbin/lpc; then chmod -h 02555 /usr/sbin/lpc; fi
-@sample %%ETCDIR%%/cups-files.conf.sample
-@sample %%ETCDIR%%/cupsd.conf.sample
-@sample %%ETCDIR%%/mime.convs.sample
-@sample %%ETCDIR%%/mime.types.sample
-@sample %%ETCDIR%%/snmp.conf.sample
-%%PAM%%@sample etc/pam.d/cups.sample
-bin/cancel
-bin/cupstestdsc
-bin/cupstestppd
-@comment bin/ippfind
-bin/ipptool
-bin/lp
-bin/lpoptions
-bin/lpq
-bin/lpr
-bin/lpr-cups
-bin/lprm
-bin/lpstat
-bin/ppdc
-bin/ppdhtml
-bin/ppdi
-bin/ppdmerge
-bin/ppdpo
-include/cups/cgi.h
-include/cups/help-index.h
-include/cups/mime.h
-include/cups/ppdc.h
-lib/libcupscgi.so
-lib/libcupscgi.so.1
-lib/libcupsmime.so
-lib/libcupsmime.so.1
-lib/libcupsppdc.so
-lib/libcupsppdc.so.1
-libexec/cups/backend/http
-libexec/cups/backend/https
-libexec/cups/backend/ipp
-libexec/cups/backend/ipps
-libexec/cups/backend/lpd
-libexec/cups/backend/snmp
-libexec/cups/backend/socket
-libexec/cups/backend/usb
-%%AVAHI%%libexec/cups/backend/dnssd
-%%MDNSRESPONDER%%libexec/cups/backend/dnssd
-%%MDNSRESPONDER%%libexec/cups/backend/mdns
-libexec/cups/cgi-bin/admin.cgi
-libexec/cups/cgi-bin/classes.cgi
-libexec/cups/cgi-bin/help.cgi
-libexec/cups/cgi-bin/jobs.cgi
-libexec/cups/cgi-bin/printers.cgi
-libexec/cups/daemon/cups-deviced
-libexec/cups/daemon/cups-driverd
-libexec/cups/daemon/cups-exec
-libexec/cups/daemon/cups-lpd
-libexec/cups/monitor/bcp
-libexec/cups/monitor/tbcp
-%%DBUS%%libexec/cups/notifier/dbus
-libexec/cups/notifier/mailto
-libexec/cups/notifier/rss
-man/man1/cancel.1.gz
-man/man1/cupstestdsc.1.gz
-man/man1/cupstestppd.1.gz
-man/man1/cups.1.gz
-%%AVAHI%%man/man1/ippfind.1.gz
-man/man1/ipptool.1.gz
-man/man1/lp.1.gz
-man/man1/lpoptions.1.gz
-man/man1/lpq.1.gz
-man/man1/lpr.1.gz
-man/man1/lprm.1.gz
-man/man1/lpstat.1.gz
-man/man1/ppdc.1.gz
-man/man1/ppdhtml.1.gz
-man/man1/ppdi.1.gz
-man/man1/ppdmerge.1.gz
-man/man1/ppdpo.1.gz
-man/man5/classes.conf.5.gz
-man/man5/client.conf.5.gz
-man/man5/cups-files.conf.5.gz
-man/man5/cups-snmp.conf.5.gz
-man/man5/cupsd.conf.5.gz
-man/man5/ipptoolfile.5.gz
-man/man5/mailto.conf.5.gz
-man/man5/mime.convs.5.gz
-man/man5/mime.types.5.gz
-man/man5/ppdcfile.5.gz
-man/man5/printers.conf.5.gz
-man/man5/subscriptions.conf.5.gz
-man/man7/backend.7.gz
-man/man7/filter.7.gz
-man/man7/notifier.7.gz
-man/man8/accept.8.gz
-man/man8/cupsd-logs.8.gz
-man/man8/cupsd-helper.8.gz
-man/man8/cups-deviced.8.gz
-man/man8/cups-exec.8.gz
-man/man8/cups-driverd.8.gz
-man/man8/cups-lpd.8.gz
-man/man8/cups-snmp.8.gz
-man/man8/cupsaccept.8.gz
-man/man8/cupsaddsmb.8.gz
-man/man8/cupsctl.8.gz
-man/man8/cupsd.8.gz
-man/man8/cupsdisable.8.gz
-man/man8/cupsenable.8.gz
-man/man8/cupsfilter.8.gz
-man/man8/cupsreject.8.gz
-man/man8/lpadmin.8.gz
-man/man8/lpc.8.gz
-man/man8/lpinfo.8.gz
-man/man8/lpmove.8.gz
-man/man8/reject.8.gz
-sbin/accept
-sbin/cupsaccept
-sbin/cupsaddsmb
-sbin/cupsctl
-sbin/cupsd
-sbin/cupsdisable
-sbin/cupsenable
-sbin/cupsfilter
-sbin/cupsreject
-sbin/lpadmin
-sbin/lpc
-sbin/lpinfo
-sbin/lpmove
-sbin/reject
-sbin/ulpt-cupsd.sh
-%%DATADIR%%/drv/sample.drv
-%%DATADIR%%/examples/color.drv
-%%DATADIR%%/examples/constraint.drv
-%%DATADIR%%/examples/custom.drv
-%%DATADIR%%/examples/grouping.drv
-%%DATADIR%%/examples/laserjet-basic.drv
-%%DATADIR%%/examples/laserjet-pjl.drv
-%%DATADIR%%/examples/minimum.drv
-%%DATADIR%%/examples/postscript.drv
-%%DATADIR%%/examples/r300-basic.drv
-%%DATADIR%%/examples/r300-colorman.drv
-%%DATADIR%%/examples/r300-remote.drv
-%%DATADIR%%/ipptool/color.jpg
-%%DATADIR%%/ipptool/create-printer-subscription.test
-%%DATADIR%%/ipptool/document-a4.pdf
-%%DATADIR%%/ipptool/document-a4.ps
-%%DATADIR%%/ipptool/document-letter.pdf
-%%DATADIR%%/ipptool/document-letter.ps
-%%DATADIR%%/ipptool/get-completed-jobs.test
-%%DATADIR%%/ipptool/get-jobs.test
-%%DATADIR%%/ipptool/get-notifications.test
-%%DATADIR%%/ipptool/get-printer-attributes.test
-%%DATADIR%%/ipptool/get-subscriptions.test
-%%DATADIR%%/ipptool/gray.jpg
-%%DATADIR%%/ipptool/ipp-1.1.test
-%%DATADIR%%/ipptool/ipp-2.0.test
-%%DATADIR%%/ipptool/ipp-2.1.test
-%%DATADIR%%/ipptool/ipp-2.2.test
-%%DATADIR%%/ipptool/ipp-everywhere.test
-%%DATADIR%%/ipptool/onepage-a4.pdf
-%%DATADIR%%/ipptool/onepage-a4.ps
-%%DATADIR%%/ipptool/onepage-letter.pdf
-%%DATADIR%%/ipptool/onepage-letter.ps
-%%DATADIR%%/ipptool/print-job-deflate.test
-%%DATADIR%%/ipptool/print-job-gzip.test
-%%DATADIR%%/ipptool/print-job.test
-%%DATADIR%%/ipptool/testfile.jpg
-%%DATADIR%%/ipptool/testfile.pcl
-%%DATADIR%%/ipptool/testfile.pdf
-%%DATADIR%%/ipptool/testfile.ps
-%%DATADIR%%/ipptool/testfile.txt
-%%DATADIR%%/ipptool/validate-job.test
-%%DATADIR%%/mime/mime.convs
-%%DATADIR%%/mime/mime.types
-%%DATADIR%%/ppdc/epson.h
-%%DATADIR%%/ppdc/font.defs
-%%DATADIR%%/ppdc/hp.h
-%%DATADIR%%/ppdc/label.h
-%%DATADIR%%/ppdc/media.defs
-%%DATADIR%%/ppdc/raster.defs
-%%DATADIR%%/templates/add-class.tmpl
-%%DATADIR%%/templates/add-printer.tmpl
-%%DATADIR%%/templates/add-rss-subscription.tmpl
-%%DATADIR%%/templates/admin.tmpl
-%%DATADIR%%/templates/choose-device.tmpl
-%%DATADIR%%/templates/choose-make.tmpl
-%%DATADIR%%/templates/choose-model.tmpl
-%%DATADIR%%/templates/choose-serial.tmpl
-%%DATADIR%%/templates/choose-uri.tmpl
-%%DATADIR%%/templates/class-added.tmpl
-%%DATADIR%%/templates/class-confirm.tmpl
-%%DATADIR%%/templates/class-deleted.tmpl
-%%DATADIR%%/templates/class-jobs-header.tmpl
-%%DATADIR%%/templates/class-modified.tmpl
-%%DATADIR%%/templates/class.tmpl
-%%DATADIR%%/templates/classes-header.tmpl
-%%DATADIR%%/templates/classes.tmpl
-%%DATADIR%%/templates/command.tmpl
-%%DATADIR%%/templates/de/add-class.tmpl
-%%DATADIR%%/templates/de/add-printer.tmpl
-%%DATADIR%%/templates/de/add-rss-subscription.tmpl
-%%DATADIR%%/templates/de/admin.tmpl
-%%DATADIR%%/templates/de/choose-device.tmpl
-%%DATADIR%%/templates/de/choose-make.tmpl
-%%DATADIR%%/templates/de/choose-model.tmpl
-%%DATADIR%%/templates/de/choose-serial.tmpl
-%%DATADIR%%/templates/de/choose-uri.tmpl
-%%DATADIR%%/templates/de/class-added.tmpl
-%%DATADIR%%/templates/de/class-confirm.tmpl
-%%DATADIR%%/templates/de/class-deleted.tmpl
-%%DATADIR%%/templates/de/class-jobs-header.tmpl
-%%DATADIR%%/templates/de/class-modified.tmpl
-%%DATADIR%%/templates/de/class.tmpl
-%%DATADIR%%/templates/de/classes-header.tmpl
-%%DATADIR%%/templates/de/classes.tmpl
-%%DATADIR%%/templates/de/command.tmpl
-%%DATADIR%%/templates/de/edit-config.tmpl
-%%DATADIR%%/templates/de/error-op.tmpl
-%%DATADIR%%/templates/de/error.tmpl
-%%DATADIR%%/templates/de/header.tmpl
-%%DATADIR%%/templates/de/help-header.tmpl
-%%DATADIR%%/templates/de/help-printable.tmpl
-%%DATADIR%%/templates/de/job-cancel.tmpl
-%%DATADIR%%/templates/de/job-hold.tmpl
-%%DATADIR%%/templates/de/job-move.tmpl
-%%DATADIR%%/templates/de/job-moved.tmpl
-%%DATADIR%%/templates/de/job-release.tmpl
-%%DATADIR%%/templates/de/job-restart.tmpl
-%%DATADIR%%/templates/de/jobs-header.tmpl
-%%DATADIR%%/templates/de/jobs.tmpl
-%%DATADIR%%/templates/de/list-available-printers.tmpl
-%%DATADIR%%/templates/de/modify-class.tmpl
-%%DATADIR%%/templates/de/modify-printer.tmpl
-%%DATADIR%%/templates/de/norestart.tmpl
-%%DATADIR%%/templates/de/option-boolean.tmpl
-%%DATADIR%%/templates/de/option-conflict.tmpl
-%%DATADIR%%/templates/de/option-header.tmpl
-%%DATADIR%%/templates/de/option-pickmany.tmpl
-%%DATADIR%%/templates/de/option-pickone.tmpl
-%%DATADIR%%/templates/de/option-trailer.tmpl
-%%DATADIR%%/templates/de/pager.tmpl
-%%DATADIR%%/templates/de/printer-accept.tmpl
-%%DATADIR%%/templates/de/printer-added.tmpl
-%%DATADIR%%/templates/de/printer-cancel-jobs.tmpl
-%%DATADIR%%/templates/de/printer-configured.tmpl
-%%DATADIR%%/templates/de/printer-confirm.tmpl
-%%DATADIR%%/templates/de/printer-default.tmpl
-%%DATADIR%%/templates/de/printer-deleted.tmpl
-%%DATADIR%%/templates/de/printer-jobs-header.tmpl
-%%DATADIR%%/templates/de/printer-modified.tmpl
-%%DATADIR%%/templates/de/printer-reject.tmpl
-%%DATADIR%%/templates/de/printer-start.tmpl
-%%DATADIR%%/templates/de/printer-stop.tmpl
-%%DATADIR%%/templates/de/printer.tmpl
-%%DATADIR%%/templates/de/printers-header.tmpl
-%%DATADIR%%/templates/de/printers.tmpl
-%%DATADIR%%/templates/de/restart.tmpl
-%%DATADIR%%/templates/de/samba-export.tmpl
-%%DATADIR%%/templates/de/samba-exported.tmpl
-%%DATADIR%%/templates/de/search.tmpl
-%%DATADIR%%/templates/de/set-printer-options-header.tmpl
-%%DATADIR%%/templates/de/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/de/subscription-added.tmpl
-%%DATADIR%%/templates/de/subscription-canceled.tmpl
-%%DATADIR%%/templates/de/test-page.tmpl
-%%DATADIR%%/templates/de/trailer.tmpl
-%%DATADIR%%/templates/de/users.tmpl
-%%DATADIR%%/templates/edit-config.tmpl
-%%DATADIR%%/templates/error-op.tmpl
-%%DATADIR%%/templates/error.tmpl
-%%DATADIR%%/templates/es/add-class.tmpl
-%%DATADIR%%/templates/es/add-printer.tmpl
-%%DATADIR%%/templates/es/add-rss-subscription.tmpl
-%%DATADIR%%/templates/es/admin.tmpl
-%%DATADIR%%/templates/es/choose-device.tmpl
-%%DATADIR%%/templates/es/choose-make.tmpl
-%%DATADIR%%/templates/es/choose-model.tmpl
-%%DATADIR%%/templates/es/choose-serial.tmpl
-%%DATADIR%%/templates/es/choose-uri.tmpl
-%%DATADIR%%/templates/es/class-added.tmpl
-%%DATADIR%%/templates/es/class-confirm.tmpl
-%%DATADIR%%/templates/es/class-deleted.tmpl
-%%DATADIR%%/templates/es/class-jobs-header.tmpl
-%%DATADIR%%/templates/es/class-modified.tmpl
-%%DATADIR%%/templates/es/class.tmpl
-%%DATADIR%%/templates/es/classes-header.tmpl
-%%DATADIR%%/templates/es/classes.tmpl
-%%DATADIR%%/templates/es/command.tmpl
-%%DATADIR%%/templates/es/edit-config.tmpl
-%%DATADIR%%/templates/es/error-op.tmpl
-%%DATADIR%%/templates/es/error.tmpl
-%%DATADIR%%/templates/es/header.tmpl
-%%DATADIR%%/templates/es/help-header.tmpl
-%%DATADIR%%/templates/es/help-printable.tmpl
-%%DATADIR%%/templates/es/help-trailer.tmpl
-%%DATADIR%%/templates/es/job-cancel.tmpl
-%%DATADIR%%/templates/es/job-hold.tmpl
-%%DATADIR%%/templates/es/job-move.tmpl
-%%DATADIR%%/templates/es/job-moved.tmpl
-%%DATADIR%%/templates/es/job-release.tmpl
-%%DATADIR%%/templates/es/job-restart.tmpl
-%%DATADIR%%/templates/es/jobs-header.tmpl
-%%DATADIR%%/templates/es/jobs.tmpl
-%%DATADIR%%/templates/es/list-available-printers.tmpl
-%%DATADIR%%/templates/es/modify-class.tmpl
-%%DATADIR%%/templates/es/modify-printer.tmpl
-%%DATADIR%%/templates/es/norestart.tmpl
-%%DATADIR%%/templates/es/option-boolean.tmpl
-%%DATADIR%%/templates/es/option-conflict.tmpl
-%%DATADIR%%/templates/es/option-header.tmpl
-%%DATADIR%%/templates/es/option-pickmany.tmpl
-%%DATADIR%%/templates/es/option-pickone.tmpl
-%%DATADIR%%/templates/es/option-trailer.tmpl
-%%DATADIR%%/templates/es/pager.tmpl
-%%DATADIR%%/templates/es/printer-accept.tmpl
-%%DATADIR%%/templates/es/printer-added.tmpl
-%%DATADIR%%/templates/es/printer-cancel-jobs.tmpl
-%%DATADIR%%/templates/es/printer-configured.tmpl
-%%DATADIR%%/templates/es/printer-confirm.tmpl
-%%DATADIR%%/templates/es/printer-default.tmpl
-%%DATADIR%%/templates/es/printer-deleted.tmpl
-%%DATADIR%%/templates/es/printer-jobs-header.tmpl
-%%DATADIR%%/templates/es/printer-modified.tmpl
-%%DATADIR%%/templates/es/printer-reject.tmpl
-%%DATADIR%%/templates/es/printer-start.tmpl
-%%DATADIR%%/templates/es/printer-stop.tmpl
-%%DATADIR%%/templates/es/printer.tmpl
-%%DATADIR%%/templates/es/printers-header.tmpl
-%%DATADIR%%/templates/es/printers.tmpl
-%%DATADIR%%/templates/es/restart.tmpl
-%%DATADIR%%/templates/es/samba-export.tmpl
-%%DATADIR%%/templates/es/samba-exported.tmpl
-%%DATADIR%%/templates/es/search.tmpl
-%%DATADIR%%/templates/es/set-printer-options-header.tmpl
-%%DATADIR%%/templates/es/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/es/subscription-added.tmpl
-%%DATADIR%%/templates/es/subscription-canceled.tmpl
-%%DATADIR%%/templates/es/test-page.tmpl
-%%DATADIR%%/templates/es/trailer.tmpl
-%%DATADIR%%/templates/es/users.tmpl
-%%DATADIR%%/templates/header.tmpl
-%%DATADIR%%/templates/help-header.tmpl
-%%DATADIR%%/templates/help-printable.tmpl
-%%DATADIR%%/templates/help-trailer.tmpl
-%%DATADIR%%/templates/ja/add-class.tmpl
-%%DATADIR%%/templates/ja/add-printer.tmpl
-%%DATADIR%%/templates/ja/add-rss-subscription.tmpl
-%%DATADIR%%/templates/ja/admin.tmpl
-%%DATADIR%%/templates/ja/choose-device.tmpl
-%%DATADIR%%/templates/ja/choose-make.tmpl
-%%DATADIR%%/templates/ja/choose-model.tmpl
-%%DATADIR%%/templates/ja/choose-serial.tmpl
-%%DATADIR%%/templates/ja/choose-uri.tmpl
-%%DATADIR%%/templates/ja/class-added.tmpl
-%%DATADIR%%/templates/ja/class-confirm.tmpl
-%%DATADIR%%/templates/ja/class-deleted.tmpl
-%%DATADIR%%/templates/ja/class-jobs-header.tmpl
-%%DATADIR%%/templates/ja/class-modified.tmpl
-%%DATADIR%%/templates/ja/class.tmpl
-%%DATADIR%%/templates/ja/classes-header.tmpl
-%%DATADIR%%/templates/ja/classes.tmpl
-%%DATADIR%%/templates/ja/command.tmpl
-%%DATADIR%%/templates/ja/edit-config.tmpl
-%%DATADIR%%/templates/ja/error-op.tmpl
-%%DATADIR%%/templates/ja/error.tmpl
-%%DATADIR%%/templates/ja/header.tmpl
-%%DATADIR%%/templates/ja/help-header.tmpl
-%%DATADIR%%/templates/ja/help-printable.tmpl
-%%DATADIR%%/templates/ja/help-trailer.tmpl
-%%DATADIR%%/templates/ja/job-cancel.tmpl
-%%DATADIR%%/templates/ja/job-hold.tmpl
-%%DATADIR%%/templates/ja/job-move.tmpl
-%%DATADIR%%/templates/ja/job-moved.tmpl
-%%DATADIR%%/templates/ja/job-release.tmpl
-%%DATADIR%%/templates/ja/job-restart.tmpl
-%%DATADIR%%/templates/ja/jobs-header.tmpl
-%%DATADIR%%/templates/ja/jobs.tmpl
-%%DATADIR%%/templates/ja/list-available-printers.tmpl
-%%DATADIR%%/templates/ja/modify-class.tmpl
-%%DATADIR%%/templates/ja/modify-printer.tmpl
-%%DATADIR%%/templates/ja/norestart.tmpl
-%%DATADIR%%/templates/ja/option-boolean.tmpl
-%%DATADIR%%/templates/ja/option-conflict.tmpl
-%%DATADIR%%/templates/ja/option-header.tmpl
-%%DATADIR%%/templates/ja/option-pickmany.tmpl
-%%DATADIR%%/templates/ja/option-pickone.tmpl
-%%DATADIR%%/templates/ja/option-trailer.tmpl
-%%DATADIR%%/templates/ja/pager.tmpl
-%%DATADIR%%/templates/ja/printer-accept.tmpl
-%%DATADIR%%/templates/ja/printer-added.tmpl
-%%DATADIR%%/templates/ja/printer-cancel-jobs.tmpl
-%%DATADIR%%/templates/ja/printer-configured.tmpl
-%%DATADIR%%/templates/ja/printer-confirm.tmpl
-%%DATADIR%%/templates/ja/printer-default.tmpl
-%%DATADIR%%/templates/ja/printer-deleted.tmpl
-%%DATADIR%%/templates/ja/printer-jobs-header.tmpl
-%%DATADIR%%/templates/ja/printer-modified.tmpl
-%%DATADIR%%/templates/ja/printer-reject.tmpl
-%%DATADIR%%/templates/ja/printer-start.tmpl
-%%DATADIR%%/templates/ja/printer-stop.tmpl
-%%DATADIR%%/templates/ja/printer.tmpl
-%%DATADIR%%/templates/ja/printers-header.tmpl
-%%DATADIR%%/templates/ja/printers.tmpl
-%%DATADIR%%/templates/ja/restart.tmpl
-%%DATADIR%%/templates/ja/samba-export.tmpl
-%%DATADIR%%/templates/ja/samba-exported.tmpl
-%%DATADIR%%/templates/ja/search.tmpl
-%%DATADIR%%/templates/ja/set-printer-options-header.tmpl
-%%DATADIR%%/templates/ja/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/ja/subscription-added.tmpl
-%%DATADIR%%/templates/ja/subscription-canceled.tmpl
-%%DATADIR%%/templates/ja/test-page.tmpl
-%%DATADIR%%/templates/ja/trailer.tmpl
-%%DATADIR%%/templates/ja/users.tmpl
-%%DATADIR%%/templates/job-cancel.tmpl
-%%DATADIR%%/templates/job-hold.tmpl
-%%DATADIR%%/templates/job-move.tmpl
-%%DATADIR%%/templates/job-moved.tmpl
-%%DATADIR%%/templates/job-release.tmpl
-%%DATADIR%%/templates/job-restart.tmpl
-%%DATADIR%%/templates/jobs-header.tmpl
-%%DATADIR%%/templates/jobs.tmpl
-%%DATADIR%%/templates/list-available-printers.tmpl
-%%DATADIR%%/templates/modify-class.tmpl
-%%DATADIR%%/templates/modify-printer.tmpl
-%%DATADIR%%/templates/norestart.tmpl
-%%DATADIR%%/templates/option-boolean.tmpl
-%%DATADIR%%/templates/option-conflict.tmpl
-%%DATADIR%%/templates/option-header.tmpl
-%%DATADIR%%/templates/option-pickmany.tmpl
-%%DATADIR%%/templates/option-pickone.tmpl
-%%DATADIR%%/templates/option-trailer.tmpl
-%%DATADIR%%/templates/pager.tmpl
-%%DATADIR%%/templates/printer-accept.tmpl
-%%DATADIR%%/templates/printer-added.tmpl
-%%DATADIR%%/templates/printer-cancel-jobs.tmpl
-%%DATADIR%%/templates/printer-configured.tmpl
-%%DATADIR%%/templates/printer-confirm.tmpl
-%%DATADIR%%/templates/printer-default.tmpl
-%%DATADIR%%/templates/printer-deleted.tmpl
-%%DATADIR%%/templates/printer-jobs-header.tmpl
-%%DATADIR%%/templates/printer-modified.tmpl
-%%DATADIR%%/templates/printer-reject.tmpl
-%%DATADIR%%/templates/printer-start.tmpl
-%%DATADIR%%/templates/printer-stop.tmpl
-%%DATADIR%%/templates/printer.tmpl
-%%DATADIR%%/templates/printers-header.tmpl
-%%DATADIR%%/templates/printers.tmpl
-%%DATADIR%%/templates/restart.tmpl
-%%DATADIR%%/templates/ru/add-class.tmpl
-%%DATADIR%%/templates/ru/add-printer.tmpl
-%%DATADIR%%/templates/ru/add-rss-subscription.tmpl
-%%DATADIR%%/templates/ru/admin.tmpl
-%%DATADIR%%/templates/ru/choose-device.tmpl
-%%DATADIR%%/templates/ru/choose-make.tmpl
-%%DATADIR%%/templates/ru/choose-model.tmpl
-%%DATADIR%%/templates/ru/choose-serial.tmpl
-%%DATADIR%%/templates/ru/choose-uri.tmpl
-%%DATADIR%%/templates/ru/class-added.tmpl
-%%DATADIR%%/templates/ru/class-confirm.tmpl
-%%DATADIR%%/templates/ru/class-deleted.tmpl
-%%DATADIR%%/templates/ru/class-jobs-header.tmpl
-%%DATADIR%%/templates/ru/class-modified.tmpl
-%%DATADIR%%/templates/ru/class.tmpl
-%%DATADIR%%/templates/ru/classes-header.tmpl
-%%DATADIR%%/templates/ru/classes.tmpl
-%%DATADIR%%/templates/ru/command.tmpl
-%%DATADIR%%/templates/ru/edit-config.tmpl
-%%DATADIR%%/templates/ru/error-op.tmpl
-%%DATADIR%%/templates/ru/error.tmpl
-%%DATADIR%%/templates/ru/header.tmpl
-%%DATADIR%%/templates/ru/help-header.tmpl
-%%DATADIR%%/templates/ru/help-printable.tmpl
-%%DATADIR%%/templates/ru/job-cancel.tmpl
-%%DATADIR%%/templates/ru/job-hold.tmpl
-%%DATADIR%%/templates/ru/job-move.tmpl
-%%DATADIR%%/templates/ru/job-moved.tmpl
-%%DATADIR%%/templates/ru/job-release.tmpl
-%%DATADIR%%/templates/ru/job-restart.tmpl
-%%DATADIR%%/templates/ru/jobs-header.tmpl
-%%DATADIR%%/templates/ru/jobs.tmpl
-%%DATADIR%%/templates/ru/list-available-printers.tmpl
-%%DATADIR%%/templates/ru/modify-class.tmpl
-%%DATADIR%%/templates/ru/modify-printer.tmpl
-%%DATADIR%%/templates/ru/norestart.tmpl
-%%DATADIR%%/templates/ru/option-boolean.tmpl
-%%DATADIR%%/templates/ru/option-conflict.tmpl
-%%DATADIR%%/templates/ru/option-header.tmpl
-%%DATADIR%%/templates/ru/option-pickmany.tmpl
-%%DATADIR%%/templates/ru/option-pickone.tmpl
-%%DATADIR%%/templates/ru/option-trailer.tmpl
-%%DATADIR%%/templates/ru/pager.tmpl
-%%DATADIR%%/templates/ru/printer-accept.tmpl
-%%DATADIR%%/templates/ru/printer-added.tmpl
-%%DATADIR%%/templates/ru/printer-cancel-jobs.tmpl
-%%DATADIR%%/templates/ru/printer-configured.tmpl
-%%DATADIR%%/templates/ru/printer-confirm.tmpl
-%%DATADIR%%/templates/ru/printer-default.tmpl
-%%DATADIR%%/templates/ru/printer-deleted.tmpl
-%%DATADIR%%/templates/ru/printer-jobs-header.tmpl
-%%DATADIR%%/templates/ru/printer-modified.tmpl
-%%DATADIR%%/templates/ru/printer-reject.tmpl
-%%DATADIR%%/templates/ru/printer-start.tmpl
-%%DATADIR%%/templates/ru/printer-stop.tmpl
-%%DATADIR%%/templates/ru/printer.tmpl
-%%DATADIR%%/templates/ru/printers-header.tmpl
-%%DATADIR%%/templates/ru/printers.tmpl
-%%DATADIR%%/templates/ru/restart.tmpl
-%%DATADIR%%/templates/ru/samba-export.tmpl
-%%DATADIR%%/templates/ru/samba-exported.tmpl
-%%DATADIR%%/templates/ru/search.tmpl
-%%DATADIR%%/templates/ru/set-printer-options-header.tmpl
-%%DATADIR%%/templates/ru/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/ru/subscription-added.tmpl
-%%DATADIR%%/templates/ru/subscription-canceled.tmpl
-%%DATADIR%%/templates/ru/test-page.tmpl
-%%DATADIR%%/templates/ru/trailer.tmpl
-%%DATADIR%%/templates/ru/users.tmpl
-%%DATADIR%%/templates/samba-export.tmpl
-%%DATADIR%%/templates/samba-exported.tmpl
-%%DATADIR%%/templates/search.tmpl
-%%DATADIR%%/templates/set-printer-options-header.tmpl
-%%DATADIR%%/templates/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/subscription-added.tmpl
-%%DATADIR%%/templates/subscription-canceled.tmpl
-%%DATADIR%%/templates/test-page.tmpl
-%%DATADIR%%/templates/trailer.tmpl
-%%DATADIR%%/templates/users.tmpl
-%%LIBUSB%%%%DATADIR%%/usb/org.cups.usb-quirks
-%%DOCSDIR%%/apple-touch-icon.png
-%%DOCSDIR%%/cups-printable.css
-%%DOCSDIR%%/cups.css
-%%DOCSDIR%%/de/index.html
-%%DOCSDIR%%/es/index.html
-%%DOCSDIR%%/help/accounting.html
-%%DOCSDIR%%/help/api-array.html
-%%DOCSDIR%%/help/api-cgi.html
-%%DOCSDIR%%/help/api-cups.html
-%%DOCSDIR%%/help/api-driver.html
-%%DOCSDIR%%/help/api-filedir.html
-%%DOCSDIR%%/help/api-filter.html
-%%DOCSDIR%%/help/api-httpipp.html
-%%DOCSDIR%%/help/api-mime.html
-%%DOCSDIR%%/help/api-overview.html
-%%DOCSDIR%%/help/api-ppd.html
-%%DOCSDIR%%/help/api-ppdc.html
-%%DOCSDIR%%/help/api-raster.html
-%%DOCSDIR%%/help/cgi.html
-%%DOCSDIR%%/help/glossary.html
-%%DOCSDIR%%/help/kerberos.html
-%%DOCSDIR%%/help/license.html
-%%DOCSDIR%%/help/man-backend.html
-%%DOCSDIR%%/help/man-cancel.html
-%%DOCSDIR%%/help/man-classes.conf.html
-%%DOCSDIR%%/help/man-client.conf.html
-%%DOCSDIR%%/help/man-cups-config.html
-%%DOCSDIR%%/help/man-cups-files.conf.html
-%%DOCSDIR%%/help/man-cups-lpd.html
-%%DOCSDIR%%/help/man-cups-snmp.html
-%%DOCSDIR%%/help/man-cups.html
-%%DOCSDIR%%/help/man-cupsaccept.html
-%%DOCSDIR%%/help/man-cupsaddsmb.html
-%%DOCSDIR%%/help/man-cupsd-helper.html
-%%DOCSDIR%%/help/man-cupsd-logs.html
-%%DOCSDIR%%/help/man-cupsd.conf.html
-%%DOCSDIR%%/help/man-cupsd.html
-%%DOCSDIR%%/help/man-cupsenable.html
-%%DOCSDIR%%/help/man-cupstestdsc.html
-%%DOCSDIR%%/help/man-cupstestppd.html
-%%DOCSDIR%%/help/man-filter.html
-%%DOCSDIR%%/help/man-ipptool.html
-%%DOCSDIR%%/help/man-ipptoolfile.html
-%%DOCSDIR%%/help/man-lp.html
-%%DOCSDIR%%/help/man-lpadmin.html
-%%DOCSDIR%%/help/man-lpc.html
-%%DOCSDIR%%/help/man-lpinfo.html
-%%DOCSDIR%%/help/man-lpmove.html
-%%DOCSDIR%%/help/man-lpoptions.html
-%%DOCSDIR%%/help/man-lpq.html
-%%DOCSDIR%%/help/man-lpr.html
-%%DOCSDIR%%/help/man-lprm.html
-%%DOCSDIR%%/help/man-lpstat.html
-%%DOCSDIR%%/help/man-mime.convs.html
-%%DOCSDIR%%/help/man-mime.types.html
-%%DOCSDIR%%/help/man-notifier.html
-%%DOCSDIR%%/help/man-ppdc.html
-%%DOCSDIR%%/help/man-ppdhtml.html
-%%DOCSDIR%%/help/man-ppdi.html
-%%DOCSDIR%%/help/man-ppdmerge.html
-%%DOCSDIR%%/help/man-ppdpo.html
-%%DOCSDIR%%/help/man-printers.conf.html
-%%DOCSDIR%%/help/man-subscriptions.conf.html
-%%DOCSDIR%%/help/network.html
-%%DOCSDIR%%/help/options.html
-%%DOCSDIR%%/help/overview.html
-%%DOCSDIR%%/help/policies.html
-%%DOCSDIR%%/help/postscript-driver.html
-%%DOCSDIR%%/help/ppd-compiler.html
-%%DOCSDIR%%/help/raster-driver.html
-%%DOCSDIR%%/help/ref-ppdcfile.html
-%%DOCSDIR%%/help/security.html
-%%DOCSDIR%%/help/sharing.html
-%%DOCSDIR%%/help/spec-banner.html
-%%DOCSDIR%%/help/spec-cmp.html
-%%DOCSDIR%%/help/spec-command.html
-%%DOCSDIR%%/help/spec-design.html
-%%DOCSDIR%%/help/spec-ipp.html
-%%DOCSDIR%%/help/spec-pdf.html
-%%DOCSDIR%%/help/spec-postscript.html
-%%DOCSDIR%%/help/spec-ppd.html
-%%DOCSDIR%%/help/spec-raster.html
-%%DOCSDIR%%/help/spec-stp.html
-%%DOCSDIR%%/help/translation.html
-%%DOCSDIR%%/images/color-wheel.png
-%%DOCSDIR%%/images/cups-block-diagram.png
-%%DOCSDIR%%/images/cups-command-chain.png
-%%DOCSDIR%%/images/cups-icon.png
-%%DOCSDIR%%/images/cups-postscript-chain.png
-%%DOCSDIR%%/images/cups-raster-chain.png
-%%DOCSDIR%%/images/cups.png
-%%DOCSDIR%%/images/generic.png
-%%DOCSDIR%%/images/left.gif
-%%DOCSDIR%%/images/raster-organization.png
-%%DOCSDIR%%/images/raster.png
-%%DOCSDIR%%/images/right.gif
-%%DOCSDIR%%/images/sample-image.png
-%%DOCSDIR%%/images/sel.gif
-%%DOCSDIR%%/images/smiley.jpg
-%%DOCSDIR%%/images/unsel.gif
-%%DOCSDIR%%/images/wait.gif
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/ja/index.html
-%%DOCSDIR%%/robots.txt
-%%DOCSDIR%%/ru/index.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ulpt-cupsd.conf
-share/applications/cups.desktop
-%%ICONS%%share/icons/hicolor/128x128/apps/cups.png
-%%ICONS%%share/icons/hicolor/16x16/apps/cups.png
-%%ICONS%%share/icons/hicolor/32x32/apps/cups.png
-%%ICONS%%share/icons/hicolor/64x64/apps/cups.png
-share/locale/ca/cups_ca.po
-share/locale/cs/cups_cs.po
-share/locale/de/cups_de.po
-share/locale/es/cups_es.po
-share/locale/fr/cups_fr.po
-share/locale/it/cups_it.po
-share/locale/ja/cups_ja.po
-share/locale/ru/cups_ru.po
-@dir etc/cups/interfaces
-@dir etc/cups/ppd
-@dir etc/cups/ssl
-@dir etc/pam.d
-@dir(,cups,) etc/cups
-@dir libexec/cups/driver
-@dir %%DATADIR%%/model
-@dir %%DATADIR%%/profiles
-@dir(root,cups,775) %%CACHEDIR%%/rss
-@dir(root,cups,775) %%CACHEDIR%%
-@dir(cups,daemon,) /var/log/cups
-@dir(cups,wheel,) /var/run/cups/certs
-@dir(root,cups,) /var/run/cups
-@dir(root,cups,1710) /var/spool/cups/tmp
-@dir(root,cups,) /var/spool/cups
--- a/print/cups-base/pkg-plist.client
+++ b/print/cups-base/pkg-plist.client
@ -1,20 +0,0 @@
-bin/cups-config
-include/cups/adminutil.h
-include/cups/array.h
-include/cups/backend.h
-include/cups/cups.h
-include/cups/dir.h
-include/cups/file.h
-include/cups/http.h
-include/cups/ipp.h
-include/cups/language.h
-include/cups/ppd.h
-include/cups/pwg.h
-include/cups/raster.h
-include/cups/sidechannel.h
-include/cups/transcode.h
-include/cups/versioning.h
-lib/libcups.a
-lib/libcups.so
-lib/libcups.so.2
-man/man1/cups-config.1.gz
--- a/print/cups-base/pkg-plist.image
+++ b/print/cups-base/pkg-plist.image
@ -1,10 +0,0 @@
-lib/libcupsimage.so
-lib/libcupsimage.so.2
-libexec/cups/filter/commandtops
-libexec/cups/filter/gziptoany
-libexec/cups/filter/pstops
-libexec/cups/filter/rastertodymo
-libexec/cups/filter/rastertoepson
-libexec/cups/filter/rastertohp
-libexec/cups/filter/rastertolabel
-libexec/cups/filter/rastertopwg
--- a/print/cups-bjnp/Makefile
+++ b/print/cups-bjnp/Makefile
@ -2,14 +2,14 @@

 PORTNAME=	cups-bjnp
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	SF

 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	CUPS backend for Canon USB over IP protocol

-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
-BUILD_DEPENDS=	${LOCALBASE}/libexec/cups/backend:${PORTSDIR}/print/cups-base
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups

 GNU_CONFIGURE=	yes
 # Just to avoid a tautological pointer compare in bjnp-commands.c:187
--- a/print/cups-client/Makefile
+++ b/print/cups-client/Makefile
@ -1,11 +0,0 @@
-# $FreeBSD$
-
-CATEGORIES=	print
-
-MAINTAINER=	ports@FreeBSD.org
-
-MASTERDIR?=	${.CURDIR}/../cups-base
-
-CUPS_CLIENT=	yes
-
-.include "${MASTERDIR}/Makefile"
--- a/print/cups-cloud-print/Makefile
+++ b/print/cups-cloud-print/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	cups-cloud-print
 PORTVERSION=	20140814.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print

 MAINTAINER=	ports@FreeBSD.org
@ -11,8 +11,8 @@ COMMENT=	Print using Google Cloud Print
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING

-BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-client
-RUN_DEPENDS=	cancel:${PORTSDIR}/print/cups-base \
+BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups
+RUN_DEPENDS=	cancel:${PORTSDIR}/print/cups \
 		${PYTHON_PKGNAMEPREFIX}pycups>0:${PORTSDIR}/print/py-pycups \
 		bash:${PORTSDIR}/shells/bash \
 		${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	cups-filters
 PORTVERSION=	1.8.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/cups-filters/

@ -16,12 +17,13 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libqpdf.so:${PORTSDIR}/print/qpdf \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libcups.so:${PORTSDIR}/print/cups-client \
-		libcupsimage.so:${PORTSDIR}/print/cups-image \
+		libcupsimage.so:${PORTSDIR}/print/cups \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libpoppler.so:${PORTSDIR}/graphics/poppler

+CONFLICTS=	cups-pstoraster-[0-9]* foomatic-filters-[0-9]*
+
 USES=		compiler:c++11-lib cpe ghostscript gmake jpeg libtool pathfix \
 		pkgconfig shebangfix tar:xz
 CPE_VENDOR=	linuxfoundation
@ -34,36 +36,30 @@ SHEBANG_FILES=	filter/braille/drivers/generic/brftoembosser.in \
 USE_GNOME=	glib20
 USE_RC_SUBR=	cups_browsed
 GNU_CONFIGURE=	yes
-CUPS_SOCKET?=	/var/run/cups.sock
-CONFIGURE_ARGS=	--with-cups-domainsocket=${CUPS_SOCKET}
-CONFIGURE_ENV=	ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz" \
-		LIBQPDF_CFLAGS="-I${LOCALBASE}/include" LIBQPDF_LIBS="-lqpdf"
+CONFIGURE_ARGS=	ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
 INSTALL_TARGET=	install-strip

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes

-OPTIONS_DEFINE=	AVAHI
+OPTIONS_DEFINE=	AVAHI DOCS
+OPTIONS_DEFAULT=AVAHI

 AVAHI_CONFIGURE_ENABLE=	avahi
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_SUB_LIST=		AVAHI_DAEMON=avahi_daemon
+AVAHI_SUB_LIST_OFF=	AVAHI_DAEMON=

 post-patch:
 	@${REINPLACE_CMD} 's:-std=c++0x:-std=c++11:' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/filter/pdftops.c
-
-post-configure:
-	@${REINPLACE_CMD} \
-		-e 's|\(BANNERTOPDF_DATADIR = \).*\(/share/cups/data\)|\1${PREFIX}\2|' \
-		-e 's|\(CUPS_DATADIR = \).*\(/share/cups\)|\1${PREFIX}\2|' \
-		-e 's|\(CUPS_SERVERBIN = \).*\(/libexec/cups\)|\1${PREFIX}\2|' \
-		-e 's|\(CUPS_SERVERROOT = \).*\(/etc/cups\)|\1${PREFIX}\2|' \
-		${WRKSRC}/Makefile
-
-post-install:
-	@${RM} -rf ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip \
-		${STAGEDIR}${PREFIX}/bin/foomatic-rip \
-		${STAGEDIR}${PREFIX}/man/man1/foomatic-rip.1
+	@${REINPLACE_CMD} 's|/usr/share/liblouis|${LOCALBASE}/share/liblouis|' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/filter/pdftops.c
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
+		-e 's|README.gz|README|' \
+		${WRKSRC}/utils/cups-browsed.8 \
+		${WRKSRC}/utils/cups-browsed.conf.5

 .include <bsd.port.mk>
--- a/print/cups-filters/files/cups_browsed.in
+++ b/print/cups-filters/files/cups_browsed.in
@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: cups_browsed
-# REQUIRE: LOGIN
+# REQUIRE: cupsd %%AVAHI_DAEMON%%
 # KEYWORD: shutdown
 #
 # Add the following to /etc/rc.conf[.local] to enable this service
--- a/print/cups-filters/files/patch-cupsfilters_colormanager.c
+++ b/print/cups-filters/files/patch-cupsfilters_colormanager.c
@ -0,0 +1,19 @@
+--- cupsfilters/colormanager.c.orig	2015-06-26 15:45:26 UTC
+++ cupsfilters/colormanager.c
+@@ -26,6 +26,7 @@ MIT Open Source License  -  http://www.o
+ */
+ 
+ 
+#include <config.h>
+ #include "colormanager.h"
+ #include <cupsfilters/colord.h>
+ //#include <cupsfilters/kmdevices.h>
+@@ -323,7 +324,7 @@ _get_ppd_icc_fallback (ppd_file_t *ppd, 
+     /* expand to a full path if not already specified */
+     if (attr->value[0] != '/')
+       snprintf(full_path, sizeof(full_path),
+-               "%s/profiles/%s", CUPSDATA, attr->value);
+               "%s/profiles/%s", CUPS_DATADIR, attr->value);
+     else
+       strncpy(full_path, attr->value, sizeof(full_path));
+ 
--- a/print/cups-filters/files/patch-filter_pdftops.c
+++ b/print/cups-filters/files/patch-filter_pdftops.c
@ -1,6 +1,6 @@
--- filter/pdftops.c.orig	2015-07-04 11:21:47 UTC
+--- filter/pdftops.c.orig	2016-01-19 22:12:43 UTC
 +++ filter/pdftops.c
-@@ -535,7 +535,7 @@ main(int  argc,				/* I - Number of comm
+@@ -532,12 +532,12 @@ main(int  argc,				/* I - Number of comm
 
   if (renderer == PDFTOPS)
   {
@ -9,3 +9,25 @@
     pdf_argc    = 1;
   }
   else if (renderer == GS)
+   {
+-    pdf_argv[0] = (char *)"gs";
+    pdf_argv[0] = (char *)"%%LOCALBASE%%/bin/gs";
+     pdf_argv[1] = (char *)"-q";
+     pdf_argv[2] = (char *)"-dNOPAUSE";
+     pdf_argv[3] = (char *)"-dBATCH";
+@@ -552,13 +552,13 @@ main(int  argc,				/* I - Number of comm
+   }
+   else if (renderer == PDFTOCAIRO)
+   {
+-    pdf_argv[0] = (char *)"pdftocairo";
+    pdf_argv[0] = (char *)"%%LOCALBASE%%/bin/pdftocairo";
+     pdf_argv[1] = (char *)"-ps";
+     pdf_argc    = 2;
+   }
+   else
+   {
+-    pdf_argv[0] = (char *)"acroread";
+    pdf_argv[0] = (char *)"%%LOCALBASE%%/bin/acroread";
+     pdf_argv[1] = (char *)"-toPostScript";
+     pdf_argc    = 2;
+   }
--- a/print/cups-filters/pkg-descr
+++ b/print/cups-filters/pkg-descr
@ -2,4 +2,4 @@ The CUPS Filters package contains backends, filters and other
 software that was once part of the core CUPS distribution but is
 no longer maintained by Apple Inc.

-WWW: http://www.linuxfromscratch.org/blfs/view/svn/pst/cups-filters.html
+WWW: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
--- a/print/cups-filters/pkg-plist
+++ b/print/cups-filters/pkg-plist
@ -1,3 +1,4 @@
+bin/foomatic-rip
 bin/ttfread
 etc/cups/cups-browsed.conf
 etc/fonts/conf.d/99pdftoopvp.conf
@ -29,6 +30,7 @@ libexec/cups/filter/bannertopdf
 libexec/cups/filter/brftoembosser
 libexec/cups/filter/commandtoescpx
 libexec/cups/filter/commandtopclx
+libexec/cups/filter/foomatic-rip
 libexec/cups/filter/gstopxl
 libexec/cups/filter/gstoraster
 libexec/cups/filter/imagetobrf
@ -55,6 +57,7 @@ libexec/cups/filter/texttobrf
 libexec/cups/filter/texttopdf
 libexec/cups/filter/texttops
 libexec/cups/filter/urftopdf
+man/man1/foomatic-rip.1.gz
 man/man5/cups-browsed.conf.5.gz
 man/man8/cups-browsed.8.gz
 sbin/cups-browsed
@ -105,11 +108,11 @@ share/cups/ppdc/liblouis3.defs
 share/cups/ppdc/liblouis4.defs
 share/cups/ppdc/media-braille.defs
 share/cups/ppdc/pcl.h
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd
 share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd
 share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
--- a/print/cups-fxlinuxprint/Makefile
+++ b/print/cups-fxlinuxprint/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	fxlinuxprint
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	ftp://download.fujixerox.co.jp/pub/exe/apeosport/c4300series/
 PKGNAMEPREFIX=	cups-
@ -13,7 +13,7 @@ COMMENT=	Fuji Xerox Printer Driver

 LICENSE=	GPLv2

-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups

 USES=		dos2unix ghostscript:run
 DOS2UNIX_FILES=	fxlinuxprint.ppd
--- a/print/cups-fxlinuxprint/files/patch-Makefile.in
+++ b/print/cups-fxlinuxprint/files/patch-Makefile.in
@ -9,7 +9,7 @@
 -cupsmimedir = /etc/cups
 +cupsfilterdir = @libexecdir@/cups/filter
 +cupsppddir = @datadir@/cups/model/FujiXerox/en
-+cupsmimedir = @sysconfdir@/cups
+cupsmimedir = @datadir@/cups/mime
 EXTRA_DIST = fxlinuxprint.ppd mimefx.types mimefx.convs
 cupsppd_DATA = fxlinuxprint.ppd
 cupsmime_DATA = mimefx.types mimefx.convs
--- a/print/cups-fxlinuxprint/pkg-plist
+++ b/print/cups-fxlinuxprint/pkg-plist
@ -1,6 +1,6 @@
-etc/cups/mimefx.convs
-etc/cups/mimefx.types
 libexec/cups/filter/pdftopdffx
 libexec/cups/filter/pdftopjlfx
 libexec/cups/filter/pstopdffx
+share/cups/mime/mimefx.convs
+share/cups/mime/mimefx.types
 share/cups/model/FujiXerox/en/fxlinuxprint.ppd
--- a/print/cups-image/Makefile
+++ b/print/cups-image/Makefile
@ -1,11 +0,0 @@
-# $FreeBSD$
-
-CATEGORIES=	print
-
-MAINTAINER=	ports@FreeBSD.org
-
-MASTERDIR?=	${.CURDIR}/../cups-base
-
-CUPS_IMAGE=	yes
-
-.include "${MASTERDIR}/Makefile"
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	cups-pdf
 PORTVERSION=	2.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups-pdf.de/src/ \
 		http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/
@ -15,7 +15,7 @@ COMMENT=	Virtual printer for CUPS to produce PDF files
 LICENSE=GPLv2
 LICENSE_FILE=${WRKSRC}/COPYING

-RUN_DEPENDS=	${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base
+RUN_DEPENDS=	${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@ -4,13 +4,14 @@

 PORTNAME=	cups-pk-helper
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/releases/

 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Helper that makes system-config-printer use PolicyKit

-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit

 USE_GNOME=	glib20 intltool
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@ -1,76 +0,0 @@
-# Created by: ports@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	cups-pstoraster
-PORTVERSION=	8.15.4
-PORTREVISION=	8
-CATEGORIES=	print
-MASTER_SITES=	EASYSW/ghostscript/${PORTVERSION}
-DISTNAME=	espgs-${ESPGS_VER}-source
-DIST_SUBDIR=	ghostscript
-
-MAINTAINER=	rea@FreeBSD.org
-COMMENT=	Postscript interpreter for CUPS printing to non-PS printers
-
-LICENSE=	GPLv2
-
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups-image
-
-ESPGS_VER=	${PORTVERSION}
-GS_VERSION=	8.15
-
-WRKSRC=		${WRKDIR}/espgs-${PORTVERSION}
-
-DATADIR=	${PREFIX}/share/espgs
-
-# We just need the ghostscript fonts, nothing more
-USES=		ghostscript:run gmake iconv tar:bzip2
-GNU_CONFIGURE=		yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--without-x --with-gs=espgs
-MAKE_ARGS=	CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \
-		DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev"
-PLIST_SUB=	GS_VERSION="${GS_VERSION}"
-
-OPTIONS_DEFINE=	CJK
-
-CJK_DESC=		Japanese PostScript documents processing
-CJK_RUN_DEPENDS=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std \
-			${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
-CJK_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-lib_cidfmap
-
-MAKE_JOBS_UNSAFE=	yes
-
-pre-configure:
-	${RM} -f ${WRKSRC}/ijs/config.guess ${WRKSRC}/ijs/missing ${WRKSRC}/ijs/config.sub ${WRKSRC}/ijs/install-sh ${WRKSRC}/ijs/ltmain.sh
-	${RM} -f ${WRKSRC}/trunk/ijs/config.guess ${WRKSRC}/trunk/ijs/missing ${WRKSRC}/trunk/ijs/config.sub ${WRKSRC}/trunk/ijs/install-sh ${WRKSRC}/trunk/ijs/ltmain.sh
-
-post-patch:
-	${LN} -sf ${WRKSRC}/pstoraster/gdevcups.c ${WRKSRC}/src
-	${CAT} ${FILESDIR}/cups.contrib.mak >> ${WRKSRC}/src/contrib.mak
-	${FIND} ${WRKSRC} -name "*.mak" -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(install_prefix)|$$(DESTDIR)$$(install_prefix)|g'
-.for file in pstopxl pstoraster
-	${REINPLACE_CMD} -e 's:@prefix@:${PREFIX}:g ; \
-		 s:@exec_prefix@:${PREFIX}:g ; \
-		 s:@bindir@:${PREFIX}/bin:g ; \
-		 s:@GS@:espgs:g ; \
-		 s|^GS_LIB="|GS_LIB="${PREFIX}/share/ghostscript/fonts:|' \
-		 ${WRKSRC}/pstoraster/${file}.in
-.endfor
-	${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS=@CPPFLAGS@ |g ; \
-		 s|^LDFLAGS=|LDFLAGS=@LDFLAGS@ |g ; \
-		 s|^DEVICE_DEVS|#DEVICE_DEVS|g ; \
-		 s|^gssharedir = @libdir@/ghostscript|gssharedir = @libdir@/espgs| ; \
-		 s|^gsdir = @datadir@/ghostscript|gsdir = @datadir@/espgs|' \
-		 ${WRKSRC}/Makefile.in
-
-pre-build:
-	${MKDIR} ${WRKSRC}/bin
-	${MKDIR} ${WRKSRC}/obj
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/espgs
-
-.include <bsd.port.mk>
--- a/print/cups-pstoraster/distinfo
+++ b/print/cups-pstoraster/distinfo
@ -1,2 +0,0 @@
-SHA256 (ghostscript/espgs-8.15.4-source.tar.bz2) = 5afc038a12aa624836192940991081fcf95a9396a6e15f6fc707a2b5f2b7cacf
-SIZE (ghostscript/espgs-8.15.4-source.tar.bz2) = 8785497
--- a/print/cups-pstoraster/files/cups.contrib.mak
+++ b/print/cups-pstoraster/files/cups.contrib.mak
@ -1,11 +0,0 @@
-### ----------------- CUPS Ghostscript Driver ---------------------- ###
-
-cups_=  $(GLOBJ)gdevcups.$(OBJ)
-
-$(DD)cups.dev:  $(cups_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cups $(cups_)
-	$(ADDMOD) $(DD)cups -lib cupsimage -lib cups
-
-$(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevcups.$(OBJ) $(C_) $(GLSRC)gdevcups.c
-
--- a/print/cups-pstoraster/files/extra-patch-lib_cidfmap
+++ b/print/cups-pstoraster/files/extra-patch-lib_cidfmap
@ -1,30 +0,0 @@
--- lib/cidfmap.orig	Thu Dec 29 04:56:24 2005
-+++ lib/cidfmap	Mon Apr  9 00:47:56 2007
-@@ -26,3 +26,27 @@
- %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
- %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
- %
-+/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 3] >> ;
-+/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 3] >> ;
-+
-+/HeiseiMin-W3		/Ryumin-Light ;
-+%/HeiseiMin-W3		/WadaMin-Regular ;
-+/HeiseiKakuGo-W5	/GothicBBB-Medium ;
-+%/HeiseiKakuGo-W5	/WadaGo-Bold ;
-+/FutoMinA101-Bold	/Ryumin-Light ;
-+%/FutoMinA101-Bold	/WadaMin-Regular ;
-+/FutoGoB101-Bold	/GothicBBB-Medium ;
-+%/FutoGoB101-Bold	/WadaGo-Bold ;
-+/Jun101-Light		/Ryumin-Light ;
-+%/Jun101-Light		/WadaMin-Regular ;
-+/MidashiGo-MB31		/GothicBBB-Medium ;
-+%/MidashiGo-MB31	/WadaGo-Bold ;
-+
-+%/Munhwa-Regular	/Munhwa-Regular ;
-+%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
-+%/Munhwa-Bold		/Munhwa-Bold ;
-+%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
-+
-+/HYGoThic-Medium	/MunhwaGothic-Regular ;
-+/HYSMyeongJo-Medium	/Munhwa-Regular ;
-+/HYRGoThic-Medium	/MunhwaGothic-Bold ;
--- a/print/cups-pstoraster/files/patch-ghostscript.list.in
+++ b/print/cups-pstoraster/files/patch-ghostscript.list.in
@ -1,66 +0,0 @@
--- ghostscript.list.in.orig	Fri Dec  1 21:38:35 2006
-+++ ghostscript.list.in	Fri Dec  1 21:40:56 2006
-@@ -71,52 +71,6 @@
- # Programs and scripts...
- f 0755 root root $bindir/@GS@ bin/@GS@
- 
-f 0755 root root $bindir/bdftops lib/bdftops
-f 0755 root root $bindir/dumphint lib/dumphint
-f 0755 root root $bindir/dvipdf lib/dvipdf
-f 0755 root root $bindir/eps2eps lib/eps2eps
-f 0755 root root $bindir/fixmswrd.pl lib/fixmswrd.pl
-f 0755 root root $bindir/font2c lib/font2c
-f 0755 root root $bindir/gsbj lib/gsbj
-f 0755 root root $bindir/gsdj lib/gsdj
-f 0755 root root $bindir/gsdj500 lib/gsdj500
-f 0755 root root $bindir/gslj lib/gslj
-f 0755 root root $bindir/gslp lib/gslp
-f 0755 root root $bindir/gsnd lib/gsnd
-f 0755 root root $bindir/lprsetup.sh lib/lprsetup.sh
-f 0755 root root $bindir/pdf2dsc lib/pdf2dsc
-f 0755 root root $bindir/pdf2ps lib/pdf2ps
-f 0755 root root $bindir/pdfopt lib/pdfopt
-f 0755 root root $bindir/pf2afm lib/pf2afm
-f 0755 root root $bindir/pfbtopfa lib/pfbtopfa
-f 0755 root root $bindir/printafm lib/printafm
-f 0755 root root $bindir/ps2ascii lib/ps2ascii
-f 0755 root root $bindir/ps2epsi lib/ps2epsi
-f 0755 root root $bindir/ps2pdf lib/ps2pdf
-f 0755 root root $bindir/ps2pdf12 lib/ps2pdf12
-f 0755 root root $bindir/ps2pdf13 lib/ps2pdf13
-f 0755 root root $bindir/ps2pdf14 lib/ps2pdf14
-f 0755 root root $bindir/ps2pdfwr lib/ps2pdfwr
-f 0755 root root $bindir/ps2ps lib/ps2ps
-f 0755 root root $bindir/pv.sh lib/pv.sh
-f 0755 root root $bindir/unix-lpr.sh lib/unix-lpr.sh
-f 0755 root root $bindir/wftopfa lib/wftopfa
-
-# Man pages...
-f 0644 root root $mandir/man1/ man/*.1
-l 0644 root root $mandir/man1/ps2pdf12.1 ps2pdf.1
-l 0644 root root $mandir/man1/ps2pdf13.1 ps2pdf.1
-l 0644 root root $mandir/man1/gsbj.1 gslp.1
-l 0644 root root $mandir/man1/gsdj.1 gslp.1
-l 0644 root root $mandir/man1/gsdj500.1 gslp.1
-l 0644 root root $mandir/man1/gslj.1 gslp.1
-
-# Documentation files...
-f 0644 root root $docdir/ doc/*.htm
-f 0644 root root $docdir/ doc/*.html
-f 0644 root root $docdir/COPYING doc/COPYING
-f 0644 root root $docdir/README doc/README
-
- # Data files...
- %if $COMPILE_INITS
- # No config files needed for this configuration...
-@@ -193,10 +147,6 @@
- f 0644 root root $gsdatadir/lib/wrfont.ps lib/wrfont.ps
- f 0644 root root $gsdatadir/lib/xlatmap lib/xlatmap
- f 0644 root root $gsdatadir/lib/zeroline.ps lib/zeroline.ps
-
-# Examples...
-f 0644 root root $exdir/ examples/*.ps
-f 0644 root root $exdir/ examples/*.eps
- 
- %subpackage cups
- # Config files...
--- a/print/cups-pstoraster/files/patch-pstopxl.in
+++ b/print/cups-pstoraster/files/patch-pstopxl.in
@ -1,20 +0,0 @@
--- pstoraster/pstopxl.in.orig	Mon Feb 21 18:13:47 2005
-+++ pstoraster/pstopxl.in	Wed Jun  8 09:11:00 2005
-@@ -27,7 +27,7 @@
- bindir=@bindir@
- 
- # Set the library/font path...
-GS_LIB="${CUPS_FONTPATH:=/usr/share/cups/fonts}"
-+GS_LIB="${CUPS_FONTPATH:=@prefix@/share/cups/fonts}"
- export GS_LIB
- 
- # Determine the PCL XL/PCL 6 driver to use...
-@@ -56,7 +56,7 @@
- 	ifile="$6"
- fi
- 
-echo INFO: Starting ESP Ghostscript @GS_VERSION_MAJOR@.@GS_VERSION_MINOR0@.@GS_VERSION_PATCH@... 1>&2
-+echo INFO: Starting GNU/GPL Ghostscript... 1>&2
- echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" "$ifile" 1>&2
- 
- # Now run Ghostscript...
--- a/print/cups-pstoraster/files/patch-pstoraster.in
+++ b/print/cups-pstoraster/files/patch-pstoraster.in
@ -1,20 +0,0 @@
--- pstoraster/pstoraster.in.orig	Wed Jun  8 09:11:26 2005
-+++ pstoraster/pstoraster.in	Wed Jun  8 09:13:19 2005
-@@ -27,7 +27,7 @@
- bindir=@bindir@
- 
- # Set the library/font path...
-GS_LIB="${CUPS_FONTPATH:=/usr/share/cups/fonts}"
-+GS_LIB="${CUPS_FONTPATH:=@prefix@/share/cups/fonts}"
- export GS_LIB
- 
- # Options we use with Ghostscript...
-@@ -51,7 +51,7 @@
- 	ifile="$6"
- fi
- 
-echo INFO: Starting ESP Ghostscript @GS_VERSION_MAJOR@.@GS_VERSION_MINOR0@.@GS_VERSION_PATCH@... 1>&2
-+echo INFO: Starting GNU/GPL Ghostscript...  1>&2
- echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile" 1>&2
- 
- # Now run Ghostscript...
--- a/print/cups-pstoraster/files/patch-src__unixinst.mk
+++ b/print/cups-pstoraster/files/patch-src__unixinst.mk
@ -1,20 +0,0 @@
--- src/unixinst.mak.orig	Fri Dec  1 21:54:25 2006
-+++ src/unixinst.mak	Fri Dec  1 21:55:49 2006
-@@ -18,7 +18,7 @@
- # containing the `install' targets.
- # This is the very last part of the makefile for these configurations.
- 
-install: install-exec install-scripts install-data $(INSTALL_SHARED) install-addons-extras
-+install: install-exec install-data $(INSTALL_SHARED) install-addons-extras
- 
- # The sh -c in the rules below is required because Ultrix's implementation
- # of sh -e terminates execution of a command if any error occurs, even if
-@@ -53,7 +53,7 @@
- PSEXDIR=$(PSLIBDIR)/../examples
- PSMANDIR=$(PSLIBDIR)/../man
- 
-install-data: install-libdata install-resdata install-doc install-man install-examples
-+install-data: install-libdata install-resdata
- 
- # There's no point in providing a complete dependency list: we include
- # one file from each subdirectory just as a sanity check.
--- a/print/cups-pstoraster/pkg-descr
+++ b/print/cups-pstoraster/pkg-descr
@ -1,12 +0,0 @@
-Ghostscript is the well-known PostScript interpreter which is available for
-all common and most esoteric platforms and supports many different printers
-and some displays.
-
-Versions entitled "GNU Ghostscript" are distributed with the GNU General
-Public License, which allows free use, and free copying and redistribution
-under certain conditions (including, in some cases, commercial distribution).
-
-This distribution is based on GNU Ghostscript and provides the "driver" for
-CUPS that supports non-PostScript printer drivers within CUPS.
-
-WWW: http://www.cups.org/ghostscript.html
--- a/print/cups-pstoraster/pkg-plist
+++ b/print/cups-pstoraster/pkg-plist
@ -1,470 +0,0 @@
-bin/espgs
-%%DATADIR%%/%%GS_VERSION%%/lib/Fontmap
-%%DATADIR%%/%%GS_VERSION%%/lib/Fontmap.GS
-%%DATADIR%%/%%GS_VERSION%%/lib/cidfmap
-%%DATADIR%%/%%GS_VERSION%%/lib/FAPIcidfmap
-%%DATADIR%%/%%GS_VERSION%%/lib/FAPIconfig
-%%DATADIR%%/%%GS_VERSION%%/lib/FAPIfontmap
-%%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
-%%DATADIR%%/%%GS_VERSION%%/lib/ht_ccsto.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/acctest.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/addxchar.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/align.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/bdftops.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/caption.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cid2code.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/decrypt.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/docie.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/dumphint.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/errpage.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/font2c.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/font2pcl.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gslp.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gsnup.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/image-qa.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/impath.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/jispaper.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/landscap.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/level1.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/lines.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/markhint.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/markpath.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/packfile.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pf2afm.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pfbtopfa.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/ppath.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/prfont.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/printafm.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/ps2ai.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/ps2ascii.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/ps2epsi.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/quit.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/rollconv.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/showchar.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/showpage.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/stcinfo.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/stcolor.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/stocht.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/traceimg.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/traceop.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/type1enc.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/type1ops.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/uninfo.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/unprot.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/viewcmyk.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/viewgif.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/viewjpeg.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/viewmiff.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/viewpcx.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/viewpbm.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/viewps2a.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/winmaps.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/wftopfa.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_agl.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_btokn.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ccfnt.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ce_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cff.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidcm.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ciddc.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidfm.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidfn.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidtt.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ciecs2.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ciecs3.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cmap.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cmdl.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_cspace.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_css_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_dbt_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_devcs.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_devn.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_devpxl.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_diskf.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_diskn.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_dpnxt.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_dps.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_dps1.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_dps2.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_dscp.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_epsf.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_fapi.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_fform.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_fntem.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_fonts.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_frsd.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_icc.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_il1_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_il2_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_img.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_indxd.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_init.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_kanji.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ksb_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_l2img.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_lev2.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_lgo_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_lgx_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ll3.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_mex_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_mgl_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_mro_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_patrn.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_pdf_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_pdfwr.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_pfile.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_rdlin.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_res.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_resmp.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_resst.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_sepr.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_setpd.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_statd.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_std_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_stres.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_sym_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_trap.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_ttf.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_typ32.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_typ42.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_type1.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_wan_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_wl1_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_wl2_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_wl5_e.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf_ops.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf_rbld.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdf_sec.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdfopt.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/pdfwrite.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cbjc600.ppd
-%%DATADIR%%/%%GS_VERSION%%/lib/cbjc800.ppd
-%%DATADIR%%/%%GS_VERSION%%/lib/ghostpdf.ppd
-%%DATADIR%%/%%GS_VERSION%%/lib/bj8.rpd
-%%DATADIR%%/%%GS_VERSION%%/lib/bj8gc12f.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bj8hg12f.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bj8oh06n.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bj8pa06n.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bj8pp12f.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bj8ts06n.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a0.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a1.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a2.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a3.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a4.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a5.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a6.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a7.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a8.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b1.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b2.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b3.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b4.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b6.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b7.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b8.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/cdj550.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/cdj690.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/cdj690ec.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/dnj750c.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/dnj750m.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/necp2x.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/necp2x6.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/ras1.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/ras24.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/ras3.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/ras32.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/ras4.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/ras8m.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/st640ih.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/st640ihg.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/st640p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/st640pg.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/st640pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/st640plg.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc1520h.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc2.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc200_h.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc2_h.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc2s_h.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc300.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc300bl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc300bm.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc500p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc500ph.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc600ih.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc600p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc600pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc640p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc800ih.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc800p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc800pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc_h.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc_l.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stcany.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stcany_h.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_l.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_l_m.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_m.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_m_m.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_s.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_s_m.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_t.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_t_m.xbm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_l.xpm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_m.xpm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_s.xpm
-%%DATADIR%%/%%GS_VERSION%%/lib/gs_t.xpm
-%%DATADIR%%/%%GS_VERSION%%/lib/cjkv/baseutil.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cjkv/cjkcidcm.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cjkv/cjkfnmap.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cjkv/cjkvinit.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cjkv/cjkvttcf.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cjkv/tt11util.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/cjkv/tt42util.ps
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/83pv-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2C
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-0
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-1
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-3
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-4
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-5
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-B5pc
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-CID
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Mac
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-0
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-1
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-3
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-4
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-5
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBK-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBpc-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-CID
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Mac
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-0
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-1
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-3
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-4
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-5
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-6
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90ms-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90pv-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-CID
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Mac
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-0
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-1
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-CID
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCms-UHC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCpc-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2C
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS1-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS1-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS2-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS2-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETenms-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETenms-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBTpc-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBTpc-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2C
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hankaku
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hiragana
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2C
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Katakana
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Roman
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90ms-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90pv-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-B5pc
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBK-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBpc-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCms-UHC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCpc-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF16-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF16-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF32-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF32-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF8-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF8-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF16-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF16-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF32-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF32-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF8-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF8-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF16-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF16-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF32-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF32-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF8-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF8-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/WP-Symbol
-%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultCMYK
-%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultGray
-%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultRGB
-%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Latin1
-%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/StandardEncoding
-%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Unicode
-%%DATADIR%%/%%GS_VERSION%%/lib/dmp_init.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/dmp_site.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src
-%%DATADIR%%/%%GS_VERSION%%/lib/PM760p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/PM760pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/PM820p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/PM820pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc670p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc670pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc680p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc680pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc740p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc740pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc760p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc760pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc777p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stc777pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stp720p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stp720pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stp870p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/Stp870pl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc6000a1.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/bjc6000b1.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/s400a1.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/s400b1.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/sharp.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc740ih.upp
-libexec/cups/filter/pstoraster
-libexec/cups/filter/pstopxl
-etc/cups/pstoraster.convs
-share/cups/model/pxlcolor.ppd
-share/cups/model/pxlmono.ppd
--- a/print/cups-smb-backend/Makefile
+++ b/print/cups-smb-backend/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	cups-smb-backend
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CUPS backend for printing to Windows servers

 RUN_DEPENDS=	smbspool:${PORTSDIR}/net/${SAMBA_PORT} \
-		${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base
+		${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups

 NO_BUILD=	yes
 PLIST_FILES=	libexec/cups/backend/smb
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@ -0,0 +1,121 @@
+# Created by: Alan Eldridge <alane@geeksrus.net>
+# $FreeBSD$
+
+PORTNAME=	cups
+PORTVERSION=	2.1.3
+DISTVERSIONSUFFIX=-source
+CATEGORIES=	print
+MASTER_SITES=	http://www.cups.org/software/${PORTVERSION}/
+
+MAINTAINER=	tijl@FreeBSD.org
+COMMENT=	Common UNIX Printing System
+
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE.txt
+LICENSE_FILE_LGPL20=	${WRKSRC}/LICENSE.txt
+
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+
+CONFLICTS=	LPRng-[0-9]*
+
+DESTDIRNAME=	DSTROOT
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-dnssd						\
+		--disable-gssapi					\
+		--disable-launchd					\
+		--disable-systemd					\
+		--enable-gnutls						\
+		--with-cups-user=${USERS}				\
+		--with-cups-group=${GROUPS}				\
+		--with-system-groups=wheel				\
+		--with-dbusdir="${PREFIX}/etc/dbus-1"			\
+		--with-icondir="${PREFIX}/share/icons"			\
+		--with-menudir="${DESKTOPDIR}"				\
+		--with-printcap="${PREFIX}/etc/printcap"		\
+		--with-rcdir=no						\
+		--with-optim=" "					\
+		--with-pam-module="unix"				\
+		ac_cv_path_JAVA= ac_cv_path_PERL= ac_cv_path_PHPCGI=	\
+		ac_cv_path_PHP= ac_cv_path_PYTHON=
+LIBS+=		-L${LOCALBASE}/lib
+USES=		cpe gmake iconv pkgconfig tar:bzip2
+CPE_VENDOR=	apple
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	cupsd
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+GROUPS=		cups
+USERS=		cups
+
+OPTIONS_DEFINE=		AVAHI DBUS DOCS IPPTOOL LIBPAPER NLS X11
+OPTIONS_DEFAULT=	AVAHI DBUS LIBPAPER
+OPTIONS_SUB=		yes
+
+AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE=	avahi
+AVAHI_SUB_LIST=		AVAHI_DAEMON=avahi_daemon
+AVAHI_SUB_LIST_OFF=	AVAHI_DAEMON=
+
+DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_CONFIGURE_ENABLE=	dbus
+DBUS_SUB_LIST=		DBUS_DAEMON=dbus
+DBUS_SUB_LIST_OFF=	DBUS_DAEMON=
+
+IPPTOOL_DESC=		Internet Printing Protocol testing tool
+
+LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIBPAPER_CONFIGURE_ENABLE=libpaper
+
+X11_DESC=		Install desktop menu item
+X11_BUILD_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+X11_RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
+
+.if defined(CUPS_OVERWRITE_BASE)
+PLIST_SUB+=	OVERWRITE=""
+.else
+PLIST_SUB+=	OVERWRITE="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
+	@${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
+		-e 's/-fstack-protector//' ${WRKSRC}/configure
+	@${REINPLACE_CMD} 's|http://www.cups.org|https://cups.org|' \
+		${WRKSRC}/doc/index.html.in \
+		${WRKSRC}/doc/??/index.html.in \
+		${WRKSRC}/templates/header.tmpl.in \
+		${WRKSRC}/templates/??/header.tmpl.in \
+		${WRKSRC}/templates/help-header.tmpl \
+		${WRKSRC}/templates/??/help-header.tmpl
+	@${REINPLACE_CMD} '/stripopt=/s/-x//' ${WRKSRC}/install-sh
+	@${REINPLACE_CMD} 's|/etc/cups|${LOCALBASE}/etc/cups|g' \
+		${WRKSRC}/man/*.man*
+	@${REINPLACE_CMD} -e 's|\.default|.sample|'\
+		${WRKSRC}/cgi-bin/admin.c\
+		${WRKSRC}/conf/Makefile
+
+post-patch-DOCS-off:
+# Link to online documentation.
+	@${REINPLACE_CMD} \
+		's|"/*help/|"https://cups.org/documentation.php/doc-${PORTVERSION:R}/|' \
+		${WRKSRC}/doc/index.html.in \
+		${WRKSRC}/doc/??/index.html.in \
+		${WRKSRC}/templates/choose-uri.tmpl \
+		${WRKSRC}/templates/??/choose-uri.tmpl \
+		${WRKSRC}/templates/header.tmpl.in \
+		${WRKSRC}/templates/??/header.tmpl.in \
+		${WRKSRC}/templates/samba-export.tmpl \
+		${WRKSRC}/templates/??/samba-export.tmpl
+
+post-install:
+	${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups
+	${INSTALL_DATA} ${FILESDIR}/cups ${STAGEDIR}${PREFIX}/etc/pam.d
+
+.include <bsd.port.post.mk>
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@ -0,0 +1,2 @@
+SHA256 (cups-2.1.3-source.tar.bz2) = 36a70d43584aea2617da914b9331e23341c3501a8254c4d2eae9c11ec01fd4d3
+SIZE (cups-2.1.3-source.tar.bz2) = 8832400
--- a/print/cups/files/cups
+++ b/print/cups/files/cups
@ -0,0 +1,4 @@
+# $FreeBSD$
+
+auth	include	system
+account	include	system
--- a/print/cups-base/files/cupsd.in
+++ b/print/cups-base/files/cupsd.in
@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 # PROVIDE: cupsd
-# REQUIRE: DAEMON %%ZEROCONF%%
+# REQUIRE: DAEMON %%DBUS_DAEMON%% %%AVAHI_DAEMON%%
 # KEYWORD: shutdown
 #
 # Add the following to /etc/rc.conf[.local] to enable this service
--- a/print/cups/files/patch-conf_mime.convs.in
+++ b/print/cups/files/patch-conf_mime.convs.in
@ -0,0 +1,15 @@
+Lower PostScript-to-PostScript cost such that PostScript files are sent to
+PostScript printers directly without intermediate conversion to PDF, see
+http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format
+
+--- conf/mime.convs.in.orig	2013-06-07 01:00:33 UTC
+++ conf/mime.convs.in
+@@ -38,7 +38,7 @@
+ # PostScript filters
+ #
+ 
+-application/postscript		application/vnd.cups-postscript	66	pstops
+application/postscript		application/vnd.cups-postscript	65	pstops
+ 
+ ########################################################################
+ #
--- a/print/cups/files/patch-configure
+++ b/print/cups/files/patch-configure
@ -0,0 +1,24 @@
+--- configure.orig	2016-02-05 17:22:09 UTC
+++ configure
+@@ -5390,6 +5390,13 @@ $as_echo "yes" >&6; }
+ 			CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
+ 			LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
+ 			USBQUIRKS="\$(DATADIR)/usb"
+		elif test -f /usr/lib/libusb.so; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			$as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
+
+			LIBUSB="-lusb"
+			USBQUIRKS="\$(DATADIR)/usb"
+ 		else
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -5656,7 +5663,6 @@ if test "${with_dbusdir+set}" = set; the
+ fi
+ 
+ 
+-DBUSDIR=""
+ DBUS_NOTIFIER=""
+ DBUS_NOTIFIERLIBS=""
+ 
--- a/print/cups-base/files/patch-scheduler__auth.c
+++ b/print/cups-base/files/patch-scheduler__auth.c
@ -1,6 +1,6 @@
--- scheduler/auth.c.orig	2014-08-28 15:37:22 UTC
+--- scheduler/auth.c.orig	2015-10-26 19:46:02 UTC
 +++ scheduler/auth.c
-@@ -491,7 +491,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+@@ -456,7 +456,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
 
     peersize = sizeof(peercred);
 
@ -9,7 +9,7 @@
     if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize))
 #  else
     if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred, &peersize))
-@@ -953,7 +953,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+@@ -854,7 +854,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
 
       peersize = sizeof(peercred);
 
--- a/print/cups/files/patch-scheduler_cups-driverd.cxx
+++ b/print/cups/files/patch-scheduler_cups-driverd.cxx
@ -0,0 +1,20 @@
+--- scheduler/cups-driverd.cxx.orig	2015-06-12 01:21:05 UTC
+++ scheduler/cups-driverd.cxx
+@@ -913,7 +913,7 @@ get_file(const char *name,		/* I - Name 
+   }
+   else
+ 
+-#elif defined(__linux)
+#elif defined(__linux) || defined(__FreeBSD__) || defined(__DragonFly__)
+   if (!strncmp(name, "lsb/usr/", 8))
+   {
+    /*
+@@ -1093,7 +1093,7 @@ list_ppds(int        request_id,	/* I - 
+   load_ppds("/System/Library/Printers/PPDs/Contents/Resources/en.lproj",
+             "System/Library/Printers/PPDs/Contents/Resources/en.lproj", 0);
+ 
+-#elif defined(__linux)
+#elif defined(__linux) || defined(__FreeBSD__) || defined(__DragonFly__)
+  /*
+   * Load PPDs from LSB-defined locations...
+   */
--- a/print/cups/pkg-descr
+++ b/print/cups/pkg-descr
@ -0,0 +1,4 @@
+CUPS is a standards-based, open source printing system.  It uses the Internet
+Printing Protocol (IPP) to support printing to local and network printers.
+
+WWW: https://cups.org/
--- a/print/cups/pkg-plist
+++ b/print/cups/pkg-plist
@ -0,0 +1,696 @@
+%%OVERWRITE%%@exec if test -e /usr/bin/lp; then chmod -h 0 /usr/bin/lp; fi
+%%OVERWRITE%%@exec if test -e /usr/bin/lpq; then chmod -h 0 /usr/bin/lpq; fi
+%%OVERWRITE%%@exec if test -e /usr/bin/lpr; then chmod -h 0 /usr/bin/lpr; fi
+%%OVERWRITE%%@exec if test -e /usr/bin/lprm; then chmod -h 0 /usr/bin/lprm; fi
+%%OVERWRITE%%@exec if test -e /usr/sbin/lpc; then chmod -h 0 /usr/sbin/lpc; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lp; then chmod -h 0555 /usr/bin/lp; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lpq; then chmod -h 06555 /usr/bin/lpq; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lpr; then chmod -h 06555 /usr/bin/lpr; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lprm; then chmod -h 06555 /usr/bin/lprm; fi
+%%OVERWRITE%%@unexec if test -e /usr/sbin/lpc; then chmod -h 02555 /usr/sbin/lpc; fi
+bin/cancel
+bin/cups-config
+bin/cupstestdsc
+bin/cupstestppd
+%%AVAHI%%bin/ippfind
+%%IPPTOOL%%bin/ipptool
+bin/lp
+bin/lpoptions
+bin/lpq
+bin/lpr
+bin/lpr-cups
+bin/lprm
+bin/lpstat
+bin/ppdc
+bin/ppdhtml
+bin/ppdi
+bin/ppdmerge
+bin/ppdpo
+@sample(,cups,640) %%ETCDIR%%/cups-files.conf.sample
+@sample(,cups,640) %%ETCDIR%%/cupsd.conf.sample
+@sample(,cups,640) %%ETCDIR%%/snmp.conf.sample
+etc/dbus-1/system.d/cups.conf
+etc/pam.d/cups
+include/cups/adminutil.h
+include/cups/array.h
+include/cups/backend.h
+include/cups/cgi.h
+include/cups/cups.h
+include/cups/dir.h
+include/cups/file.h
+include/cups/help-index.h
+include/cups/http.h
+include/cups/ipp.h
+include/cups/language.h
+include/cups/mime.h
+include/cups/ppd.h
+include/cups/ppdc.h
+include/cups/pwg.h
+include/cups/raster.h
+include/cups/sidechannel.h
+include/cups/transcode.h
+include/cups/versioning.h
+lib/libcups.so
+lib/libcups.so.2
+lib/libcupscgi.so
+lib/libcupscgi.so.1
+lib/libcupsimage.so
+lib/libcupsimage.so.2
+lib/libcupsmime.so
+lib/libcupsmime.so.1
+lib/libcupsppdc.so
+lib/libcupsppdc.so.1
+libexec/cups/backend/http
+libexec/cups/backend/https
+libexec/cups/backend/ipp
+libexec/cups/backend/ipps
+libexec/cups/backend/lpd
+libexec/cups/backend/snmp
+libexec/cups/backend/socket
+libexec/cups/backend/usb
+%%AVAHI%%libexec/cups/backend/dnssd
+libexec/cups/cgi-bin/admin.cgi
+libexec/cups/cgi-bin/classes.cgi
+libexec/cups/cgi-bin/help.cgi
+libexec/cups/cgi-bin/jobs.cgi
+libexec/cups/cgi-bin/printers.cgi
+libexec/cups/daemon/cups-deviced
+libexec/cups/daemon/cups-driverd
+libexec/cups/daemon/cups-exec
+libexec/cups/daemon/cups-lpd
+libexec/cups/filter/commandtops
+libexec/cups/filter/gziptoany
+libexec/cups/filter/pstops
+libexec/cups/filter/rastertodymo
+libexec/cups/filter/rastertoepson
+libexec/cups/filter/rastertohp
+libexec/cups/filter/rastertolabel
+libexec/cups/filter/rastertopwg
+libexec/cups/monitor/bcp
+libexec/cups/monitor/tbcp
+%%DBUS%%libexec/cups/notifier/dbus
+libexec/cups/notifier/mailto
+libexec/cups/notifier/rss
+man/man1/cancel.1.gz
+man/man1/cups-config.1.gz
+man/man1/cupstestdsc.1.gz
+man/man1/cupstestppd.1.gz
+man/man1/cups.1.gz
+%%AVAHI%%man/man1/ippfind.1.gz
+%%IPPTOOL%%man/man1/ipptool.1.gz
+man/man1/lp.1.gz
+man/man1/lpoptions.1.gz
+man/man1/lpq.1.gz
+man/man1/lpr.1.gz
+man/man1/lprm.1.gz
+man/man1/lpstat.1.gz
+man/man1/ppdc.1.gz
+man/man1/ppdhtml.1.gz
+man/man1/ppdi.1.gz
+man/man1/ppdmerge.1.gz
+man/man1/ppdpo.1.gz
+man/man5/classes.conf.5.gz
+man/man5/client.conf.5.gz
+man/man5/cups-files.conf.5.gz
+man/man5/cups-snmp.conf.5.gz
+man/man5/cupsd-logs.5.gz
+man/man5/cupsd.conf.5.gz
+%%IPPTOOL%%man/man5/ipptoolfile.5.gz
+man/man5/mailto.conf.5.gz
+man/man5/mime.convs.5.gz
+man/man5/mime.types.5.gz
+man/man5/ppdcfile.5.gz
+man/man5/printers.conf.5.gz
+man/man5/subscriptions.conf.5.gz
+man/man7/backend.7.gz
+man/man7/filter.7.gz
+man/man7/notifier.7.gz
+man/man8/accept.8.gz
+man/man8/cupsd-helper.8.gz
+man/man8/cups-deviced.8.gz
+man/man8/cups-exec.8.gz
+man/man8/cups-driverd.8.gz
+man/man8/cups-lpd.8.gz
+man/man8/cups-snmp.8.gz
+man/man8/cupsaccept.8.gz
+man/man8/cupsaddsmb.8.gz
+man/man8/cupsctl.8.gz
+man/man8/cupsd.8.gz
+man/man8/cupsdisable.8.gz
+man/man8/cupsenable.8.gz
+man/man8/cupsfilter.8.gz
+man/man8/cupsreject.8.gz
+man/man8/lpadmin.8.gz
+man/man8/lpc.8.gz
+man/man8/lpinfo.8.gz
+man/man8/lpmove.8.gz
+man/man8/reject.8.gz
+sbin/accept
+sbin/cupsaccept
+sbin/cupsaddsmb
+sbin/cupsctl
+sbin/cupsd
+sbin/cupsdisable
+sbin/cupsenable
+sbin/cupsfilter
+sbin/cupsreject
+sbin/lpadmin
+sbin/lpc
+sbin/lpinfo
+sbin/lpmove
+sbin/reject
+%%X11%%share/applications/cups.desktop
+%%DATADIR%%/drv/sample.drv
+%%DATADIR%%/examples/color.drv
+%%DATADIR%%/examples/constraint.drv
+%%DATADIR%%/examples/custom.drv
+%%DATADIR%%/examples/grouping.drv
+%%DATADIR%%/examples/laserjet-basic.drv
+%%DATADIR%%/examples/laserjet-pjl.drv
+%%DATADIR%%/examples/minimum.drv
+%%DATADIR%%/examples/postscript.drv
+%%DATADIR%%/examples/r300-basic.drv
+%%DATADIR%%/examples/r300-colorman.drv
+%%DATADIR%%/examples/r300-remote.drv
+%%IPPTOOL%%%%DATADIR%%/ipptool/color.jpg
+%%IPPTOOL%%%%DATADIR%%/ipptool/create-printer-subscription.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/document-a4.pdf
+%%IPPTOOL%%%%DATADIR%%/ipptool/document-a4.ps
+%%IPPTOOL%%%%DATADIR%%/ipptool/document-letter.pdf
+%%IPPTOOL%%%%DATADIR%%/ipptool/document-letter.ps
+%%IPPTOOL%%%%DATADIR%%/ipptool/get-completed-jobs.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/get-jobs.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/get-notifications.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/get-printer-attributes.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/get-subscriptions.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/gray.jpg
+%%IPPTOOL%%%%DATADIR%%/ipptool/ipp-1.1.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/ipp-2.0.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/ipp-2.1.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/ipp-2.2.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/ipp-everywhere.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/onepage-a4.pdf
+%%IPPTOOL%%%%DATADIR%%/ipptool/onepage-a4.ps
+%%IPPTOOL%%%%DATADIR%%/ipptool/onepage-letter.pdf
+%%IPPTOOL%%%%DATADIR%%/ipptool/onepage-letter.ps
+%%IPPTOOL%%%%DATADIR%%/ipptool/print-job-deflate.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/print-job-gzip.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/print-job.test
+%%IPPTOOL%%%%DATADIR%%/ipptool/testfile.jpg
+%%IPPTOOL%%%%DATADIR%%/ipptool/testfile.pcl
+%%IPPTOOL%%%%DATADIR%%/ipptool/testfile.pdf
+%%IPPTOOL%%%%DATADIR%%/ipptool/testfile.ps
+%%IPPTOOL%%%%DATADIR%%/ipptool/testfile.txt
+%%IPPTOOL%%%%DATADIR%%/ipptool/validate-job.test
+%%DATADIR%%/mime/mime.convs
+%%DATADIR%%/mime/mime.types
+%%DATADIR%%/ppdc/epson.h
+%%DATADIR%%/ppdc/font.defs
+%%DATADIR%%/ppdc/hp.h
+%%DATADIR%%/ppdc/label.h
+%%DATADIR%%/ppdc/media.defs
+%%DATADIR%%/ppdc/raster.defs
+%%DATADIR%%/templates/add-class.tmpl
+%%DATADIR%%/templates/add-printer.tmpl
+%%DATADIR%%/templates/add-rss-subscription.tmpl
+%%DATADIR%%/templates/admin.tmpl
+%%DATADIR%%/templates/choose-device.tmpl
+%%DATADIR%%/templates/choose-make.tmpl
+%%DATADIR%%/templates/choose-model.tmpl
+%%DATADIR%%/templates/choose-serial.tmpl
+%%DATADIR%%/templates/choose-uri.tmpl
+%%DATADIR%%/templates/class-added.tmpl
+%%DATADIR%%/templates/class-confirm.tmpl
+%%DATADIR%%/templates/class-deleted.tmpl
+%%DATADIR%%/templates/class-jobs-header.tmpl
+%%DATADIR%%/templates/class-modified.tmpl
+%%DATADIR%%/templates/class.tmpl
+%%DATADIR%%/templates/classes-header.tmpl
+%%DATADIR%%/templates/classes.tmpl
+%%DATADIR%%/templates/command.tmpl
+%%NLS%%%%DATADIR%%/templates/de/add-class.tmpl
+%%NLS%%%%DATADIR%%/templates/de/add-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/de/add-rss-subscription.tmpl
+%%NLS%%%%DATADIR%%/templates/de/admin.tmpl
+%%NLS%%%%DATADIR%%/templates/de/choose-device.tmpl
+%%NLS%%%%DATADIR%%/templates/de/choose-make.tmpl
+%%NLS%%%%DATADIR%%/templates/de/choose-model.tmpl
+%%NLS%%%%DATADIR%%/templates/de/choose-serial.tmpl
+%%NLS%%%%DATADIR%%/templates/de/choose-uri.tmpl
+%%NLS%%%%DATADIR%%/templates/de/class-added.tmpl
+%%NLS%%%%DATADIR%%/templates/de/class-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/de/class-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/de/class-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/class-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/de/class.tmpl
+%%NLS%%%%DATADIR%%/templates/de/classes-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/classes.tmpl
+%%NLS%%%%DATADIR%%/templates/de/command.tmpl
+%%NLS%%%%DATADIR%%/templates/de/edit-config.tmpl
+%%NLS%%%%DATADIR%%/templates/de/error-op.tmpl
+%%NLS%%%%DATADIR%%/templates/de/error.tmpl
+%%NLS%%%%DATADIR%%/templates/de/header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/help-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/help-printable.tmpl
+%%NLS%%%%DATADIR%%/templates/de/help-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/de/job-cancel.tmpl
+%%NLS%%%%DATADIR%%/templates/de/job-hold.tmpl
+%%NLS%%%%DATADIR%%/templates/de/job-move.tmpl
+%%NLS%%%%DATADIR%%/templates/de/job-moved.tmpl
+%%NLS%%%%DATADIR%%/templates/de/job-release.tmpl
+%%NLS%%%%DATADIR%%/templates/de/job-restart.tmpl
+%%NLS%%%%DATADIR%%/templates/de/jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/de/list-available-printers.tmpl
+%%NLS%%%%DATADIR%%/templates/de/modify-class.tmpl
+%%NLS%%%%DATADIR%%/templates/de/modify-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/de/norestart.tmpl
+%%NLS%%%%DATADIR%%/templates/de/option-boolean.tmpl
+%%NLS%%%%DATADIR%%/templates/de/option-conflict.tmpl
+%%NLS%%%%DATADIR%%/templates/de/option-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/option-pickmany.tmpl
+%%NLS%%%%DATADIR%%/templates/de/option-pickone.tmpl
+%%NLS%%%%DATADIR%%/templates/de/option-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/de/pager.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-accept.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-added.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-cancel-jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-configured.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-default.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-reject.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-start.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer-stop.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printer.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printers-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/printers.tmpl
+%%NLS%%%%DATADIR%%/templates/de/restart.tmpl
+%%NLS%%%%DATADIR%%/templates/de/samba-export.tmpl
+%%NLS%%%%DATADIR%%/templates/de/samba-exported.tmpl
+%%NLS%%%%DATADIR%%/templates/de/search.tmpl
+%%NLS%%%%DATADIR%%/templates/de/set-printer-options-header.tmpl
+%%NLS%%%%DATADIR%%/templates/de/set-printer-options-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/de/subscription-added.tmpl
+%%NLS%%%%DATADIR%%/templates/de/subscription-canceled.tmpl
+%%NLS%%%%DATADIR%%/templates/de/test-page.tmpl
+%%NLS%%%%DATADIR%%/templates/de/trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/de/users.tmpl
+%%DATADIR%%/templates/edit-config.tmpl
+%%DATADIR%%/templates/error-op.tmpl
+%%DATADIR%%/templates/error.tmpl
+%%NLS%%%%DATADIR%%/templates/es/add-class.tmpl
+%%NLS%%%%DATADIR%%/templates/es/add-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/es/add-rss-subscription.tmpl
+%%NLS%%%%DATADIR%%/templates/es/admin.tmpl
+%%NLS%%%%DATADIR%%/templates/es/choose-device.tmpl
+%%NLS%%%%DATADIR%%/templates/es/choose-make.tmpl
+%%NLS%%%%DATADIR%%/templates/es/choose-model.tmpl
+%%NLS%%%%DATADIR%%/templates/es/choose-serial.tmpl
+%%NLS%%%%DATADIR%%/templates/es/choose-uri.tmpl
+%%NLS%%%%DATADIR%%/templates/es/class-added.tmpl
+%%NLS%%%%DATADIR%%/templates/es/class-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/es/class-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/es/class-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/class-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/es/class.tmpl
+%%NLS%%%%DATADIR%%/templates/es/classes-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/classes.tmpl
+%%NLS%%%%DATADIR%%/templates/es/command.tmpl
+%%NLS%%%%DATADIR%%/templates/es/edit-config.tmpl
+%%NLS%%%%DATADIR%%/templates/es/error-op.tmpl
+%%NLS%%%%DATADIR%%/templates/es/error.tmpl
+%%NLS%%%%DATADIR%%/templates/es/header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/help-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/help-printable.tmpl
+%%NLS%%%%DATADIR%%/templates/es/help-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/es/job-cancel.tmpl
+%%NLS%%%%DATADIR%%/templates/es/job-hold.tmpl
+%%NLS%%%%DATADIR%%/templates/es/job-move.tmpl
+%%NLS%%%%DATADIR%%/templates/es/job-moved.tmpl
+%%NLS%%%%DATADIR%%/templates/es/job-release.tmpl
+%%NLS%%%%DATADIR%%/templates/es/job-restart.tmpl
+%%NLS%%%%DATADIR%%/templates/es/jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/es/list-available-printers.tmpl
+%%NLS%%%%DATADIR%%/templates/es/modify-class.tmpl
+%%NLS%%%%DATADIR%%/templates/es/modify-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/es/norestart.tmpl
+%%NLS%%%%DATADIR%%/templates/es/option-boolean.tmpl
+%%NLS%%%%DATADIR%%/templates/es/option-conflict.tmpl
+%%NLS%%%%DATADIR%%/templates/es/option-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/option-pickmany.tmpl
+%%NLS%%%%DATADIR%%/templates/es/option-pickone.tmpl
+%%NLS%%%%DATADIR%%/templates/es/option-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/es/pager.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-accept.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-added.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-cancel-jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-configured.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-default.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-reject.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-start.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer-stop.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printer.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printers-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/printers.tmpl
+%%NLS%%%%DATADIR%%/templates/es/restart.tmpl
+%%NLS%%%%DATADIR%%/templates/es/samba-export.tmpl
+%%NLS%%%%DATADIR%%/templates/es/samba-exported.tmpl
+%%NLS%%%%DATADIR%%/templates/es/search.tmpl
+%%NLS%%%%DATADIR%%/templates/es/set-printer-options-header.tmpl
+%%NLS%%%%DATADIR%%/templates/es/set-printer-options-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/es/subscription-added.tmpl
+%%NLS%%%%DATADIR%%/templates/es/subscription-canceled.tmpl
+%%NLS%%%%DATADIR%%/templates/es/test-page.tmpl
+%%NLS%%%%DATADIR%%/templates/es/trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/es/users.tmpl
+%%DATADIR%%/templates/header.tmpl
+%%DATADIR%%/templates/help-header.tmpl
+%%DATADIR%%/templates/help-printable.tmpl
+%%DATADIR%%/templates/help-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/add-class.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/add-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/add-rss-subscription.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/admin.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/choose-device.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/choose-make.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/choose-model.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/choose-serial.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/choose-uri.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/class-added.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/class-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/class-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/class-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/class-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/class.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/classes-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/classes.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/command.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/edit-config.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/error-op.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/error.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/help-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/help-printable.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/help-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/job-cancel.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/job-hold.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/job-move.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/job-moved.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/job-release.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/job-restart.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/list-available-printers.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/modify-class.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/modify-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/norestart.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/option-boolean.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/option-conflict.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/option-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/option-pickmany.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/option-pickone.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/option-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/pager.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-accept.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-added.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-cancel-jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-configured.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-default.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-reject.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-start.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer-stop.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printers-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/printers.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/restart.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/samba-export.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/samba-exported.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/search.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/set-printer-options-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/set-printer-options-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/subscription-added.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/subscription-canceled.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/test-page.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ja/users.tmpl
+%%DATADIR%%/templates/job-cancel.tmpl
+%%DATADIR%%/templates/job-hold.tmpl
+%%DATADIR%%/templates/job-move.tmpl
+%%DATADIR%%/templates/job-moved.tmpl
+%%DATADIR%%/templates/job-release.tmpl
+%%DATADIR%%/templates/job-restart.tmpl
+%%DATADIR%%/templates/jobs-header.tmpl
+%%DATADIR%%/templates/jobs.tmpl
+%%DATADIR%%/templates/list-available-printers.tmpl
+%%DATADIR%%/templates/modify-class.tmpl
+%%DATADIR%%/templates/modify-printer.tmpl
+%%DATADIR%%/templates/norestart.tmpl
+%%DATADIR%%/templates/option-boolean.tmpl
+%%DATADIR%%/templates/option-conflict.tmpl
+%%DATADIR%%/templates/option-header.tmpl
+%%DATADIR%%/templates/option-pickmany.tmpl
+%%DATADIR%%/templates/option-pickone.tmpl
+%%DATADIR%%/templates/option-trailer.tmpl
+%%DATADIR%%/templates/pager.tmpl
+%%DATADIR%%/templates/printer-accept.tmpl
+%%DATADIR%%/templates/printer-added.tmpl
+%%DATADIR%%/templates/printer-cancel-jobs.tmpl
+%%DATADIR%%/templates/printer-configured.tmpl
+%%DATADIR%%/templates/printer-confirm.tmpl
+%%DATADIR%%/templates/printer-default.tmpl
+%%DATADIR%%/templates/printer-deleted.tmpl
+%%DATADIR%%/templates/printer-jobs-header.tmpl
+%%DATADIR%%/templates/printer-modified.tmpl
+%%DATADIR%%/templates/printer-reject.tmpl
+%%DATADIR%%/templates/printer-start.tmpl
+%%DATADIR%%/templates/printer-stop.tmpl
+%%DATADIR%%/templates/printer.tmpl
+%%DATADIR%%/templates/printers-header.tmpl
+%%DATADIR%%/templates/printers.tmpl
+%%DATADIR%%/templates/restart.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/add-class.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/add-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/add-rss-subscription.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/admin.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/choose-device.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/choose-make.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/choose-model.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/choose-serial.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/choose-uri.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/class-added.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/class-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/class-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/class-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/class-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/class.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/classes-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/classes.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/command.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/edit-config.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/error-op.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/error.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/help-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/help-printable.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/help-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/job-cancel.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/job-hold.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/job-move.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/job-moved.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/job-release.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/job-restart.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/list-available-printers.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/modify-class.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/modify-printer.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/norestart.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/option-boolean.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/option-conflict.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/option-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/option-pickmany.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/option-pickone.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/option-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/pager.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-accept.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-added.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-cancel-jobs.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-configured.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-confirm.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-default.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-deleted.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-jobs-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-modified.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-reject.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-start.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer-stop.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printer.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printers-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/printers.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/restart.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/samba-export.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/samba-exported.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/search.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/set-printer-options-header.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/set-printer-options-trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/subscription-added.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/subscription-canceled.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/test-page.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/trailer.tmpl
+%%NLS%%%%DATADIR%%/templates/ru/users.tmpl
+%%DATADIR%%/templates/samba-export.tmpl
+%%DATADIR%%/templates/samba-exported.tmpl
+%%DATADIR%%/templates/search.tmpl
+%%DATADIR%%/templates/set-printer-options-header.tmpl
+%%DATADIR%%/templates/set-printer-options-trailer.tmpl
+%%DATADIR%%/templates/subscription-added.tmpl
+%%DATADIR%%/templates/subscription-canceled.tmpl
+%%DATADIR%%/templates/test-page.tmpl
+%%DATADIR%%/templates/trailer.tmpl
+%%DATADIR%%/templates/users.tmpl
+%%DATADIR%%/usb/org.cups.usb-quirks
+%%DOCSDIR%%/apple-touch-icon.png
+%%DOCSDIR%%/cups-printable.css
+%%DOCSDIR%%/cups.css
+%%NLS%%%%DOCSDIR%%/de/index.html
+%%NLS%%%%DOCSDIR%%/es/index.html
+%%PORTDOCS%%%%DOCSDIR%%/help/accounting.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-array.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-cgi.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-cups.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-driver.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-filedir.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-filter.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-httpipp.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-mime.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-overview.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-ppd.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-ppdc.html
+%%PORTDOCS%%%%DOCSDIR%%/help/api-raster.html
+%%PORTDOCS%%%%DOCSDIR%%/help/cgi.html
+%%PORTDOCS%%%%DOCSDIR%%/help/glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/help/kerberos.html
+%%PORTDOCS%%%%DOCSDIR%%/help/license.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-backend.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cancel.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-classes.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-client.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cups-config.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cups-files.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cups-lpd.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cups-snmp.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cups.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupsaccept.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupsaddsmb.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupsd-helper.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupsd-logs.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupsd.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupsd.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupsenable.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupstestdsc.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-cupstestppd.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-filter.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-ipptool.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-ipptoolfile.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lp.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpadmin.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpc.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpmove.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpoptions.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpq.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpr.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lprm.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-lpstat.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-mime.convs.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-mime.types.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-notifier.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-ppdc.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-ppdhtml.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-ppdi.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-ppdmerge.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-ppdpo.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-printers.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/help/man-subscriptions.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/help/network.html
+%%PORTDOCS%%%%DOCSDIR%%/help/options.html
+%%PORTDOCS%%%%DOCSDIR%%/help/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/help/policies.html
+%%PORTDOCS%%%%DOCSDIR%%/help/postscript-driver.html
+%%PORTDOCS%%%%DOCSDIR%%/help/ppd-compiler.html
+%%PORTDOCS%%%%DOCSDIR%%/help/raster-driver.html
+%%PORTDOCS%%%%DOCSDIR%%/help/ref-ppdcfile.html
+%%PORTDOCS%%%%DOCSDIR%%/help/security.html
+%%PORTDOCS%%%%DOCSDIR%%/help/sharing.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-banner.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-cmp.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-command.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-design.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-ipp.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-pdf.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-postscript.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-ppd.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-raster.html
+%%PORTDOCS%%%%DOCSDIR%%/help/spec-stp.html
+%%PORTDOCS%%%%DOCSDIR%%/help/translation.html
+%%PORTDOCS%%%%DOCSDIR%%/images/color-wheel.png
+%%PORTDOCS%%%%DOCSDIR%%/images/cups-block-diagram.png
+%%PORTDOCS%%%%DOCSDIR%%/images/cups-command-chain.png
+%%PORTDOCS%%%%DOCSDIR%%/images/cups-icon.png
+%%PORTDOCS%%%%DOCSDIR%%/images/cups-postscript-chain.png
+%%PORTDOCS%%%%DOCSDIR%%/images/cups-raster-chain.png
+%%PORTDOCS%%%%DOCSDIR%%/images/cups.png
+%%DOCSDIR%%/images/generic.png
+%%PORTDOCS%%%%DOCSDIR%%/images/left.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/raster-organization.png
+%%PORTDOCS%%%%DOCSDIR%%/images/raster.png
+%%PORTDOCS%%%%DOCSDIR%%/images/right.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/sample-image.png
+%%DOCSDIR%%/images/sel.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/smiley.jpg
+%%DOCSDIR%%/images/unsel.gif
+%%DOCSDIR%%/images/wait.gif
+%%DOCSDIR%%/index.html
+%%NLS%%%%DOCSDIR%%/ja/index.html
+%%DOCSDIR%%/robots.txt
+%%NLS%%%%DOCSDIR%%/ru/index.html
+%%X11%%share/icons/hicolor/128x128/apps/cups.png
+%%X11%%share/icons/hicolor/16x16/apps/cups.png
+%%X11%%share/icons/hicolor/32x32/apps/cups.png
+%%X11%%share/icons/hicolor/64x64/apps/cups.png
+%%NLS%%share/locale/ca/cups_ca.po
+%%NLS%%share/locale/cs/cups_cs.po
+%%NLS%%share/locale/de/cups_de.po
+%%NLS%%share/locale/es/cups_es.po
+%%NLS%%share/locale/fr/cups_fr.po
+%%NLS%%share/locale/it/cups_it.po
+%%NLS%%share/locale/ja/cups_ja.po
+%%NLS%%share/locale/ru/cups_ru.po
+@dir(,cups,) %%ETCDIR%%/interfaces
+@dir(,cups,) %%ETCDIR%%/ppd
+@dir(,cups,700) %%ETCDIR%%/ssl
+@dir(,cups,) %%ETCDIR%%
+@dir libexec/cups/driver
+@dir %%DATADIR%%/banners
+@dir %%DATADIR%%/data
+@dir %%DATADIR%%/model
+@dir %%DATADIR%%/profiles
+@dir(,cups,775) /var/cache/cups/rss
+@dir(,cups,770) /var/cache/cups
+@dir /var/log/cups
+@dir(cups,wheel,511) /var/run/cups/certs
+@dir /var/run/cups
+@dir(,cups,1770) /var/spool/cups/tmp
+@dir(,cups,710) /var/spool/cups
--- a/print/dymo-cups-drivers/Makefile
+++ b/print/dymo-cups-drivers/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	dymo-cups-drivers
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://download.dymo.com/Software/Linux/

@ -11,7 +12,7 @@ COMMENT=	Open source DYMO CUPS driver
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE

-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups-image
+LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups

 WRKSRC=		${WRKDIR}/dymo-cups-drivers-1.4.0.5

--- a/print/epson-inkjet-printer-escpr/Makefile
+++ b/print/epson-inkjet-printer-escpr/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	epson-inkjet-printer-escpr
 PORTVERSION=	1.6.4
 DISTVERSIONSUFFIX=	-1lsb3.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/hrs

@ -11,9 +12,7 @@ COMMENT=	Epson Inkjet Printer Driver (ESC/P-R) for Linux

 LICENSE=	GPLv2

-BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-client
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
-		libcupsimage.so:${PORTSDIR}/print/cups-image
+LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups

 USES=		autoreconf dos2unix gmake libtool
 USE_LDCONFIG=	yes
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	foo2zjs
 PORTVERSION=	20150511
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	GOOGLE_CODE \
 		LOCAL/bsam/${PORTNAME}  \
@ -15,7 +15,7 @@ COMMENT=	Driver for printers that use the ZjStream wire protocol
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 RUN_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:${PORTSDIR}/print/foomatic-db \
 		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
 		gsed:${PORTSDIR}/textproc/gsed
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@ -1,16 +1,12 @@
 # Created by: Martin Ranne <gasp@ridcully.dnsalias.org>
 # $FreeBSD$

-PORTNAME=	engine
+PORTNAME=	foomatic-db-engine
 PORTVERSION=	4.0.12
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	print
-MASTER_SITES=	http://www.openprinting.org/download/foomatic/ \
-		GOOGLE_CODE \
-		LOCAL/acm/foomatic
-PKGNAMEPREFIX=	foomatic-db-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
-DIST_SUBDIR=	foomatic
+MASTER_SITES=	http://www.openprinting.org/download/foomatic/

 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Foomatic database engine
@ -36,8 +32,7 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		"s,/usr/local/bin:,${PREFIX}/bin:,g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
-		"/ln -sf foo/ s,foomatic-ppdfile,$$\(BINDIR\)/foomatic-ppdfile," \
-		-e "/if \[ -d/ s,LIB_CUPS,PREFIX," ${WRKSRC}/Makefile.in
+		"/if \[ -d/ s,LIB_CUPS,PREFIX," ${WRKSRC}/Makefile.in

 post-install:
 .for file in foomatic-combo-xml foomatic-perl-data
--- a/print/foomatic-db-engine/distinfo
+++ b/print/foomatic-db-engine/distinfo
@ -1,2 +1,2 @@
-SHA256 (foomatic/foomatic-db-engine-4.0.12.tar.gz) = 66143b76ed5b325b7025e261ad917b543de534c6d0a6e495d5489a20cace7c21
-SIZE (foomatic/foomatic-db-engine-4.0.12.tar.gz) = 360499
+SHA256 (foomatic-db-engine-4.0.12.tar.gz) = 66143b76ed5b325b7025e261ad917b543de534c6d0a6e495d5489a20cace7c21
+SIZE (foomatic-db-engine-4.0.12.tar.gz) = 360499
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@ -1,24 +1,21 @@
 # Created by: Dima Dorfman <dima@unixfreak.org>
 # $FreeBSD$

-PORTNAME=	db
+PORTNAME=	foomatic-db
 PORTVERSION=	20160226
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	LOCAL/danilo
-PKGNAMEPREFIX=	foomatic-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${FOOMATICVER}-${PORTVERSION}

 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Database for integrating printer drivers with common spoolers

-LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libcurl.so:${PORTSDIR}/ftp/curl
-
-USES=		autoreconf gmake tar:xz
+USES=		gmake tar:xz
 GNU_CONFIGURE=	yes

 FOOMATICVER=	4.0
-WRKSRC=	${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	foomatic-filters
 PORTVERSION=	4.0.17
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/

@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus

+CONFLICTS=	cups-filters-[0-9]*
+
 USES=		autoreconf ghostscript perl5 pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \
@ -46,7 +48,7 @@ MPAGE_DESC=		Print multiple pages per sheet of paper
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MCUPS_IMAGE}
-RUN_DEPENDS+=	${LOCALBASE}/lib/libcupsimage.so:${PORTSDIR}/print/cups-image
+RUN_DEPENDS+=	${LOCALBASE}/lib/libcupsimage.so:${PORTSDIR}/print/cups
 .endif

 .if ${PORT_OPTIONS:MA2PS}
@ -73,8 +75,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' ${WRKSRC}/foomaticrip.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/foomaticrip.c
 	@${REINPLACE_CMD} -e '/filter.conf/ s|if|#if|g' ${WRKSRC}/Makefile.in
-	@${MV} ${WRKSRC}/beh.in ${WRKSRC}/foomatic-beh.in
-	@${REINPLACE_CMD} -e 's|beh|foomatic-beh|' ${WRKSRC}/foomatic-beh.in

 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/foomatic-rip
--- a/print/foomatic-filters/files/patch-Makefile.am
+++ b/print/foomatic-filters/files/patch-Makefile.am
@ -1,31 +0,0 @@
-Index: files/patch-Makefile.am
-===================================================================
--- Makefile.am.orig	2012-07-02 14:50:46 UTC
-+++ Makefile.am
-@@ -76,7 +76,7 @@ install-cups:	install-bin
- 	${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_FILTERS)
- 	${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_BACKENDS)
- 	ln -sf $(BINDIR)/foomatic-rip $(DESTDIR)$(CUPS_FILTERS)
-	${INSTALL} -m 755 beh $(DESTDIR)$(CUPS_BACKENDS)
-+	${INSTALL} -m 755 foomatic-beh $(DESTDIR)$(CUPS_BACKENDS)
- 
- install-ppr:	install-bin
- 	${SRC}/mkinstalldirs $(DESTDIR)$(PPR_INTERFACES)
-@@ -102,7 +102,7 @@ install-man:
- 
- # Clean up the source directory
- clean:	remove-trash
-	rm -f *.o foomatic-rip foomatic-rip.1 beh 
-+	rm -f *.o foomatic-rip foomatic-rip.1 foomatic-beh 
- 	rm -f .testing-stamp stamp-h1
- 	rm -f test/*.out
- 
-@@ -140,7 +140,7 @@ uninstall-etc:
- 
- uninstall-cups:
- 	rm -f $(DESTDIR)$(CUPS_FILTERS)/foomatic-rip
-	rm -f $(DESTDIR)$(CUPS_BACKENDS)/beh
-+	rm -f $(DESTDIR)$(CUPS_BACKENDS)/foomatic-beh
- 	rmdir $(DESTDIR)$(CUPS_FILTERS) || :
- 	rmdir $(DESTDIR)$(CUPS_BACKENDS) || :
- 	rmdir $(DESTDIR)$(CUPS) || :
--- a/print/foomatic-filters/files/patch-configure.ac
+++ b/print/foomatic-filters/files/patch-configure.ac
@ -1,13 +0,0 @@
-Index: files/patch-configure.ac
-===================================================================
--- configure.ac.orig	2012-07-02 14:50:46 UTC
-+++ configure.ac
-@@ -148,7 +148,7 @@ AC_ARG_WITH(execpath,[  --with-execpath=
- AC_MSG_RESULT([Execpath: $EXECPATH])
- AC_SUBST(EXECPATH)
- 
-AC_CONFIG_FILES([Makefile beh foomatic-rip.1])
-+AC_CONFIG_FILES([Makefile foomatic-beh foomatic-rip.1])
- AC_CONFIG_HEADER(config.h)
- AC_OUTPUT
- 
--- a/print/foomatic-filters/pkg-plist
+++ b/print/foomatic-filters/pkg-plist
@ -1,6 +1,6 @@
 bin/foomatic-rip
@sample etc/foomatic/filter.conf.sample
-libexec/cups/backend/foomatic-beh
+libexec/cups/backend/beh
 libexec/cups/filter/foomatic-rip
 lib/ppr/interfaces/foomatic-rip
 lib/ppr/lib/foomatic-rip
--- a/print/ghostscript8-base/Makefile
+++ b/print/ghostscript8-base/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ghostscript
 PORTVERSION=	8.71
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
--- a/print/ghostscript8-base/files/Makefile.drivers_post
+++ b/print/ghostscript8-base/files/Makefile.drivers_post
@ -40,7 +40,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor

 .if defined(_CUPS_DEVS)
-LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups-image
+LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
--- a/print/ghostscript9-agpl-base/Makefile
+++ b/print/ghostscript9-agpl-base/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	ghostscript
 PORTVERSION=	9.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
--- a/print/ghostscript9-agpl-base/files/Makefile.drivers_post
+++ b/print/ghostscript9-agpl-base/files/Makefile.drivers_post
@ -41,7 +41,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor

 .if defined(_CUPS_DEVS)
-LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups-image
+LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
--- a/print/ghostscript9-base/Makefile
+++ b/print/ghostscript9-base/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	ghostscript
 PORTVERSION=	9.06
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	print
 MASTER_SITES=	http://downloads.ghostscript.com/public/:gs_srcs \
 		SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
--- a/print/ghostscript9-base/files/Makefile.drivers_post
+++ b/print/ghostscript9-base/files/Makefile.drivers_post
@ -40,7 +40,7 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NGS_${D}}
 .endfor

 .if defined(_CUPS_DEVS)
-LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups-image
+LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	gtklp
 PORTVERSION=	1.3.1
 DISTVERSIONSUFFIX=	.src
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	SF

@ -13,7 +14,7 @@ COMMENT=	GTK interface to cups
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@ -4,7 +4,7 @@

 PORTNAME?=	gutenprint
 PORTVERSION=	5.2.10
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	print
 MASTER_SITES=	SF/gimp-print/gutenprint-5.2/${PORTVERSION}
 PKGNAMESUFFIX?=	-base
@ -56,9 +56,8 @@ INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
 PLIST_FILES+=	libexec/cups/backend/gutenprint52+usb \
 		share/cups/usb/net.sf.gimp-print.usb-quirks
 .endif
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client \
-		libcupsimage.so:${PORTSDIR}/print/cups-image
-RUN_DEPENDS+=	espgs:${PORTSDIR}/print/cups-pstoraster
+LIB_DEPENDS+=	libcupsimage.so:${PORTSDIR}/print/cups
+RUN_DEPENDS+=	${LOCALBASE}/libexec/cups/filter/gstoraster:${PORTSDIR}/print/cups-filters
 CONFIGURE_ARGS+=	--with-cups=${PREFIX} \
 			--enable-cups-ppds \
 			--enable-cups-level3-ppds
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	hpijs
 PORTVERSION=	2.1.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	print
 MASTER_SITES=	SF/hpinkjet/${PORTNAME}/${PORTVERSION}

@ -37,8 +37,8 @@ CONFIGURE_ARGS+=	--disable-foomatic-install
 .endif

 .if ${PORT_OPTIONS:MCUPS}
-BUILD_DEPENDS+=		cups-base>0:${PORTSDIR}/print/cups-base
-RUN_DEPENDS+=		cups-base>0:${PORTSDIR}/print/cups-base
+BUILD_DEPENDS+=		cups>0:${PORTSDIR}/print/cups
+RUN_DEPENDS+=		cups>0:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups-install
 .else
 CONFIGURE_ARGS+=	--disable-cups-install
--- a/print/hplip-plugin/Makefile
+++ b/print/hplip-plugin/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	hplip-plugin
-PORTVERSION=	3.14.10
+PORTVERSION=	3.16.2
 CATEGORIES=	print
 MASTER_SITES=	http://hplipopensource.com/hplip-web/plugin/
 DISTNAME=	hplip-${DISTVERSION}-plugin
@ -25,6 +25,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 PLUGIN_LINKS=	fax/plugins/fax_marvell \
 		prnt/plugins/hbpl1 \
 		prnt/plugins/lj \
+		scan/plugins/bb_escl \
 		scan/plugins/bb_marvell \
 		scan/plugins/bb_soap \
 		scan/plugins/bb_soapht
@ -47,14 +48,14 @@ LINARCH=	x86_64

 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} --keep --noexec
+	@(cd ${WRKDIR} && ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
+		--keep --noexec --nox11)

 post-patch:
-	${REINPLACE_CMD} -e 's|ok, ans = tui.enter_yes_no.*|ok, ans = 1, 1|' \
-		${WRKSRC}/plugin_install.py
-	${REINPLACE_CMD} -e 's|rules,||;s|rules_alt,||' ${WRKSRC}/plugin.spec
-	${REINPLACE_CMD} -e 's|/etc/hp|${HPLIP_FAKEDIR}|g' \
-		${WRKSRC}/plugin_install.py
+	@${REINPLACE_CMD} -e 's|ok, ans = tui.enter_yes_no.*|ok, ans = 1, 1|' \
+		-e 's|/etc/hp|${HPLIP_FAKEDIR}|' \
+		${WRKSRC}/plugin_install.py \
+		${WRKSRC}/installPlugin.py

 do-install:
 # fake hplip installation
@ -72,7 +73,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}/var/lib/hp
 # install hplip-plugin
 	${MKDIR} ${PLUGIN_DIRS:S,^,${STAGEDIR}${PREFIX}/share/hplip/,}
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -B plugin_install.py)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -B \
+		plugin_install.py -i)
 .for i in ${PLUGIN_LINKS}
 	${LN} -sf ${i:T}-${LINARCH}.so ${STAGEDIR}${PREFIX}/share/hplip/${i}.so
 .endfor
--- a/print/hplip-plugin/distinfo
+++ b/print/hplip-plugin/distinfo
@ -1,2 +1,2 @@
-SHA256 (hplip-3.14.10-plugin.run) = b395b480ad86b9f27b6a2f63b6ecb00beb78e762a6137efb81dc1104837f9b81
-SIZE (hplip-3.14.10-plugin.run) = 1869038
+SHA256 (hplip-3.16.2-plugin.run) = 47202db87a7092bc8dbeab0843ab1cd4923a835a20401c538978a3360a372326
+SIZE (hplip-3.16.2-plugin.run) = 2084269
--- a/print/hplip-plugin/files/patch-installPlugin.py
+++ b/print/hplip-plugin/files/patch-installPlugin.py
@ -0,0 +1,11 @@
+--- installPlugin.py.orig	2016-02-08 09:48:27 UTC
+++ installPlugin.py
+@@ -52,7 +52,7 @@ pluginObj = pluginhandler.PluginHandle()
+  
+ status = False
+  
+-if os.geteuid() == 0:
+if True:
+     status = pluginObj.copyFiles(os.getcwd())
+     if status == True:
+         sys.exit(0)
--- a/print/hplip-plugin/files/patch-plugin_install.py
+++ b/print/hplip-plugin/files/patch-plugin_install.py
@ -1,35 +1,14 @@
--- ./plugin_install.py.orig	2014-04-04 10:53:11.000000000 +0000
-+++ ./plugin_install.py	2014-04-14 21:21:12.685877696 +0000
-@@ -144,30 +144,13 @@
- log.info("")
+--- plugin_install.py.orig	2016-02-08 09:48:27 UTC
+++ plugin_install.py
+@@ -50,10 +50,8 @@ def startGUIInstall():
 
- PKIT = utils.to_bool(sys_conf.get('configure', 'policy-kit'))
-try:
-    from base.pkit import *
-    pkit_version = policykit_version()
-    if pkit_version:
-        if not user_pkit_version is None:
-            pkit_version = user_pkit_version
-        log.debug("pkit_version %d" % pkit_version)
-    try:
-        pkit = PolicyKit(pkit_version)
-        pkit_installed = True
-    except dbus.DBusException, ex:
-        pkit_installed = False
-except ImportError, e:
-    log.error("Unable to load pkit...is HPLIP installed?")
-    sys.exit(1)
-+
- if not PKIT:
-     pkit_installed = False
- log.debug("pkit_installed %s" % pkit_installed)
- 
-if mode == INTERACTIVE_MODE:
-+if True:
- 
-    if not pkit_installed and not os.geteuid() == 0:
-        log.error("You must be root to install this plug-in.")
-        sys.exit(1)
- 
-     log.info(log.bold("You must agree to the license terms before installing the plug-in:"))
-     log.info()
+ def installPlugin():
+     exec_str = sys.executable
+-    passwordObj = password.Password(mode)
+     cmd = "%s installPlugin.py"%exec_str
+-    cmd = passwordObj.getAuthCmd()%cmd
+-    status, output = utils.run(cmd, passwordObj)
+    status, output = utils.run(cmd)
+     if status == 0:
+         result = True
+     else:
--- a/print/hplip-plugin/pkg-plist
+++ b/print/hplip-plugin/pkg-plist
@ -19,6 +19,8 @@ share/hplip/prnt/plugins/hbpl1-%%LINARCH%%.so
 share/hplip/prnt/plugins/hbpl1.so
 share/hplip/prnt/plugins/lj-%%LINARCH%%.so
 share/hplip/prnt/plugins/lj.so
+share/hplip/scan/plugins/bb_escl-%%LINARCH%%.so
+share/hplip/scan/plugins/bb_escl.so
 share/hplip/scan/plugins/bb_marvell-%%LINARCH%%.so
 share/hplip/scan/plugins/bb_marvell.so
 share/hplip/scan/plugins/bb_soap-%%LINARCH%%.so
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@ -2,50 +2,38 @@
 # $FreeBSD$

 PORTNAME=	hplip
-PORTVERSION=	3.14.10
-PORTREVISION=	1
+PORTVERSION=	3.16.2
 CATEGORIES=	print
 MASTER_SITES=	SF

 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Drivers and utilities for HP Printers and All-in-One devices

-LIB_DEPENDS=	libcupsmime.so:${PORTSDIR}/print/cups-base \
-		libcups.so:${PORTSDIR}/print/cups-client \
-		libcupsimage.so:${PORTSDIR}/print/cups-image \
+LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups \
 		libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	espgs:${PORTSDIR}/print/cups-pstoraster \
-		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
-		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \
-		xdg-open:${PORTSDIR}/devel/xdg-utils
+RUN_DEPENDS=	${LOCALBASE}/libexec/cups/filter/gstoraster:${PORTSDIR}/print/cups-filters \
+		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus

 CONFLICTS_INSTALL=	hpijs-[0-9]*

 INSTALL_TARGET=	install-strip
-USES=		dos2unix ghostscript:run jpeg libtool pkgconfig python \
-		shebangfix
+USES=		jpeg libtool pkgconfig python
 USE_GNOME=	pygobject
 USE_LDCONFIG=	yes

 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-foomatic-ppd-install \
-		--enable-hpijs-install \
-		--enable-cups-ppd-install \
-		--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
+CONFIGURE_ARGS=	--with-cupsbackenddir=${PREFIX}/libexec/cups/backend \
 		--with-cupsfilterdir=${PREFIX}/libexec/cups/filter \
 		--with-icondir=${DESKTOPDIR} \
 		--with-systraydir=${PREFIX}/etc/xdg/autostart \
-		--with-hpppddir=${PREFIX}/share/ppd/HP \
-		--with-mimedir=${PREFIX}/etc/cups \
+		--with-mimedir=${PREFIX}/share/cups/mime \
 		--with-docdir=${DOCSDIR} \
 		--with-htmldir=${DOCSDIR} \
-		--with-drvdir=${PREFIX}/libexec/cups/driver
+		--with-drvdir=${PREFIX}/share/cups/drv
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib

 SUB_FILES=	pkg-message
-DOS2UNIX_REGEX=.+\.(c|cpp|h|py)$
-SHEBANG_FILES=	prnt/hpijs/foomatic-rip-hplip
 FILES4FIX=	Makefile.in \
 		base/codes.py \
 		base/g.py \
@ -66,7 +54,6 @@ FILES4FIX=	Makefile.in \
 		prnt/cups.py \
 		prnt/filters/hpps \
 		prnt/hpcups/HPCupsFilter.cpp \
-		prnt/hpijs/foomatic-rip-hplip \
 		prnt/hpijs/globals.cpp \
 		prnt/hpijs/hpcupsfax.cpp \
 		prnt/hpijs/hpijs.cpp \
@ -75,14 +62,9 @@ FILES4FIX=	Makefile.in \

 PYTHON_SITELIBDIR_REL=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}

-OPTIONS_DEFINE=	QT FAX SNMP SCAN XSANE DOCS
-OPTIONS_DEFAULT=	QT SNMP SCAN
-OPTIONS_SUB=		yes # QT FAX SCAN
-
-QT_DESC=	Graphical User Interface (Qt 4)
-QT_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbussupport
-QT_CONFIGURE_ENABLE=	qt4 gui-build
+OPTIONS_DEFINE=	DOCS FAX SNMP SCAN X11 XSANE
+OPTIONS_DEFAULT=SNMP SCAN X11
+OPTIONS_SUB=	yes # FAX SCAN X11

 FAX_DESC=	PC Send Fax support
 FAX_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
@ -98,6 +80,11 @@ SCAN_LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
 SCAN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
 SCAN_CONFIGURE_ENABLE=	scan-build

+X11_DESC=	Graphical User Interface (Qt 4)
+X11_RUN_DEPENDS=${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbussupport
+X11_CONFIGURE_ENABLE=	qt4 gui-build
+
 XSANE_DESC=	Install XSane for scanning (requires SCAN)
 XSANE_IMPLIES=	SCAN
 XSANE_RUN_DEPENDS=	xsane:${PORTSDIR}/graphics/xsane
@ -111,22 +98,22 @@ post-patch:
 		${WRKSRC}/configure \
 		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \
-		-e '/[[:space:]]install-hplip_confDATA/ s,install-hplip_confDATA,,' \
-		-e '/[[:space:]]install-dist_hplip_LogDATA/ s,install-dist_hplip_LogDATA,,' \
-		-e '/[[:space:]]install-dist_cronDATA/ s,install-dist_cronDATA,,' \
-		-e '/[[:space:]]install-dist_halpreDATA/ s,install-dist_halpreDATA,,' \
-		-e '/[[:space:]]install-dist_hplip_stateDATA/ s,install-dist_hplip_stateDATA,,' \
-		-e '/[[:space:]]install-dist_hplip_tmpDATA/ s,install-dist_hplip_tmpDATA,,' \
 		-e '/[[:space:]]install-dist_rulessystemDATA/ s,install-dist_rulessystemDATA,,' \
 		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's,/etc/hp,${PREFIX}&,g' \
 		-e 's,/etc/cups,${LOCALBASE}&,g' \
-		-e 's,/etc/foomatic,${LOCALBASE}&,g' \
 		-e 's,/etc/init.d,${LOCALBASE}/etc/rc.d,g' \
 		-e 's,/etc/sane.d,${LOCALBASE}&,g' \
 		-e 's,/usr/share,${LOCALBASE}/share,g' \
 		-e 's,/usr/include,${LOCALBASE}/include,g' \
 		${FILES4FIX:S,^,${WRKSRC}/,}
+	@${REINPLACE_CMD} -e 's/umask(0)/umask(0o022)/' \
+		-e 's/umask(0o111)/umask(0o133)/' \
+		${WRKSRC}/base/os_utils.py \
+		${WRKSRC}/base/validation.py \
+		${WRKSRC}/fax/backend/hpfax.py \
+		${WRKSRC}/hpdio.py \
+		${WRKSRC}/installer/pluginhandler.py
 	${REINPLACE_CMD} -e 's,%USB_INCLUDE%,/usr/include,' \
 		${WRKSRC}/installer/core_install.py
 	${FIND} ${WRKSRC} -name '*.py' | ${XARGS} ${SED} -i '' \
@ -134,19 +121,8 @@ post-patch:
 		-e 's,^#!/usr/bin/env python,#!${PYTHON_CMD},' \
 		-e 's,^#!/bin/env python,#!${PYTHON_CMD},'

-post-patch-DOCS-off:
-	${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \
-		${WRKSRC}/Makefile.in
-
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/hp
-	${INSTALL_DATA} ${WRKSRC}/hplip.conf ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample
-	${LN} -sf ${LOCALBASE}/bin/foomatic-rip ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip-hplip
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model
-	${LN} -sf ${LOCALBASE}/share/ppd/HP ${STAGEDIR}${PREFIX}/share/cups/model/hplip
-
-post-install-QT-on:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
-	${INSTALL_DATA} ${WRKSRC}/hplip-systray.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart/hplip-systray.desktop
+	${MV} ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf \
+		${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample

 .include <bsd.port.mk>
--- a/Show more
+++ b/Show more