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)

139 files changed, 1678 insertions, 4425 deletions

diff --git a/MOVED b/MOVED
index 4e7f68872ef1..f4cf03373f1a 100644
--- a/MOVED
+++ b/MOVED
@@ -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
diff --git a/UPDATING b/UPDATING
index a89d0c4de759..dc40f3b28de2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 2ec0f689ecc4..59a356fda4d6 100644
--- 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
diff --git a/editors/libreoffice4/Makefile b/editors/libreoffice4/Makefile
index 1000ff00d36c..460c6176ce44 100644
--- 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
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index ad74b0050004..a554cd62f7f5 100644
--- 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
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 8aa157c36711..1ae5c5d58bc1 100644
--- 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
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 25363b7533a5..911b093b10f5 100644
--- 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
 
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index be851ee5a900..f9833b769f61 100644
--- 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
 
diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile
index 36189caaeb3a..f28f1dfa6c07 100644
--- 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
diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile
index fb64849b673d..eea9be7295a3 100644
--- 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
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 3ef4212d4341..cccc98e685e0 100644
--- 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
diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile
index fcb36e4abcfc..612edafc0fa0 100644
--- 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 \
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 6b11b63145a5..0e1ba2040be8 100644
--- 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
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 6c97592420c8..529bd368357d 100644
--- 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
 
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index cf4c4e5f4402..813c0842e7bf 100644
--- 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 \
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index d7c03a1c4711..dacbae5141f7 100644
--- 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
 
diff --git a/net/opennx/Makefile b/net/opennx/Makefile
index b45795f2104c..4abcb03afd19 100644
--- 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
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 96d4f878015c..077fa362d5dd 100644
--- 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
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 62b3084846c8..0866bba7ed59 100644
--- 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
diff --git a/net/samba42/Makefile b/net/samba42/Makefile
index 2a4de83c2b02..03dc21424aa5 100644
--- 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
diff --git a/net/samba43/Makefile b/net/samba43/Makefile
index f029e308be84..bd8ca04cae0a 100644
--- 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
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index 4f4ebeabd8e5..6476b49162e1 100644
--- 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
diff --git a/print/Makefile b/print/Makefile
index 6e8c280c64cb..9fec9fb8c67f 100644
--- 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
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
deleted file mode 100644
index 6278cc25077f..000000000000
--- a/print/cups-base/Makefile
+++ /dev/null
@@ -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>
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
deleted file mode 100644
index 047405288dc8..000000000000
--- a/print/cups-base/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cups-2.0.3-source.tar.bz2) = bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881
-SIZE (cups-2.0.3-source.tar.bz2) = 8797220
diff --git a/print/cups-base/files/patch-conf-Makefile b/print/cups-base/files/patch-conf-Makefile
deleted file mode 100644
index 81889e4935a5..000000000000
--- a/print/cups-base/files/patch-conf-Makefile
+++ /dev/null
@@ -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)
diff --git a/print/cups-base/files/patch-configure b/print/cups-base/files/patch-configure
deleted file mode 100644
index 08a2cb0ffd87..000000000000
--- a/print/cups-base/files/patch-configure
+++ /dev/null
@@ -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"
diff --git a/print/cups-base/files/patch-data-Makefile b/print/cups-base/files/patch-data-Makefile
deleted file mode 100644
index c679ce5b0c8f..000000000000
--- a/print/cups-base/files/patch-data-Makefile
+++ /dev/null
@@ -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 \
diff --git a/print/cups-base/files/patch-data_cups.pam b/print/cups-base/files/patch-data_cups.pam
deleted file mode 100644
index 6a3ed54b9c9e..000000000000
--- a/print/cups-base/files/patch-data_cups.pam
+++ /dev/null
@@ -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
diff --git a/print/cups-base/files/patch-scheduler_Makefile b/print/cups-base/files/patch-scheduler_Makefile
deleted file mode 100644
index e8dae02388fd..000000000000
--- a/print/cups-base/files/patch-scheduler_Makefile
+++ /dev/null
@@ -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); \
diff --git a/print/cups-base/files/ulpt-cupsd.conf.in b/print/cups-base/files/ulpt-cupsd.conf.in
deleted file mode 100644
index d0a4cc068a45..000000000000
--- a/print/cups-base/files/ulpt-cupsd.conf.in
+++ /dev/null
@@ -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
diff --git a/print/cups-base/files/ulpt-cupsd.sh.in b/print/cups-base/files/ulpt-cupsd.sh.in
deleted file mode 100644
index 41935aa71111..000000000000
--- a/print/cups-base/files/ulpt-cupsd.sh.in
+++ /dev/null
@@ -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
diff --git a/print/cups-base/pkg-descr b/print/cups-base/pkg-descr
deleted file mode 100644
index 0d4fa7369425..000000000000
--- a/print/cups-base/pkg-descr
+++ /dev/null
@@ -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]
diff --git a/print/cups-base/pkg-descr.client b/print/cups-base/pkg-descr.client
deleted file mode 100644
index 897a8d14bf98..000000000000
--- a/print/cups-base/pkg-descr.client
+++ /dev/null
@@ -1,3 +0,0 @@
-This provides libcups for applications to access CUPS.
-
-WWW: http://www.cups.org/
diff --git a/print/cups-base/pkg-descr.image b/print/cups-base/pkg-descr.image
deleted file mode 100644
index cf6c8e017a46..000000000000
--- a/print/cups-base/pkg-descr.image
+++ /dev/null
@@ -1,3 +0,0 @@
-This provides libcupsimage for applications to process CUPS raster files.
-
-WWW: http://www.cups.org/
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
deleted file mode 100644
index a19aaadd65e2..000000000000
--- a/print/cups-base/pkg-message
+++ /dev/null
@@ -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
-======================================================================
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
deleted file mode 100644
index 0c64094bfa1f..000000000000
--- a/print/cups-base/pkg-plist
+++ /dev/null
@@ -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
diff --git a/print/cups-base/pkg-plist.client b/print/cups-base/pkg-plist.client
deleted file mode 100644
index e9b218f1174c..000000000000
--- a/print/cups-base/pkg-plist.client
+++ /dev/null
@@ -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
diff --git a/print/cups-base/pkg-plist.image b/print/cups-base/pkg-plist.image
deleted file mode 100644
index fab8ebb61052..000000000000
--- a/print/cups-base/pkg-plist.image
+++ /dev/null
@@ -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
diff --git a/print/cups-bjnp/Makefile b/print/cups-bjnp/Makefile
index 88a9ac494292..06be639b4fd0 100644
--- 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
diff --git a/print/cups-client/Makefile b/print/cups-client/Makefile
deleted file mode 100644
index b0f24a04640f..000000000000
--- a/print/cups-client/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-CATEGORIES=	print
-
-MAINTAINER=	ports@FreeBSD.org
-
-MASTERDIR?=	${.CURDIR}/../cups-base
-
-CUPS_CLIENT=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/print/cups-cloud-print/Makefile b/print/cups-cloud-print/Makefile
index d1f88da7d9f5..8494a5a86d89 100644
--- 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
diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 6f2e5f2761ad..e1fe52b88de0 100644
--- 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>
diff --git a/print/cups-filters/files/cups_browsed.in b/print/cups-filters/files/cups_browsed.in
index 98513cf6901f..62035d871e6d 100644
--- 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
diff --git a/print/cups-filters/files/patch-cupsfilters_colormanager.c b/print/cups-filters/files/patch-cupsfilters_colormanager.c
new file mode 100644
index 000000000000..d6615e17846c
--- /dev/null
+++ 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));
+ 
diff --git a/print/cups-filters/files/patch-filter_pdftops.c b/print/cups-filters/files/patch-filter_pdftops.c
index 461664bf4a4b..a3928ea97c08 100644
--- 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;
+   }
diff --git a/print/cups-filters/pkg-descr b/print/cups-filters/pkg-descr
index 193d10934a81..2d921bee79b8 100644
--- 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
diff --git a/print/cups-filters/pkg-plist b/print/cups-filters/pkg-plist
index f55ceca93102..42c815c29557 100644
--- 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
diff --git a/print/cups-fxlinuxprint/Makefile b/print/cups-fxlinuxprint/Makefile
index 54aa4004c9d6..b29e8edcb8c7 100644
--- 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
diff --git a/print/cups-fxlinuxprint/files/patch-Makefile.in b/print/cups-fxlinuxprint/files/patch-Makefile.in
index ec11a72d8ee0..0bad444be7c1 100644
--- 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
diff --git a/print/cups-fxlinuxprint/pkg-plist b/print/cups-fxlinuxprint/pkg-plist
index 128582897ab3..354dc210b242 100644
--- 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
diff --git a/print/cups-image/Makefile b/print/cups-image/Makefile
deleted file mode 100644
index 283b9a14839e..000000000000
--- a/print/cups-image/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-CATEGORIES=	print
-
-MAINTAINER=	ports@FreeBSD.org
-
-MASTERDIR?=	${.CURDIR}/../cups-base
-
-CUPS_IMAGE=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index dbb43a496cd9..a3d75ad3a496 100644
--- 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}
 
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index ae9079ce703d..e5ac4defaa8c 100644
--- 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
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
deleted file mode 100644
index 90777f723135..000000000000
--- a/print/cups-pstoraster/Makefile
+++ /dev/null
@@ -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>
diff --git a/print/cups-pstoraster/distinfo b/print/cups-pstoraster/distinfo
deleted file mode 100644
index 0586d4551b35..000000000000
--- a/print/cups-pstoraster/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ghostscript/espgs-8.15.4-source.tar.bz2) = 5afc038a12aa624836192940991081fcf95a9396a6e15f6fc707a2b5f2b7cacf
-SIZE (ghostscript/espgs-8.15.4-source.tar.bz2) = 8785497
diff --git a/print/cups-pstoraster/files/cups.contrib.mak b/print/cups-pstoraster/files/cups.contrib.mak
deleted file mode 100644
index 71ec8fd85900..000000000000
--- a/print/cups-pstoraster/files/cups.contrib.mak
+++ /dev/null
@@ -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
-
diff --git a/print/cups-pstoraster/files/extra-patch-lib_cidfmap b/print/cups-pstoraster/files/extra-patch-lib_cidfmap
deleted file mode 100644
index 88790f724b56..000000000000
--- a/print/cups-pstoraster/files/extra-patch-lib_cidfmap
+++ /dev/null
@@ -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 ;
diff --git a/print/cups-pstoraster/files/patch-ghostscript.list.in b/print/cups-pstoraster/files/patch-ghostscript.list.in
deleted file mode 100644
index fd83776322ae..000000000000
--- a/print/cups-pstoraster/files/patch-ghostscript.list.in
+++ /dev/null
@@ -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...
diff --git a/print/cups-pstoraster/files/patch-pstopxl.in b/print/cups-pstoraster/files/patch-pstopxl.in
deleted file mode 100644
index 18a29e61b352..000000000000
--- a/print/cups-pstoraster/files/patch-pstopxl.in
+++ /dev/null
@@ -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...
diff --git a/print/cups-pstoraster/files/patch-pstoraster.in b/print/cups-pstoraster/files/patch-pstoraster.in
deleted file mode 100644
index d206951c32b8..000000000000
--- a/print/cups-pstoraster/files/patch-pstoraster.in
+++ /dev/null
@@ -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...
diff --git a/print/cups-pstoraster/files/patch-src__unixinst.mk b/print/cups-pstoraster/files/patch-src__unixinst.mk
deleted file mode 100644
index e132b816cb75..000000000000
--- a/print/cups-pstoraster/files/patch-src__unixinst.mk
+++ /dev/null
@@ -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.
diff --git a/print/cups-pstoraster/pkg-descr b/print/cups-pstoraster/pkg-descr
deleted file mode 100644
index bfcd7b6dda14..000000000000
--- a/print/cups-pstoraster/pkg-descr
+++ /dev/null
@@ -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
diff --git a/print/cups-pstoraster/pkg-plist b/print/cups-pstoraster/pkg-plist
deleted file mode 100644
index c21b473c007a..000000000000
--- a/print/cups-pstoraster/pkg-plist
+++ /dev/null
@@ -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
diff --git a/print/cups-smb-backend/Makefile b/print/cups-smb-backend/Makefile
index 563a937275ff..167c9aef47c7 100644
--- 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
diff --git a/print/cups/Makefile b/print/cups/Makefile
new file mode 100644
index 000000000000..978b5c69564b
--- /dev/null
+++ 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>
diff --git a/print/cups/distinfo b/print/cups/distinfo
new file mode 100644
index 000000000000..74832e87e2bd
--- /dev/null
+++ 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
diff --git a/print/cups/files/cups b/print/cups/files/cups
new file mode 100644
index 000000000000..193cc95c6573
--- /dev/null
+++ b/print/cups/files/cups
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+auth	include	system
+account	include	system
diff --git a/print/cups-base/files/cupsd.in b/print/cups/files/cupsd.in
index 498161d981e5..f768f2665832 100644
--- a/print/cups-base/files/cupsd.in
+++ b/print/cups/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
diff --git a/print/cups/files/patch-conf_mime.convs.in b/print/cups/files/patch-conf_mime.convs.in
new file mode 100644
index 000000000000..b460d92b0424
--- /dev/null
+++ 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
+ 
+ ########################################################################
+ #
diff --git a/print/cups/files/patch-configure b/print/cups/files/patch-configure
new file mode 100644
index 000000000000..e667eebbc89c
--- /dev/null
+++ 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=""
+ 
diff --git a/print/cups-base/files/patch-scheduler__auth.c b/print/cups/files/patch-scheduler_auth.c
index 7c5cd1ab8e55..1d4cecbbabbd 100644
--- a/print/cups-base/files/patch-scheduler__auth.c
+++ b/print/cups/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);
  
diff --git a/print/cups/files/patch-scheduler_cups-driverd.cxx b/print/cups/files/patch-scheduler_cups-driverd.cxx
new file mode 100644
index 000000000000..7f8dbf101a78
--- /dev/null
+++ 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...
+   */
diff --git a/print/cups/pkg-descr b/print/cups/pkg-descr
new file mode 100644
index 000000000000..433cfd42ea47
--- /dev/null
+++ 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/
diff --git a/print/cups/pkg-plist b/print/cups/pkg-plist
new file mode 100644
index 000000000000..7ed42f8b7495
--- /dev/null
+++ 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
diff --git a/print/dymo-cups-drivers/Makefile b/print/dymo-cups-drivers/Makefile
index d0a4ad529644..51d9a8766fe6 100644
--- 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
 
diff --git a/print/epson-inkjet-printer-escpr/Makefile b/print/epson-inkjet-printer-escpr/Makefile
index 49d65e877fbc..dda26294e035 100644
--- 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
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index f994f94af260..cddd2f54f3f4 100644
--- 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
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 9016219d6aec..70737b5ab0f5 100644
--- 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
diff --git a/print/foomatic-db-engine/distinfo b/print/foomatic-db-engine/distinfo
index d9eb1dd6272b..ac0c8ca10d85 100644
--- 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
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index a76bfda162b2..68d806e68087 100644
--- 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>
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index cd0f4189e7eb..243158a23613 100644
--- 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
diff --git a/print/foomatic-filters/files/patch-Makefile.am b/print/foomatic-filters/files/patch-Makefile.am
deleted file mode 100644
index 24524fe3848c..000000000000
--- a/print/foomatic-filters/files/patch-Makefile.am
+++ /dev/null
@@ -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) || :
diff --git a/print/foomatic-filters/files/patch-configure.ac b/print/foomatic-filters/files/patch-configure.ac
deleted file mode 100644
index 4f8dbb04c036..000000000000
--- a/print/foomatic-filters/files/patch-configure.ac
+++ /dev/null
@@ -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
- 
diff --git a/print/foomatic-filters/pkg-plist b/print/foomatic-filters/pkg-plist
index 959729d37661..2f7e1e43bc83 100644
--- 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
diff --git a/print/ghostscript8-base/Makefile b/print/ghostscript8-base/Makefile
index fb07ebf6d512..4d708c008453 100644
--- 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 \
diff --git a/print/ghostscript8-base/files/Makefile.drivers_post b/print/ghostscript8-base/files/Makefile.drivers_post
index cdb8a6ccb31f..6f44682dcc6b 100644
--- 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
diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile
index d84902739732..dfe8528ef95d 100644
--- 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 \
diff --git a/print/ghostscript9-agpl-base/files/Makefile.drivers_post b/print/ghostscript9-agpl-base/files/Makefile.drivers_post
index ee552b7dff31..e02dc786adb0 100644
--- 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
diff --git a/print/ghostscript9-base/Makefile b/print/ghostscript9-base/Makefile
index 0a2e046f75e3..82e6dc1cd716 100644
--- 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 \
diff --git a/print/ghostscript9-base/files/Makefile.drivers_post b/print/ghostscript9-base/files/Makefile.drivers_post
index 182a14fa9cfd..63c98d11afdc 100644
--- 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
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index f57b73c9c2d2..4cdcda60f8f7 100644
--- 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}
 
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 187bcf2e0c21..d2b7c13eba1f 100644
--- 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
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index cd958d58d525..6402f10fa7bd 100644
--- 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
diff --git a/print/hplip-plugin/Makefile b/print/hplip-plugin/Makefile
index 0f79df14b040..ba5f1952055f 100644
--- 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
diff --git a/print/hplip-plugin/distinfo b/print/hplip-plugin/distinfo
index ab253a923377..1e0559278da6 100644
--- 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
diff --git a/print/hplip-plugin/files/patch-installPlugin.py b/print/hplip-plugin/files/patch-installPlugin.py
new file mode 100644
index 000000000000..bffc708dfc42
--- /dev/null
+++ 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)
diff --git a/print/hplip-plugin/files/patch-plugin_install.py b/print/hplip-plugin/files/patch-plugin_install.py
index 677d9befd2c4..675530c0313a 100644
--- 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("")
- 
- 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()
+--- plugin_install.py.orig	2016-02-08 09:48:27 UTC
++++ plugin_install.py
+@@ -50,10 +50,8 @@ def startGUIInstall():
+ 
+ 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:
diff --git a/print/hplip-plugin/pkg-plist b/print/hplip-plugin/pkg-plist
index 6b4eb9e30892..84e28ae373e1 100644
--- 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
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index a5b0db6ca80c..23ba41b2459b 100644
--- 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>
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index fdab5ab63a4f..8fe3a98a769d 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hplip-3.14.10.tar.gz) = 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598
-SIZE (hplip-3.14.10.tar.gz) = 21773429
+SHA256 (hplip-3.16.2.tar.gz) = f2c845a9d48a8ba2b74ccae21e29829abc929dc6c74e2b5b19df01ea577ed4d9
+SIZE (hplip-3.16.2.tar.gz) = 22285808
diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in
deleted file mode 100644
index a458a6223d7d..000000000000
--- a/print/hplip/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./Makefile.in.orig	2012-09-04 12:35:24.000000000 +0000
-+++ ./Makefile.in	2012-09-12 15:40:02.278587826 +0000
-@@ -4374,14 +4346,14 @@
- 
- # data
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_16x16dir = $(hplipdir)/data/images/16x16
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_24x24dir = $(hplipdir)/data/images/24x24
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_32x32dir = $(hplipdir)/data/images/32x32
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_64x64dir = $(hplipdir)/data/images/64x64
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_128x128dir = $(hplipdir)/data/images/128x128
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_256x256dir = $(hplipdir)/data/images/256x256
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_devicesdir = $(hplipdir)/data/images/devices
--@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_otherdir = $(hplipdir)/data/images/other
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_16x16dir = $(hplipdir)/data/images/16x16
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_24x24dir = $(hplipdir)/data/images/24x24
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_32x32dir = $(hplipdir)/data/images/32x32
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_64x64dir = $(hplipdir)/data/images/64x64
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_128x128dir = $(hplipdir)/data/images/128x128
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_256x256dir = $(hplipdir)/data/images/256x256
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_devicesdir = $(hplipdir)/data/images/devices
-+@FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@images_otherdir = $(hplipdir)/data/images/other
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps
diff --git a/print/hplip/files/patch-base__pexpect.py b/print/hplip/files/patch-base__pexpect.py
deleted file mode 100644
index 0b9119ae495d..000000000000
--- a/print/hplip/files/patch-base__pexpect.py
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./base/pexpect.py.orig	2014-04-04 10:42:20.000000000 +0000
-+++ ./base/pexpect.py	2014-04-13 18:58:40.504883518 +0000
-@@ -1158,20 +1158,7 @@
-         It changes the size reported to TTY-aware applications like
-         vi or curses -- applications that respond to the SIGWINCH signal.
-         """
--        # Check for buggy platforms. Some Python versions on some platforms
--        # (notably OSF1 Alpha and RedHat 7.1) truncate the value for
--        # termios.TIOCSWINSZ. It is not clear why this happens.
--        # These platforms don't seem to handle the signed int very well;
--        # yet other platforms like OpenBSD have a large negative value for
--        # TIOCSWINSZ and they don't have a truncate problem.
--        # Newer versions of Linux have totally different values for TIOCSWINSZ.
--        # Note that this fix is a hack.
--        if 'TIOCSWINSZ' in dir(termios):
--            TIOCSWINSZ = termios.TIOCSWINSZ
--        else:
--            TIOCSWINSZ = -2146929561
--        if TIOCSWINSZ == 2148037735L: # L is not required in Python >= 2.2.
--            TIOCSWINSZ = -2146929561 # Same bits, but with sign.
-+        TIOCSWINSZ = getattr(termios, 'TIOCSWINSZ', -2146929561)
-         # Note, assume ws_xpixel and ws_ypixel are zero.
-         s = struct.pack('HHHH', r, c, 0, 0)
-         fcntl.ioctl(self.fileno(), TIOCSWINSZ, s)
diff --git a/print/hplip/files/patch-hplip-plugin b/print/hplip/files/patch-hplip-plugin
deleted file mode 100644
index 3090346fc280..000000000000
--- a/print/hplip/files/patch-hplip-plugin
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./Makefile.in.orig	2014-01-08 09:33:45.000000000 +0000
-+++ ./Makefile.in	2014-01-22 20:28:18.950635134 +0000
-@@ -511,7 +511,7 @@
- @HPIJS_INSTALL_TRUE@@HPLIP_BUILD_TRUE@	$(am__DEPENDENCIES_1)
- hpijs_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CXXLD) $(hpijs_CXXFLAGS) $(CXXFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) -Wl,--export-dynamic -o $@
- am__hppgsz_SOURCES_DIST = prnt/hpijs/PrinterProperties.cpp \
- 	prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am_hppgsz_OBJECTS = hppgsz-PrinterProperties.$(OBJEXT)
---- ./prnt/hpijs/hpijs.cpp.orig	2014-01-08 09:28:31.000000000 +0000
-+++ ./prnt/hpijs/hpijs.cpp	2014-01-22 20:27:15.921633756 +0000
-@@ -44,6 +44,9 @@
- #include "services.h"
- #include "utils.h"
- 
-+#undef stderr;
-+FILE *stderr;
-+
- extern void SendDbusMessage (const char *dev, const char *printer, int code, 
-                              const char *username, const int jobid, const char *title);
- 
-@@ -590,6 +593,7 @@
-    int ret, n, i, kn=0, width, k_width;
-    char user_name[32]={0,};
-         
-+   stderr = __stderrp;
-    openlog("hpijs", LOG_PID,  LOG_DAEMON);
- 
-    if (argc > 1)
diff --git a/print/hplip/files/patch-installer__core_install.py b/print/hplip/files/patch-installer__core_install.py
deleted file mode 100644
index 788bfcb860aa..000000000000
--- a/print/hplip/files/patch-installer__core_install.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- installer/core_install.py.orig	2014-10-07 08:55:35 UTC
-+++ installer/core_install.py
-@@ -769,14 +769,14 @@ class CoreInstall(object):
-             if not check_lib('libusb'):
-                 return False
-             if self.distro_name != "rhel":
--                return len(locate_file_contains("usb.h", '/usr/include', 'usb_init'))
-+                return len(locate_file_contains("usb.h", '%USB_INCLUDE%', 'usb_init'))
-             else:
-                 return True
-         else:
-             if not check_lib('libusb-1.0'):
-                 return False
-             if self.distro_name != "rhel":
--                return len(locate_file_contains("libusb.h", '/usr/include/libusb-1.0', 'libusb_init'))
-+                return len(locate_file_contains("libusb.h", '%USB_INCLUDE%', 'libusb_init'))
-             else:
-                 return True
- 
diff --git a/print/hplip/files/patch-io-hpmud-musb.c b/print/hplip/files/patch-io-hpmud-musb.c
index bad60e64460d..099f5c4e3004 100644
--- a/print/hplip/files/patch-io-hpmud-musb.c
+++ b/print/hplip/files/patch-io-hpmud-musb.c
@@ -1,22 +1,22 @@
---- ./io/hpmud/musb.c.orig	2012-11-20 09:55:09.000000000 +0000
-+++ ./io/hpmud/musb.c	2012-12-07 21:32:31.615696389 +0000
-@@ -135,10 +135,16 @@
- 				0x409,
- 				tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
+--- io/hpmud/musb.c.orig	2015-06-13 19:38:23 UTC
++++ io/hpmud/musb.c
+@@ -138,10 +138,16 @@ static int get_string_descriptor(libusb_
+                 0x409,
+                 tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
  
--		if (ret==0)
-+		if (ret==0
+-        if (ret==0)
++        if (ret==0
 +#ifdef __FreeBSD__
-+			|| ret == -EIO
++          || ret == -EIO
 +#endif
-+		)
- 		{
--			/* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
--			BUG("get_string_descriptor zero result, retrying...");
-+			/* This retry is necessary for lj1000 and lj1005. des 12/12/07
-+			Also HP Photosmart 42xx seems to suffer transient errors with serial id */
-+			BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
-+			sleep(2);
- 			continue;
- 		}
- 		break;
++        )
+         {
+-            /* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
+-            BUG("get_string_descriptor zero result, retrying...");
++            /* This retry is necessary for lj1000 and lj1005. des 12/12/07
++               Also HP Photosmart 42xx seems to suffer transient errors with serial id */
++            BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
++            sleep(2);
+             continue;
+         }
+         break;
diff --git a/print/hplip/files/patch-prnt__hpcups__ErnieFilter.cpp b/print/hplip/files/patch-prnt__hpcups__ErnieFilter.cpp
index 5edd03d1a33e..4fe2710ee42c 100644
--- a/print/hplip/files/patch-prnt__hpcups__ErnieFilter.cpp
+++ b/print/hplip/files/patch-prnt__hpcups__ErnieFilter.cpp
@@ -1,11 +1,12 @@
 --- ./prnt/hpcups/ErnieFilter.cpp.orig	2010-02-25 02:04:09.000000000 +0300
 +++ ./prnt/hpcups/ErnieFilter.cpp	2010-04-18 10:49:13.471529924 +0400
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,8 @@
  #include "ErnieFilter.h"
  
  
 -#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__) || defined(__NetBSD__)
-+#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__) || defined(__NetBSD__) || (__FreeBSD__)
++#if defined(__APPLE__) || defined(__linux) || defined(__GLIBC__) \
++ || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
  #include <math.h>
  #endif
  
diff --git a/print/hplip/files/patch-protocol-discovery-mdns.c b/print/hplip/files/patch-protocol-discovery-mdns.c
new file mode 100644
index 000000000000..402490b2764b
--- /dev/null
+++ b/print/hplip/files/patch-protocol-discovery-mdns.c
@@ -0,0 +1,27 @@
+--- protocol/discovery/mdns.c.orig	2016-02-08 09:43:19 UTC
++++ protocol/discovery/mdns.c
+@@ -24,7 +24,11 @@
+  Author: Sanjay Kumar
+  \*****************************************************************************/
+ 
+-//#include <stdio.h>
++#include <ctype.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/select.h>
+ #include <string.h>
+ #include <syslog.h>
+ #include <sys/socket.h>
+@@ -89,6 +93,11 @@ static int mdns_open_socket(int *psocket
+         BUG("unable to setsockopt: %m\n");
+         goto bugout;
+     }
++    if (setsockopt(udp_socket, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) == -1)
++    {
++        BUG("unable to setsockopt: %m\n");
++        goto bugout;
++    }
+ 
+     /* Bind the socket to port and IP equal to INADDR_ANY. */
+     bzero(&recv_addr, sizeof(recv_addr));
diff --git a/print/hplip/files/pkg-message.in b/print/hplip/files/pkg-message.in
index 56a2d82cd91c..38b23e8ba6a1 100644
--- a/print/hplip/files/pkg-message.in
+++ b/print/hplip/files/pkg-message.in
@@ -1,5 +1,3 @@
-=====================================================================
-
 HPLIP expects printers to be attached as a ugen(4) devices.  This
 means that you must NOT have "device ulpt" in your kernel and ulpt
 must NOT be loaded as a kernel module (you may also want to compile
@@ -9,5 +7,3 @@ usb devices.
 
 In order to enable full functionality of hp tools, users must be
 added to group `cups'.
-
-=====================================================================
diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist
index 2befef4ffbe9..28dfb495486d 100644
--- a/print/hplip/pkg-plist
+++ b/print/hplip/pkg-plist
@@ -29,20 +29,25 @@ bin/hp-setup
 bin/hp-systray
 bin/hp-testpage
 bin/hp-timedate
-%%QT%%bin/hp-toolbox
+%%X11%%bin/hp-toolbox
 bin/hp-uninstall
 bin/hp-unload
 bin/hp-upgrade
 bin/hp-wificonfig
-bin/hpijs
 %%FAX%%etc/cups/pstotiff.convs
 %%FAX%%etc/cups/pstotiff.types
 @sample etc/hp/hplip.conf.sample
 @comment etc/sane.d/dll.conf
-%%QT%%etc/xdg/autostart/hplip-systray.desktop
+%%X11%%etc/xdg/autostart/hplip-systray.desktop
+lib/libhpdiscovery.so
+lib/libhpdiscovery.so.0
+lib/libhpdiscovery.so.0.0.1
 lib/libhpip.so
 lib/libhpip.so.0
 lib/libhpip.so.0.0.1
+lib/libhpipp.so
+lib/libhpipp.so.0
+lib/libhpipp.so.0.0.1
 lib/libhpmud.so
 lib/libhpmud.so.0
 lib/libhpmud.so.0.0.6
@@ -55,14 +60,12 @@ lib/libhpmud.so.0.0.6
 %%SCAN%%lib/sane/libsane-hpaio.so.1.0.0
 libexec/cups/backend/hp
 %%FAX%%libexec/cups/backend/hpfax
-libexec/cups/driver/hpcups.drv
-libexec/cups/filter/foomatic-rip-hplip
 libexec/cups/filter/hpcups
 %%FAX%%libexec/cups/filter/hpcupsfax
 libexec/cups/filter/hpps
 libexec/cups/filter/pstotiff
-%%QT%%share/applications/hplip.desktop
-share/cups/model/hplip
+%%X11%%share/applications/hplip.desktop
+share/cups/drv/hpcups.drv
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README_LIBJPG
 %%PORTDOCS%%%%DOCSDIR%%/commandline.html
@@ -97,6 +100,7 @@ share/cups/model/hplip
 %%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
 %%PORTDOCS%%%%DOCSDIR%%/uninstalling.html
 %%PORTDOCS%%%%DOCSDIR%%/upgrading.html
+share/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %%DATADIR%%/__init__.py
 %%DATADIR%%/align.py
 %%DATADIR%%/base/LedmWifi.py
@@ -118,11 +122,13 @@ share/cups/model/hplip
 %%DATADIR%%/base/module.py
 %%DATADIR%%/base/os_utils.py
 %%DATADIR%%/base/password.py
-%%DATADIR%%/base/pexpect.py
+%%DATADIR%%/base/pexpect/__init__.py
 %%DATADIR%%/base/pkit.py
 %%DATADIR%%/base/pml.py
 %%DATADIR%%/base/queues.py
 %%DATADIR%%/base/services.py
+%%DATADIR%%/base/six.py
+%%DATADIR%%/base/sixext.py
 %%DATADIR%%/base/slp.py
 %%DATADIR%%/base/smart_install.py
 %%DATADIR%%/base/status.py
@@ -139,324 +145,324 @@ share/cups/model/hplip
 %%DATADIR%%/config_usb_printer.py
 %%DATADIR%%/copier/__init__.py
 %%DATADIR%%/copier/copier.py
-%%QT%%%%DATADIR%%/data/images/128x128/audio.png
-%%QT%%%%DATADIR%%/data/images/128x128/bmp.png
-%%QT%%%%DATADIR%%/data/images/128x128/gif.png
-%%QT%%%%DATADIR%%/data/images/128x128/hp_logo.png
-%%QT%%%%DATADIR%%/data/images/128x128/jpg.png
-%%QT%%%%DATADIR%%/data/images/128x128/movie.png
-%%QT%%%%DATADIR%%/data/images/128x128/mpg.png
-%%QT%%%%DATADIR%%/data/images/128x128/png.png
-%%QT%%%%DATADIR%%/data/images/128x128/tif.png
-%%QT%%%%DATADIR%%/data/images/128x128/unknown.png
-%%QT%%%%DATADIR%%/data/images/16x16/active.png
-%%QT%%%%DATADIR%%/data/images/16x16/add_user.png
-%%QT%%%%DATADIR%%/data/images/16x16/add_user_quick.png
-%%QT%%%%DATADIR%%/data/images/16x16/add_users.png
-%%QT%%%%DATADIR%%/data/images/16x16/battery.png
-%%QT%%%%DATADIR%%/data/images/16x16/busy.png
-%%QT%%%%DATADIR%%/data/images/16x16/cancel.png
-%%QT%%%%DATADIR%%/data/images/16x16/close.png
-%%QT%%%%DATADIR%%/data/images/16x16/down.png
-%%QT%%%%DATADIR%%/data/images/16x16/down_user.png
-%%QT%%%%DATADIR%%/data/images/16x16/download.png
-%%QT%%%%DATADIR%%/data/images/16x16/edit.png
-%%QT%%%%DATADIR%%/data/images/16x16/error.png
-%%QT%%%%DATADIR%%/data/images/16x16/fab.png
-%%QT%%%%DATADIR%%/data/images/16x16/fax.png
-%%QT%%%%DATADIR%%/data/images/16x16/folder_open.png
-%%QT%%%%DATADIR%%/data/images/16x16/folder_remove.png
-%%QT%%%%DATADIR%%/data/images/16x16/help.png
-%%QT%%%%DATADIR%%/data/images/16x16/hp_logo.png
-%%QT%%%%DATADIR%%/data/images/16x16/idle.png
-%%QT%%%%DATADIR%%/data/images/16x16/info.png
-%%QT%%%%DATADIR%%/data/images/16x16/inkdrop.png
-%%QT%%%%DATADIR%%/data/images/16x16/list_add.png
-%%QT%%%%DATADIR%%/data/images/16x16/list_remove.png
-%%QT%%%%DATADIR%%/data/images/16x16/makecopies.png
-%%QT%%%%DATADIR%%/data/images/16x16/mimetypes.png
-%%QT%%%%DATADIR%%/data/images/16x16/minus.png
-%%QT%%%%DATADIR%%/data/images/16x16/next.png
-%%QT%%%%DATADIR%%/data/images/16x16/ok.png
-%%QT%%%%DATADIR%%/data/images/16x16/paper.png
-%%QT%%%%DATADIR%%/data/images/16x16/pcard.png
-%%QT%%%%DATADIR%%/data/images/16x16/plus.png
-%%QT%%%%DATADIR%%/data/images/16x16/prev.png
-%%QT%%%%DATADIR%%/data/images/16x16/print.png
-%%QT%%%%DATADIR%%/data/images/16x16/quit.png
-%%QT%%%%DATADIR%%/data/images/16x16/refresh.png
-%%QT%%%%DATADIR%%/data/images/16x16/refresh1.png
-%%QT%%%%DATADIR%%/data/images/16x16/remove_user.png
-%%QT%%%%DATADIR%%/data/images/16x16/scan.png
-%%QT%%%%DATADIR%%/data/images/16x16/settings.png
-%%QT%%%%DATADIR%%/data/images/16x16/status_refresh.png
-%%QT%%%%DATADIR%%/data/images/16x16/thumbnail.png
-%%QT%%%%DATADIR%%/data/images/16x16/toner.png
-%%QT%%%%DATADIR%%/data/images/16x16/troubleshoot.png
-%%QT%%%%DATADIR%%/data/images/16x16/up.png
-%%QT%%%%DATADIR%%/data/images/16x16/up_user.png
-%%QT%%%%DATADIR%%/data/images/16x16/warning.png
-%%QT%%%%DATADIR%%/data/images/24x24/add_to_group.png
-%%QT%%%%DATADIR%%/data/images/24x24/new_group.png
-%%QT%%%%DATADIR%%/data/images/24x24/new_group_from_selection.png
-%%QT%%%%DATADIR%%/data/images/24x24/new_user.png
-%%QT%%%%DATADIR%%/data/images/24x24/remove_from_group.png
-%%QT%%%%DATADIR%%/data/images/24x24/remove_group.png
-%%QT%%%%DATADIR%%/data/images/24x24/remove_user.png
-%%QT%%%%DATADIR%%/data/images/24x24/rename_group.png
-%%QT%%%%DATADIR%%/data/images/256x256/hp_logo.png
-%%QT%%%%DATADIR%%/data/images/256x256/logo.png
-%%QT%%%%DATADIR%%/data/images/32x32/align.png
-%%QT%%%%DATADIR%%/data/images/32x32/battery.png
-%%QT%%%%DATADIR%%/data/images/32x32/busy.png
-%%QT%%%%DATADIR%%/data/images/32x32/clean.png
-%%QT%%%%DATADIR%%/data/images/32x32/colorcal.png
-%%QT%%%%DATADIR%%/data/images/32x32/cups.png
-%%QT%%%%DATADIR%%/data/images/32x32/download.png
-%%QT%%%%DATADIR%%/data/images/32x32/error.png
-%%QT%%%%DATADIR%%/data/images/32x32/ews.png
-%%QT%%%%DATADIR%%/data/images/32x32/fab.png
-%%QT%%%%DATADIR%%/data/images/32x32/fax-disabled.png
-%%QT%%%%DATADIR%%/data/images/32x32/fax.png
-%%QT%%%%DATADIR%%/data/images/32x32/fax_machine.png
-%%QT%%%%DATADIR%%/data/images/32x32/fax_setup.png
-%%QT%%%%DATADIR%%/data/images/32x32/firmware.png
-%%QT%%%%DATADIR%%/data/images/32x32/help.png
-%%QT%%%%DATADIR%%/data/images/32x32/hp_logo.png
-%%QT%%%%DATADIR%%/data/images/32x32/idle.png
-%%QT%%%%DATADIR%%/data/images/32x32/info.png
-%%QT%%%%DATADIR%%/data/images/32x32/inkdrop.png
-%%QT%%%%DATADIR%%/data/images/32x32/keys.png
-%%QT%%%%DATADIR%%/data/images/32x32/linefeed_cal.png
-%%QT%%%%DATADIR%%/data/images/32x32/lock.png
-%%QT%%%%DATADIR%%/data/images/32x32/lporg.png
-%%QT%%%%DATADIR%%/data/images/32x32/makecopies-disabled.png
-%%QT%%%%DATADIR%%/data/images/32x32/makecopies.png
-%%QT%%%%DATADIR%%/data/images/32x32/ok.png
-%%QT%%%%DATADIR%%/data/images/32x32/paper.png
-%%QT%%%%DATADIR%%/data/images/32x32/pcard-disabled.png
-%%QT%%%%DATADIR%%/data/images/32x32/pcard.png
-%%QT%%%%DATADIR%%/data/images/32x32/plugin.png
-%%QT%%%%DATADIR%%/data/images/32x32/pq_diag.png
-%%QT%%%%DATADIR%%/data/images/32x32/print-disabled.png
-%%QT%%%%DATADIR%%/data/images/32x32/print.png
-%%QT%%%%DATADIR%%/data/images/32x32/scan-disabled.png
-%%QT%%%%DATADIR%%/data/images/32x32/scan.png
-%%QT%%%%DATADIR%%/data/images/32x32/settings.png
-%%QT%%%%DATADIR%%/data/images/32x32/testpage.png
-%%QT%%%%DATADIR%%/data/images/32x32/toner.png
-%%QT%%%%DATADIR%%/data/images/32x32/toner_cartridge.png
-%%QT%%%%DATADIR%%/data/images/32x32/troubleshoot.png
-%%QT%%%%DATADIR%%/data/images/32x32/warning.png
-%%QT%%%%DATADIR%%/data/images/32x32/wireless.png
-%%QT%%%%DATADIR%%/data/images/64x64/hp_logo.png
-%%QT%%%%DATADIR%%/data/images/devices/120.png
-%%QT%%%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
-%%QT%%%%DATADIR%%/data/images/devices/CP_1700.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_1120C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_1220C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_2500C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_3820.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_5740.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_610.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_630C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_650C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_840C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_916C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_9600.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_960C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_970C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_990C.png
-%%QT%%%%DATADIR%%/data/images/devices/DESKJET_995C.png
-%%QT%%%%DATADIR%%/data/images/devices/Deskjet_3740.png
-%%QT%%%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Deskjet_5700.png
-%%QT%%%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Deskjet_6500.png
-%%QT%%%%DATADIR%%/data/images/devices/Deskjet_6800.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_2000C.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_2500C.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_BI_3000.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
-%%QT%%%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
-%%QT%%%%DATADIR%%/data/images/devices/LASERJET_3500.png
-%%QT%%%%DATADIR%%/data/images/devices/LASERJET_4650.png
-%%QT%%%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
-%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5500.png
-%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
-%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5550.png
-%%QT%%%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
-%%QT%%%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
-%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_5105.png
-%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
-%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_8500_a910.png
-%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_G85.png
-%%QT%%%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
-%%QT%%%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
-%%QT%%%%DATADIR%%/data/images/devices/Officejet_6200_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Officejet_7200_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Officejet_9100_series.png
-%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
-%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
-%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
-%%QT%%%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
-%%QT%%%%DATADIR%%/data/images/devices/PSC_900_Series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_370_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8050.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8250.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C3100.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C4100.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C5100.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_C6100.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D5060.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D5100.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D6160.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D7100.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_D7300.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_a310.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_a510.png
-%%QT%%%%DATADIR%%/data/images/devices/Photosmart_a710.png
-%%QT%%%%DATADIR%%/data/images/devices/cp1160.png
-%%QT%%%%DATADIR%%/data/images/devices/default_business_inkjet.png
-%%QT%%%%DATADIR%%/data/images/devices/default_designjet.png
-%%QT%%%%DATADIR%%/data/images/devices/default_deskjet.png
-%%QT%%%%DATADIR%%/data/images/devices/default_laserjet.png
-%%QT%%%%DATADIR%%/data/images/devices/default_officejet.png
-%%QT%%%%DATADIR%%/data/images/devices/default_photosmart.png
-%%QT%%%%DATADIR%%/data/images/devices/default_printer.png
-%%QT%%%%DATADIR%%/data/images/devices/default_psc.png
-%%QT%%%%DATADIR%%/data/images/devices/desket_5650.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_1280.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3200.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3320.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3325.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3420.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3425.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3500.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3600.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_3840.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_5100.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_5550.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_5552.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_5600.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_6120.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_6980.png
-%%QT%%%%DATADIR%%/data/images/devices/deskjet_D2360.png
-%%QT%%%%DATADIR%%/data/images/devices/dj350.png
-%%QT%%%%DATADIR%%/data/images/devices/dj450.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
-%%QT%%%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
-%%QT%%%%DATADIR%%/data/images/devices/laserjet_2410.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_4200_series.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_500.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_5500_series.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_5600.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_j3600_series.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_j5500_series.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_k550.png
-%%QT%%%%DATADIR%%/data/images/devices/officejet_k80.png
-%%QT%%%%DATADIR%%/data/images/devices/photosmart_7150.png
-%%QT%%%%DATADIR%%/data/images/devices/photosmart_7900_series.png
-%%QT%%%%DATADIR%%/data/images/devices/photosmart_a610.png
-%%QT%%%%DATADIR%%/data/images/devices/photosmart_a820_series.png
-%%QT%%%%DATADIR%%/data/images/devices/psc_1100_series.png
-%%QT%%%%DATADIR%%/data/images/devices/psc_1610.png
-%%QT%%%%DATADIR%%/data/images/devices/psc_2300_series.png
-%%QT%%%%DATADIR%%/data/images/other/aio_align.png
-%%QT%%%%DATADIR%%/data/images/other/align10.png
-%%QT%%%%DATADIR%%/data/images/other/clean.png
-%%QT%%%%DATADIR%%/data/images/other/color_adj.png
-%%QT%%%%DATADIR%%/data/images/other/confidential_coverpage.png
-%%QT%%%%DATADIR%%/data/images/other/confidential_title.png
-%%QT%%%%DATADIR%%/data/images/other/fax.png
-%%QT%%%%DATADIR%%/data/images/other/fax2.png
-%%QT%%%%DATADIR%%/data/images/other/generic_coverpage.png
-%%QT%%%%DATADIR%%/data/images/other/generic_title.png
-%%QT%%%%DATADIR%%/data/images/other/h-k-2.png
-%%QT%%%%DATADIR%%/data/images/other/h-k-3.png
-%%QT%%%%DATADIR%%/data/images/other/h-kc-2.png
-%%QT%%%%DATADIR%%/data/images/other/h-kc-3.png
-%%QT%%%%DATADIR%%/data/images/other/hp-tux-printer.png
-%%QT%%%%DATADIR%%/data/images/other/load_paper.png
-%%QT%%%%DATADIR%%/data/images/other/opensource-75x65.png
-%%QT%%%%DATADIR%%/data/images/other/panel_lcd.png
-%%QT%%%%DATADIR%%/data/images/other/pens.png
-%%QT%%%%DATADIR%%/data/images/other/powered_by_python.png
-%%QT%%%%DATADIR%%/data/images/other/signal0.png
-%%QT%%%%DATADIR%%/data/images/other/signal1.png
-%%QT%%%%DATADIR%%/data/images/other/signal2.png
-%%QT%%%%DATADIR%%/data/images/other/signal3.png
-%%QT%%%%DATADIR%%/data/images/other/signal4.png
-%%QT%%%%DATADIR%%/data/images/other/signal5.png
-%%QT%%%%DATADIR%%/data/images/other/standard_coverpage.png
-%%QT%%%%DATADIR%%/data/images/other/type4_color_patch.png
-%%QT%%%%DATADIR%%/data/images/other/type4_gray_patch.png
-%%QT%%%%DATADIR%%/data/images/other/urgent_coverpage.png
-%%QT%%%%DATADIR%%/data/images/other/urgent_title.png
-%%QT%%%%DATADIR%%/data/images/other/usb_connection.png
-%%QT%%%%DATADIR%%/data/images/other/v-c-2.png
-%%QT%%%%DATADIR%%/data/images/other/v-c-3.png
-%%QT%%%%DATADIR%%/data/images/other/v-k-2.png
-%%QT%%%%DATADIR%%/data/images/other/v-k-3.png
-%%QT%%%%DATADIR%%/data/images/other/v-kc-2.png
-%%QT%%%%DATADIR%%/data/images/other/v-kc-3.png
-%%QT%%%%DATADIR%%/data/images/other/zca.png
+%%X11%%%%DATADIR%%/data/images/128x128/audio.png
+%%X11%%%%DATADIR%%/data/images/128x128/bmp.png
+%%X11%%%%DATADIR%%/data/images/128x128/gif.png
+%%X11%%%%DATADIR%%/data/images/128x128/hp_logo.png
+%%X11%%%%DATADIR%%/data/images/128x128/jpg.png
+%%X11%%%%DATADIR%%/data/images/128x128/movie.png
+%%X11%%%%DATADIR%%/data/images/128x128/mpg.png
+%%X11%%%%DATADIR%%/data/images/128x128/png.png
+%%X11%%%%DATADIR%%/data/images/128x128/tif.png
+%%X11%%%%DATADIR%%/data/images/128x128/unknown.png
+%%X11%%%%DATADIR%%/data/images/16x16/active.png
+%%X11%%%%DATADIR%%/data/images/16x16/add_user.png
+%%X11%%%%DATADIR%%/data/images/16x16/add_user_quick.png
+%%X11%%%%DATADIR%%/data/images/16x16/add_users.png
+%%X11%%%%DATADIR%%/data/images/16x16/battery.png
+%%X11%%%%DATADIR%%/data/images/16x16/busy.png
+%%X11%%%%DATADIR%%/data/images/16x16/cancel.png
+%%X11%%%%DATADIR%%/data/images/16x16/close.png
+%%X11%%%%DATADIR%%/data/images/16x16/down.png
+%%X11%%%%DATADIR%%/data/images/16x16/down_user.png
+%%X11%%%%DATADIR%%/data/images/16x16/download.png
+%%X11%%%%DATADIR%%/data/images/16x16/edit.png
+%%X11%%%%DATADIR%%/data/images/16x16/error.png
+%%X11%%%%DATADIR%%/data/images/16x16/fab.png
+%%X11%%%%DATADIR%%/data/images/16x16/fax.png
+%%X11%%%%DATADIR%%/data/images/16x16/folder_open.png
+%%X11%%%%DATADIR%%/data/images/16x16/folder_remove.png
+%%X11%%%%DATADIR%%/data/images/16x16/help.png
+%%X11%%%%DATADIR%%/data/images/16x16/hp_logo.png
+%%X11%%%%DATADIR%%/data/images/16x16/idle.png
+%%X11%%%%DATADIR%%/data/images/16x16/info.png
+%%X11%%%%DATADIR%%/data/images/16x16/inkdrop.png
+%%X11%%%%DATADIR%%/data/images/16x16/list_add.png
+%%X11%%%%DATADIR%%/data/images/16x16/list_remove.png
+%%X11%%%%DATADIR%%/data/images/16x16/makecopies.png
+%%X11%%%%DATADIR%%/data/images/16x16/mimetypes.png
+%%X11%%%%DATADIR%%/data/images/16x16/minus.png
+%%X11%%%%DATADIR%%/data/images/16x16/next.png
+%%X11%%%%DATADIR%%/data/images/16x16/ok.png
+%%X11%%%%DATADIR%%/data/images/16x16/paper.png
+%%X11%%%%DATADIR%%/data/images/16x16/pcard.png
+%%X11%%%%DATADIR%%/data/images/16x16/plus.png
+%%X11%%%%DATADIR%%/data/images/16x16/prev.png
+%%X11%%%%DATADIR%%/data/images/16x16/print.png
+%%X11%%%%DATADIR%%/data/images/16x16/quit.png
+%%X11%%%%DATADIR%%/data/images/16x16/refresh.png
+%%X11%%%%DATADIR%%/data/images/16x16/refresh1.png
+%%X11%%%%DATADIR%%/data/images/16x16/remove_user.png
+%%X11%%%%DATADIR%%/data/images/16x16/scan.png
+%%X11%%%%DATADIR%%/data/images/16x16/settings.png
+%%X11%%%%DATADIR%%/data/images/16x16/status_refresh.png
+%%X11%%%%DATADIR%%/data/images/16x16/thumbnail.png
+%%X11%%%%DATADIR%%/data/images/16x16/toner.png
+%%X11%%%%DATADIR%%/data/images/16x16/troubleshoot.png
+%%X11%%%%DATADIR%%/data/images/16x16/up.png
+%%X11%%%%DATADIR%%/data/images/16x16/up_user.png
+%%X11%%%%DATADIR%%/data/images/16x16/warning.png
+%%X11%%%%DATADIR%%/data/images/24x24/add_to_group.png
+%%X11%%%%DATADIR%%/data/images/24x24/new_group.png
+%%X11%%%%DATADIR%%/data/images/24x24/new_group_from_selection.png
+%%X11%%%%DATADIR%%/data/images/24x24/new_user.png
+%%X11%%%%DATADIR%%/data/images/24x24/remove_from_group.png
+%%X11%%%%DATADIR%%/data/images/24x24/remove_group.png
+%%X11%%%%DATADIR%%/data/images/24x24/remove_user.png
+%%X11%%%%DATADIR%%/data/images/24x24/rename_group.png
+%%X11%%%%DATADIR%%/data/images/256x256/hp_logo.png
+%%X11%%%%DATADIR%%/data/images/256x256/logo.png
+%%X11%%%%DATADIR%%/data/images/32x32/align.png
+%%X11%%%%DATADIR%%/data/images/32x32/battery.png
+%%X11%%%%DATADIR%%/data/images/32x32/busy.png
+%%X11%%%%DATADIR%%/data/images/32x32/clean.png
+%%X11%%%%DATADIR%%/data/images/32x32/colorcal.png
+%%X11%%%%DATADIR%%/data/images/32x32/cups.png
+%%X11%%%%DATADIR%%/data/images/32x32/download.png
+%%X11%%%%DATADIR%%/data/images/32x32/error.png
+%%X11%%%%DATADIR%%/data/images/32x32/ews.png
+%%X11%%%%DATADIR%%/data/images/32x32/fab.png
+%%X11%%%%DATADIR%%/data/images/32x32/fax-disabled.png
+%%X11%%%%DATADIR%%/data/images/32x32/fax.png
+%%X11%%%%DATADIR%%/data/images/32x32/fax_machine.png
+%%X11%%%%DATADIR%%/data/images/32x32/fax_setup.png
+%%X11%%%%DATADIR%%/data/images/32x32/firmware.png
+%%X11%%%%DATADIR%%/data/images/32x32/help.png
+%%X11%%%%DATADIR%%/data/images/32x32/hp_logo.png
+%%X11%%%%DATADIR%%/data/images/32x32/idle.png
+%%X11%%%%DATADIR%%/data/images/32x32/info.png
+%%X11%%%%DATADIR%%/data/images/32x32/inkdrop.png
+%%X11%%%%DATADIR%%/data/images/32x32/keys.png
+%%X11%%%%DATADIR%%/data/images/32x32/linefeed_cal.png
+%%X11%%%%DATADIR%%/data/images/32x32/lock.png
+%%X11%%%%DATADIR%%/data/images/32x32/lporg.png
+%%X11%%%%DATADIR%%/data/images/32x32/makecopies-disabled.png
+%%X11%%%%DATADIR%%/data/images/32x32/makecopies.png
+%%X11%%%%DATADIR%%/data/images/32x32/ok.png
+%%X11%%%%DATADIR%%/data/images/32x32/paper.png
+%%X11%%%%DATADIR%%/data/images/32x32/pcard-disabled.png
+%%X11%%%%DATADIR%%/data/images/32x32/pcard.png
+%%X11%%%%DATADIR%%/data/images/32x32/plugin.png
+%%X11%%%%DATADIR%%/data/images/32x32/pq_diag.png
+%%X11%%%%DATADIR%%/data/images/32x32/print-disabled.png
+%%X11%%%%DATADIR%%/data/images/32x32/print.png
+%%X11%%%%DATADIR%%/data/images/32x32/scan-disabled.png
+%%X11%%%%DATADIR%%/data/images/32x32/scan.png
+%%X11%%%%DATADIR%%/data/images/32x32/settings.png
+%%X11%%%%DATADIR%%/data/images/32x32/testpage.png
+%%X11%%%%DATADIR%%/data/images/32x32/toner.png
+%%X11%%%%DATADIR%%/data/images/32x32/toner_cartridge.png
+%%X11%%%%DATADIR%%/data/images/32x32/troubleshoot.png
+%%X11%%%%DATADIR%%/data/images/32x32/warning.png
+%%X11%%%%DATADIR%%/data/images/32x32/wireless.png
+%%X11%%%%DATADIR%%/data/images/64x64/hp_logo.png
+%%X11%%%%DATADIR%%/data/images/devices/120.png
+%%X11%%%%DATADIR%%/data/images/devices/COLOR_INKJET_PRINTER_CP1700.png
+%%X11%%%%DATADIR%%/data/images/devices/CP_1700.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_1120C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_1220C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_2500C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_3820.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_5740.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_610.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_630C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_650C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_840C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_916C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_9600.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_960C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_970C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_990C.png
+%%X11%%%%DATADIR%%/data/images/devices/DESKJET_995C.png
+%%X11%%%%DATADIR%%/data/images/devices/Deskjet_3740.png
+%%X11%%%%DATADIR%%/data/images/devices/Deskjet_5400_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Deskjet_5700.png
+%%X11%%%%DATADIR%%/data/images/devices/Deskjet_5900_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Deskjet_6500.png
+%%X11%%%%DATADIR%%/data/images/devices/Deskjet_6800.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_2000C.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_2500C.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_BI_3000.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_Business_Inkjet_1200.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_1500.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_2840.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4500.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_4730mfp.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_Color_LaserJet_8550.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LJ1xxx.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_1012.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_1220.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_3200M.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_3300_3310_3320.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_4000.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_4100_MFP.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_4M.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_5Si.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_6MP.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_8100_Series.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_9000_MFP.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_9040_MFP.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_9500dn.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1005.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_LaserJet_m1522.png
+%%X11%%%%DATADIR%%/data/images/devices/HP_Officejet_Pro_L7700.png
+%%X11%%%%DATADIR%%/data/images/devices/LASERJET_3500.png
+%%X11%%%%DATADIR%%/data/images/devices/LASERJET_4650.png
+%%X11%%%%DATADIR%%/data/images/devices/LASERJET_4650dtn.png
+%%X11%%%%DATADIR%%/data/images/devices/LASERJET_5500.png
+%%X11%%%%DATADIR%%/data/images/devices/LASERJET_5500dtn.png
+%%X11%%%%DATADIR%%/data/images/devices/LASERJET_5550.png
+%%X11%%%%DATADIR%%/data/images/devices/LASERJET_5550DTN.png
+%%X11%%%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png
+%%X11%%%%DATADIR%%/data/images/devices/OfficeJet_5105.png
+%%X11%%%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png
+%%X11%%%%DATADIR%%/data/images/devices/OfficeJet_8500_a910.png
+%%X11%%%%DATADIR%%/data/images/devices/OfficeJet_G85.png
+%%X11%%%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png
+%%X11%%%%DATADIR%%/data/images/devices/Officejet_6150_Series.png
+%%X11%%%%DATADIR%%/data/images/devices/Officejet_6200_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Officejet_7200_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Officejet_9100_series.png
+%%X11%%%%DATADIR%%/data/images/devices/PHOTOSMART_100.png
+%%X11%%%%DATADIR%%/data/images/devices/PHOTOSMART_1218.png
+%%X11%%%%DATADIR%%/data/images/devices/PHOTOSMART_1315.png
+%%X11%%%%DATADIR%%/data/images/devices/PHOTOSMART_P1100.png
+%%X11%%%%DATADIR%%/data/images/devices/PSC_900_Series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_2600_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_2700_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_3300_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_370_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_7400_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_8050.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_8100_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_8250.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_8400_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_8750_series.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_C3100.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_C4100.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_C5100.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_C6100.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_D5060.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_D5100.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_D6160.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_D7100.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_D7300.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B8300.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_Pro_B9180.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_a310.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_a510.png
+%%X11%%%%DATADIR%%/data/images/devices/Photosmart_a710.png
+%%X11%%%%DATADIR%%/data/images/devices/cp1160.png
+%%X11%%%%DATADIR%%/data/images/devices/default_business_inkjet.png
+%%X11%%%%DATADIR%%/data/images/devices/default_designjet.png
+%%X11%%%%DATADIR%%/data/images/devices/default_deskjet.png
+%%X11%%%%DATADIR%%/data/images/devices/default_laserjet.png
+%%X11%%%%DATADIR%%/data/images/devices/default_officejet.png
+%%X11%%%%DATADIR%%/data/images/devices/default_photosmart.png
+%%X11%%%%DATADIR%%/data/images/devices/default_printer.png
+%%X11%%%%DATADIR%%/data/images/devices/default_psc.png
+%%X11%%%%DATADIR%%/data/images/devices/desket_5650.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_1280.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3200.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3320.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3325.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3420.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3425.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3500.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3600.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_3840.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_5100.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_5550.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_5552.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_5600.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_6120.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_6980.png
+%%X11%%%%DATADIR%%/data/images/devices/deskjet_D2360.png
+%%X11%%%%DATADIR%%/data/images/devices/dj350.png
+%%X11%%%%DATADIR%%/data/images/devices/dj450.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_LaserJet_1200.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_LaserJet_2100.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_LaserJet_3015.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_LaserJet_3020.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_LaserJet_4345_mfp.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_LaserJet_5000.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_LaserJet_8000.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_business_inkjet_1100.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2200.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_business_inkjet_2600.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_business_inkjet_3000.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_2550.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_3700.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_4600.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_LaserJet_9500.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1015_mfp.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cm1312_mfp.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp2025.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3505.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp3525.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp4005.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_color_laserjet_cp6015.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_deskjet_9300.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_deskjet_f4200.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_laserjet_3050.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_laserjet_m2727_mfp.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_laserjet_p2015.png
+%%X11%%%%DATADIR%%/data/images/devices/hp_photosmart_b8500_series.png
+%%X11%%%%DATADIR%%/data/images/devices/laserjet_2410.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_4200_series.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_500.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_5500_series.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_5600.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_j3600_series.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_j5500_series.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_k550.png
+%%X11%%%%DATADIR%%/data/images/devices/officejet_k80.png
+%%X11%%%%DATADIR%%/data/images/devices/photosmart_7150.png
+%%X11%%%%DATADIR%%/data/images/devices/photosmart_7900_series.png
+%%X11%%%%DATADIR%%/data/images/devices/photosmart_a610.png
+%%X11%%%%DATADIR%%/data/images/devices/photosmart_a820_series.png
+%%X11%%%%DATADIR%%/data/images/devices/psc_1100_series.png
+%%X11%%%%DATADIR%%/data/images/devices/psc_1610.png
+%%X11%%%%DATADIR%%/data/images/devices/psc_2300_series.png
+%%X11%%%%DATADIR%%/data/images/other/aio_align.png
+%%X11%%%%DATADIR%%/data/images/other/align10.png
+%%X11%%%%DATADIR%%/data/images/other/clean.png
+%%X11%%%%DATADIR%%/data/images/other/color_adj.png
+%%X11%%%%DATADIR%%/data/images/other/confidential_coverpage.png
+%%X11%%%%DATADIR%%/data/images/other/confidential_title.png
+%%X11%%%%DATADIR%%/data/images/other/fax.png
+%%X11%%%%DATADIR%%/data/images/other/fax2.png
+%%X11%%%%DATADIR%%/data/images/other/generic_coverpage.png
+%%X11%%%%DATADIR%%/data/images/other/generic_title.png
+%%X11%%%%DATADIR%%/data/images/other/h-k-2.png
+%%X11%%%%DATADIR%%/data/images/other/h-k-3.png
+%%X11%%%%DATADIR%%/data/images/other/h-kc-2.png
+%%X11%%%%DATADIR%%/data/images/other/h-kc-3.png
+%%X11%%%%DATADIR%%/data/images/other/hp-tux-printer.png
+%%X11%%%%DATADIR%%/data/images/other/load_paper.png
+%%X11%%%%DATADIR%%/data/images/other/opensource-75x65.png
+%%X11%%%%DATADIR%%/data/images/other/panel_lcd.png
+%%X11%%%%DATADIR%%/data/images/other/pens.png
+%%X11%%%%DATADIR%%/data/images/other/powered_by_python.png
+%%X11%%%%DATADIR%%/data/images/other/signal0.png
+%%X11%%%%DATADIR%%/data/images/other/signal1.png
+%%X11%%%%DATADIR%%/data/images/other/signal2.png
+%%X11%%%%DATADIR%%/data/images/other/signal3.png
+%%X11%%%%DATADIR%%/data/images/other/signal4.png
+%%X11%%%%DATADIR%%/data/images/other/signal5.png
+%%X11%%%%DATADIR%%/data/images/other/standard_coverpage.png
+%%X11%%%%DATADIR%%/data/images/other/type4_color_patch.png
+%%X11%%%%DATADIR%%/data/images/other/type4_gray_patch.png
+%%X11%%%%DATADIR%%/data/images/other/urgent_coverpage.png
+%%X11%%%%DATADIR%%/data/images/other/urgent_title.png
+%%X11%%%%DATADIR%%/data/images/other/usb_connection.png
+%%X11%%%%DATADIR%%/data/images/other/v-c-2.png
+%%X11%%%%DATADIR%%/data/images/other/v-c-3.png
+%%X11%%%%DATADIR%%/data/images/other/v-k-2.png
+%%X11%%%%DATADIR%%/data/images/other/v-k-3.png
+%%X11%%%%DATADIR%%/data/images/other/v-kc-2.png
+%%X11%%%%DATADIR%%/data/images/other/v-kc-3.png
+%%X11%%%%DATADIR%%/data/images/other/zca.png
 %%DATADIR%%/data/ldl/cb2pcal.ldl.gz
 %%DATADIR%%/data/ldl/cb2pcal_done.ldl.gz
 %%DATADIR%%/data/ldl/cbbcal.ldl.gz
@@ -548,146 +554,92 @@ share/cups/model/hplip
 %%DATADIR%%/testpage.py
 %%DATADIR%%/timedate.py
 %%DATADIR%%/toolbox.py
-%%QT%%%%DATADIR%%/ui4/__init__.py
-%%QT%%%%DATADIR%%/ui4/aboutdialog.py
-%%QT%%%%DATADIR%%/ui4/aboutdialog_base.py
-%%QT%%%%DATADIR%%/ui4/aligndialog.py
-%%QT%%%%DATADIR%%/ui4/aligndialog_base.py
-%%QT%%%%DATADIR%%/ui4/cleandialog.py
-%%QT%%%%DATADIR%%/ui4/cleandialog_base.py
-%%QT%%%%DATADIR%%/ui4/colorcaldialog.py
-%%QT%%%%DATADIR%%/ui4/colorcaldialog_base.py
-%%QT%%%%DATADIR%%/ui4/devicesetupdialog.py
-%%QT%%%%DATADIR%%/ui4/devicesetupdialog_base.py
-%%QT%%%%DATADIR%%/ui4/deviceuricombobox.py
-%%QT%%%%DATADIR%%/ui4/devmgr5.py
-%%QT%%%%DATADIR%%/ui4/devmgr5_base.py
-%%QT%%%%DATADIR%%/ui4/fabgrouptable.py
-%%QT%%%%DATADIR%%/ui4/fabnametable.py
-%%QT%%%%DATADIR%%/ui4/fabwindow.py
-%%QT%%%%DATADIR%%/ui4/fabwindow_base.py
-%%QT%%%%DATADIR%%/ui4/faxsetupdialog.py
-%%QT%%%%DATADIR%%/ui4/faxsetupdialog_base.py
-%%QT%%%%DATADIR%%/ui4/filetable.py
-%%QT%%%%DATADIR%%/ui4/firmwaredialog.py
-%%QT%%%%DATADIR%%/ui4/firmwaredialog_base.py
-%%QT%%%%DATADIR%%/ui4/infodialog.py
-%%QT%%%%DATADIR%%/ui4/infodialog_base.py
-%%QT%%%%DATADIR%%/ui4/linefeedcaldialog.py
-%%QT%%%%DATADIR%%/ui4/linefeedcaldialog_base.py
-%%QT%%%%DATADIR%%/ui4/loadpapergroupbox.py
-%%QT%%%%DATADIR%%/ui4/makecopiesdialog.py
-%%QT%%%%DATADIR%%/ui4/makecopiesdialog_base.py
-%%QT%%%%DATADIR%%/ui4/mimetypesdialog.py
-%%QT%%%%DATADIR%%/ui4/mimetypesdialog_base.py
-%%QT%%%%DATADIR%%/ui4/nodevicesdialog.py
-%%QT%%%%DATADIR%%/ui4/nodevicesdialog_base.py
-%%QT%%%%DATADIR%%/ui4/plugindiagnose.py
-%%QT%%%%DATADIR%%/ui4/plugindiagnose_base.py
-%%QT%%%%DATADIR%%/ui4/plugindialog.py
-%%QT%%%%DATADIR%%/ui4/plugindialog_base.py
-%%QT%%%%DATADIR%%/ui4/pluginlicensedialog.py
-%%QT%%%%DATADIR%%/ui4/pluginlicensedialog_base.py
-%%QT%%%%DATADIR%%/ui4/pqdiagdialog.py
-%%QT%%%%DATADIR%%/ui4/pqdiagdialog_base.py
-%%QT%%%%DATADIR%%/ui4/printdialog.py
-%%QT%%%%DATADIR%%/ui4/printdialog_base.py
-%%QT%%%%DATADIR%%/ui4/printernamecombobox.py
-%%QT%%%%DATADIR%%/ui4/printsettingsdialog.py
-%%QT%%%%DATADIR%%/ui4/printsettingsdialog_base.py
-%%QT%%%%DATADIR%%/ui4/printsettingstoolbox.py
-%%QT%%%%DATADIR%%/ui4/printtestpagedialog.py
-%%QT%%%%DATADIR%%/ui4/printtestpagedialog_base.py
-%%QT%%%%DATADIR%%/ui4/queuesconf.py
-%%QT%%%%DATADIR%%/ui4/readonlyradiobutton.py
-%%QT%%%%DATADIR%%/ui4/sendfaxdialog.py
-%%QT%%%%DATADIR%%/ui4/sendfaxdialog_base.py
-%%QT%%%%DATADIR%%/ui4/settingsdialog.py
-%%QT%%%%DATADIR%%/ui4/settingsdialog_base.py
-%%QT%%%%DATADIR%%/ui4/setupdialog.py
-%%QT%%%%DATADIR%%/ui4/setupdialog_base.py
-%%QT%%%%DATADIR%%/ui4/systemtray.py
-%%QT%%%%DATADIR%%/ui4/systrayframe.py
-%%QT%%%%DATADIR%%/ui4/systrayframe_base.py
-%%QT%%%%DATADIR%%/ui4/ui_utils.py
-%%QT%%%%DATADIR%%/ui4/upgradedialog.py
-%%QT%%%%DATADIR%%/ui4/upgradedialog_base.py
-%%QT%%%%DATADIR%%/ui4/wifisetupdialog.py
-%%QT%%%%DATADIR%%/ui4/wifisetupdialog_base.py
+%%X11%%%%DATADIR%%/ui4/__init__.py
+%%X11%%%%DATADIR%%/ui4/aboutdialog.py
+%%X11%%%%DATADIR%%/ui4/aboutdialog_base.py
+%%X11%%%%DATADIR%%/ui4/aligndialog.py
+%%X11%%%%DATADIR%%/ui4/aligndialog_base.py
+%%X11%%%%DATADIR%%/ui4/cleandialog.py
+%%X11%%%%DATADIR%%/ui4/cleandialog_base.py
+%%X11%%%%DATADIR%%/ui4/colorcaldialog.py
+%%X11%%%%DATADIR%%/ui4/colorcaldialog_base.py
+%%X11%%%%DATADIR%%/ui4/devicesetupdialog.py
+%%X11%%%%DATADIR%%/ui4/devicesetupdialog_base.py
+%%X11%%%%DATADIR%%/ui4/deviceuricombobox.py
+%%X11%%%%DATADIR%%/ui4/devmgr5.py
+%%X11%%%%DATADIR%%/ui4/devmgr5_base.py
+%%X11%%%%DATADIR%%/ui4/fabgrouptable.py
+%%X11%%%%DATADIR%%/ui4/fabnametable.py
+%%X11%%%%DATADIR%%/ui4/fabwindow.py
+%%X11%%%%DATADIR%%/ui4/fabwindow_base.py
+%%X11%%%%DATADIR%%/ui4/faxsetupdialog.py
+%%X11%%%%DATADIR%%/ui4/faxsetupdialog_base.py
+%%X11%%%%DATADIR%%/ui4/filetable.py
+%%X11%%%%DATADIR%%/ui4/firmwaredialog.py
+%%X11%%%%DATADIR%%/ui4/firmwaredialog_base.py
+%%X11%%%%DATADIR%%/ui4/infodialog.py
+%%X11%%%%DATADIR%%/ui4/infodialog_base.py
+%%X11%%%%DATADIR%%/ui4/linefeedcaldialog.py
+%%X11%%%%DATADIR%%/ui4/linefeedcaldialog_base.py
+%%X11%%%%DATADIR%%/ui4/loadpapergroupbox.py
+%%X11%%%%DATADIR%%/ui4/makecopiesdialog.py
+%%X11%%%%DATADIR%%/ui4/makecopiesdialog_base.py
+%%X11%%%%DATADIR%%/ui4/mimetypesdialog.py
+%%X11%%%%DATADIR%%/ui4/mimetypesdialog_base.py
+%%X11%%%%DATADIR%%/ui4/nodevicesdialog.py
+%%X11%%%%DATADIR%%/ui4/nodevicesdialog_base.py
+%%X11%%%%DATADIR%%/ui4/plugindiagnose.py
+%%X11%%%%DATADIR%%/ui4/plugindiagnose_base.py
+%%X11%%%%DATADIR%%/ui4/plugindialog.py
+%%X11%%%%DATADIR%%/ui4/plugindialog_base.py
+%%X11%%%%DATADIR%%/ui4/pluginlicensedialog.py
+%%X11%%%%DATADIR%%/ui4/pluginlicensedialog_base.py
+%%X11%%%%DATADIR%%/ui4/pqdiagdialog.py
+%%X11%%%%DATADIR%%/ui4/pqdiagdialog_base.py
+%%X11%%%%DATADIR%%/ui4/printdialog.py
+%%X11%%%%DATADIR%%/ui4/printdialog_base.py
+%%X11%%%%DATADIR%%/ui4/printernamecombobox.py
+%%X11%%%%DATADIR%%/ui4/printsettingsdialog.py
+%%X11%%%%DATADIR%%/ui4/printsettingsdialog_base.py
+%%X11%%%%DATADIR%%/ui4/printsettingstoolbox.py
+%%X11%%%%DATADIR%%/ui4/printtestpagedialog.py
+%%X11%%%%DATADIR%%/ui4/printtestpagedialog_base.py
+%%X11%%%%DATADIR%%/ui4/queuesconf.py
+%%X11%%%%DATADIR%%/ui4/readonlyradiobutton.py
+%%X11%%%%DATADIR%%/ui4/sendfaxdialog.py
+%%X11%%%%DATADIR%%/ui4/sendfaxdialog_base.py
+%%X11%%%%DATADIR%%/ui4/settingsdialog.py
+%%X11%%%%DATADIR%%/ui4/settingsdialog_base.py
+%%X11%%%%DATADIR%%/ui4/setupdialog.py
+%%X11%%%%DATADIR%%/ui4/setupdialog_base.py
+%%X11%%%%DATADIR%%/ui4/systemtray.py
+%%X11%%%%DATADIR%%/ui4/systrayframe.py
+%%X11%%%%DATADIR%%/ui4/systrayframe_base.py
+%%X11%%%%DATADIR%%/ui4/ui_utils.py
+%%X11%%%%DATADIR%%/ui4/upgradedialog.py
+%%X11%%%%DATADIR%%/ui4/upgradedialog_base.py
+%%X11%%%%DATADIR%%/ui4/wifisetupdialog.py
+%%X11%%%%DATADIR%%/ui4/wifisetupdialog_base.py
 %%DATADIR%%/uninstall.py
 %%DATADIR%%/unload.py
 %%DATADIR%%/upgrade.py
 %%DATADIR%%/wificonfig.py
 %%FAX%%share/ppd/HP/HP-Fax-hpcups.ppd.gz
-%%FAX%%share/ppd/HP/HP-Fax-hpijs.ppd.gz
 %%FAX%%share/ppd/HP/HP-Fax2-hpcups.ppd.gz
-%%FAX%%share/ppd/HP/HP-Fax2-hpijs.ppd.gz
 %%FAX%%share/ppd/HP/HP-Fax3-hpcups.ppd.gz
-%%FAX%%share/ppd/HP/HP-Fax3-hpijs.ppd.gz
 %%FAX%%share/ppd/HP/HP-Fax4-hpcups.ppd.gz
-%%FAX%%share/ppd/HP/HP-Fax4-hpijs.ppd.gz
-share/ppd/HP/apollo-2100.ppd.gz
-share/ppd/HP/apollo-2150.ppd.gz
-share/ppd/HP/apollo-2200.ppd.gz
-share/ppd/HP/apollo-2500.ppd.gz
-share/ppd/HP/apollo-2600.ppd.gz
-share/ppd/HP/apollo-2650.ppd.gz
-share/ppd/HP/apollo-p2000-u.ppd.gz
-share/ppd/HP/apollo-p2250.ppd.gz
-share/ppd/HP/hp-2000c-hpijs.ppd.gz
-share/ppd/HP/hp-2000c.ppd.gz
-share/ppd/HP/hp-2500c-hpijs.ppd.gz
-share/ppd/HP/hp-2500c.ppd.gz
-share/ppd/HP/hp-910-hpijs.ppd.gz
-share/ppd/HP/hp-910.ppd.gz
-share/ppd/HP/hp-915-hpijs.ppd.gz
-share/ppd/HP/hp-915.ppd.gz
-share/ppd/HP/hp-business_inkjet_1000-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_1000.ppd.gz
-share/ppd/HP/hp-business_inkjet_1100-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_1100.ppd.gz
-share/ppd/HP/hp-business_inkjet_1200-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_1200.ppd.gz
-share/ppd/HP/hp-business_inkjet_2200-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_2200.ppd.gz
-share/ppd/HP/hp-business_inkjet_2230-hpijs.ppd.gz
-share/ppd/HP/hp-business_inkjet_2230.ppd.gz
-share/ppd/HP/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-business_inkjet_2250-pcl3.ppd.gz
 share/ppd/HP/hp-business_inkjet_2250-ps.ppd.gz
-share/ppd/HP/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-business_inkjet_2280-pcl3.ppd.gz
 share/ppd/HP/hp-business_inkjet_2280-ps.ppd.gz
-share/ppd/HP/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-business_inkjet_2300-pcl3.ppd.gz
 share/ppd/HP/hp-business_inkjet_2300-ps.ppd.gz
-share/ppd/HP/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-business_inkjet_2600-pcl3.ppd.gz
 share/ppd/HP/hp-business_inkjet_2600-ps.ppd.gz
-share/ppd/HP/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-business_inkjet_2800-pcl3.ppd.gz
 share/ppd/HP/hp-business_inkjet_2800-ps.ppd.gz
-share/ppd/HP/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-business_inkjet_3000-pcl3.ppd.gz
 share/ppd/HP/hp-business_inkjet_3000-ps.ppd.gz
 share/ppd/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
 share/ppd/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
-share/ppd/HP/hp-color_inkjet_cp1700-hpijs.ppd.gz
-share/ppd/HP/hp-color_inkjet_cp1700.ppd.gz
-share/ppd/HP/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz
-share/ppd/HP/hp-color_inkjet_printer_cp1700.ppd.gz
 share/ppd/HP/hp-color_laserjet-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_1600-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_1600.ppd.gz
-share/ppd/HP/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_2500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_2500-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_2500_series-hpijs.ppd.gz
 share/ppd/HP/hp-color_laserjet_2500_series-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_2500_series.ppd.gz
 share/ppd/HP/hp-color_laserjet_2550_series-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_2600n-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_2600n.ppd.gz
 share/ppd/HP/hp-color_laserjet_2605-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_2605dn-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_2605dtn-ps.ppd.gz
@@ -697,188 +649,80 @@ share/ppd/HP/hp-color_laserjet_2800-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_2820-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_2830-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_2840-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_3000-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_3000-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_3500-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3500.ppd.gz
-share/ppd/HP/hp-color_laserjet_3500n-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3500n.ppd.gz
-share/ppd/HP/hp-color_laserjet_3550-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3550.ppd.gz
-share/ppd/HP/hp-color_laserjet_3550n-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3550n.ppd.gz
-share/ppd/HP/hp-color_laserjet_3600-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_3600.ppd.gz
-share/ppd/HP/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_3700-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_3700-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_3700n-hpijs.ppd.gz
 share/ppd/HP/hp-color_laserjet_3700n-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_3700n.ppd.gz
-share/ppd/HP/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_3800-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_3800-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_4500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_4500-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_4550-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_4550-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_4600-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_4600-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4600_series-hpijs.ppd.gz
 share/ppd/HP/hp-color_laserjet_4600_series-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4600_series.ppd.gz
-share/ppd/HP/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_4610-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_4610-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_4650-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_4650-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_4700-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_4700-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_4730mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_4730mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_5-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_5.ppd.gz
-share/ppd/HP/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_5500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_5500-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_5550-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_5550-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_5m-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_5m-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_8500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_8500-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_8550-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_8550-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_9500-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_9500-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_9500_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm1015-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm1017-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm1312_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320n_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm2320nf_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm3530_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm4540_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm4540_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm4540_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm4730_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm6030_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm6040_mfp.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cm6049_mfp.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1215.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1217-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1217.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1514n-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp1514n-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1515n-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp1515n-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp1518ni-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp1518ni-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp2025-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025dn-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp2025dn-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025n-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp2025n-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp2025x-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp2025x-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp3505-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp3505-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp3525-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp3525-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4005-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp4005-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4020_series-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp4520_series-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp5225-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225dn-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5225n-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp5225n-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5520_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp5520_series-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-color_laserjet_cp6015-pcl3.ppd.gz
 share/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_m452-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_m452d-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_m552-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_m553-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
-share/ppd/HP/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_pro_mfp_m176n.ppd.gz
-share/ppd/HP/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz
-share/ppd/HP/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
+share/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
 share/ppd/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
-share/ppd/HP/hp-cp1160-hpijs.ppd.gz
-share/ppd/HP/hp-cp1160.ppd.gz
-share/ppd/HP/hp-designjet_d5800-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_pro_mfp_m477-ps.ppd.gz
+share/ppd/HP/hp-color_laserjet_pro_mfp_m477d-ps.ppd.gz
 share/ppd/HP/hp-designjet_4000ps.ppd.gz
 share/ppd/HP/hp-designjet_4020ps-ps.ppd.gz
 share/ppd/HP/hp-designjet_4500mfp.ppd.gz
 share/ppd/HP/hp-designjet_4500ps.ppd.gz
 share/ppd/HP/hp-designjet_4520mfp-ps.ppd.gz
 share/ppd/HP/hp-designjet_4520ps-ps.ppd.gz
+share/ppd/HP/hp-designjet_d5800-ps.ppd.gz
 share/ppd/HP/hp-designjet_t1100ps_24in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t1100ps_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t1120ps_24in-ps.ppd.gz
@@ -888,16 +732,16 @@ share/ppd/HP/hp-designjet_t1300_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_t1500-postscript.ppd.gz
 share/ppd/HP/hp-designjet_t2300_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_t2500-postscript.ppd.gz
+share/ppd/HP/hp-designjet_t3500-ps.ppd.gz
 share/ppd/HP/hp-designjet_t7100ps-ps.ppd.gz
 share/ppd/HP/hp-designjet_t7100ps_monochrome-ps.ppd.gz
+share/ppd/HP/hp-designjet_t7200-ps.ppd.gz
 share/ppd/HP/hp-designjet_t770_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_t770ps_24in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t790ps_24in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t790ps_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t795ps_44in-ps.ppd.gz
 share/ppd/HP/hp-designjet_t920-postscript.ppd.gz
-share/ppd/HP/hp-designjet_t3500-ps.ppd.gz
-share/ppd/HP/hp-designjet_t7200-ps.ppd.gz
 share/ppd/HP/hp-designjet_z5200_postscript-ps.ppd.gz
 share/ppd/HP/hp-designjet_z5400-postscript.ppd.gz
 share/ppd/HP/hp-designjet_z6100ps_42in_photo-ps.ppd.gz
@@ -906,1487 +750,147 @@ share/ppd/HP/hp-designjet_z6200_42in_photo-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6200_60in_photo-ps.ppd.gz
 share/ppd/HP/hp-designjet_z6600-postscript.ppd.gz
 share/ppd/HP/hp-designjet_z6800_photo-postscript.ppd.gz
-share/ppd/HP/hp-deskjet_1000_j110_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1000_j110_series.ppd.gz
-share/ppd/HP/hp-deskjet_1010_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1010_series.ppd.gz
-share/ppd/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1050_j410_series.ppd.gz
-share/ppd/HP/hp-deskjet_1100-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1100.ppd.gz
-share/ppd/HP/hp-deskjet_1120-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1120.ppd.gz
-share/ppd/HP/hp-deskjet_1125-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1125.ppd.gz
-share/ppd/HP/hp-deskjet_1200c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1200c.ppd.gz
-share/ppd/HP/hp-deskjet_1220c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1220c.ppd.gz
-share/ppd/HP/hp-deskjet_1280-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1280.ppd.gz
-share/ppd/HP/hp-deskjet_1510_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1510_series.ppd.gz
-share/ppd/HP/hp-deskjet_1600c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1600c.ppd.gz
-share/ppd/HP/hp-deskjet_1600cm-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1600cm.ppd.gz
-share/ppd/HP/hp-deskjet_1600cn-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_1600cn.ppd.gz
-share/ppd/HP/hp-deskjet_2000_j210_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_2000_j210_series.ppd.gz
-share/ppd/HP/hp-deskjet_2020_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_2020_series.ppd.gz
-share/ppd/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_2050_j510_series.ppd.gz
-share/ppd/HP/hp-deskjet_2510_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_2510_series.ppd.gz
-share/ppd/HP/hp-deskjet_2520_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_2520_series.ppd.gz
-share/ppd/HP/hp-deskjet_2540_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_2540_series.ppd.gz
-share/ppd/HP/hp-deskjet_2640_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_2640_series.ppd.gz
-share/ppd/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3000_j310_series.ppd.gz
-share/ppd/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3050_j610_series.ppd.gz
-share/ppd/HP/hp-deskjet_3050a_j611_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3050a_j611_series.ppd.gz
-share/ppd/HP/hp-deskjet_3070_b611_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3070_b611_series.ppd.gz
-share/ppd/HP/hp-deskjet_3320-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3320.ppd.gz
-share/ppd/HP/hp-deskjet_3325-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3325.ppd.gz
-share/ppd/HP/hp-deskjet_3420-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3420.ppd.gz
-share/ppd/HP/hp-deskjet_3425-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3425.ppd.gz
-share/ppd/HP/hp-deskjet_3450-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3450.ppd.gz
-share/ppd/HP/hp-deskjet_3500-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3500.ppd.gz
-share/ppd/HP/hp-deskjet_3510_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3510_series.ppd.gz
-share/ppd/HP/hp-deskjet_3520_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3520_series.ppd.gz
-share/ppd/HP/hp-deskjet_3540_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3540_series.ppd.gz
-share/ppd/HP/hp-deskjet_3550-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3550.ppd.gz
-share/ppd/HP/hp-deskjet_3600-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3600.ppd.gz
-share/ppd/HP/hp-deskjet_3650-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3650.ppd.gz
-share/ppd/HP/hp-deskjet_3740-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3740.ppd.gz
-share/ppd/HP/hp-deskjet_3810-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3810.ppd.gz
-share/ppd/HP/hp-deskjet_3816-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3816.ppd.gz
-share/ppd/HP/hp-deskjet_3819-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3819.ppd.gz
-share/ppd/HP/hp-deskjet_3820-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3820.ppd.gz
-share/ppd/HP/hp-deskjet_3822-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3822.ppd.gz
-share/ppd/HP/hp-deskjet_3840-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3840.ppd.gz
-share/ppd/HP/hp-deskjet_3870-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3870.ppd.gz
-share/ppd/HP/hp-deskjet_3900-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3900.ppd.gz
-share/ppd/HP/hp-deskjet_3910-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3910.ppd.gz
-share/ppd/HP/hp-deskjet_3920-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3920.ppd.gz
-share/ppd/HP/hp-deskjet_3940-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_3940.ppd.gz
-share/ppd/HP/hp-deskjet_400-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_400.ppd.gz
-share/ppd/HP/hp-deskjet_400l-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_400l.ppd.gz
-share/ppd/HP/hp-deskjet_4510_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_4510_series.ppd.gz
-share/ppd/HP/hp-deskjet_460-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_460.ppd.gz
-share/ppd/HP/hp-deskjet_4610_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_4610_series.ppd.gz
-share/ppd/HP/hp-deskjet_4620_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_4620_series.ppd.gz
-share/ppd/HP/hp-deskjet_4640_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_4640_series.ppd.gz
-share/ppd/HP/hp-deskjet_500-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_500.ppd.gz
-share/ppd/HP/hp-deskjet_500c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_500c.ppd.gz
-share/ppd/HP/hp-deskjet_505j-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_505j.ppd.gz
-share/ppd/HP/hp-deskjet_510-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_510.ppd.gz
-share/ppd/HP/hp-deskjet_5100-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5100.ppd.gz
-share/ppd/HP/hp-deskjet_520-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_520.ppd.gz
-share/ppd/HP/hp-deskjet_540-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_540.ppd.gz
-share/ppd/HP/hp-deskjet_5400_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5400_series.ppd.gz
-share/ppd/HP/hp-deskjet_550c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_550c.ppd.gz
-share/ppd/HP/hp-deskjet_5520_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5520_series.ppd.gz
-share/ppd/HP/hp-deskjet_5550-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5550.ppd.gz
-share/ppd/HP/hp-deskjet_5551-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5551.ppd.gz
-share/ppd/HP/hp-deskjet_5552-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5552.ppd.gz
-share/ppd/HP/hp-deskjet_5600-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5600.ppd.gz
-share/ppd/HP/hp-deskjet_5650-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5650.ppd.gz
-share/ppd/HP/hp-deskjet_5652-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5652.ppd.gz
-share/ppd/HP/hp-deskjet_5700-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5700.ppd.gz
-share/ppd/HP/hp-deskjet_5800-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5800.ppd.gz
-share/ppd/HP/hp-deskjet_5850-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5850.ppd.gz
-share/ppd/HP/hp-deskjet_5900_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_5900_series.ppd.gz
-share/ppd/HP/hp-deskjet_600-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_600.ppd.gz
-share/ppd/HP/hp-deskjet_610c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_610c.ppd.gz
-share/ppd/HP/hp-deskjet_610cl-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_610cl.ppd.gz
-share/ppd/HP/hp-deskjet_6120-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6120.ppd.gz
-share/ppd/HP/hp-deskjet_6122-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6122.ppd.gz
-share/ppd/HP/hp-deskjet_6127-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6127.ppd.gz
-share/ppd/HP/hp-deskjet_612c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_612c.ppd.gz
-share/ppd/HP/hp-deskjet_630c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_630c.ppd.gz
-share/ppd/HP/hp-deskjet_632c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_632c.ppd.gz
-share/ppd/HP/hp-deskjet_640c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_640c.ppd.gz
-share/ppd/HP/hp-deskjet_648c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_648c.ppd.gz
-share/ppd/HP/hp-deskjet_6500-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6500.ppd.gz
-share/ppd/HP/hp-deskjet_6520_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6520_series.ppd.gz
-share/ppd/HP/hp-deskjet_656c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_656c.ppd.gz
-share/ppd/HP/hp-deskjet_660-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_660.ppd.gz
-share/ppd/HP/hp-deskjet_6600-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6600.ppd.gz
-share/ppd/HP/hp-deskjet_670-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_670.ppd.gz
-share/ppd/HP/hp-deskjet_670c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_670c.ppd.gz
-share/ppd/HP/hp-deskjet_670tv-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_670tv.ppd.gz
-share/ppd/HP/hp-deskjet_672c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_672c.ppd.gz
-share/ppd/HP/hp-deskjet_680-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_680.ppd.gz
-share/ppd/HP/hp-deskjet_6800-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6800.ppd.gz
-share/ppd/HP/hp-deskjet_682-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_682.ppd.gz
-share/ppd/HP/hp-deskjet_690-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_690.ppd.gz
-share/ppd/HP/hp-deskjet_690c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_690c.ppd.gz
-share/ppd/HP/hp-deskjet_692-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_692.ppd.gz
-share/ppd/HP/hp-deskjet_693-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_693.ppd.gz
-share/ppd/HP/hp-deskjet_694-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_694.ppd.gz
-share/ppd/HP/hp-deskjet_6940_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6940_series.ppd.gz
-share/ppd/HP/hp-deskjet_695-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_695.ppd.gz
-share/ppd/HP/hp-deskjet_697-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_697.ppd.gz
-share/ppd/HP/hp-deskjet_6980_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_6980_series.ppd.gz
-share/ppd/HP/hp-deskjet_810c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_810c.ppd.gz
-share/ppd/HP/hp-deskjet_812c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_812c.ppd.gz
-share/ppd/HP/hp-deskjet_815c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_815c.ppd.gz
-share/ppd/HP/hp-deskjet_816c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_816c.ppd.gz
-share/ppd/HP/hp-deskjet_825c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_825c.ppd.gz
-share/ppd/HP/hp-deskjet_830c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_830c.ppd.gz
-share/ppd/HP/hp-deskjet_832c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_832c.ppd.gz
-share/ppd/HP/hp-deskjet_840c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_840c.ppd.gz
-share/ppd/HP/hp-deskjet_841c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_841c.ppd.gz
-share/ppd/HP/hp-deskjet_842c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_842c.ppd.gz
-share/ppd/HP/hp-deskjet_843c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_843c.ppd.gz
-share/ppd/HP/hp-deskjet_845c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_845c.ppd.gz
-share/ppd/HP/hp-deskjet_850c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_850c.ppd.gz
-share/ppd/HP/hp-deskjet_855c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_855c.ppd.gz
-share/ppd/HP/hp-deskjet_870c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_870c.ppd.gz
-share/ppd/HP/hp-deskjet_880c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_880c.ppd.gz
-share/ppd/HP/hp-deskjet_882c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_882c.ppd.gz
-share/ppd/HP/hp-deskjet_890c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_890c.ppd.gz
-share/ppd/HP/hp-deskjet_895c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_895c.ppd.gz
-share/ppd/HP/hp-deskjet_916c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_916c.ppd.gz
-share/ppd/HP/hp-deskjet_920c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_920c.ppd.gz
-share/ppd/HP/hp-deskjet_9300-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_9300.ppd.gz
-share/ppd/HP/hp-deskjet_930c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_930c.ppd.gz
-share/ppd/HP/hp-deskjet_932c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_932c.ppd.gz
-share/ppd/HP/hp-deskjet_933c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_933c.ppd.gz
-share/ppd/HP/hp-deskjet_934c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_934c.ppd.gz
-share/ppd/HP/hp-deskjet_935c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_935c.ppd.gz
-share/ppd/HP/hp-deskjet_940c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_940c.ppd.gz
-share/ppd/HP/hp-deskjet_948c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_948c.ppd.gz
-share/ppd/HP/hp-deskjet_950c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_950c.ppd.gz
-share/ppd/HP/hp-deskjet_952c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_952c.ppd.gz
-share/ppd/HP/hp-deskjet_955c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_955c.ppd.gz
-share/ppd/HP/hp-deskjet_957c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_957c.ppd.gz
-share/ppd/HP/hp-deskjet_959c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_959c.ppd.gz
-share/ppd/HP/hp-deskjet_9600-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_9600.ppd.gz
-share/ppd/HP/hp-deskjet_960c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_960c.ppd.gz
-share/ppd/HP/hp-deskjet_970c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_970c.ppd.gz
-share/ppd/HP/hp-deskjet_975c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_975c.ppd.gz
-share/ppd/HP/hp-deskjet_9800-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_9800.ppd.gz
-share/ppd/HP/hp-deskjet_980c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_980c.ppd.gz
-share/ppd/HP/hp-deskjet_990c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_990c.ppd.gz
-share/ppd/HP/hp-deskjet_995c-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_995c.ppd.gz
-share/ppd/HP/hp-deskjet_d1300_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d1300_series.ppd.gz
-share/ppd/HP/hp-deskjet_d1400_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d1400_series.ppd.gz
-share/ppd/HP/hp-deskjet_d1500_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d1500_series.ppd.gz
-share/ppd/HP/hp-deskjet_d1600_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d1600_series.ppd.gz
-share/ppd/HP/hp-deskjet_d2300_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d2300_series.ppd.gz
-share/ppd/HP/hp-deskjet_d2400_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d2400_series.ppd.gz
-share/ppd/HP/hp-deskjet_d2500_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d2500_series.ppd.gz
-share/ppd/HP/hp-deskjet_d2600_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d2600_series.ppd.gz
-share/ppd/HP/hp-deskjet_d4100_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d4100_series.ppd.gz
-share/ppd/HP/hp-deskjet_d4200_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d4200_series.ppd.gz
-share/ppd/HP/hp-deskjet_d4300_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d4300_series.ppd.gz
-share/ppd/HP/hp-deskjet_d5500_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d5500_series.ppd.gz
-share/ppd/HP/hp-deskjet_d730-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_d730.ppd.gz
-share/ppd/HP/hp-deskjet_f2100_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f2100_series.ppd.gz
-share/ppd/HP/hp-deskjet_f2200_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f2200_series.ppd.gz
-share/ppd/HP/hp-deskjet_f2400_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f2400_series.ppd.gz
-share/ppd/HP/hp-deskjet_f300_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f300_series.ppd.gz
-share/ppd/HP/hp-deskjet_f4100_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f4100_series.ppd.gz
-share/ppd/HP/hp-deskjet_f4200_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f4200_series.ppd.gz
-share/ppd/HP/hp-deskjet_f4210_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f4210_series.ppd.gz
-share/ppd/HP/hp-deskjet_f4213_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f4213_series.ppd.gz
-share/ppd/HP/hp-deskjet_f4400_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f4400_series.ppd.gz
-share/ppd/HP/hp-deskjet_f4500_series-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f4500_series.ppd.gz
-share/ppd/HP/hp-deskjet_f735-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_f735.ppd.gz
-share/ppd/HP/hp-deskjet_ink_adv_2010_k010-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_ink_adv_2010_k010.ppd.gz
-share/ppd/HP/hp-deskjet_ink_adv_2060_k110-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_ink_adv_2060_k110.ppd.gz
-share/ppd/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_ink_advant_k109a-z.ppd.gz
-share/ppd/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz
-share/ppd/HP/hp-deskjet_ink_advant_k209a-z.ppd.gz
-share/ppd/HP/hp-dj350-hpijs.ppd.gz
-share/ppd/HP/hp-dj350.ppd.gz
-share/ppd/HP/hp-dj450-hpijs.ppd.gz
-share/ppd/HP/hp-dj450.ppd.gz
-share/ppd/HP/hp-envy_100_d410_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_100_d410_series.ppd.gz
-share/ppd/HP/hp-envy_110_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_110_series.ppd.gz
-share/ppd/HP/hp-envy_120_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_120_series.ppd.gz
-share/ppd/HP/hp-envy_4500_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_4500_series.ppd.gz
-share/ppd/HP/hp-envy_5530_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_5530_series.ppd.gz
-share/ppd/HP/hp-envy_5640_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_5640_series.ppd.gz
-share/ppd/HP/hp-envy_5660_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_5660_series.ppd.gz
-share/ppd/HP/hp-envy_7640_series-hpijs.ppd.gz
-share/ppd/HP/hp-envy_7640_series.ppd.gz
-share/ppd/HP/hp-laserjet_1000-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1000.ppd.gz
-share/ppd/HP/hp-laserjet_1005_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1005_series.ppd.gz
 share/ppd/HP/hp-laserjet_100_color_mfp_m175-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1010-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1010.ppd.gz
-share/ppd/HP/hp-laserjet_1012-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1012.ppd.gz
-share/ppd/HP/hp-laserjet_1015-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1015.ppd.gz
-share/ppd/HP/hp-laserjet_1018-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1018.ppd.gz
-share/ppd/HP/hp-laserjet_1020-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1020.ppd.gz
-share/ppd/HP/hp-laserjet_1022-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1022-hpijs-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_1022-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1022-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_1022n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1022n-hpijs-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_1022n-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1022n-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1022nw-hpijs-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_1022nw-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1022nw-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_1100-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1100.ppd.gz
-share/ppd/HP/hp-laserjet_1100a-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1100a.ppd.gz
-share/ppd/HP/hp-laserjet_1100xi-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1100xi.ppd.gz
-share/ppd/HP/hp-laserjet_1150-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1150.ppd.gz
-share/ppd/HP/hp-laserjet_1160-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1160.ppd.gz
-share/ppd/HP/hp-laserjet_1160_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_1160_series.ppd.gz
-share/ppd/HP/hp-laserjet_1200-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1200-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_1200-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1200n-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1200n-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1200n.ppd.gz
-share/ppd/HP/hp-laserjet_1220-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1220-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_1220-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1220se-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1220se-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1220se.ppd.gz
-share/ppd/HP/hp-laserjet_1300-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1300-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_1300-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1300n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1300n-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_1300n-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1300xi-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_1300xi-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1320-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1320-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1320.ppd.gz
-share/ppd/HP/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_1320_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_1320_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1320n-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1320n-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1320n.ppd.gz
-share/ppd/HP/hp-laserjet_1320nw-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1320nw-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1320nw.ppd.gz
-share/ppd/HP/hp-laserjet_1320tn-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_1320tn-ps.ppd.gz
-share/ppd/HP/hp-laserjet_1320tn.ppd.gz
 share/ppd/HP/hp-laserjet_200_color_m251-ps.ppd.gz
 share/ppd/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz
 share/ppd/HP/hp-laserjet_200_colormfp_m276-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2100-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_2100-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2100.ppd.gz
-share/ppd/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_2100_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_2100_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2200-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_2200-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_2200-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2200_series-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_2200_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2200_series.ppd.gz
-share/ppd/HP/hp-laserjet_2300-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_2300-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_2300-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2300_series-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_2300_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2300_series.ppd.gz
-share/ppd/HP/hp-laserjet_2410-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_2410-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_2410-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2420-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_2420-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_2420-ps.ppd.gz
-share/ppd/HP/hp-laserjet_2430-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_2430-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_2430-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3015-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3015-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3015-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3020-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3020-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3020-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3030-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3030-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3030-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3050-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3050-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3050-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3052-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3052-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3052-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3055-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3055.ppd.gz
-share/ppd/HP/hp-laserjet_3100-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3100.ppd.gz
-share/ppd/HP/hp-laserjet_3150-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3150.ppd.gz
-share/ppd/HP/hp-laserjet_3200-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3200.ppd.gz
-share/ppd/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3200m-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3200m-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3200se-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3200se.ppd.gz
-share/ppd/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3300_3310_3320-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3330-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3330.ppd.gz
-share/ppd/HP/hp-laserjet_3380-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3380-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3380-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3390-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_3390-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_3390-ps.ppd.gz
-share/ppd/HP/hp-laserjet_3392-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_3392.ppd.gz
 share/ppd/HP/hp-laserjet_4-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4000_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4000_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_400_m401-ps.ppd.gz
 share/ppd/HP/hp-laserjet_400_m401dne-ps.ppd.gz
 share/ppd/HP/hp-laserjet_400_mfp_m425-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4050_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4050_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4100_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4100_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4100_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4100_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4150_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4150_series.ppd.gz
-share/ppd/HP/hp-laserjet_4200-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4200-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4200-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4240-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4240-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4240-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4250-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4250-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4250-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4300-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4300-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4300-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4345_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4345_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4350-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4350-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4350-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4_plus-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4_plus-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4l-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_4l.ppd.gz
-share/ppd/HP/hp-laserjet_4ml-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_4ml-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4ml.ppd.gz
-share/ppd/HP/hp-laserjet_4mp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4mp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4mp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4si-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4si-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4si-ps.ppd.gz
-share/ppd/HP/hp-laserjet_4v-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_4v-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_4v-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5000-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_5000-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5000.ppd.gz
-share/ppd/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_5000_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5000_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_500_color_m551-ps.ppd.gz
 share/ppd/HP/hp-laserjet_500_color_mfp_m570-ps.ppd.gz
 share/ppd/HP/hp-laserjet_500_color_mfp_m575-ps.ppd.gz
 share/ppd/HP/hp-laserjet_500_mfp_m525-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_5100_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5100_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5200-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_5200-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5200-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5200l-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_5200l-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5200l-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5200lx-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_5200lx-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5200lx.ppd.gz
-share/ppd/HP/hp-laserjet_5l-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_5l.ppd.gz
-share/ppd/HP/hp-laserjet_5mp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_5mp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5mp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5p-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_5p-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5p.ppd.gz
-share/ppd/HP/hp-laserjet_5si-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_5si-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5si-ps.ppd.gz
-share/ppd/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_5si_mopier-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_5si_mopier-ps.ppd.gz
 share/ppd/HP/hp-laserjet_600_m601_m602_m603-ps.ppd.gz
-share/ppd/HP/hp-laserjet_6l-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_6l.ppd.gz
-share/ppd/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_6mp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_6mp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_6p-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_6p-ps.ppd.gz
-share/ppd/HP/hp-laserjet_6p.ppd.gz
 share/ppd/HP/hp-laserjet_700_color_mfp_m775-ps.ppd.gz
 share/ppd/HP/hp-laserjet_700_m712-ps.ppd.gz
-share/ppd/HP/hp-laserjet_8000-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_8000-ps.ppd.gz
-share/ppd/HP/hp-laserjet_8000.ppd.gz
-share/ppd/HP/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_8000_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_8000_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_8100_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_8100_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_8100_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_8100_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_8100_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_8150_mfp-hpijs.ppd.gz
 share/ppd/HP/hp-laserjet_8150_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_8150_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_8150_series-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9000_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9000_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9000_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9000_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_9040-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9040-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9040-ps.ppd.gz
-share/ppd/HP/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9040_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9040_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_9050-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9050-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9050-ps.ppd.gz
-share/ppd/HP/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9050_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9050_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9055mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9055mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_9065mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_9065mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_cm1410_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_cm1411fn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1411fn-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1412fn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1412fn-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1413fn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1413fn-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1415fn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1415fn-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1415fnw-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1415fnw-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1416fnw-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1416fnw-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1417fnw-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1417fnw-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1418fnw-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_cm1418fnw-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_color_flow_mfp_m575-ps.ppd.gz
-share/ppd/HP/hp-laserjet_cp1025-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp1025.ppd.gz
-share/ppd/HP/hp-laserjet_cp1025nw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp1025nw.ppd.gz
 share/ppd/HP/hp-laserjet_cp1520_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_cp_1025-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp_1025.ppd.gz
-share/ppd/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_cp_1025nw.ppd.gz
-share/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
 share/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+share/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
 share/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m1005-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m1005.ppd.gz
-share/ppd/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m1120_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_m1120n_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m1120n_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_m1319f_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_m1319f_mfp.ppd.gz
 share/ppd/HP/hp-laserjet_m1522_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m1522nf_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m1530_mfp_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m1537dnf_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m1537dnf_mfp-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m1538dnf_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m1538dnf_mfp-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m1539dnf_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m1539dnf_mfp-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m2727_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m2727_mfp_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m3027_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m3027_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m3035_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m3035_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m4345_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m4345_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m4349_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m4349_mfp-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m4555_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m5025_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m5025_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m5035_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_m506-ps.ppd.gz
+share/ppd/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
 share/ppd/HP/hp-laserjet_m806-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m9040_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m9050_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
-share/ppd/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
+share/ppd/HP/hp-laserjet_mfp_m426_m427-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
-share/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
+share/ppd/HP/hp-laserjet_mfp_m527-ps.ppd.gz
 share/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz
-share/ppd/HP/hp-laserjet_p1005-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p1005.ppd.gz
-share/ppd/HP/hp-laserjet_p1006-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p1006.ppd.gz
-share/ppd/HP/hp-laserjet_p1007-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p1007.ppd.gz
-share/ppd/HP/hp-laserjet_p1008-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p1008.ppd.gz
-share/ppd/HP/hp-laserjet_p1009-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p1009.ppd.gz
-share/ppd/HP/hp-laserjet_p1505-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p1505.ppd.gz
-share/ppd/HP/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p1505n-hpijs-zxs.ppd.gz
-share/ppd/HP/hp-laserjet_p1505n-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p1505n-zxs.ppd.gz
-share/ppd/HP/hp-laserjet_p2014-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2014-hpijs-zxs.ppd.gz
-share/ppd/HP/hp-laserjet_p2014-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2014-zxs.ppd.gz
-share/ppd/HP/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2014n-hpijs-zxs.ppd.gz
-share/ppd/HP/hp-laserjet_p2014n-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2014n-zxs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2015_series-pcl3.ppd.gz
+share/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p2015_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_p2015d_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015d_series.ppd.gz
-share/ppd/HP/hp-laserjet_p2015dn_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015dn_series.ppd.gz
-share/ppd/HP/hp-laserjet_p2015n_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015n_series.ppd.gz
-share/ppd/HP/hp-laserjet_p2015x_series-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p2015x_series.ppd.gz
-share/ppd/HP/hp-laserjet_p2035-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2035-hpijs-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_p2035-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2035-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2035n-hpijs-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_p2035n-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2035n-zjs.ppd.gz
-share/ppd/HP/hp-laserjet_p2055-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p2055_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055d-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055dn-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p2055x-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p3004-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p3004-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p3004-ps.ppd.gz
-share/ppd/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p3005-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p3005-ps.ppd.gz
-share/ppd/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-laserjet_p3010_series-pcl3.ppd.gz
 share/ppd/HP/hp-laserjet_p3010_series-ps.ppd.gz
 share/ppd/HP/hp-laserjet_p4010_series-ps.ppd.gz
-share/ppd/HP/hp-laserjet_p4014-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4014.ppd.gz
-share/ppd/HP/hp-laserjet_p4014dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4014dn.ppd.gz
-share/ppd/HP/hp-laserjet_p4014n-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4014n.ppd.gz
-share/ppd/HP/hp-laserjet_p4015-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015.ppd.gz
-share/ppd/HP/hp-laserjet_p4015dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015dn.ppd.gz
-share/ppd/HP/hp-laserjet_p4015n-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015n.ppd.gz
-share/ppd/HP/hp-laserjet_p4015tn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015tn.ppd.gz
-share/ppd/HP/hp-laserjet_p4015x-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4015x.ppd.gz
-share/ppd/HP/hp-laserjet_p4515-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515.ppd.gz
-share/ppd/HP/hp-laserjet_p4515n-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515n.ppd.gz
-share/ppd/HP/hp-laserjet_p4515tn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515tn.ppd.gz
-share/ppd/HP/hp-laserjet_p4515x-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515x.ppd.gz
-share/ppd/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_p4515xm.ppd.gz
+share/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
+share/ppd/HP/hp-laserjet_pro_m402_m403-ps.ppd.gz
+share/ppd/HP/hp-laserjet_pro_m402_m403d-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
 share/ppd/HP/hp-laserjet_pro_m706-ps.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125a.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125nw.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125rnw.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m126a.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m126nw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m126nw.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m127fn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m127fn.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m127fp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m127fp.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m127fw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m127fw.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m128fn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m128fn.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m128fp.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m128fw.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
-share/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125r.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_pro_mfp_m125ra.ppd.gz
 share/ppd/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1136_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1137_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1137_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1138_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1138_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1139_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1139_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1212nf_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1213nf_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1213nf_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1214nfh_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1214nfh_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1216nfh_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1216nfh_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1217nfw_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1218nfg_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1218nfg_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1218nfs_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1218nfs_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1219nf_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1219nf_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1219nfg_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1219nfg_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1219nfs_mfp-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_m1219nfs_mfp.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1102.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1102w.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1106-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1106.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1106w-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1106w.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1107-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1107.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1107w-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1107w.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1108-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1108.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1108w-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1108w.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1109-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1109.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1109w-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1109w.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1566.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1567-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1567.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1568-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1568.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1569-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1569.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1606dn.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1607dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1607dn.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1608dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1608dn.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1609dn-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p1609dn.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p_1102w-hpijs.ppd.gz
-share/ppd/HP/hp-laserjet_professional_p_1102w.ppd.gz
+share/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
 share/ppd/HP/hp-lj_300_400_color_m351_m451-ps.ppd.gz
 share/ppd/HP/hp-lj_300_400_color_mfp_m375_m475-ps.ppd.gz
-share/ppd/HP/hp-mopier_240-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-mopier_240-pcl3.ppd.gz
 share/ppd/HP/hp-mopier_240-ps.ppd.gz
-share/ppd/HP/hp-mopier_320-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-mopier_320-pcl3.ppd.gz
 share/ppd/HP/hp-mopier_320-ps.ppd.gz
-share/ppd/HP/hp-officejet-hpijs.ppd.gz
-share/ppd/HP/hp-officejet.ppd.gz
-share/ppd/HP/hp-officejet_100_mobile_l411-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_100_mobile_l411.ppd.gz
-share/ppd/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_150_mobile_l511.ppd.gz
-share/ppd/HP/hp-officejet_2620_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_2620_series.ppd.gz
-share/ppd/HP/hp-officejet_4000_k210-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4000_k210.ppd.gz
-share/ppd/HP/hp-officejet_4100_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4100_series.ppd.gz
-share/ppd/HP/hp-officejet_4105-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4105.ppd.gz
-share/ppd/HP/hp-officejet_4115_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4115_series.ppd.gz
-share/ppd/HP/hp-officejet_4200_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4200_series.ppd.gz
-share/ppd/HP/hp-officejet_4255-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4255.ppd.gz
-share/ppd/HP/hp-officejet_4300_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4300_series.ppd.gz
-share/ppd/HP/hp-officejet_4400_k410-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4400_k410.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510a-f.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510g-m.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510n-z-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4500_g510n-z.ppd.gz
-share/ppd/HP/hp-officejet_4500_k710-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4500_k710.ppd.gz
-share/ppd/HP/hp-officejet_4610_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4610_series.ppd.gz
-share/ppd/HP/hp-officejet_4620_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4620_series.ppd.gz
-share/ppd/HP/hp-officejet_4630_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_4630_series.ppd.gz
-share/ppd/HP/hp-officejet_5100_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_5100_series.ppd.gz
-share/ppd/HP/hp-officejet_5105-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_5105.ppd.gz
-share/ppd/HP/hp-officejet_5110-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_5110.ppd.gz
-share/ppd/HP/hp-officejet_5110v-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_5110v.ppd.gz
-share/ppd/HP/hp-officejet_5500_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_5500_series.ppd.gz
-share/ppd/HP/hp-officejet_5600_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_5600_series.ppd.gz
-share/ppd/HP/hp-officejet_5740_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_5740_series.ppd.gz
-share/ppd/HP/hp-officejet_6000_e609a-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6000_e609a.ppd.gz
-share/ppd/HP/hp-officejet_6000_e609n-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6000_e609n.ppd.gz
-share/ppd/HP/hp-officejet_6100-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6100.ppd.gz
-share/ppd/HP/hp-officejet_6100_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6100_series.ppd.gz
-share/ppd/HP/hp-officejet_6150_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6150_series.ppd.gz
-share/ppd/HP/hp-officejet_6200_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6200_series.ppd.gz
-share/ppd/HP/hp-officejet_6300_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6300_series.ppd.gz
-share/ppd/HP/hp-officejet_6500_e709a-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6500_e709a.ppd.gz
-share/ppd/HP/hp-officejet_6500_e709n-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6500_e709n.ppd.gz
-share/ppd/HP/hp-officejet_6500_e710a-f-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6500_e710a-f.ppd.gz
-share/ppd/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6500_e710n-z.ppd.gz
-share/ppd/HP/hp-officejet_6600-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6600.ppd.gz
-share/ppd/HP/hp-officejet_6700-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6700.ppd.gz
-share/ppd/HP/hp-officejet_6800-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_6800.ppd.gz
-share/ppd/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7000_e809a.ppd.gz
-share/ppd/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7000_e809a_series.ppd.gz
-share/ppd/HP/hp-officejet_7100_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7100_series.ppd.gz
-share/ppd/HP/hp-officejet_7110_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7110_series.ppd.gz
-share/ppd/HP/hp-officejet_7200_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7200_series.ppd.gz
-share/ppd/HP/hp-officejet_7300_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7300_series.ppd.gz
-share/ppd/HP/hp-officejet_7400_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7400_series.ppd.gz
-share/ppd/HP/hp-officejet_7500_e910-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7500_e910.ppd.gz
-share/ppd/HP/hp-officejet_7610_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_7610_series.ppd.gz
-share/ppd/HP/hp-officejet_8040_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_8040_series.ppd.gz
-share/ppd/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz
-share/ppd/HP/hp-officejet_9100_series-pcl3.ppd.gz
 share/ppd/HP/hp-officejet_color_mfp_x585.ppd.gz
 share/ppd/HP/hp-officejet_color_x555-ps.ppd.gz
-share/ppd/HP/hp-officejet_d_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_d_series.ppd.gz
-share/ppd/HP/hp-officejet_g55-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_g55.ppd.gz
-share/ppd/HP/hp-officejet_g55xi-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_g55xi.ppd.gz
-share/ppd/HP/hp-officejet_g85-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_g85.ppd.gz
-share/ppd/HP/hp-officejet_g85xi-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_g85xi.ppd.gz
-share/ppd/HP/hp-officejet_g95-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_g95.ppd.gz
-share/ppd/HP/hp-officejet_h470-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_h470.ppd.gz
-share/ppd/HP/hp-officejet_j3500_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j3500_series.ppd.gz
-share/ppd/HP/hp-officejet_j3600_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j3600_series.ppd.gz
-share/ppd/HP/hp-officejet_j4500_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j4500_series.ppd.gz
-share/ppd/HP/hp-officejet_j4660_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j4660_series.ppd.gz
-share/ppd/HP/hp-officejet_j4680_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j4680_series.ppd.gz
-share/ppd/HP/hp-officejet_j5500_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j5500_series.ppd.gz
-share/ppd/HP/hp-officejet_j5700_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j5700_series.ppd.gz
-share/ppd/HP/hp-officejet_j6400_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_j6400_series.ppd.gz
-share/ppd/HP/hp-officejet_k60-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_k60.ppd.gz
-share/ppd/HP/hp-officejet_k60xi-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_k60xi.ppd.gz
-share/ppd/HP/hp-officejet_k7100-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_k7100.ppd.gz
-share/ppd/HP/hp-officejet_k80-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_k80.ppd.gz
-share/ppd/HP/hp-officejet_k80xi-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_k80xi.ppd.gz
-share/ppd/HP/hp-officejet_lx-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_lx.ppd.gz
-share/ppd/HP/hp-officejet_pro_1150c-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_1150c.ppd.gz
-share/ppd/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_1170c_series.ppd.gz
 share/ppd/HP/hp-officejet_pro_251dw_printer-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_276dw_mfp-ps.ppd.gz
-share/ppd/HP/hp-officejet_pro_3610-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_3610.ppd.gz
-share/ppd/HP/hp-officejet_pro_3620-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_3620.ppd.gz
 share/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
 share/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
-share/ppd/HP/hp-officejet_pro_6230-hpijs.ppd.gz 
-share/ppd/HP/hp-officejet_pro_6230.ppd.gz 
-share/ppd/HP/hp-officejet_pro_6830-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_6830.ppd.gz
-share/ppd/HP/hp-officejet_pro_8640-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8640.ppd.gz
-share/ppd/HP/hp-officejet_pro_8660-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8660.ppd.gz
-share/ppd/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz
 share/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
-share/ppd/HP/hp-officejet_pro_8100-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8100.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a909a.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a909g.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a909n.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a910-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8500_a910.ppd.gz
-share/ppd/HP/hp-officejet_pro_8600-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8600.ppd.gz
-share/ppd/HP/hp-officejet_pro_8610-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8610.ppd.gz
-share/ppd/HP/hp-officejet_pro_8620-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8620.ppd.gz
-share/ppd/HP/hp-officejet_pro_8630-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_8630.ppd.gz
-share/ppd/HP/hp-officejet_pro_k5300-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_k5300.ppd.gz
-share/ppd/HP/hp-officejet_pro_k5400-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_k5400.ppd.gz
-share/ppd/HP/hp-officejet_pro_k550-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_k550.ppd.gz
-share/ppd/HP/hp-officejet_pro_k850-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_k850.ppd.gz
-share/ppd/HP/hp-officejet_pro_k8600-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_k8600.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7300-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7300.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7400-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7400.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7500-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7500.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7600-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7600.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7700-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_pro_l7700.ppd.gz
-share/ppd/HP/hp-officejet_r40-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_r40.ppd.gz
-share/ppd/HP/hp-officejet_r40xi-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_r40xi.ppd.gz
-share/ppd/HP/hp-officejet_r45-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_r45.ppd.gz
-share/ppd/HP/hp-officejet_r60-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_r60.ppd.gz
-share/ppd/HP/hp-officejet_r65-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_r65.ppd.gz
-share/ppd/HP/hp-officejet_r80-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_r80.ppd.gz
-share/ppd/HP/hp-officejet_r80xi-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_r80xi.ppd.gz
-share/ppd/HP/hp-officejet_series_300-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_300.ppd.gz
-share/ppd/HP/hp-officejet_series_310-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_310.ppd.gz
-share/ppd/HP/hp-officejet_series_320-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_320.ppd.gz
-share/ppd/HP/hp-officejet_series_330-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_330.ppd.gz
-share/ppd/HP/hp-officejet_series_350-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_350.ppd.gz
-share/ppd/HP/hp-officejet_series_520-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_520.ppd.gz
-share/ppd/HP/hp-officejet_series_570-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_570.ppd.gz
-share/ppd/HP/hp-officejet_series_580-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_580.ppd.gz
-share/ppd/HP/hp-officejet_series_590-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_590.ppd.gz
-share/ppd/HP/hp-officejet_series_600-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_600.ppd.gz
-share/ppd/HP/hp-officejet_series_610-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_610.ppd.gz
-share/ppd/HP/hp-officejet_series_630-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_630.ppd.gz
-share/ppd/HP/hp-officejet_series_700-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_700.ppd.gz
-share/ppd/HP/hp-officejet_series_710-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_710.ppd.gz
-share/ppd/HP/hp-officejet_series_720-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_720.ppd.gz
-share/ppd/HP/hp-officejet_series_725-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_series_725.ppd.gz
-share/ppd/HP/hp-officejet_t_series-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_t_series.ppd.gz
-share/ppd/HP/hp-officejet_v30-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_v30.ppd.gz
-share/ppd/HP/hp-officejet_v40-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_v40.ppd.gz
-share/ppd/HP/hp-officejet_v40xi-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_v40xi.ppd.gz
-share/ppd/HP/hp-officejet_v45-hpijs.ppd.gz
-share/ppd/HP/hp-officejet_v45.ppd.gz
-share/ppd/HP/hp-photosmart_100-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_100.ppd.gz
-share/ppd/HP/hp-photosmart_1115-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_1115.ppd.gz
-share/ppd/HP/hp-photosmart_1215-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_1215.ppd.gz
-share/ppd/HP/hp-photosmart_1218-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_1218.ppd.gz
-share/ppd/HP/hp-photosmart_130-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_130.ppd.gz
-share/ppd/HP/hp-photosmart_1315-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_1315.ppd.gz
-share/ppd/HP/hp-photosmart_140_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_140_series.ppd.gz
-share/ppd/HP/hp-photosmart_230-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_230.ppd.gz
-share/ppd/HP/hp-photosmart_240_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_240_series.ppd.gz
-share/ppd/HP/hp-photosmart_2570_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_2570_series.ppd.gz
-share/ppd/HP/hp-photosmart_2600_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_2600_series.ppd.gz
-share/ppd/HP/hp-photosmart_2700_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_2700_series.ppd.gz
-share/ppd/HP/hp-photosmart_3100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_3100_series.ppd.gz
-share/ppd/HP/hp-photosmart_3200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_3200_series.ppd.gz
-share/ppd/HP/hp-photosmart_320_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_320_series.ppd.gz
-share/ppd/HP/hp-photosmart_3300_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_3300_series.ppd.gz
-share/ppd/HP/hp-photosmart_330_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_330_series.ppd.gz
-share/ppd/HP/hp-photosmart_370_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_370_series.ppd.gz
-share/ppd/HP/hp-photosmart_380_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_380_series.ppd.gz
-share/ppd/HP/hp-photosmart_420_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_420_series.ppd.gz
-share/ppd/HP/hp-photosmart_470_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_470_series.ppd.gz
-share/ppd/HP/hp-photosmart_5510_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_5510_series.ppd.gz
-share/ppd/HP/hp-photosmart_5510d_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_5510d_series.ppd.gz
-share/ppd/HP/hp-photosmart_5520_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_5520_series.ppd.gz
-share/ppd/HP/hp-photosmart_6510_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_6510_series.ppd.gz
-share/ppd/HP/hp-photosmart_6520_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_6520_series.ppd.gz
-share/ppd/HP/hp-photosmart_7150-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7150.ppd.gz
-share/ppd/HP/hp-photosmart_7200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7200_series.ppd.gz
-share/ppd/HP/hp-photosmart_7345-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7345.ppd.gz
-share/ppd/HP/hp-photosmart_7350-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7350.ppd.gz
-share/ppd/HP/hp-photosmart_7400_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7400_series.ppd.gz
-share/ppd/HP/hp-photosmart_7510_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7510_series.ppd.gz
-share/ppd/HP/hp-photosmart_7520_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7520_series.ppd.gz
-share/ppd/HP/hp-photosmart_7550-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7550.ppd.gz
-share/ppd/HP/hp-photosmart_7600_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7600_series.ppd.gz
-share/ppd/HP/hp-photosmart_7700_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7700_series.ppd.gz
-share/ppd/HP/hp-photosmart_7800_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7800_series.ppd.gz
-share/ppd/HP/hp-photosmart_7900_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_7900_series.ppd.gz
-share/ppd/HP/hp-photosmart_8000_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_8000_series.ppd.gz
-share/ppd/HP/hp-photosmart_8100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_8100_series.ppd.gz
-share/ppd/HP/hp-photosmart_8200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_8200_series.ppd.gz
-share/ppd/HP/hp-photosmart_8400_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_8400_series.ppd.gz
-share/ppd/HP/hp-photosmart_8700_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_8700_series.ppd.gz
-share/ppd/HP/hp-photosmart_a310_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a310_series.ppd.gz
-share/ppd/HP/hp-photosmart_a320_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a320_series.ppd.gz
-share/ppd/HP/hp-photosmart_a430_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a430_series.ppd.gz
-share/ppd/HP/hp-photosmart_a440_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a440_series.ppd.gz
-share/ppd/HP/hp-photosmart_a510_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a510_series.ppd.gz
-share/ppd/HP/hp-photosmart_a520_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a520_series.ppd.gz
-share/ppd/HP/hp-photosmart_a530_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a530_series.ppd.gz
-share/ppd/HP/hp-photosmart_a610_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a610_series.ppd.gz
-share/ppd/HP/hp-photosmart_a620_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a620_series.ppd.gz
-share/ppd/HP/hp-photosmart_a630_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a630_series.ppd.gz
-share/ppd/HP/hp-photosmart_a640_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a640_series.ppd.gz
-share/ppd/HP/hp-photosmart_a710_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a710_series.ppd.gz
-share/ppd/HP/hp-photosmart_a820_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_a820_series.ppd.gz
-share/ppd/HP/hp-photosmart_b010_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_b010_series.ppd.gz
-share/ppd/HP/hp-photosmart_b109a-m-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_b109a-m.ppd.gz
-share/ppd/HP/hp-photosmart_b109a_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_b109a_series.ppd.gz
-share/ppd/HP/hp-photosmart_b110_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_b110_series.ppd.gz
-share/ppd/HP/hp-photosmart_b8500_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_b8500_series.ppd.gz
-share/ppd/HP/hp-photosmart_c309a_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c309a_series.ppd.gz
-share/ppd/HP/hp-photosmart_c3100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c3100_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4100_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4200_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4340_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4340_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4380_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4380_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4400_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4400_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4500_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4500_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4600_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4600_series.ppd.gz
-share/ppd/HP/hp-photosmart_c4700_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c4700_series.ppd.gz
-share/ppd/HP/hp-photosmart_c5100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c5100_series.ppd.gz
-share/ppd/HP/hp-photosmart_c5200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c5200_series.ppd.gz
-share/ppd/HP/hp-photosmart_c5300_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c5300_series.ppd.gz
-share/ppd/HP/hp-photosmart_c5500_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c5500_series.ppd.gz
-share/ppd/HP/hp-photosmart_c6100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c6100_series.ppd.gz
-share/ppd/HP/hp-photosmart_c6200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c6200_series.ppd.gz
-share/ppd/HP/hp-photosmart_c6300_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c6300_series.ppd.gz
-share/ppd/HP/hp-photosmart_c7100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c7100_series.ppd.gz
-share/ppd/HP/hp-photosmart_c7200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c7200_series.ppd.gz
-share/ppd/HP/hp-photosmart_c8100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_c8100_series.ppd.gz
-share/ppd/HP/hp-photosmart_d110_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d110_series.ppd.gz
-share/ppd/HP/hp-photosmart_d5060_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d5060_series.ppd.gz
-share/ppd/HP/hp-photosmart_d5100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d5100_series.ppd.gz
-share/ppd/HP/hp-photosmart_d5300_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d5300_series.ppd.gz
-share/ppd/HP/hp-photosmart_d5400_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d5400_series.ppd.gz
-share/ppd/HP/hp-photosmart_d6100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d6100_series.ppd.gz
-share/ppd/HP/hp-photosmart_d7100_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d7100_series.ppd.gz
-share/ppd/HP/hp-photosmart_d7200_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d7200_series.ppd.gz
-share/ppd/HP/hp-photosmart_d7300_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d7300_series.ppd.gz
-share/ppd/HP/hp-photosmart_d7400_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d7400_series.ppd.gz
-share/ppd/HP/hp-photosmart_d7500_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_d7500_series.ppd.gz
-share/ppd/HP/hp-photosmart_estn_c510_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_estn_c510_series.ppd.gz
-share/ppd/HP/hp-photosmart_ink_adv_k510-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_ink_adv_k510.ppd.gz
-share/ppd/HP/hp-photosmart_p1000-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_p1000.ppd.gz
-share/ppd/HP/hp-photosmart_p1100-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_p1100.ppd.gz
-share/ppd/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_plus_b209a-m.ppd.gz
-share/ppd/HP/hp-photosmart_plus_b210_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_plus_b210_series.ppd.gz
-share/ppd/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_prem-web_c309n-s.ppd.gz
-share/ppd/HP/hp-photosmart_prem_c310_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_prem_c310_series.ppd.gz
-share/ppd/HP/hp-photosmart_prem_c410_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_prem_c410_series.ppd.gz
-share/ppd/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_premium_c309g-m.ppd.gz
-share/ppd/HP/hp-photosmart_pro_b8300_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_pro_b8300_series.ppd.gz
-share/ppd/HP/hp-photosmart_pro_b8800_series-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_pro_b8800_series.ppd.gz
-share/ppd/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz
-share/ppd/HP/hp-photosmart_wireless_b109n-z.ppd.gz
-share/ppd/HP/hp-printer_scanner_copier_300-hpijs.ppd.gz
-share/ppd/HP/hp-printer_scanner_copier_300.ppd.gz
-share/ppd/HP/hp-psc_1000_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1000_series.ppd.gz
-share/ppd/HP/hp-psc_1100_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1100_series.ppd.gz
-share/ppd/HP/hp-psc_1200_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1200_series.ppd.gz
-share/ppd/HP/hp-psc_1300_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1300_series.ppd.gz
-share/ppd/HP/hp-psc_1310_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1310_series.ppd.gz
-share/ppd/HP/hp-psc_1358_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1358_series.ppd.gz
-share/ppd/HP/hp-psc_1400_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1400_series.ppd.gz
-share/ppd/HP/hp-psc_1500_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1500_series.ppd.gz
-share/ppd/HP/hp-psc_1510_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1510_series.ppd.gz
-share/ppd/HP/hp-psc_1600_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_1600_series.ppd.gz
-share/ppd/HP/hp-psc_2100_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2100_series.ppd.gz
-share/ppd/HP/hp-psc_2150_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2150_series.ppd.gz
-share/ppd/HP/hp-psc_2170_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2170_series.ppd.gz
-share/ppd/HP/hp-psc_2200_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2200_series.ppd.gz
-share/ppd/HP/hp-psc_2210_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2210_series.ppd.gz
-share/ppd/HP/hp-psc_2300_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2300_series.ppd.gz
-share/ppd/HP/hp-psc_2350_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2350_series.ppd.gz
-share/ppd/HP/hp-psc_2400_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2400_series.ppd.gz
-share/ppd/HP/hp-psc_2500_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_2500_series.ppd.gz
-share/ppd/HP/hp-psc_500-hpijs.ppd.gz
-share/ppd/HP/hp-psc_500.ppd.gz
-share/ppd/HP/hp-psc_720-hpijs.ppd.gz
-share/ppd/HP/hp-psc_720.ppd.gz
-share/ppd/HP/hp-psc_750-hpijs.ppd.gz
-share/ppd/HP/hp-psc_750.ppd.gz
-share/ppd/HP/hp-psc_750xi-hpijs.ppd.gz
-share/ppd/HP/hp-psc_750xi.ppd.gz
-share/ppd/HP/hp-psc_760-hpijs.ppd.gz
-share/ppd/HP/hp-psc_760.ppd.gz
-share/ppd/HP/hp-psc_780-hpijs.ppd.gz
-share/ppd/HP/hp-psc_780.ppd.gz
-share/ppd/HP/hp-psc_780xi-hpijs.ppd.gz
-share/ppd/HP/hp-psc_780xi.ppd.gz
-share/ppd/HP/hp-psc_900_series-hpijs.ppd.gz
-share/ppd/HP/hp-psc_900_series.ppd.gz
-share/ppd/HP/hp-psc_920-hpijs.ppd.gz
-share/ppd/HP/hp-psc_920.ppd.gz
-share/ppd/HP/hp-psc_950-hpijs.ppd.gz
-share/ppd/HP/hp-psc_950.ppd.gz
-share/ppd/HP/hp-psc_950vr-hpijs.ppd.gz
-share/ppd/HP/hp-psc_950vr.ppd.gz
-share/ppd/HP/hp-psc_950xi-hpijs.ppd.gz
-share/ppd/HP/hp-psc_950xi.ppd.gz
-%%QT%%@dir %%DATADIR%%/ui4/plugins
+%%X11%%@dir %%DATADIR%%/ui4/plugins
+@dir /var/lib/hp
+@dir /var/lib
 %%SCAN%%@exec if ! grep ^hpaio %%LOCALBASE%%/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then echo hpaio >> %%LOCALBASE%%/etc/sane.d/dll.conf; fi
 %%SCAN%%@unexec sed -i "" -e '/^hpaio$/d' %%LOCALBASE%%/etc/sane.d/dll.conf
diff --git a/print/kde4-print-manager/Makefile b/print/kde4-print-manager/Makefile
index 2bba31aad50f..f9d212437f48 100644
--- a/print/kde4-print-manager/Makefile
+++ b/print/kde4-print-manager/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	print-manager
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	print kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -9,7 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Printer manager for KDE 4
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 
 USES=		cmake:outsource tar:xz
 USE_KDE4=	kdelibs kdeprefix automoc4
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index f6c518c8924c..9380ec3d9489 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgnomecups
 PORTVERSION=	0.2.3
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Support library for gnome cups administration
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 
 USES=		pkgconfig pathfix gettext gmake libtool:keepla tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/print/linux-c6-cups-libs/Makefile b/print/linux-c6-cups-libs/Makefile
index 722952fc9830..b4ce43fb3a16 100644
--- a/print/linux-c6-cups-libs/Makefile
+++ b/print/linux-c6-cups-libs/Makefile
@@ -17,6 +17,6 @@ SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 RPMVERSION=	72.el6
 USE_LDCONFIG=	yes
 
-DESCR=		${.CURDIR}/../cups-base/pkg-descr
+DESCR=		${.CURDIR}/../cups/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/print/linux-f10-cups-libs/Makefile b/print/linux-f10-cups-libs/Makefile
index 399bee859c5a..e129584e9fb5 100644
--- a/print/linux-f10-cups-libs/Makefile
+++ b/print/linux-f10-cups-libs/Makefile
@@ -17,6 +17,6 @@ RPMVERSION=	4.fc10
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	usr/lib/libcups.so.2 usr/lib/libcupsimage.so.2
-DESCR=		${.CURDIR}/../cups-base/pkg-descr
+DESCR=		${.CURDIR}/../cups/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 2f8d906bc9f7..0b693e5b7a7f 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	muttprint
 PORTVERSION=	0.73
+PORTREVISION=	1
 CATEGORIES=	print mail
 MASTER_SITES=	SF/muttprint/muttprint/muttprint-${PORTVERSION}
 
@@ -29,8 +30,7 @@ OPTIONS_DEFINE=		CUPS X11
 OPTIONS_DEFAULT=	X11
 X11_DESC=		graphics/ImageMagick[-nox11] dependency
 
-CUPS_RUN_DEPENDS=	cupstestppd:${PORTSDIR}/print/cups-base \
-			espgs:${PORTSDIR}/print/cups-pstoraster
+CUPS_RUN_DEPENDS=	lpr-cups:${PORTSDIR}/print/cups
 
 .if !defined(PAPERSIZE)
 PAPERSIZE=	letter
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 9b05db8404de..4060fda3c92d 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openprinting
 PORTVERSION=	1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print net
 MASTER_SITES=	SF/openprinting/papi/1.0%20Beta
 DISTNAME=	papi-${PORTVERSION}_beta
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=--without-apache
 .endif
 
 .if defined(WITH_PSM_CUPS)
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=--with-cups=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-cups
diff --git a/print/p5-Net-CUPS/Makefile b/print/p5-Net-CUPS/Makefile
index 9ba0c15c7555..d79cec6aaa4b 100644
--- a/print/p5-Net-CUPS/Makefile
+++ b/print/p5-Net-CUPS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Net-CUPS
 PORTVERSION=	0.61
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,8 +14,7 @@ COMMENT=	Interface to the CUPS API
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-client
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups-image \
+LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups \
 		libcupsfilters.so:${PORTSDIR}/print/cups-filters
 
 USES=		perl5
diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile
index c4126f2a258d..9f6365fe3db0 100644
--- a/print/photoprint/Makefile
+++ b/print/photoprint/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	photoprint
 DISTVERSION=	0.4.2-pre2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print graphics
 MASTER_SITES=	http://www.blackfiveimaging.co.uk/photoprint/
 
@@ -11,7 +11,7 @@ COMMENT=	Utility to print multiple images per sheet
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
 		libgutenprint.so:${PORTSDIR}/print/gutenprint-base \
 		liblcms.so:${PORTSDIR}/graphics/lcms \
 		libnetpbm.so:${PORTSDIR}/graphics/netpbm \
diff --git a/print/py-pycups/Makefile b/print/py-pycups/Makefile
index 3e4e55978c2d..756bc8a8776c 100644
--- a/print/py-pycups/Makefile
+++ b/print/py-pycups/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pycups
 PORTVERSION=	1.9.73
+PORTREVISION=	1
 CATEGORIES=	print python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	CUPS bindings for Python
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 
 USE_PYTHON=	autoplist concurrent distutils
 USES=		iconv localbase python tar:bzip2
diff --git a/print/qpdf/Makefile b/print/qpdf/Makefile
index 5bfdacc81a4d..6f23a5e649c3 100644
--- a/print/qpdf/Makefile
+++ b/print/qpdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qpdf
 PORTVERSION=	5.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	SF
 
diff --git a/print/qpdf/files/patch-libqpdf.pc.in b/print/qpdf/files/patch-libqpdf.pc.in
new file mode 100644
index 000000000000..b5c7f6733c18
--- /dev/null
+++ b/print/qpdf/files/patch-libqpdf.pc.in
@@ -0,0 +1,11 @@
+--- libqpdf.pc.in.orig	2014-06-07 21:06:13 UTC
++++ libqpdf.pc.in
+@@ -6,6 +6,7 @@ includedir=@includedir@
+ Name: libqpdf
+ Description: PDF transformation library
+ Version: @PACKAGE_VERSION@
+-Requires.private: zlib, libpcre
++Requires.private: libpcre
+ Libs: -L${libdir} -lqpdf
++Libs.private: -lz
+ Cflags: -I${includedir}
diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index c2c619a1bce7..c3fdc9b2e3c2 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qpdfview
 PORTVERSION=	0.4.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	https://launchpadlibrarian.net/226592308/ \
 	https://launchpad.net/${PORTVERSION}/trunk/${PORTVERSION}/+download/
@@ -29,7 +29,7 @@ OPTIONS_DEFAULT=	QT4 CUPS PS
 OPTIONS_SUB=	yes
 
 CUPS_QMAKE_OFF=	"CONFIG+=without_cups"
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 
 DJVU_LIB_DEPENDS=	libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
 DJVU_QMAKE_OFF=	"CONFIG+=without_djvu"
diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile
index 9e15e23870a3..9a1e4e6bcce8 100644
--- a/print/qt5-printsupport/Makefile
+++ b/print/qt5-printsupport/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	printsupport
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	print
 PKGNAMEPREFIX=	qt5-
 
@@ -22,7 +23,7 @@ OPTIONS_SUB=	yes
 
 CUPS_CONFIGURE_ON=	-cups
 CUPS_CONFIGURE_OFF=	-no-cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 
 .include <bsd.port.options.mk>
 
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 9be4c9c9901b..d46e1ead2fde 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	scribus
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	print editors
 MASTER_SITES=	SF \
 		http://www.scribus.net/downloads/${PORTVERSION}/
@@ -13,7 +14,7 @@ COMMENT=	Comprehensive desktop publishing program
 LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libcups.so:${PORTSDIR}/print/cups-client \
+		libcups.so:${PORTSDIR}/print/cups \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpodofo.so:${PORTSDIR}/graphics/podofo \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
diff --git a/print/splix/Makefile b/print/splix/Makefile
index 617a83b6079a..dbac762a5a48 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -2,16 +2,14 @@
 
 PORTNAME=	splix
 PORTVERSION=	2.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES?=	print
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CUPS printer drivers for Samsung Printer Language printers
 
-LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups-image
-BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-client
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups
 
 USES=		gmake tar:bzip2
 
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index d77f9f21cba2..f9dcb1b820cf 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	system-config-printer
 PORTVERSION=	1.4.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print gnome
 MASTER_SITES=	http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
 
@@ -12,7 +12,7 @@ COMMENT=	CUPS configuration Gtk+2.0 GUI
 
 BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
 		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-pycups \
 		${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-pycurl \
 		${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 06fc6f9aa379..bc6c0aee4743 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.6.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	print xfce
 MASTER_SITES=	XFCE/src/archive/xfprint/${PORTVERSION:R}
 DISTNAME=	xfprint-${PORTVERSION}
@@ -30,7 +30,7 @@ OPTIONS_SINGLE=	PRINTMETHOD
 OPTIONS_SINGLE_PRINTMETHOD=	LPR CUPS
 LETTER_DESC=	Use letter paper format instead of A4
 LPR_DESC=	LPR printing system support
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 CUPS_CONFIGURE_ENABLE=	cups
 LPR_CONFIGURE_ENABLE=	bsdlpr
 LPR_CONFIGURE_WITH=	printcap=/etc/printcap
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 8f24832cf795..ae409c029df9 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -3,16 +3,15 @@
 
 PORTNAME=	xpp
 PORTVERSION=	1.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	print
 MASTER_SITES=	SF/cups/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	X11-based printer manager for CUPS
 
-LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
+LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
 		libfltk.so.1:${PORTSDIR}/x11-toolkits/fltk
-BUILD_DEPENDS=	${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base
 
 USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 7208047141f2..ab6d91d6c8e5 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cinnamon-control-center
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/9363a4a1e121344ae98f22b55fb28623cf0f6038/panels/datetime/data/:tzpng
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -58,7 +58,7 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	CUPS
 OPTIONS_DEFAULT=CUPS
 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 
 MISSING_PNG=timezone_8.5.png timezone_8.5_dim.png
 .for i in ${MISSING_PNG}
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index 6e38d00baef2..ad79a71407a3 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cinnamon-settings-daemon
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome3
 
@@ -64,7 +65,7 @@ OPTIONS_DEFINE=	CUPS SMARTCARD
 OPTIONS_DEFAULT=CUPS SMARTCARD
 SMARTCARD_DESC=	Smartcard support
 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 SMARTCARD_CONFIGURE_ENABLE=	smartcard-support
 SMARTCARD_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index da3fcb8b6cb4..ebcd62d1d444 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.18.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -57,7 +58,7 @@ OPTIONS_DEFINE_i386=	CHEESE
 OPTIONS_DEFAULT_i386=	CHEESE
 OPTIONS_DEFINE_amd64=	CHEESE
 OPTIONS_DEFAULT_amd64=	CHEESE
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client \
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups \
 			libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
 CUPS_CONFIGURE_ENABLE=	cups
 CHEESE_LIB_DEPENDS=	libcheese.so:${PORTSDIR}/multimedia/cheese
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 5335333e733a..2508538d10a5 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	3.18.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -51,7 +52,7 @@ OPTIONS_DEFINE=	CUPS SMARTCARD
 OPTIONS_DEFAULT=CUPS SMARTCARD
 SMARTCARD_DESC=	Smartcard support
 CUPS_CONFIGURE_ENABLE=	cups
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 SMARTCARD_CONFIGURE_ENABLE=	smartcard-support
 SMARTCARD_LIB_DEPENDS=	libnss3.so:${PORTSDIR}/security/nss
 
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index d7c7d715873b..a4c9ff2e1f48 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	48.0.2564.116
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -34,7 +35,7 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
-		libcups.so:${PORTSDIR}/print/cups-client \
+		libcups.so:${PORTSDIR}/print/cups \
 		libevent.so:${PORTSDIR}/devel/libevent2 \
 		libexif.so:${PORTSDIR}/graphics/libexif \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 15df0ece5442..2014854cc190 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/${MASTER_SITES_VER_PATH}/ \
 		ftp://opera.inode.at/${MASTER_SITES_VER_PATH}/ \
@@ -42,7 +42,7 @@ NO_OPTIONS_SORT=yes
 CUPS_DESC=	support for printing (requires CUPS)
 VIDEO_DESC=	support for HTML5 video (requires GStreamer)
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 
 VIDEO_USE=	gstreamer=vorbis,ogg,theora,vp8,good
 GTK2_USE=	gnome=gtk20,libxml2
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 1850933d7a39..1077b64738cb 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.4.35
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
@@ -62,7 +62,7 @@ CONFIGURE_ARGS+=	--with-xshm=no
 .endif
 #
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index ba7283badd4b..4b04b8ff7915 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnustep-gui
 PORTVERSION=	0.24.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	GNUSTEP/core
 
@@ -48,7 +48,7 @@ MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
 PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 
 CUPS_CONFIGURE_ENABLE=		cups
-CUPS_LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
 ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
 ASPELL_CONFIGURE_ENABLE=	aspell
 
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 6c3f7bc46706..bf78d4694a52 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.24.29
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	2
@@ -42,7 +42,7 @@ OPTIONS_DEFINE=	CUPS DEBUG
 OPTIONS_DEFAULT=CUPS
 OPTIONS_SUB=	yes
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 CUPS_CONFIGURE_ON=	--enable-cups=auto
 CUPS_CONFIGURE_OFF=	--disable-cups
 DEBUG_CONFIGURE_ON=	--enable-debug=yes
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index ed4533c43bc7..6f636bc0a079 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	3.18.8
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	3
@@ -65,7 +65,7 @@ COLORD_DESC=	Color profile support
 COLORD_LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord
 COLORD_CONFIGURE_ENABLE=colord
 
-CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client
+CUPS_LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups
 CUPS_CONFIGURE_ENABLE=	cups
 
 CLOUDPRINT_DESC=	Cloud printing support
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index fd10ed8d0bf4..5ab8239a63d9 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gui
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 PKGNAMEPREFIX=	qt4-
 
@@ -51,7 +52,7 @@ FONTENCOD=	${LOCALBASE}/share/fonts/encodings/encodings.dir
 .include "${.CURDIR}/../../devel/qt4/files/Makefile.options"
 
 .if ${QT4_OPTIONS:MCUPS}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcups.a:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups
 CONFIGURE_ARGS+=-cups -L${LOCALBASE}/lib -I. -I${LOCALBASE}/include
 .endif