[Midnightbsd-cvs] mports [19559] trunk/print: update most print ports

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Jul 8 21:08:36 EDT 2015


Revision: 19559
          http://svnweb.midnightbsd.org/mports/?rev=19559
Author:   laffer1
Date:     2015-07-08 21:08:35 -0400 (Wed, 08 Jul 2015)
Log Message:
-----------
update most print ports

Modified Paths:
--------------
    trunk/print/Makefile
    trunk/print/a2ps/Makefile
    trunk/print/a2ps/pkg-plist
    trunk/print/adobe-cmaps/Makefile
    trunk/print/adobe-cmaps/distinfo
    trunk/print/adobe-cmaps/pkg-plist
    trunk/print/cups/Makefile
    trunk/print/cups-base/Makefile
    trunk/print/cups-base/distinfo
    trunk/print/cups-base/files/cupsd.in
    trunk/print/cups-base/files/patch-conf-Makefile
    trunk/print/cups-base/files/patch-configure
    trunk/print/cups-base/files/ulpt-cupsd.conf.in
    trunk/print/cups-base/files/ulpt-cupsd.sh.in
    trunk/print/cups-base/pkg-descr
    trunk/print/cups-base/pkg-descr.client
    trunk/print/cups-base/pkg-descr.image
    trunk/print/cups-base/pkg-plist
    trunk/print/cups-base/pkg-plist.client
    trunk/print/cups-base/pkg-plist.image
    trunk/print/cups-client/Makefile
    trunk/print/cups-pstoraster/Makefile
    trunk/print/cups-pstoraster/distinfo
    trunk/print/cups-pstoraster/pkg-plist
    trunk/print/enscript-letter/Makefile
    trunk/print/enscript-letter/distinfo
    trunk/print/enscript-letter/pkg-descr
    trunk/print/enscript-letter/pkg-plist
    trunk/print/fontforge/Makefile
    trunk/print/fontforge/distinfo
    trunk/print/fontforge/files/patch-fontforge_splinefont.h
    trunk/print/foomatic-db/Makefile
    trunk/print/foomatic-db/distinfo
    trunk/print/foomatic-db/pkg-plist
    trunk/print/foomatic-db-engine/distinfo
    trunk/print/foomatic-db-engine/pkg-plist
    trunk/print/foomatic-db-hpijs/distinfo
    trunk/print/foomatic-db-hpijs/pkg-descr
    trunk/print/foomatic-db-hpijs/pkg-plist
    trunk/print/freetype/Makefile
    trunk/print/freetype/pkg-plist
    trunk/print/freetype2/Makefile
    trunk/print/gimp-gutenprint/Makefile
    trunk/print/gsfonts/pkg-plist
    trunk/print/gspdf/Makefile
    trunk/print/gspdf/distinfo
    trunk/print/gspdf/pkg-descr
    trunk/print/gspdf/pkg-plist
    trunk/print/gutenprint-base/Makefile
    trunk/print/gutenprint-base/pkg-plist
    trunk/print/gv/Makefile
    trunk/print/harfbuzz/Makefile
    trunk/print/harfbuzz/distinfo
    trunk/print/hs-hscolour/Makefile
    trunk/print/hs-hscolour/distinfo
    trunk/print/hs-hscolour/pkg-descr
    trunk/print/libgnomecups/Makefile
    trunk/print/libgnomecups/pkg-plist
    trunk/print/libgnomeprintmm/Makefile
    trunk/print/libijs/Makefile
    trunk/print/libotf/Makefile
    trunk/print/mp-letter/Makefile
    trunk/print/mp-letter/distinfo
    trunk/print/mp-letter/pkg-descr
    trunk/print/mp-letter/pkg-plist
    trunk/print/pdflib/Makefile
    trunk/print/pdflib/pkg-plist
    trunk/print/pecl-pdflib/Makefile
    trunk/print/pecl-pdflib/distinfo
    trunk/print/t1utils/Makefile
    trunk/print/t1utils/pkg-plist
    trunk/print/ttf2pt1/Makefile
    trunk/print/ttf2pt1/files/patch-Makefile
    trunk/print/ttf2pt1/files/patch-ft.c
    trunk/print/ttf2pt1/pkg-plist

Added Paths:
-----------
    trunk/print/cups/files/
    trunk/print/cups/files/pkg-message.in
    trunk/print/cups-base/files/patch-data-Makefile
    trunk/print/cups-base/files/patch-data_cups.pam
    trunk/print/cups-base/files/patch-scheduler_Makefile
    trunk/print/cups-base/files/patch-scheduler__auth.c
    trunk/print/cups-pstoraster/files/patch-src__unixinst.mk
    trunk/print/foomatic-db-engine/files/
    trunk/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in
    trunk/print/freetype2/files/patch-builds_unix_detect.mk
    trunk/print/mp-letter/files/patch-Makefile.dist
    trunk/print/mp-letter/files/patch-header.cc
    trunk/print/mp-letter/files/patch-input.cc
    trunk/print/mp-letter/files/patch-main.cc
    trunk/print/mp-letter/files/patch-mp.common.ps
    trunk/print/mp-letter/files/patch-mp.man
    trunk/print/mp-letter/files/patch-print.cc
    trunk/print/mp-letter/files/patch-print.hh
    trunk/print/qpdf/
    trunk/print/qpdf/Makefile
    trunk/print/qpdf/distinfo
    trunk/print/qpdf/files/
    trunk/print/qpdf/files/patch-configure
    trunk/print/qpdf/files/patch-include_QPDFExc.hh
    trunk/print/qpdf/files/patch-include_QUtil.hh
    trunk/print/qpdf/files/patch-include_qpdf_QPDF.hh
    trunk/print/qpdf/pkg-descr
    trunk/print/qpdf/pkg-plist

Removed Paths:
-------------
    trunk/print/acroread9/
    trunk/print/acroreadwrapper/
    trunk/print/amspsfnt/
    trunk/print/cmpsfont/
    trunk/print/cups/pkg-message
    trunk/print/cups-base/files/patch-Makefile
    trunk/print/cups-base/files/patch-cups-request.c
    trunk/print/cups-base/files/patch-cups.pam
    trunk/print/cups-pstoraster/files/patch-src:unixinst.mak
    trunk/print/dvipdfmx/
    trunk/print/dvipsk-tetex/
    trunk/print/enscript-letter/files/
    trunk/print/freetype2/files/patch-aa
    trunk/print/hs-hscolour-docs/
    trunk/print/jadetex/
    trunk/print/mp-letter/files/patch-aa
    trunk/print/mp-letter/files/patch-ab
    trunk/print/mp-letter/files/patch-ac
    trunk/print/mp-letter/files/patch-ad
    trunk/print/mp-letter/files/patch-ae
    trunk/print/teTeX/
    trunk/print/teTeX-base/
    trunk/print/teTeX-texmf/
    trunk/print/wmlpq/
    trunk/print/xdvik/

Modified: trunk/print/Makefile
===================================================================
--- trunk/print/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -3,19 +3,14 @@
 COMMENT = Desktop publishing
 
 SUBDIR += a2ps
-SUBDIR += acroread9
-SUBDIR += acroreadwrapper
 SUBDIR += adobe-cmaps
-SUBDIR += amspsfnt
 SUBDIR += cm-super
-SUBDIR += cmpsfont
 SUBDIR += cups
 SUBDIR += cups-base
 SUBDIR += cups-client
+SUBDIR += cups-filters
 SUBDIR += cups-image
 SUBDIR += cups-pstoraster
-SUBDIR += dvipdfmx
-SUBDIR += dvipsk-tetex
 SUBDIR += enscript-a4
 SUBDIR += enscript-letter
 SUBDIR += fontforge
@@ -33,9 +28,7 @@
 SUBDIR += gv
 SUBDIR += harfbuzz
 SUBDIR += hs-hscolour
-SUBDIR += hs-hscolour-docs
 SUBDIR += indexinfo
-SUBDIR += jadetex
 SUBDIR += libgnomecups
 SUBDIR += libgnomeprint
 SUBDIR += libgnomeprint-reference
@@ -49,10 +42,8 @@
 SUBDIR += pdflib
 SUBDIR += pecl-pdflib
 SUBDIR += psutils
+SUBDIR += qpdf
 SUBDIR += t1utils
-SUBDIR += teTeX
-SUBDIR += teTeX-base
-SUBDIR += teTeX-texmf
 SUBDIR += tex-formats
 SUBDIR += tex-texmflocal
 SUBDIR += texinfo
@@ -59,8 +50,6 @@
 SUBDIR += texlive-base
 SUBDIR += texlive-texmf
 SUBDIR += ttf2pt1
-SUBDIR += wmlpq
-SUBDIR += xdvik
 SUBDIR += xfce4-print
 
 .include <bsd.port.subdir.mk>

Modified: trunk/print/a2ps/Makefile
===================================================================
--- trunk/print/a2ps/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/a2ps/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,11 +2,9 @@
 
 PORTNAME=	a2ps
 PORTVERSION=	4.13b
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		${MASTER_SITE_LOCAL:S/$/:i18n/}
-MASTER_SITE_SUBDIR=	${PORTNAME} hrs/a2ps/:i18n
+MASTER_SITES=	GNU FREEBSD_LOCAL/hrs/a2ps/:i18n
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Formats an ASCII file for printing on a postscript printer
@@ -13,28 +11,25 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	paper:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
 
+USES=		cpe
 USE_PERL5=	yes
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAN1=		a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1 psset.1 \
-		texi2dvi4a2ps.1
 INFO=		a2ps ogonkify regex
 WRKSRC=		${WRKDIR}/${PORTNAME}-4.13
 I18N_PACKAGE=	i18n-fonts-0.1
-PORTSCOUT=	skipv:4.14
+CPE_VENDOR=	gnu
 
-STRIP=
 CONFIGURE_ARGS=	--with-medium=libpaper --sharedstatedir=${PREFIX}/share \
 	--sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share \
 	--localstatedir=${PREFIX}/share
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-MAKE_JOBS_SAFE=	yes
+LIBS+=		-L${LOCALBASE}/lib
 
 PAPERSIZE?=
-.if ${PAPERSIZE:L} == a4
+.if ${PAPERSIZE:tl} == a4
 RUN_DEPENDS+=	${LOCALBASE}/etc/papersize:${PORTSDIR}/print/papersize-default-a4
 .endif
 
@@ -41,31 +36,28 @@
 OPTIONS_DEFINE=NLS I18N EMACS
 OPTIONS_DEFAULT=NLS
 NO_OPTIONS_SORT=yes
+OPTIONS_SUB=	yes
 EMACS_DESC=Enable Emacs support
 I18N_DESC=Enable I18N support
 
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+EMACS_USE=		EMACS=yes
+EMACS_CONFIGURE_ON=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
+
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MEMACS}
-USE_EMACS=	yes
-CONFIGURE_ARGS+=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
-PLIST_SUB+=	WITHEMACS=""
-.else
+.if ! ${PORT_OPTIONS:MEMACS}
 CONFIGURE_ENV+=	EMACS=no
-PLIST_SUB+=	WITHEMACS="@comment "
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \
+		`${FIND} ${WRKSRC} -name "Makefile.in"`
+
 .if ${PORT_OPTIONS:MI18N}
+#DISTFILES+=	${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
-PLIST_SUB+=	WITHI18N=""
 
 pre-configure:
 	cd ${WRKDIR}/${I18N_PACKAGE}/afm && \
@@ -78,15 +70,12 @@
 	@cd ${WRKSRC}/fonts && { ${ECHO_CMD} ''; \
 	${ECHO_CMD} "pfb_fonts =" *.pfb; } >> Makefile && \
 	${REINPLACE_CMD} 's,^\(fonts_DATA = .*\),\1 $$(pfb_fonts),' Makefile
-	@cd ${WRKSRC}/afm && { ${ECHO} ''; \
-	${ECHO} "i18n_afms =" `cat ${WRKDIR}/${I18N_PACKAGE}/afm/afms.lst`; } >> Makefile && \
+	@cd ${WRKSRC}/afm && { ${ECHO_CMD} ''; \
+	${ECHO_CMD} "i18n_afms =" `cat ${WRKDIR}/${I18N_PACKAGE}/afm/afms.lst`; } >> Makefile && \
 	${REINPLACE_CMD} 's,^\(all_afms = .*\),\1 $$(i18n_afms),' Makefile
-.else
-PLIST_SUB+=	WITHI18N="@comment "
 .endif
 
 post-install:
-	${STRIP_CMD} ${PREFIX}/bin/a2ps
 .if ${PORT_OPTIONS:MEMACS}
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps-print.el \
@@ -95,7 +84,7 @@
 		  ${PREFIX}/lib/xemacs/site-lisp/a2ps.el
 .endif
 	cd ${WRKSRC}/doc && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${INSTALL_TARGET}
+		${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${MAKE_ARGS} ${INSTALL_TARGET}
 	${RM} -f ${PREFIX}/lib/liba2ps.la
 
 .include <bsd.port.mk>

Modified: trunk/print/a2ps/pkg-plist
===================================================================
--- trunk/print/a2ps/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/a2ps/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -12,6 +12,14 @@
 etc/a2ps.cfg
 include/liba2ps.h
 lib/liba2ps.a
+man/man1/a2ps.1.gz
+man/man1/ogonkify.1.gz
+man/man1/card.1.gz
+man/man1/psmandup.1.gz
+man/man1/fixps.1.gz
+man/man1/pdiff.1.gz
+man/man1/psset.1.gz
+man/man1/texi2dvi4a2ps.1.gz
 %%DATADIR%%/README
 %%DATADIR%%/afm/fonts.map
 %%DATADIR%%/afm/make_fonts_map.sh
@@ -47,16 +55,16 @@
 %%DATADIR%%/afm/ptmr.afm
 %%DATADIR%%/afm/pzcmi.afm
 %%DATADIR%%/afm/pzdr.afm
-%%WITHI18N%%%%DATADIR%%/afm/colle10.afm
-%%WITHI18N%%%%DATADIR%%/afm/colle8.afm
-%%WITHI18N%%%%DATADIR%%/afm/colle9.afm
-%%WITHI18N%%%%DATADIR%%/afm/crr35__i.afm
-%%WITHI18N%%%%DATADIR%%/afm/crr36__i.afm
-%%WITHI18N%%%%DATADIR%%/afm/crr55__i.afm
-%%WITHI18N%%%%DATADIR%%/afm/crr56__i.afm
-%%WITHI18N%%%%DATADIR%%/afm/textb18.afm
-%%WITHI18N%%%%DATADIR%%/afm/textb19.afm
-%%WITHI18N%%%%DATADIR%%/afm/textb20.afm
+%%I18N%%%%DATADIR%%/afm/colle10.afm
+%%I18N%%%%DATADIR%%/afm/colle8.afm
+%%I18N%%%%DATADIR%%/afm/colle9.afm
+%%I18N%%%%DATADIR%%/afm/crr35__i.afm
+%%I18N%%%%DATADIR%%/afm/crr36__i.afm
+%%I18N%%%%DATADIR%%/afm/crr55__i.afm
+%%I18N%%%%DATADIR%%/afm/crr56__i.afm
+%%I18N%%%%DATADIR%%/afm/textb18.afm
+%%I18N%%%%DATADIR%%/afm/textb19.afm
+%%I18N%%%%DATADIR%%/afm/textb20.afm
 %%DATADIR%%/encoding/ascii.edf
 %%DATADIR%%/encoding/encoding.map
 %%DATADIR%%/encoding/hp.edf
@@ -76,16 +84,16 @@
 %%DATADIR%%/encoding/mac.edf
 %%DATADIR%%/encoding/ms-cp1250.edf
 %%DATADIR%%/fonts/pcfont.pfa
-%%WITHI18N%%%%DATADIR%%/fonts/colle10.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/colle8.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/colle9.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/crr35__i.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/crr36__i.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/crr55__i.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/crr56__i.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/textb18.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/textb19.pfb
-%%WITHI18N%%%%DATADIR%%/fonts/textb20.pfb
+%%I18N%%%%DATADIR%%/fonts/colle10.pfb
+%%I18N%%%%DATADIR%%/fonts/colle8.pfb
+%%I18N%%%%DATADIR%%/fonts/colle9.pfb
+%%I18N%%%%DATADIR%%/fonts/crr35__i.pfb
+%%I18N%%%%DATADIR%%/fonts/crr36__i.pfb
+%%I18N%%%%DATADIR%%/fonts/crr55__i.pfb
+%%I18N%%%%DATADIR%%/fonts/crr56__i.pfb
+%%I18N%%%%DATADIR%%/fonts/textb18.pfb
+%%I18N%%%%DATADIR%%/fonts/textb19.pfb
+%%I18N%%%%DATADIR%%/fonts/textb20.pfb
 %%DATADIR%%/ogonkify/README
 %%DATADIR%%/ogonkify/adobe.enc
 %%DATADIR%%/ogonkify/afm/pcrb-o.afm
@@ -276,21 +284,9 @@
 %%NLS%%share/locale/sl/LC_MESSAGES/a2ps.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/a2ps.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/a2ps.mo
-%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el
-%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc
-%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el
-%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc
-%%WITHEMACS%%lib/xemacs/site-lisp/a2ps-print.el
-%%WITHEMACS%%lib/xemacs/site-lisp/a2ps.el
- at dirrm %%DATADIR%%/ogonkify/fonts
- at dirrm %%DATADIR%%/ogonkify/afm
- at dirrm %%DATADIR%%/ogonkify
- at dirrm %%DATADIR%%/ps
- at dirrm %%DATADIR%%/ppd
- at dirrm %%DATADIR%%/sheets
- at dirrm %%DATADIR%%/fonts
- at dirrm %%DATADIR%%/encoding
- at dirrm %%DATADIR%%/afm
- at dirrm %%DATADIR%%
-%%WITHEMACS%%@dirrm lib/xemacs/site-lisp
-%%WITHEMACS%%@dirrm lib/xemacs
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc
+%%EMACS%%lib/xemacs/site-lisp/a2ps-print.el
+%%EMACS%%lib/xemacs/site-lisp/a2ps.el

Modified: trunk/print/adobe-cmaps/Makefile
===================================================================
--- trunk/print/adobe-cmaps/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/adobe-cmaps/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,10 +2,9 @@
 
 PORTNAME=	adobe-cmaps
 PORTVERSION=	20051217
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL}
-MASTER_SITE_SUBDIR=	hrs/adobe
+MASTER_SITES=	FREEBSD_LOCAL/hrs/adobe
 DISTFILES=	ac15.tar.gz ag15.tar.gz \
 		ai0.tar.gz aj16.tar.gz \
 		aj20.tar.gz ak12.tar.gz rksj-cmaps.tar.gz
@@ -13,21 +12,22 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Adobe CMap collection
+
 LICENSE=	unknown
 
+USES=		fonts
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST_SUB=	CMAPDIR=${CMAPDIR}
 INSTDIRS=	ac15 ag15 ai0 aj16 aj20 ak12 rksj-cmaps
-CMAPDIR=	share/fonts/${PORTNAME}
+FONTSDIR=	share/fonts/${PORTNAME}
 
 post-extract:
 	${RM} -f ${WRKDIR}/ag15/.nfsFA55
 
 do-install:
-	${MKDIR} ${PREFIX}/${CMAPDIR}
+	${MKDIR} ${PREFIX}/${FONTSDIR}
 	cd ${WRKDIR} && \
 		${TAR} cf - ${INSTDIRS} | \
-		(cd ${PREFIX}/${CMAPDIR} && ${TAR} xf - )
+		(cd ${PREFIX}/${FONTSDIR} && ${TAR} xf - )
 
 .include <bsd.port.mk>

Modified: trunk/print/adobe-cmaps/distinfo
===================================================================
--- trunk/print/adobe-cmaps/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/adobe-cmaps/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,21 +1,14 @@
 SHA256 (adobe/ac15.tar.gz) = ea3b54a34335580712cb2337e3184809efb105b8a8bf8110e4bf44fd45438250
-RMD160 (adobe/ac15.tar.gz) = 4bbe309310bd0b3a313df38fc5ab315515074b9e
 SIZE (adobe/ac15.tar.gz) = 1274621
 SHA256 (adobe/ag15.tar.gz) = 6f7f7292c3198bd090b257ff479fe33fce2fea1a10340f86114d0c2501480cd5
-RMD160 (adobe/ag15.tar.gz) = 81e4b4e2505f51f51ad30318f50800822e8822c3
 SIZE (adobe/ag15.tar.gz) = 1781899
 SHA256 (adobe/ai0.tar.gz) = 2fc38c13cff2b40719605afd4ae944bfa1fed65f14cba6e2fc2596d9c1119f6a
-RMD160 (adobe/ai0.tar.gz) = bc58a7b8fa366bb5c0e6174a1a39745c6e8b06fd
 SIZE (adobe/ai0.tar.gz) = 2763
 SHA256 (adobe/aj16.tar.gz) = 3732294d7830bd5abec6a485bad4afea134b3c43c2d757a14d531e8576e33aaf
-RMD160 (adobe/aj16.tar.gz) = b8aa9fd0aaaa02f792a6921596329ab5e56b1bbe
 SIZE (adobe/aj16.tar.gz) = 916598
 SHA256 (adobe/aj20.tar.gz) = 6f5ee26f43bd5b84516982c239051d53cf48bba2af7e3b05af1cadad111b916b
-RMD160 (adobe/aj20.tar.gz) = a56e51a157fda6a4e35c60708b1c29f86243976b
 SIZE (adobe/aj20.tar.gz) = 218407
 SHA256 (adobe/ak12.tar.gz) = 7f07bed5eb75896fda401e45c165d583829e78cb9435b6fee3f3d097a80feee3
-RMD160 (adobe/ak12.tar.gz) = bb29d1a648cc32805617d8ecfeca065eda5f5c6c
 SIZE (adobe/ak12.tar.gz) = 791828
 SHA256 (adobe/rksj-cmaps.tar.gz) = a0bf0986a7d445f9b41907acf5fee0eb6c015f363fd6bfc95b0fd95de37a7f99
-RMD160 (adobe/rksj-cmaps.tar.gz) = 8c98e3f9036a2c6891abe13e77c10734538e0a4d
 SIZE (adobe/rksj-cmaps.tar.gz) = 29772

Modified: trunk/print/adobe-cmaps/pkg-plist
===================================================================
--- trunk/print/adobe-cmaps/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/adobe-cmaps/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,220 +1,204 @@
- at comment $FreeBSD: ports/print/adobe-cmaps/pkg-plist,v 1.7 2006/05/20 17:23:47 hrs Exp $
-%%CMAPDIR%%/ac15/cid2code.txt
-%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-0
-%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-1
-%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-2
-%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-3
-%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-4
-%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-5
-%%CMAPDIR%%/ac15/CMap/B5-H
-%%CMAPDIR%%/ac15/CMap/B5-V
-%%CMAPDIR%%/ac15/CMap/B5pc-H
-%%CMAPDIR%%/ac15/CMap/B5pc-V
-%%CMAPDIR%%/ac15/CMap/CNS-EUC-H
-%%CMAPDIR%%/ac15/CMap/CNS-EUC-V
-%%CMAPDIR%%/ac15/CMap/CNS1-H
-%%CMAPDIR%%/ac15/CMap/CNS1-V
-%%CMAPDIR%%/ac15/CMap/CNS2-H
-%%CMAPDIR%%/ac15/CMap/CNS2-V
-%%CMAPDIR%%/ac15/CMap/ETen-B5-H
-%%CMAPDIR%%/ac15/CMap/ETen-B5-V
-%%CMAPDIR%%/ac15/CMap/ETHK-B5-H
-%%CMAPDIR%%/ac15/CMap/ETHK-B5-V
-%%CMAPDIR%%/ac15/CMap/HKdla-B5-H
-%%CMAPDIR%%/ac15/CMap/HKdla-B5-V
-%%CMAPDIR%%/ac15/CMap/HKdlb-B5-H
-%%CMAPDIR%%/ac15/CMap/HKdlb-B5-V
-%%CMAPDIR%%/ac15/CMap/HKgccs-B5-H
-%%CMAPDIR%%/ac15/CMap/HKgccs-B5-V
-%%CMAPDIR%%/ac15/CMap/HKm314-B5-H
-%%CMAPDIR%%/ac15/CMap/HKm314-B5-V
-%%CMAPDIR%%/ac15/CMap/HKm471-B5-H
-%%CMAPDIR%%/ac15/CMap/HKm471-B5-V
-%%CMAPDIR%%/ac15/CMap/HKscs-B5-H
-%%CMAPDIR%%/ac15/CMap/HKscs-B5-V
-%%CMAPDIR%%/ac15/CMap/UniCNS-UCS2-H
-%%CMAPDIR%%/ac15/CMap/UniCNS-UCS2-V
-%%CMAPDIR%%/ac15/CMap/UniCNS-UTF16-H
-%%CMAPDIR%%/ac15/CMap/UniCNS-UTF16-V
-%%CMAPDIR%%/ac15/CMap/UniCNS-UTF32-H
-%%CMAPDIR%%/ac15/CMap/UniCNS-UTF32-V
-%%CMAPDIR%%/ac15/CMap/UniCNS-UTF8-H
-%%CMAPDIR%%/ac15/CMap/UniCNS-UTF8-V
-%%CMAPDIR%%/ac15/CMap/ETen-B5-UCS2
-%%CMAPDIR%%/ac15/CMap/B5pc-UCS2
-%%CMAPDIR%%/ac15/CMap/Adobe-CNS1-UCS2
-%%CMAPDIR%%/ac15/CMap/B5pc-UCS2C
-%%CMAPDIR%%/ag15/cid2code.txt
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-0
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-1
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-2
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-3
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-4
-%%CMAPDIR%%/ag15/CMap/GB-EUC-H
-%%CMAPDIR%%/ag15/CMap/GB-EUC-V
-%%CMAPDIR%%/ag15/CMap/GB-H
-%%CMAPDIR%%/ag15/CMap/GB-V
-%%CMAPDIR%%/ag15/CMap/GBK-EUC-H
-%%CMAPDIR%%/ag15/CMap/GBK-EUC-V
-%%CMAPDIR%%/ag15/CMap/GBK2K-H
-%%CMAPDIR%%/ag15/CMap/GBK2K-V
-%%CMAPDIR%%/ag15/CMap/GBKp-EUC-H
-%%CMAPDIR%%/ag15/CMap/GBKp-EUC-V
-%%CMAPDIR%%/ag15/CMap/GBpc-EUC-H
-%%CMAPDIR%%/ag15/CMap/GBpc-EUC-V
-%%CMAPDIR%%/ag15/CMap/GBT-EUC-H
-%%CMAPDIR%%/ag15/CMap/GBT-EUC-V
-%%CMAPDIR%%/ag15/CMap/GBT-H
-%%CMAPDIR%%/ag15/CMap/GBT-V
-%%CMAPDIR%%/ag15/CMap/GBTpc-EUC-H
-%%CMAPDIR%%/ag15/CMap/GBTpc-EUC-V
-%%CMAPDIR%%/ag15/CMap/UniGB-UCS2-H
-%%CMAPDIR%%/ag15/CMap/UniGB-UCS2-V
-%%CMAPDIR%%/ag15/CMap/UniGB-UTF16-H
-%%CMAPDIR%%/ag15/CMap/UniGB-UTF16-V
-%%CMAPDIR%%/ag15/CMap/UniGB-UTF32-H
-%%CMAPDIR%%/ag15/CMap/UniGB-UTF32-V
-%%CMAPDIR%%/ag15/CMap/UniGB-UTF8-H
-%%CMAPDIR%%/ag15/CMap/UniGB-UTF8-V
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-5
-%%CMAPDIR%%/ag15/CMap/GBpc-EUC-UCS2
-%%CMAPDIR%%/ag15/CMap/GBK-EUC-UCS2
-%%CMAPDIR%%/ag15/CMap/Adobe-GB1-UCS2
-%%CMAPDIR%%/ag15/CMap/GBpc-EUC-UCS2C
-%%CMAPDIR%%/ai0/CMap/Identity-H
-%%CMAPDIR%%/ai0/CMap/Identity-V
-%%CMAPDIR%%/aj16/cid2code.txt
-%%CMAPDIR%%/aj16/CMap/78-EUC-H
-%%CMAPDIR%%/aj16/CMap/78-EUC-V
-%%CMAPDIR%%/aj16/CMap/78-H
-%%CMAPDIR%%/aj16/CMap/78-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/78-RKSJ-V
-%%CMAPDIR%%/aj16/CMap/78-V
-%%CMAPDIR%%/aj16/CMap/78ms-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/78ms-RKSJ-V
-%%CMAPDIR%%/aj16/CMap/83pv-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/90ms-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/90ms-RKSJ-V
-%%CMAPDIR%%/aj16/CMap/90msp-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/90msp-RKSJ-V
-%%CMAPDIR%%/aj16/CMap/90pv-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/90pv-RKSJ-V
-%%CMAPDIR%%/aj16/CMap/Add-H
-%%CMAPDIR%%/aj16/CMap/Add-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/Add-RKSJ-V
-%%CMAPDIR%%/aj16/CMap/Add-V
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-0
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-1
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-2
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-3
-%%CMAPDIR%%/aj16/CMap/EUC-H
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-4
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-5
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-6
-%%CMAPDIR%%/aj16/CMap/EUC-V
-%%CMAPDIR%%/aj16/CMap/Ext-H
-%%CMAPDIR%%/aj16/CMap/Ext-RKSJ-H
-%%CMAPDIR%%/aj16/CMap/Ext-RKSJ-V
-%%CMAPDIR%%/aj16/CMap/Ext-V
-%%CMAPDIR%%/aj16/CMap/H
-%%CMAPDIR%%/aj16/CMap/Hankaku
-%%CMAPDIR%%/aj16/CMap/Hiragana
-%%CMAPDIR%%/aj16/CMap/Katakana
-%%CMAPDIR%%/aj16/CMap/NWP-H
-%%CMAPDIR%%/aj16/CMap/NWP-V
-%%CMAPDIR%%/aj16/CMap/RKSJ-H
-%%CMAPDIR%%/aj16/CMap/RKSJ-V
-%%CMAPDIR%%/aj16/CMap/Roman
-%%CMAPDIR%%/aj16/CMap/UniJIS-UCS2-H
-%%CMAPDIR%%/aj16/CMap/UniJIS-UCS2-HW-H
-%%CMAPDIR%%/aj16/CMap/UniJIS-UCS2-HW-V
-%%CMAPDIR%%/aj16/CMap/UniJIS-UCS2-V
-%%CMAPDIR%%/aj16/CMap/UniJIS-UTF16-H
-%%CMAPDIR%%/aj16/CMap/UniJIS-UTF16-V
-%%CMAPDIR%%/aj16/CMap/UniJIS-UTF32-H
-%%CMAPDIR%%/aj16/CMap/UniJIS-UTF32-V
-%%CMAPDIR%%/aj16/CMap/UniJIS-UTF8-H
-%%CMAPDIR%%/aj16/CMap/UniJIS-UTF8-V
-%%CMAPDIR%%/aj16/CMap/UniJISPro-UCS2-HW-V
-%%CMAPDIR%%/aj16/CMap/UniJISPro-UCS2-V
-%%CMAPDIR%%/aj16/CMap/UniJISPro-UTF8-V
-%%CMAPDIR%%/aj16/CMap/UniJISX0213-UTF32-H
-%%CMAPDIR%%/aj16/CMap/UniJISX0213-UTF32-V
-%%CMAPDIR%%/aj16/CMap/V
-%%CMAPDIR%%/aj16/CMap/WP-Symbol
-%%CMAPDIR%%/aj16/CMap/90pv-RKSJ-UCS2C
-%%CMAPDIR%%/aj16/CMap/Adobe-Japan1-UCS2
-%%CMAPDIR%%/aj16/CMap/90pv-RKSJ-UCS2
-%%CMAPDIR%%/aj16/CMap/90ms-RKSJ-UCS2
-%%CMAPDIR%%/aj20/cid2code.txt
-%%CMAPDIR%%/aj20/CMap/Adobe-Japan2-0
-%%CMAPDIR%%/aj20/CMap/Hojo-EUC-H
-%%CMAPDIR%%/aj20/CMap/Hojo-EUC-V
-%%CMAPDIR%%/aj20/CMap/Hojo-H
-%%CMAPDIR%%/aj20/CMap/Hojo-V
-%%CMAPDIR%%/aj20/CMap/UniHojo-UCS2-H
-%%CMAPDIR%%/aj20/CMap/UniHojo-UCS2-V
-%%CMAPDIR%%/aj20/CMap/UniHojo-UTF16-H
-%%CMAPDIR%%/aj20/CMap/UniHojo-UTF16-V
-%%CMAPDIR%%/aj20/CMap/UniHojo-UTF32-H
-%%CMAPDIR%%/aj20/CMap/UniHojo-UTF32-V
-%%CMAPDIR%%/aj20/CMap/UniHojo-UTF8-H
-%%CMAPDIR%%/aj20/CMap/UniHojo-UTF8-V
-%%CMAPDIR%%/ak12/cid2code.txt
-%%CMAPDIR%%/ak12/CMap/Adobe-Korea1-0
-%%CMAPDIR%%/ak12/CMap/Adobe-Korea1-1
-%%CMAPDIR%%/ak12/CMap/Adobe-Korea1-2
-%%CMAPDIR%%/ak12/CMap/KSC-EUC-H
-%%CMAPDIR%%/ak12/CMap/KSC-EUC-V
-%%CMAPDIR%%/ak12/CMap/KSC-H
-%%CMAPDIR%%/ak12/CMap/KSC-Johab-H
-%%CMAPDIR%%/ak12/CMap/KSC-Johab-V
-%%CMAPDIR%%/ak12/CMap/KSC-V
-%%CMAPDIR%%/ak12/CMap/KSCms-UHC-H
-%%CMAPDIR%%/ak12/CMap/KSCms-UHC-HW-H
-%%CMAPDIR%%/ak12/CMap/KSCms-UHC-HW-V
-%%CMAPDIR%%/ak12/CMap/KSCms-UHC-V
-%%CMAPDIR%%/ak12/CMap/KSCpc-EUC-H
-%%CMAPDIR%%/ak12/CMap/KSCpc-EUC-V
-%%CMAPDIR%%/ak12/CMap/UniKS-UCS2-H
-%%CMAPDIR%%/ak12/CMap/UniKS-UCS2-V
-%%CMAPDIR%%/ak12/CMap/UniKS-UTF16-H
-%%CMAPDIR%%/ak12/CMap/UniKS-UTF16-V
-%%CMAPDIR%%/ak12/CMap/UniKS-UTF32-H
-%%CMAPDIR%%/ak12/CMap/UniKS-UTF32-V
-%%CMAPDIR%%/ak12/CMap/UniKS-UTF8-H
-%%CMAPDIR%%/ak12/CMap/UniKS-UTF8-V
-%%CMAPDIR%%/ak12/CMap/KSCpc-EUC-UCS2
-%%CMAPDIR%%/ak12/CMap/KSCms-UHC-UCS2
-%%CMAPDIR%%/ak12/CMap/Adobe-Korea1-UCS2
-%%CMAPDIR%%/ak12/CMap/KSCpc-EUC-UCS2C
-%%CMAPDIR%%/rksj-cmaps/CNS01-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/CNS02-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/CNS03-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/CNS04-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/CNS05-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/CNS06-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/CNS07-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/CNS15-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/GB-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/GBT-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/HK-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/Hojo-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/KSC-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/KSC2-RKSJ-H
-%%CMAPDIR%%/rksj-cmaps/TCVN-RKSJ-H
- at dirrm %%CMAPDIR%%/rksj-cmaps
- at dirrm %%CMAPDIR%%/ak12/CMap
- at dirrm %%CMAPDIR%%/ak12
- at dirrm %%CMAPDIR%%/aj20/CMap
- at dirrm %%CMAPDIR%%/aj20
- at dirrm %%CMAPDIR%%/aj16/CMap
- at dirrm %%CMAPDIR%%/aj16
- at dirrm %%CMAPDIR%%/ai0/CMap
- at dirrm %%CMAPDIR%%/ai0
- at dirrm %%CMAPDIR%%/ag15/CMap
- at dirrm %%CMAPDIR%%/ag15
- at dirrm %%CMAPDIR%%/ac15/CMap
- at dirrm %%CMAPDIR%%/ac15
- at dirrmtry %%CMAPDIR%%
- at dirrmtry share/fonts
+%%FONTSDIR%%/ac15/cid2code.txt
+%%FONTSDIR%%/ac15/CMap/Adobe-CNS1-0
+%%FONTSDIR%%/ac15/CMap/Adobe-CNS1-1
+%%FONTSDIR%%/ac15/CMap/Adobe-CNS1-2
+%%FONTSDIR%%/ac15/CMap/Adobe-CNS1-3
+%%FONTSDIR%%/ac15/CMap/Adobe-CNS1-4
+%%FONTSDIR%%/ac15/CMap/Adobe-CNS1-5
+%%FONTSDIR%%/ac15/CMap/B5-H
+%%FONTSDIR%%/ac15/CMap/B5-V
+%%FONTSDIR%%/ac15/CMap/B5pc-H
+%%FONTSDIR%%/ac15/CMap/B5pc-V
+%%FONTSDIR%%/ac15/CMap/CNS-EUC-H
+%%FONTSDIR%%/ac15/CMap/CNS-EUC-V
+%%FONTSDIR%%/ac15/CMap/CNS1-H
+%%FONTSDIR%%/ac15/CMap/CNS1-V
+%%FONTSDIR%%/ac15/CMap/CNS2-H
+%%FONTSDIR%%/ac15/CMap/CNS2-V
+%%FONTSDIR%%/ac15/CMap/ETen-B5-H
+%%FONTSDIR%%/ac15/CMap/ETen-B5-V
+%%FONTSDIR%%/ac15/CMap/ETHK-B5-H
+%%FONTSDIR%%/ac15/CMap/ETHK-B5-V
+%%FONTSDIR%%/ac15/CMap/HKdla-B5-H
+%%FONTSDIR%%/ac15/CMap/HKdla-B5-V
+%%FONTSDIR%%/ac15/CMap/HKdlb-B5-H
+%%FONTSDIR%%/ac15/CMap/HKdlb-B5-V
+%%FONTSDIR%%/ac15/CMap/HKgccs-B5-H
+%%FONTSDIR%%/ac15/CMap/HKgccs-B5-V
+%%FONTSDIR%%/ac15/CMap/HKm314-B5-H
+%%FONTSDIR%%/ac15/CMap/HKm314-B5-V
+%%FONTSDIR%%/ac15/CMap/HKm471-B5-H
+%%FONTSDIR%%/ac15/CMap/HKm471-B5-V
+%%FONTSDIR%%/ac15/CMap/HKscs-B5-H
+%%FONTSDIR%%/ac15/CMap/HKscs-B5-V
+%%FONTSDIR%%/ac15/CMap/UniCNS-UCS2-H
+%%FONTSDIR%%/ac15/CMap/UniCNS-UCS2-V
+%%FONTSDIR%%/ac15/CMap/UniCNS-UTF16-H
+%%FONTSDIR%%/ac15/CMap/UniCNS-UTF16-V
+%%FONTSDIR%%/ac15/CMap/UniCNS-UTF32-H
+%%FONTSDIR%%/ac15/CMap/UniCNS-UTF32-V
+%%FONTSDIR%%/ac15/CMap/UniCNS-UTF8-H
+%%FONTSDIR%%/ac15/CMap/UniCNS-UTF8-V
+%%FONTSDIR%%/ac15/CMap/ETen-B5-UCS2
+%%FONTSDIR%%/ac15/CMap/B5pc-UCS2
+%%FONTSDIR%%/ac15/CMap/Adobe-CNS1-UCS2
+%%FONTSDIR%%/ac15/CMap/B5pc-UCS2C
+%%FONTSDIR%%/ag15/cid2code.txt
+%%FONTSDIR%%/ag15/CMap/Adobe-GB1-0
+%%FONTSDIR%%/ag15/CMap/Adobe-GB1-1
+%%FONTSDIR%%/ag15/CMap/Adobe-GB1-2
+%%FONTSDIR%%/ag15/CMap/Adobe-GB1-3
+%%FONTSDIR%%/ag15/CMap/Adobe-GB1-4
+%%FONTSDIR%%/ag15/CMap/GB-EUC-H
+%%FONTSDIR%%/ag15/CMap/GB-EUC-V
+%%FONTSDIR%%/ag15/CMap/GB-H
+%%FONTSDIR%%/ag15/CMap/GB-V
+%%FONTSDIR%%/ag15/CMap/GBK-EUC-H
+%%FONTSDIR%%/ag15/CMap/GBK-EUC-V
+%%FONTSDIR%%/ag15/CMap/GBK2K-H
+%%FONTSDIR%%/ag15/CMap/GBK2K-V
+%%FONTSDIR%%/ag15/CMap/GBKp-EUC-H
+%%FONTSDIR%%/ag15/CMap/GBKp-EUC-V
+%%FONTSDIR%%/ag15/CMap/GBpc-EUC-H
+%%FONTSDIR%%/ag15/CMap/GBpc-EUC-V
+%%FONTSDIR%%/ag15/CMap/GBT-EUC-H
+%%FONTSDIR%%/ag15/CMap/GBT-EUC-V
+%%FONTSDIR%%/ag15/CMap/GBT-H
+%%FONTSDIR%%/ag15/CMap/GBT-V
+%%FONTSDIR%%/ag15/CMap/GBTpc-EUC-H
+%%FONTSDIR%%/ag15/CMap/GBTpc-EUC-V
+%%FONTSDIR%%/ag15/CMap/UniGB-UCS2-H
+%%FONTSDIR%%/ag15/CMap/UniGB-UCS2-V
+%%FONTSDIR%%/ag15/CMap/UniGB-UTF16-H
+%%FONTSDIR%%/ag15/CMap/UniGB-UTF16-V
+%%FONTSDIR%%/ag15/CMap/UniGB-UTF32-H
+%%FONTSDIR%%/ag15/CMap/UniGB-UTF32-V
+%%FONTSDIR%%/ag15/CMap/UniGB-UTF8-H
+%%FONTSDIR%%/ag15/CMap/UniGB-UTF8-V
+%%FONTSDIR%%/ag15/CMap/Adobe-GB1-5
+%%FONTSDIR%%/ag15/CMap/GBpc-EUC-UCS2
+%%FONTSDIR%%/ag15/CMap/GBK-EUC-UCS2
+%%FONTSDIR%%/ag15/CMap/Adobe-GB1-UCS2
+%%FONTSDIR%%/ag15/CMap/GBpc-EUC-UCS2C
+%%FONTSDIR%%/ai0/CMap/Identity-H
+%%FONTSDIR%%/ai0/CMap/Identity-V
+%%FONTSDIR%%/aj16/cid2code.txt
+%%FONTSDIR%%/aj16/CMap/78-EUC-H
+%%FONTSDIR%%/aj16/CMap/78-EUC-V
+%%FONTSDIR%%/aj16/CMap/78-H
+%%FONTSDIR%%/aj16/CMap/78-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/78-RKSJ-V
+%%FONTSDIR%%/aj16/CMap/78-V
+%%FONTSDIR%%/aj16/CMap/78ms-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/78ms-RKSJ-V
+%%FONTSDIR%%/aj16/CMap/83pv-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/90ms-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/90ms-RKSJ-V
+%%FONTSDIR%%/aj16/CMap/90msp-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/90msp-RKSJ-V
+%%FONTSDIR%%/aj16/CMap/90pv-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/90pv-RKSJ-V
+%%FONTSDIR%%/aj16/CMap/Add-H
+%%FONTSDIR%%/aj16/CMap/Add-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/Add-RKSJ-V
+%%FONTSDIR%%/aj16/CMap/Add-V
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-0
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-1
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-2
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-3
+%%FONTSDIR%%/aj16/CMap/EUC-H
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-4
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-5
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-6
+%%FONTSDIR%%/aj16/CMap/EUC-V
+%%FONTSDIR%%/aj16/CMap/Ext-H
+%%FONTSDIR%%/aj16/CMap/Ext-RKSJ-H
+%%FONTSDIR%%/aj16/CMap/Ext-RKSJ-V
+%%FONTSDIR%%/aj16/CMap/Ext-V
+%%FONTSDIR%%/aj16/CMap/H
+%%FONTSDIR%%/aj16/CMap/Hankaku
+%%FONTSDIR%%/aj16/CMap/Hiragana
+%%FONTSDIR%%/aj16/CMap/Katakana
+%%FONTSDIR%%/aj16/CMap/NWP-H
+%%FONTSDIR%%/aj16/CMap/NWP-V
+%%FONTSDIR%%/aj16/CMap/RKSJ-H
+%%FONTSDIR%%/aj16/CMap/RKSJ-V
+%%FONTSDIR%%/aj16/CMap/Roman
+%%FONTSDIR%%/aj16/CMap/UniJIS-UCS2-H
+%%FONTSDIR%%/aj16/CMap/UniJIS-UCS2-HW-H
+%%FONTSDIR%%/aj16/CMap/UniJIS-UCS2-HW-V
+%%FONTSDIR%%/aj16/CMap/UniJIS-UCS2-V
+%%FONTSDIR%%/aj16/CMap/UniJIS-UTF16-H
+%%FONTSDIR%%/aj16/CMap/UniJIS-UTF16-V
+%%FONTSDIR%%/aj16/CMap/UniJIS-UTF32-H
+%%FONTSDIR%%/aj16/CMap/UniJIS-UTF32-V
+%%FONTSDIR%%/aj16/CMap/UniJIS-UTF8-H
+%%FONTSDIR%%/aj16/CMap/UniJIS-UTF8-V
+%%FONTSDIR%%/aj16/CMap/UniJISPro-UCS2-HW-V
+%%FONTSDIR%%/aj16/CMap/UniJISPro-UCS2-V
+%%FONTSDIR%%/aj16/CMap/UniJISPro-UTF8-V
+%%FONTSDIR%%/aj16/CMap/UniJISX0213-UTF32-H
+%%FONTSDIR%%/aj16/CMap/UniJISX0213-UTF32-V
+%%FONTSDIR%%/aj16/CMap/V
+%%FONTSDIR%%/aj16/CMap/WP-Symbol
+%%FONTSDIR%%/aj16/CMap/90pv-RKSJ-UCS2C
+%%FONTSDIR%%/aj16/CMap/Adobe-Japan1-UCS2
+%%FONTSDIR%%/aj16/CMap/90pv-RKSJ-UCS2
+%%FONTSDIR%%/aj16/CMap/90ms-RKSJ-UCS2
+%%FONTSDIR%%/aj20/cid2code.txt
+%%FONTSDIR%%/aj20/CMap/Adobe-Japan2-0
+%%FONTSDIR%%/aj20/CMap/Hojo-EUC-H
+%%FONTSDIR%%/aj20/CMap/Hojo-EUC-V
+%%FONTSDIR%%/aj20/CMap/Hojo-H
+%%FONTSDIR%%/aj20/CMap/Hojo-V
+%%FONTSDIR%%/aj20/CMap/UniHojo-UCS2-H
+%%FONTSDIR%%/aj20/CMap/UniHojo-UCS2-V
+%%FONTSDIR%%/aj20/CMap/UniHojo-UTF16-H
+%%FONTSDIR%%/aj20/CMap/UniHojo-UTF16-V
+%%FONTSDIR%%/aj20/CMap/UniHojo-UTF32-H
+%%FONTSDIR%%/aj20/CMap/UniHojo-UTF32-V
+%%FONTSDIR%%/aj20/CMap/UniHojo-UTF8-H
+%%FONTSDIR%%/aj20/CMap/UniHojo-UTF8-V
+%%FONTSDIR%%/ak12/cid2code.txt
+%%FONTSDIR%%/ak12/CMap/Adobe-Korea1-0
+%%FONTSDIR%%/ak12/CMap/Adobe-Korea1-1
+%%FONTSDIR%%/ak12/CMap/Adobe-Korea1-2
+%%FONTSDIR%%/ak12/CMap/KSC-EUC-H
+%%FONTSDIR%%/ak12/CMap/KSC-EUC-V
+%%FONTSDIR%%/ak12/CMap/KSC-H
+%%FONTSDIR%%/ak12/CMap/KSC-Johab-H
+%%FONTSDIR%%/ak12/CMap/KSC-Johab-V
+%%FONTSDIR%%/ak12/CMap/KSC-V
+%%FONTSDIR%%/ak12/CMap/KSCms-UHC-H
+%%FONTSDIR%%/ak12/CMap/KSCms-UHC-HW-H
+%%FONTSDIR%%/ak12/CMap/KSCms-UHC-HW-V
+%%FONTSDIR%%/ak12/CMap/KSCms-UHC-V
+%%FONTSDIR%%/ak12/CMap/KSCpc-EUC-H
+%%FONTSDIR%%/ak12/CMap/KSCpc-EUC-V
+%%FONTSDIR%%/ak12/CMap/UniKS-UCS2-H
+%%FONTSDIR%%/ak12/CMap/UniKS-UCS2-V
+%%FONTSDIR%%/ak12/CMap/UniKS-UTF16-H
+%%FONTSDIR%%/ak12/CMap/UniKS-UTF16-V
+%%FONTSDIR%%/ak12/CMap/UniKS-UTF32-H
+%%FONTSDIR%%/ak12/CMap/UniKS-UTF32-V
+%%FONTSDIR%%/ak12/CMap/UniKS-UTF8-H
+%%FONTSDIR%%/ak12/CMap/UniKS-UTF8-V
+%%FONTSDIR%%/ak12/CMap/KSCpc-EUC-UCS2
+%%FONTSDIR%%/ak12/CMap/KSCms-UHC-UCS2
+%%FONTSDIR%%/ak12/CMap/Adobe-Korea1-UCS2
+%%FONTSDIR%%/ak12/CMap/KSCpc-EUC-UCS2C
+%%FONTSDIR%%/rksj-cmaps/CNS01-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/CNS02-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/CNS03-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/CNS04-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/CNS05-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/CNS06-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/CNS07-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/CNS15-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/GB-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/GBT-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/HK-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/Hojo-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/KSC-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/KSC2-RKSJ-H
+%%FONTSDIR%%/rksj-cmaps/TCVN-RKSJ-H

Modified: trunk/print/cups/Makefile
===================================================================
--- trunk/print/cups/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,7 +2,7 @@
 # $FreeBSD: ports/print/cups/Makefile,v 1.54 2011/10/05 06:02:12 dinoex Exp $
 
 PORTNAME=	cups
-PORTVERSION=	1.5.4
+PORTVERSION=	2.0.3
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -12,11 +12,13 @@
 
 LICENSE=	gpl2
 
-BUILD_DEPENDS=	espgs:${PORTSDIR}/${PKGCATEGORY}/cups-pstoraster \
-		cupsd:${PORTSDIR}/${PKGCATEGORY}/cups-base
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	espgs:${PORTSDIR}/${PKGCATEGORY}/cups-pstoraster \
+		cupsd:${PORTSDIR}/${PKGCATEGORY}/cups-base \
+		ttfread:${PORTSDIR}/${PKGCATEGORY}/cups-filters
 
 NO_BUILD=	yes
 NO_INSTALL=	yes
 
+SUB_FILES=	pkg-message
+
 .include <bsd.port.mk>

Added: trunk/print/cups/files/pkg-message.in
===================================================================
--- trunk/print/cups/files/pkg-message.in	                        (rev 0)
+++ trunk/print/cups/files/pkg-message.in	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,9 @@
+======================================================================
+
+CUPS is now installed.
+
+Please read the documentation in %%PREFIX%%/share/doc/cups/ for information
+on how to set up your printer to use CUPS. Basic template configuration files
+have been installed in %%PREFIX%%/etc/cups/
+
+======================================================================


Property changes on: trunk/print/cups/files/pkg-message.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/print/cups/pkg-message
===================================================================
--- trunk/print/cups/pkg-message	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups/pkg-message	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,9 +0,0 @@
-======================================================================
-
-CUPS is now installed.
-
-Please read the documentation in %%PREFIX%%/share/doc/cups/ for information
-on how to set up your printer to use CUPS. Basic template configuration files
-have been installed in %%PREFIX%%/etc/cups/
-
-======================================================================

Modified: trunk/print/cups-base/Makefile
===================================================================
--- trunk/print/cups-base/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,13 +1,13 @@
 # $MidnightBSD$
 
 PORTNAME=	cups
-PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTVERSION=	2.0.3
 DISTVERSIONSUFFIX=	-source
+#PORTREVISION=	defined further
 CATEGORIES=	print
-MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
+MASTER_SITES=	http://www.cups.org/software/${DISTVERSION}/ \
+		EASYSW/${PORTNAME}/${DISTVERSION}
 PKGNAMESUFFIX=	${CUPS_SUFFIX}${PKGNAMESUFFIX2}
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Common UNIX Printing System: ${COMMENT2}
@@ -14,32 +14,33 @@
 
 LICENSE=	gpl2
 
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+
 CONFLICTS=	LPRng-[0-9]*
 
-DESTDIRNAME=    BUILDROOT
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
-USES=		gmake tar:bzip2
+USES+=		cpe gmake iconv pkgconfig tar:bzip2
+CPE_VENDOR=	apple
+DESTDIRNAME=	DSTROOT
 GNU_CONFIGURE=	yes
-CFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-DSOFLAGS=	-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib ${LDFLAGS}
+DSOFLAGS=	-Wl,-rpath,${PREFIX}/lib ${LDFLAGS} ${LIBS}
 CONFIGURE_ENV=	DSOFLAGS="${DSOFLAGS}"
 CONFIGURE_ARGS+=	--localstatedir=/var			\
-			--disable-slp				\
 			--disable-gssapi			\
-			--with-cups-user=${CUPSOWN}		\
-			--with-cups-group=${CUPSGRP}		\
+			--with-cups-user=${USERS}		\
+			--with-cups-group=${GROUPS}		\
 			--with-system-groups=${CUPSSYSGRP}	\
 			--with-docdir=${DOCSDIR}		\
-			--with-icondir=${PREFIX}/share/icons	\
 			--with-menudir=${DESKTOPDIR}		\
 			--with-domainsocket=${CUPS_SOCKET}	\
 			--with-cachedir=${CUPS_CACHEDIR}	\
 			--with-pam-module="unix"		\
-			--enable-ssl
+			--enable-gnutls
 
-CUPS_ETCDIR=	${PREFIX}/etc/cups
 CUPS_CACHEDIR?=	/var/db/cups
 CUPS_SPOOLDIR=	/var/spool/cups
 CUPS_SOCKET?=	/var/run/cups.sock
@@ -46,38 +47,41 @@
 CUPS_PDFTOPS?=	${LOCALBASE}/libexec/xpdf/pdftops
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-# file, dir ownership
-CUPSGRP=	cups
-CUPSOWN=	cups
 CUPSSYSGRP=	wheel
 # GROUPS/USERS does not work here
-#GROUPS=	cups
-#USERS=		cups
+GROUPS=	cups
+USERS=		cups
 
 # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
+OPTIONS_SUB=		yes
 .if defined(CUPS_CLIENT)
-PORTREVISION=	0
+PORTREVISION=	2
 LICENSE=	lgpl2.1
 CUPS_SUFFIX=	-client
-OPTIONS_DEFINE=	GNUTLS
+OPTIONS_RADIO=		ZEROCONF
+OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
+OPTIONS_DEFAULT+=	MDNSRESPONDER
 .elif defined(CUPS_IMAGE)
-PORTREVISION=	0
+PORTREVISION=	2
 CUPS_SUFFIX=	-image
 LICENSE=	lgpl2.1
-OPTIONS_DEFINE=	GNUTLS
 .else
-INSTALLS_ICONS=	yes
-PORTREVISION=	0
+PORTREVISION=	3
 CUPS_SUFFIX=	-base
-OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM LDAP DBUS LIBUSB XDG_OPEN GHOSTSCRIPT XPDF AVAHI MDNSRESPONDER
-OPTIONS_DEFAULT=	LIBPAPER GHOSTSCRIPT
-NO_OPTIONS_SORT=	yes
+# 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
-GHOSTSCRIPT_DESC=	Build pdftops with GHOSTSCRIPT
-XPDF_DESC=		Build pdftops with XPDF
+WEB_DESC=		Interpreters for web interfaces
 XDG_OPEN_DESC=		Build with XDG_OPEN as browser
+ZEROCONF_DESC=		Zeroconf support
 
 .include <bsd.mport.options.mk>
 
@@ -85,19 +89,18 @@
 COMMENT2=	Library cups
 INSTALL_WRKSRC=	${WRKSRC}/cups
 PLIST=		${MASTERDIR}/pkg-plist.client
-USES+=		iconv
+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 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		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
-CONFIGURE_ARGS+=	--disable-pdftops
 INSTALL_WRKSRC=	${WRKSRC}/filter
 PLIST=		${MASTERDIR}/pkg-plist.image
 USE_LDCONFIG=	yes
@@ -104,8 +107,8 @@
 PKGMESSAGE=	${NONEXISTENT}
 DESCR=		${MASTERDIR}/pkg-descr.image
 .else
-LIB_DEPENDS+=	cups:${PORTSDIR}/${PKGCATEGORY}/cups-client
-LIB_DEPENDS+=	cupsimage:${PORTSDIR}/${PKGCATEGORY}/cups-image
+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
@@ -122,161 +125,95 @@
 CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
 .endif
 
-.if ${PORT_OPTIONS:MGNUTLS}
-CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
-LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
-LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
-USES+=		pkgconfig
-.else
-CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
-EXTENSIONS+=	openssl
-.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 !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPHP}
-CONFIGURE_ARGS+=	--with-php
+. 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
-PLIST_SUB+=		PHP=""
-.else
-CONFIGURE_ARGS+=	--without-php
-PLIST_SUB+=		PHP="@comment "
-.endif
+WANT_PHP_CGI=		yes
+. endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MGHOSTSCRIPT}
-.if ${PORT_OPTIONS:MXPDF}
-IGNORE=			You must select one and only one option to build pdftops
-.endif
-USE_GHOSTSCRIPT=	yes
-CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/bin/gs
-PLIST_SUB+=		WITH_PDFTOPS=""
-.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXPDF}
-BUILD_DEPENDS+=		${CUPS_PDFTOPS}:${PORTSDIR}/graphics/xpdf
-RUN_DEPENDS+=		${CUPS_PDFTOPS}:${PORTSDIR}/graphics/xpdf
-CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${CUPS_PDFTOPS}
-PLIST_SUB+=		WITH_PDFTOPS=""
-.else
-PLIST_SUB+=		WITH_PDFTOPS="@comment "
-.endif
+. if ${PORT_OPTIONS:MPYTHON}
+CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
+USES+=			python
+. endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPYTHON}
-CONFIGURE_ARGS+=	--with-python
-USE_PYTHON=		yes
-EXTENSIONS+=		python
-.endif
-
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBPAPER}
+. if ${PORT_OPTIONS:MLIBPAPER}
 CONFIGURE_ARGS+=	--enable-libpaper
-LIB_DEPENDS+=		paper:${PORTSDIR}/print/libpaper
-.endif
+LIB_DEPENDS+=		libpaper.so:${PORTSDIR}/print/libpaper
+. endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}
-.if ${PORT_OPTIONS:MAVAHI}
-IGNORE=			You must select one and only one option to build for Zeroconf
-.endif
-CONFIGURE_ARGS+=	--with-dnssd-includes=/usr/include
-PLIST_SUB+=		WITH_MDNSRESPONDER=""
-.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MAVAHI}
-CONFIGURE_ARGS+=	--enable-dnssd \
-			--with-dnssd-libs=${LOCALBASE}/lib/
-LIB_DEPENDS+=		dns_sd:${PORTSDIR}/net/avahi-libdns
-CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include/avahi-compat-libdns_sd/
-BROKEN=			missing function, see http://www.avahi.org/ticket/303
-.else
-CONFIGURE_ARGS+=	--disable-dnssd
-PLIST_SUB+=		WITH_MDNSRESPONDER="@comment "
-.endif
-
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM}
+. if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--enable-pam
-PLIST_SUB+=		WITH_PAMD=""
-.else
+. else
 CONFIGURE_ARGS+=	--disable-pam
-PLIST_SUB+=		WITH_PAMD="@comment "
-.endif
+. endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--enable-ldap
-.else
-CONFIGURE_ARGS+=	--disable-ldap
-.endif
-
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=		dbus-1:${PORTSDIR}/devel/dbus
+. if ${PORT_OPTIONS:MDBUS}
+LIB_DEPENDS+=		libdbus-1.so:${PORTSDIR}/devel/dbus
 CONFIGURE_ARGS+=	--enable-dbus
-PLIST_SUB+=		WITH_DBUS=""
-.else
+. else
 CONFIGURE_ARGS+=	--disable-dbus
-PLIST_SUB+=		WITH_DBUS="@comment "
-.endif
+. endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXDG_OPEN}
+. if ${PORT_OPTIONS:MXDG_OPEN}
 RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
-.endif
+. endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB}
-CPPFLAGS+=		-I/usr/include
-LDFLAGS+=		-L/usr/lib
-.else
+. 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
-CONFIGURE_ARGS+=	LIBS="-lssp_nonshared"
 
-.if defined(CUPS_CLIENT)
-MAN1=	cups-config.1
-.elif defined(CUPS_IMAGE)
-.else
-MAN1+=	cancel.1 \
-	cupstestdsc.1 \
-	cupstestppd.1 \
-	ipptool.1 \
-	lp.1 \
-	lpoptions.1 \
-	lppasswd.1 \
-	lpq.1 \
-	lprm.1 \
-	lpr.1 \
-	lpstat.1 \
-	ppdc.1 \
-	ppdhtml.1 \
-	ppdi.1 \
-	ppdmerge.1 \
-	ppdpo.1
-MAN5=	classes.conf.5 \
-	client.conf.5 \
-	cups-snmp.conf.5 \
-	cupsd.conf.5 \
-	ipptoolfile.5 \
-	mailto.conf.5 \
-	mime.convs.5 \
-	mime.types.5 \
-	ppdcfile.5 \
-	printers.conf.5 \
-	subscriptions.conf.5
-MAN7=	backend.7 \
-	filter.7 \
-	notifier.7
-MAN8=	accept.8 \
-	cupsaccept.8 \
-	cupsaddsmb.8 \
-	cupsctl.8 \
-	cupsd.8 \
-	cupsenable.8 \
-	cupsfilter.8 \
-	cups-deviced.8 \
-	cups-driverd.8 \
-	cups-lpd.8 \
-	cups-polld.8 \
-	lpadmin.8 \
-	lpinfo.8 \
-	lpmove.8 \
-	lpc.8
+.if !defined(CUPS_IMAGE)
+. if ${PORT_OPTIONS:MMDNSRESPONDER}
+CONFIGURE_ARGS+=	--enable-dnssd
+CONFIGURE_ARGS+=	--with-dnssd-includes=/usr/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
 
-MLINKS=	accept.8 reject.8 \
-	cupsaccept.8 cupsreject.8 \
-	cupsenable.8 cupsdisable.8
+.if ${OSVERSION} < 1000036 && ${ARCH} == i386
+LIBS+=		-lssp_nonshared
+.endif
 
-SUB_FILES+=	ulpt-cupsd.conf ulpt-cupsd.sh
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ENV+=	ac_cv_search_libiconv_open=no
 .endif
 
 post-patch:
@@ -292,10 +229,16 @@
 .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|-lpthreads.*;|${PTHREAD_LIBS};|g' \
-		-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
+	@${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|' \
@@ -314,6 +257,7 @@
 	@${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} \
@@ -321,10 +265,6 @@
 		${WRKSRC}/man/Makefile
 .endif
 
-pre-configure::
-	@${ECHO_MSG} Configuring CUPS with options:
-	@${ECHO_MSG} ${CONFIGURE_ARGS} | fmt
-
 post-configure:
 .if defined(CUPS_CLIENT)
 	@${REINPLACE_CMD} \
@@ -337,6 +277,7 @@
 .else
 	@${REINPLACE_CMD} \
 		-e 's|filter backend|backend|' \
+		-e 's|/etc/pam.d|${LOCALBASE}/etc/pam.d|'\
 		${WRKSRC}/Makedefs
 .endif
 
@@ -351,57 +292,26 @@
 .endif
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
-post-build:
-	cd ${WRKSRC}/filter && ${MAKE} pdftops
-.endif
-
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
-pre-su-install:
-	@${INSTALL} -d ${DESKTOPDIR}/
-	if ! pw groupshow ${CUPSGRP}; then pw groupadd ${CUPSGRP} -g 193; fi
-	if ! pw usershow ${CUPSOWN}; then pw useradd ${CUPSOWN} -g ${CUPSGRP} -u 193 \
-		-h - -d ${NONEXISTENT} -s /usr/sbin/nologin -c "CUPS Owner"; fi
-.if defined(CUPS_OVERWRITE_BASE)
-	if test -e /usr/bin/lp; then ${CHMOD} -h 0 /usr/bin/lp; fi
-	if test -e /usr/bin/lpq; then ${CHMOD} -h 0 /usr/bin/lpq; fi
-	if test -e /usr/bin/lpr; then ${CHMOD} -h 0 /usr/bin/lpr; fi
-	if test -e /usr/bin/lprm; then ${CHMOD} -h 0 /usr/bin/lprm; fi
-	if test -e /usr/sbin/lpc; then ${CHMOD} -h 0 /usr/sbin/lpc; fi
-.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 ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/cups/libcups.a ${PREFIX}/lib/
-	${INSTALL_MAN} ${WRKSRC}/man/cups-config.man ${PREFIX}/man/man1/cups-config.1
+	${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)
-	${INSTALL_DATA} ${WRKSRC}/cups/raster.h ${PREFIX}/include/cups/
 .else
-.if  ${PORT_OPTIONS:MGHOSTSCRIPT} || ${PORT_OPTIONS:MXPDF}
-	${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${PREFIX}/libexec/cups/filter/
-.endif
-	${LN} -sf ${PREFIX}/bin/lpr ${PREFIX}/bin/lpr-cups
-	${INSTALL} -d ${CUPS_ETCDIR}/
-	${CP} -p ${WRKSRC}/conf/snmp.conf ${WRKSRC}/conf/snmp.conf.N
+	${LN} -sf lpr ${STAGEDIR}${PREFIX}/bin/lpr-cups
+	${MKDIR} ${STAGEDIR}${ETCDIR}/
 .for f in cupsd.conf mime.convs mime.types snmp.conf
-	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
-	cd ${CUPS_ETCDIR}/; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi
+	test -f ${STAGEDIR}${ETCDIR}/${f} && ${RM} -f ${STAGEDIR}${ETCDIR}/${f} || ${TRUE}
+	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
-.if  ${PORT_OPTIONS:MPAM}
-	@if [ ! -f ${PREFIX}/etc/pam.d/cups ]; then \
-		${CP} -p ${PREFIX}/etc/pam.d/cups.default \
-		${PREFIX}/etc/pam.d/cups ; \
-	fi
+	@${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
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKDIR}/ulpt-cupsd.conf ${EXAMPLESDIR}/
-	${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${PREFIX}/sbin/
-	${INSTALL} -d ${CUPS_SPOOLDIR}/tmp/
-	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}/
-	${CHMOD} -R g+w ${CUPS_SPOOLDIR}/
-	${INSTALL} -d -m 775 -g ${CUPSGRP} ${CUPS_CACHEDIR}
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: trunk/print/cups-base/distinfo
===================================================================
--- trunk/print/cups-base/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,2 +1,2 @@
-SHA256 (cups-1.5.4-source.tar.bz2) = 8023034e8b58eab1ad7279364e872270a77459f6fb59a84d03229cb1d2a6d0e5
-SIZE (cups-1.5.4-source.tar.bz2) = 9583002
+SHA256 (cups-2.0.3-source.tar.bz2) = bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881
+SIZE (cups-2.0.3-source.tar.bz2) = 8797220

Modified: trunk/print/cups-base/files/cupsd.in
===================================================================
--- trunk/print/cups-base/files/cupsd.in	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/cupsd.in	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/print/cups-base/files/cupsd.in 372260 2014-11-07 13:03:09Z tijl $
 #
 # PROVIDE: cupsd
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON %%ZEROCONF%%
 # KEYWORD: shutdown
 #
 # Add the following to /etc/rc.conf[.local] to enable this service

Deleted: trunk/print/cups-base/files/patch-Makefile
===================================================================
--- trunk/print/cups-base/files/patch-Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/patch-Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,10 +0,0 @@
---- cups/Makefile.orig	2009-05-27 01:27:06.000000000 +0200
-+++ cups/Makefile	2009-10-21 09:49:20.000000000 +0200
-@@ -102,7 +102,6 @@
- 		ipp.h \
- 		language.h \
- 		ppd.h \
--		raster.h \
- 		sidechannel.h \
- 		transcode.h \
- 		versioning.h

Modified: trunk/print/cups-base/files/patch-conf-Makefile
===================================================================
--- trunk/print/cups-base/files/patch-conf-Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/patch-conf-Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,16 +1,34 @@
---- conf/Makefile.orig	2011-03-03 00:19:41.555484014 +0100
-+++ conf/Makefile	2011-03-03 00:20:17.791387420 +0100
-@@ -90,10 +90,10 @@
+--- 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.default ; then \
-+			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.default.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.default ; \
++			$(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)

Modified: trunk/print/cups-base/files/patch-configure
===================================================================
--- trunk/print/cups-base/files/patch-configure	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/patch-configure	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,6 +1,6 @@
---- configure.orig	2012-07-27 22:57:23.000000000 +0200
-+++ configure	2012-11-05 20:13:13.000000000 +0100
-@@ -566,6 +566,7 @@
+--- 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>
@@ -8,7 +8,21 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
-@@ -5660,7 +5661,7 @@
+@@ -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"
@@ -17,12 +31,21 @@
  		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"
-@@ -8302,7 +8303,7 @@
+@@ -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
  
- 	if test x$ac_cv_header_pthread_h = xyes; then
--				for flag in -lpthreads -lpthread -pthread; do
-+				for flag in -pthread; do
-         		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create using $flag" >&5
- $as_echo_n "checking for pthread_create using $flag... " >&6; }
- 			SAVELIBS="$LIBS"
+ 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"

Deleted: trunk/print/cups-base/files/patch-cups-request.c
===================================================================
--- trunk/print/cups-base/files/patch-cups-request.c	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/patch-cups-request.c	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,28 +0,0 @@
---- cups/request.c
-+++ cups/request.c
-@@ -1004,6 +1004,25 @@
-       httpClose(cg->http);
-       cg->http = NULL;
-     }
-+    else
-+    {
-+     /*
-+      * Same server, see if the connection is still established...
-+      */
-+
-+      char ch;				/* Connection check byte */
-+
-+      if (recv(cg->http->fd, &ch, 1, MSG_PEEK | MSG_DONTWAIT) < 0 &&
-+          errno != EWOULDBLOCK)
-+      {
-+       /*
-+        * Nope, close the connection...
-+        */
-+
-+	httpClose(cg->http);
-+	cg->http = NULL;
-+      }
-+    }
-   }
- 
-  /*

Deleted: trunk/print/cups-base/files/patch-cups.pam
===================================================================
--- trunk/print/cups-base/files/patch-cups.pam	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/patch-cups.pam	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,7 +0,0 @@
---- data/cups.pam.orig	2010-11-18 16:24:16.000000000 +0100
-+++ data/cups.pam	2010-11-18 16:24:50.000000000 +0100
-@@ -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

Added: trunk/print/cups-base/files/patch-data-Makefile
===================================================================
--- trunk/print/cups-base/files/patch-data-Makefile	                        (rev 0)
+++ trunk/print/cups-base/files/patch-data-Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,25 @@
+--- 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 \


Property changes on: trunk/print/cups-base/files/patch-data-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups-base/files/patch-data_cups.pam
===================================================================
--- trunk/print/cups-base/files/patch-data_cups.pam	                        (rev 0)
+++ trunk/print/cups-base/files/patch-data_cups.pam	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,7 @@
+--- 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


Property changes on: trunk/print/cups-base/files/patch-data_cups.pam
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups-base/files/patch-scheduler_Makefile
===================================================================
--- trunk/print/cups-base/files/patch-scheduler_Makefile	                        (rev 0)
+++ trunk/print/cups-base/files/patch-scheduler_Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,20 @@
+--- 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); \


Property changes on: trunk/print/cups-base/files/patch-scheduler_Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups-base/files/patch-scheduler__auth.c
===================================================================
--- trunk/print/cups-base/files/patch-scheduler__auth.c	                        (rev 0)
+++ trunk/print/cups-base/files/patch-scheduler__auth.c	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,20 @@
+--- scheduler/auth.c.orig	2014-08-28 15:37:22 UTC
++++ scheduler/auth.c
+@@ -491,7 +491,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+ 
+     peersize = sizeof(peercred);
+ 
+-#  ifdef __APPLE__
++#  if defined(__APPLE__) || defined(__FreeBSD__)
+     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
+ 
+       peersize = sizeof(peercred);
+ 
+-#    ifdef __APPLE__
++#    if defined(__APPLE__) || defined(__FreeBSD__)
+       if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize))
+ #    else
+       if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred,


Property changes on: trunk/print/cups-base/files/patch-scheduler__auth.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/cups-base/files/ulpt-cupsd.conf.in
===================================================================
--- trunk/print/cups-base/files/ulpt-cupsd.conf.in	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/ulpt-cupsd.conf.in	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,6 +1,6 @@
 # /usr/local/etc/devd/cups.conf
 #
-# $FreeBSD$
+# $FreeBSD: head/print/cups-base/files/ulpt-cupsd.conf.in 340872 2014-01-24 00:14:07Z mat $
 #
 # Tell cups to pause and unpause the printer when it arrives and departs.
 #

Modified: trunk/print/cups-base/files/ulpt-cupsd.sh.in
===================================================================
--- trunk/print/cups-base/files/ulpt-cupsd.sh.in	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/files/ulpt-cupsd.sh.in	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/print/cups-base/files/ulpt-cupsd.sh.in 340872 2014-01-24 00:14:07Z mat $
 
 usage() {
 	echo "$0: usage:" >&2

Modified: trunk/print/cups-base/pkg-descr
===================================================================
--- trunk/print/cups-base/pkg-descr	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/pkg-descr	2015-07-09 01:08:35 UTC (rev 19559)
@@ -17,7 +17,5 @@
 that use these filters. This software is available in the cups-pstoraster
 port.
 
-LICENSE: GPL2 or later with exception to link with OpenSSL
-
 WWW: http://www.cups.org/
 [original text by greid at ukug.uk.freebsd.org]

Modified: trunk/print/cups-base/pkg-descr.client
===================================================================
--- trunk/print/cups-base/pkg-descr.client	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/pkg-descr.client	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,5 +1,3 @@
 This provides libcups for applications to access CUPS.
 
-LICENSE: LGPL2 or later with exception to link with OpenSSL
-
 WWW: http://www.cups.org/

Modified: trunk/print/cups-base/pkg-descr.image
===================================================================
--- trunk/print/cups-base/pkg-descr.image	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/pkg-descr.image	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,5 +1,3 @@
 This provides libcupsimage for applications to process CUPS raster files.
 
-LICENSE: LGPL2 or later with exception to link with OpenSSL
-
 WWW: http://www.cups.org/

Modified: trunk/print/cups-base/pkg-plist
===================================================================
--- trunk/print/cups-base/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,21 +1,3 @@
- at exec if ! pw groupshow cups 2>/dev/null; then pw groupadd cups -g 193; fi
- at exec if ! pw usershow cups 2>/dev/null; then pw useradd cups -g cups -u 193 -h - -d /nonexistent -s /usr/sbin/nologin -c "CUPS Owner"; fi
- at unexec if pw usershow cups; then pw userdel cups; fi
- at exec mkdir -p /var/spool/cups/tmp || true
- at exec chown -R root:daemon /var/spool/cups
- at exec mkdir -p %%CACHEDIR%% || true
- at exec chown root:cups %%CACHEDIR%%
- at exec chmod 775 %%CACHEDIR%%
- at exec mkdir -p /var/log/cups || true
- at exec chown cups:daemon /var/log/cups
- at exec mkdir -p %D/etc/cups/ppd || true
- at exec mkdir -p %D/etc/cups/interfaces || true
- at unexec rm -rf %%CACHEDIR%% 2>/dev/null || true
- at unexec rmdir /var/spool/cups/tmp 2>/dev/null || true
- at unexec rmdir /var/spool/cups 2>/dev/null || true
- at unexec rmdir /var/log/cups 2>/dev/null || true
- at unexec rmdir /var/run/cups/certs 2>/dev/null || true
- at unexec rmdir /var/run/cups 2>/dev/null || true
 %%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
@@ -26,29 +8,19 @@
 %%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
- at unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi
-etc/cups/cupsd.conf.N
- at exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi
- at unexec if cmp -s %D/etc/cups/mime.convs.N %D/etc/cups/mime.convs; then rm -f %D/etc/cups/mime.convs; fi
-etc/cups/mime.convs.N
- at exec if test ! -f %D/etc/cups/mime.convs; then cp -p %D/etc/cups/mime.convs.N %D/etc/cups/mime.convs; fi
- at unexec if cmp -s %D/etc/cups/mime.types.N %D/etc/cups/mime.types; then rm -f %D/etc/cups/mime.types; fi
-etc/cups/mime.types.N
- at exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi
- at unexec if cmp -s %D/etc/cups/snmp.conf.N %D/etc/cups/snmp.conf; then rm -f %D/etc/cups/snmp.conf; fi
-etc/cups/snmp.conf.N
- at exec if test ! -f %D/etc/cups/snmp.conf; then cp -p %D/etc/cups/snmp.conf.N %D/etc/cups/snmp.conf; fi
- at exec chgrp cups %D/etc/cups
-%%WITH_PAMD%%@unexec if cmp -s %D/etc/pam.d/cups.default %D/etc/pam.d/cups; then rm -f %D/etc/pam.d/cups ; fi
-%%WITH_PAMD%%etc/pam.d/cups.default
-%%WITH_PAMD%%@exec if [ ! -f %D/etc/pam.d/cups ] ; then cp -p %D/%F %B/cups; fi
+ at sample %%ETCDIR%%/cups-files.conf.sample
+ at sample %%ETCDIR%%/cupsd.conf.sample
+ at sample %%ETCDIR%%/mime.convs.sample
+ at sample %%ETCDIR%%/mime.types.sample
+ at sample %%ETCDIR%%/snmp.conf.sample
+%%PAM%%@sample etc/pam.d/cups.sample
 bin/cancel
 bin/cupstestdsc
 bin/cupstestppd
+ at comment bin/ippfind
 bin/ipptool
 bin/lp
 bin/lpoptions
-bin/lppasswd
 bin/lpq
 bin/lpr
 bin/lpr-cups
@@ -59,33 +31,26 @@
 bin/ppdi
 bin/ppdmerge
 bin/ppdpo
-etc/cups/cupsd.conf.default
 include/cups/cgi.h
-include/cups/driver.h
 include/cups/help-index.h
 include/cups/mime.h
 include/cups/ppdc.h
 lib/libcupscgi.so
 lib/libcupscgi.so.1
-lib/libcupsdriver.so
-lib/libcupsdriver.so.1
 lib/libcupsmime.so
 lib/libcupsmime.so.1
 lib/libcupsppdc.so
 lib/libcupsppdc.so.1
-%%PHP%%lib/php/%%PHP_EXT_DIR%%/phpcups.so
 libexec/cups/backend/http
 libexec/cups/backend/https
 libexec/cups/backend/ipp
 libexec/cups/backend/ipps
 libexec/cups/backend/lpd
-libexec/cups/backend/parallel
-libexec/cups/backend/serial
 libexec/cups/backend/snmp
 libexec/cups/backend/socket
 libexec/cups/backend/usb
-%%WITH_MDNSRESPONDER%%libexec/cups/backend/dnssd
-%%WITH_MDNSRESPONDER%%libexec/cups/backend/mdns
+%%AVAHI%%libexec/cups/backend/dnssd
+%%MDNSRESPONDER%%libexec/cups/backend/dnssd
 libexec/cups/cgi-bin/admin.cgi
 libexec/cups/cgi-bin/classes.cgi
 libexec/cups/cgi-bin/help.cgi
@@ -95,17 +60,64 @@
 libexec/cups/daemon/cups-driverd
 libexec/cups/daemon/cups-exec
 libexec/cups/daemon/cups-lpd
-libexec/cups/daemon/cups-polld
-libexec/cups/filter/commandtoescpx
-libexec/cups/filter/commandtopclx
-%%WITH_PDFTOPS%%libexec/cups/filter/pdftops
-libexec/cups/filter/rastertoescpx
-libexec/cups/filter/rastertopclx
 libexec/cups/monitor/bcp
 libexec/cups/monitor/tbcp
-%%WITH_DBUS%%libexec/cups/notifier/dbus
+%%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
@@ -115,21 +127,12 @@
 sbin/cupsenable
 sbin/cupsfilter
 sbin/cupsreject
-sbin/ulpt-cupsd.sh
 sbin/lpadmin
 sbin/lpc
 sbin/lpinfo
 sbin/lpmove
 sbin/reject
-%%DATADIR%%/banners/classified
-%%DATADIR%%/banners/confidential
-%%DATADIR%%/banners/secret
-%%DATADIR%%/banners/standard
-%%DATADIR%%/banners/topsecret
-%%DATADIR%%/banners/unclassified
-%%DATADIR%%/charsets/utf-8
-%%DATADIR%%/data/psglyphs
-%%DATADIR%%/data/testprint
+sbin/ulpt-cupsd.sh
 %%DATADIR%%/drv/sample.drv
 %%DATADIR%%/examples/color.drv
 %%DATADIR%%/examples/constraint.drv
@@ -142,19 +145,43 @@
 %%DATADIR%%/examples/r300-basic.drv
 %%DATADIR%%/examples/r300-colorman.drv
 %%DATADIR%%/examples/r300-remote.drv
-%%DATADIR%%/fonts/Monospace
-%%DATADIR%%/fonts/Monospace-Bold
-%%DATADIR%%/fonts/Monospace-BoldOblique
-%%DATADIR%%/fonts/Monospace-Oblique
+%%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/escp.h
 %%DATADIR%%/ppdc/font.defs
 %%DATADIR%%/ppdc/hp.h
 %%DATADIR%%/ppdc/label.h
 %%DATADIR%%/ppdc/media.defs
-%%DATADIR%%/ppdc/pcl.h
 %%DATADIR%%/ppdc/raster.defs
 %%DATADIR%%/templates/add-class.tmpl
 %%DATADIR%%/templates/add-printer.tmpl
@@ -197,7 +224,6 @@
 %%DATADIR%%/templates/de/error.tmpl
 %%DATADIR%%/templates/de/header.tmpl
 %%DATADIR%%/templates/de/help-header.tmpl
-%%DATADIR%%/templates/de/help-trailer.tmpl
 %%DATADIR%%/templates/de/help-printable.tmpl
 %%DATADIR%%/templates/de/job-cancel.tmpl
 %%DATADIR%%/templates/de/job-hold.tmpl
@@ -220,6 +246,7 @@
 %%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
@@ -226,7 +253,6 @@
 %%DATADIR%%/templates/de/printer-deleted.tmpl
 %%DATADIR%%/templates/de/printer-jobs-header.tmpl
 %%DATADIR%%/templates/de/printer-modified.tmpl
-%%DATADIR%%/templates/de/printer-purge.tmpl
 %%DATADIR%%/templates/de/printer-reject.tmpl
 %%DATADIR%%/templates/de/printer-start.tmpl
 %%DATADIR%%/templates/de/printer-stop.tmpl
@@ -293,6 +319,7 @@
 %%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
@@ -299,7 +326,6 @@
 %%DATADIR%%/templates/es/printer-deleted.tmpl
 %%DATADIR%%/templates/es/printer-jobs-header.tmpl
 %%DATADIR%%/templates/es/printer-modified.tmpl
-%%DATADIR%%/templates/es/printer-purge.tmpl
 %%DATADIR%%/templates/es/printer-reject.tmpl
 %%DATADIR%%/templates/es/printer-start.tmpl
 %%DATADIR%%/templates/es/printer-stop.tmpl
@@ -317,359 +343,10 @@
 %%DATADIR%%/templates/es/test-page.tmpl
 %%DATADIR%%/templates/es/trailer.tmpl
 %%DATADIR%%/templates/es/users.tmpl
-%%DATADIR%%/templates/eu/add-class.tmpl
-%%DATADIR%%/templates/eu/add-printer.tmpl
-%%DATADIR%%/templates/eu/add-rss-subscription.tmpl
-%%DATADIR%%/templates/eu/admin.tmpl
-%%DATADIR%%/templates/eu/choose-device.tmpl
-%%DATADIR%%/templates/eu/choose-make.tmpl
-%%DATADIR%%/templates/eu/choose-model.tmpl
-%%DATADIR%%/templates/eu/choose-serial.tmpl
-%%DATADIR%%/templates/eu/choose-uri.tmpl
-%%DATADIR%%/templates/eu/class-added.tmpl
-%%DATADIR%%/templates/eu/class-confirm.tmpl
-%%DATADIR%%/templates/eu/class-deleted.tmpl
-%%DATADIR%%/templates/eu/class-jobs-header.tmpl
-%%DATADIR%%/templates/eu/class-modified.tmpl
-%%DATADIR%%/templates/eu/class.tmpl
-%%DATADIR%%/templates/eu/classes-header.tmpl
-%%DATADIR%%/templates/eu/classes.tmpl
-%%DATADIR%%/templates/eu/command.tmpl
-%%DATADIR%%/templates/eu/edit-config.tmpl
-%%DATADIR%%/templates/eu/error-op.tmpl
-%%DATADIR%%/templates/eu/error.tmpl
-%%DATADIR%%/templates/eu/header.tmpl
-%%DATADIR%%/templates/eu/help-header.tmpl
-%%DATADIR%%/templates/eu/help-printable.tmpl
-%%DATADIR%%/templates/eu/help-trailer.tmpl
-%%DATADIR%%/templates/eu/job-cancel.tmpl
-%%DATADIR%%/templates/eu/job-hold.tmpl
-%%DATADIR%%/templates/eu/job-move.tmpl
-%%DATADIR%%/templates/eu/job-moved.tmpl
-%%DATADIR%%/templates/eu/job-release.tmpl
-%%DATADIR%%/templates/eu/job-restart.tmpl
-%%DATADIR%%/templates/eu/jobs-header.tmpl
-%%DATADIR%%/templates/eu/jobs.tmpl
-%%DATADIR%%/templates/eu/list-available-printers.tmpl
-%%DATADIR%%/templates/eu/modify-class.tmpl
-%%DATADIR%%/templates/eu/modify-printer.tmpl
-%%DATADIR%%/templates/eu/norestart.tmpl
-%%DATADIR%%/templates/eu/option-boolean.tmpl
-%%DATADIR%%/templates/eu/option-conflict.tmpl
-%%DATADIR%%/templates/eu/option-header.tmpl
-%%DATADIR%%/templates/eu/option-pickmany.tmpl
-%%DATADIR%%/templates/eu/option-pickone.tmpl
-%%DATADIR%%/templates/eu/option-trailer.tmpl
-%%DATADIR%%/templates/eu/pager.tmpl
-%%DATADIR%%/templates/eu/printer-accept.tmpl
-%%DATADIR%%/templates/eu/printer-added.tmpl
-%%DATADIR%%/templates/eu/printer-configured.tmpl
-%%DATADIR%%/templates/eu/printer-confirm.tmpl
-%%DATADIR%%/templates/eu/printer-default.tmpl
-%%DATADIR%%/templates/eu/printer-deleted.tmpl
-%%DATADIR%%/templates/eu/printer-jobs-header.tmpl
-%%DATADIR%%/templates/eu/printer-modified.tmpl
-%%DATADIR%%/templates/eu/printer-purge.tmpl
-%%DATADIR%%/templates/eu/printer-reject.tmpl
-%%DATADIR%%/templates/eu/printer-start.tmpl
-%%DATADIR%%/templates/eu/printer-stop.tmpl
-%%DATADIR%%/templates/eu/printer.tmpl
-%%DATADIR%%/templates/eu/printers-header.tmpl
-%%DATADIR%%/templates/eu/printers.tmpl
-%%DATADIR%%/templates/eu/restart.tmpl
-%%DATADIR%%/templates/eu/samba-export.tmpl
-%%DATADIR%%/templates/eu/samba-exported.tmpl
-%%DATADIR%%/templates/eu/search.tmpl
-%%DATADIR%%/templates/eu/set-printer-options-header.tmpl
-%%DATADIR%%/templates/eu/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/eu/subscription-added.tmpl
-%%DATADIR%%/templates/eu/subscription-canceled.tmpl
-%%DATADIR%%/templates/eu/test-page.tmpl
-%%DATADIR%%/templates/eu/trailer.tmpl
-%%DATADIR%%/templates/eu/users.tmpl
-%%DATADIR%%/templates/fr/add-class.tmpl
-%%DATADIR%%/templates/fr/add-printer.tmpl
-%%DATADIR%%/templates/fr/add-rss-subscription.tmpl
-%%DATADIR%%/templates/fr/admin.tmpl
-%%DATADIR%%/templates/fr/choose-device.tmpl
-%%DATADIR%%/templates/fr/choose-make.tmpl
-%%DATADIR%%/templates/fr/choose-model.tmpl
-%%DATADIR%%/templates/fr/choose-serial.tmpl
-%%DATADIR%%/templates/fr/choose-uri.tmpl
-%%DATADIR%%/templates/fr/class.tmpl
-%%DATADIR%%/templates/fr/class-added.tmpl
-%%DATADIR%%/templates/fr/class-confirm.tmpl
-%%DATADIR%%/templates/fr/class-deleted.tmpl
-%%DATADIR%%/templates/fr/class-jobs-header.tmpl
-%%DATADIR%%/templates/fr/class-modified.tmpl
-%%DATADIR%%/templates/fr/classes.tmpl
-%%DATADIR%%/templates/fr/classes-header.tmpl
-%%DATADIR%%/templates/fr/command.tmpl
-%%DATADIR%%/templates/fr/edit-config.tmpl
-%%DATADIR%%/templates/fr/error.tmpl
-%%DATADIR%%/templates/fr/error-op.tmpl
-%%DATADIR%%/templates/fr/header.tmpl
-%%DATADIR%%/templates/fr/help-header.tmpl
-%%DATADIR%%/templates/fr/help-trailer.tmpl
-%%DATADIR%%/templates/fr/help-printable.tmpl
-%%DATADIR%%/templates/fr/job-cancel.tmpl
-%%DATADIR%%/templates/fr/job-hold.tmpl
-%%DATADIR%%/templates/fr/job-move.tmpl
-%%DATADIR%%/templates/fr/job-moved.tmpl
-%%DATADIR%%/templates/fr/job-release.tmpl
-%%DATADIR%%/templates/fr/job-restart.tmpl
-%%DATADIR%%/templates/fr/jobs.tmpl
-%%DATADIR%%/templates/fr/jobs-header.tmpl
-%%DATADIR%%/templates/fr/list-available-printers.tmpl
-%%DATADIR%%/templates/fr/modify-class.tmpl
-%%DATADIR%%/templates/fr/modify-printer.tmpl
-%%DATADIR%%/templates/fr/norestart.tmpl
-%%DATADIR%%/templates/fr/option-boolean.tmpl
-%%DATADIR%%/templates/fr/option-conflict.tmpl
-%%DATADIR%%/templates/fr/option-header.tmpl
-%%DATADIR%%/templates/fr/option-pickmany.tmpl
-%%DATADIR%%/templates/fr/option-pickone.tmpl
-%%DATADIR%%/templates/fr/option-trailer.tmpl
-%%DATADIR%%/templates/fr/pager.tmpl
-%%DATADIR%%/templates/fr/printer.tmpl
-%%DATADIR%%/templates/fr/printer-accept.tmpl
-%%DATADIR%%/templates/fr/printer-added.tmpl
-%%DATADIR%%/templates/fr/printer-configured.tmpl
-%%DATADIR%%/templates/fr/printer-confirm.tmpl
-%%DATADIR%%/templates/fr/printer-default.tmpl
-%%DATADIR%%/templates/fr/printer-deleted.tmpl
-%%DATADIR%%/templates/fr/printer-jobs-header.tmpl
-%%DATADIR%%/templates/fr/printer-modified.tmpl
-%%DATADIR%%/templates/fr/printer-purge.tmpl
-%%DATADIR%%/templates/fr/printer-reject.tmpl
-%%DATADIR%%/templates/fr/printer-start.tmpl
-%%DATADIR%%/templates/fr/printer-stop.tmpl
-%%DATADIR%%/templates/fr/printers.tmpl
-%%DATADIR%%/templates/fr/printers-header.tmpl
-%%DATADIR%%/templates/fr/restart.tmpl
-%%DATADIR%%/templates/fr/samba-export.tmpl
-%%DATADIR%%/templates/fr/samba-exported.tmpl
-%%DATADIR%%/templates/fr/search.tmpl
-%%DATADIR%%/templates/fr/set-printer-options-header.tmpl
-%%DATADIR%%/templates/fr/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/fr/subscription-added.tmpl
-%%DATADIR%%/templates/fr/subscription-canceled.tmpl
-%%DATADIR%%/templates/fr/test-page.tmpl
-%%DATADIR%%/templates/fr/trailer.tmpl
-%%DATADIR%%/templates/fr/users.tmpl
-%%DATADIR%%/templates/hu/add-class.tmpl
-%%DATADIR%%/templates/hu/add-printer.tmpl
-%%DATADIR%%/templates/hu/add-rss-subscription.tmpl
-%%DATADIR%%/templates/hu/admin.tmpl
-%%DATADIR%%/templates/hu/choose-device.tmpl
-%%DATADIR%%/templates/hu/choose-make.tmpl
-%%DATADIR%%/templates/hu/choose-model.tmpl
-%%DATADIR%%/templates/hu/choose-serial.tmpl
-%%DATADIR%%/templates/hu/choose-uri.tmpl
-%%DATADIR%%/templates/hu/class.tmpl
-%%DATADIR%%/templates/hu/class-added.tmpl
-%%DATADIR%%/templates/hu/class-confirm.tmpl
-%%DATADIR%%/templates/hu/class-deleted.tmpl
-%%DATADIR%%/templates/hu/class-jobs-header.tmpl
-%%DATADIR%%/templates/hu/class-modified.tmpl
-%%DATADIR%%/templates/hu/classes.tmpl
-%%DATADIR%%/templates/hu/classes-header.tmpl
-%%DATADIR%%/templates/hu/command.tmpl
-%%DATADIR%%/templates/hu/edit-config.tmpl
-%%DATADIR%%/templates/hu/error.tmpl
-%%DATADIR%%/templates/hu/error-op.tmpl
-%%DATADIR%%/templates/hu/header.tmpl
-%%DATADIR%%/templates/hu/help-header.tmpl
-%%DATADIR%%/templates/hu/help-trailer.tmpl
-%%DATADIR%%/templates/hu/help-printable.tmpl
-%%DATADIR%%/templates/hu/job-cancel.tmpl
-%%DATADIR%%/templates/hu/job-hold.tmpl
-%%DATADIR%%/templates/hu/job-move.tmpl
-%%DATADIR%%/templates/hu/job-moved.tmpl
-%%DATADIR%%/templates/hu/job-release.tmpl
-%%DATADIR%%/templates/hu/job-restart.tmpl
-%%DATADIR%%/templates/hu/jobs.tmpl
-%%DATADIR%%/templates/hu/jobs-header.tmpl
-%%DATADIR%%/templates/hu/list-available-printers.tmpl
-%%DATADIR%%/templates/hu/modify-class.tmpl
-%%DATADIR%%/templates/hu/modify-printer.tmpl
-%%DATADIR%%/templates/hu/norestart.tmpl
-%%DATADIR%%/templates/hu/option-boolean.tmpl
-%%DATADIR%%/templates/hu/option-conflict.tmpl
-%%DATADIR%%/templates/hu/option-header.tmpl
-%%DATADIR%%/templates/hu/option-pickmany.tmpl
-%%DATADIR%%/templates/hu/option-pickone.tmpl
-%%DATADIR%%/templates/hu/option-trailer.tmpl
-%%DATADIR%%/templates/hu/pager.tmpl
-%%DATADIR%%/templates/hu/printer.tmpl
-%%DATADIR%%/templates/hu/printer-accept.tmpl
-%%DATADIR%%/templates/hu/printer-added.tmpl
-%%DATADIR%%/templates/hu/printer-configured.tmpl
-%%DATADIR%%/templates/hu/printer-confirm.tmpl
-%%DATADIR%%/templates/hu/printer-default.tmpl
-%%DATADIR%%/templates/hu/printer-deleted.tmpl
-%%DATADIR%%/templates/hu/printer-jobs-header.tmpl
-%%DATADIR%%/templates/hu/printer-modified.tmpl
-%%DATADIR%%/templates/hu/printer-purge.tmpl
-%%DATADIR%%/templates/hu/printer-reject.tmpl
-%%DATADIR%%/templates/hu/printer-start.tmpl
-%%DATADIR%%/templates/hu/printer-stop.tmpl
-%%DATADIR%%/templates/hu/printers.tmpl
-%%DATADIR%%/templates/hu/printers-header.tmpl
-%%DATADIR%%/templates/hu/restart.tmpl
-%%DATADIR%%/templates/hu/samba-export.tmpl
-%%DATADIR%%/templates/hu/samba-exported.tmpl
-%%DATADIR%%/templates/hu/search.tmpl
-%%DATADIR%%/templates/hu/set-printer-options-header.tmpl
-%%DATADIR%%/templates/hu/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/hu/subscription-added.tmpl
-%%DATADIR%%/templates/hu/subscription-canceled.tmpl
-%%DATADIR%%/templates/hu/test-page.tmpl
-%%DATADIR%%/templates/hu/trailer.tmpl
-%%DATADIR%%/templates/hu/users.tmpl
 %%DATADIR%%/templates/header.tmpl
 %%DATADIR%%/templates/help-header.tmpl
 %%DATADIR%%/templates/help-printable.tmpl
 %%DATADIR%%/templates/help-trailer.tmpl
-%%DATADIR%%/templates/id/add-class.tmpl
-%%DATADIR%%/templates/id/add-printer.tmpl
-%%DATADIR%%/templates/id/add-rss-subscription.tmpl
-%%DATADIR%%/templates/id/admin.tmpl
-%%DATADIR%%/templates/id/choose-device.tmpl
-%%DATADIR%%/templates/id/choose-make.tmpl
-%%DATADIR%%/templates/id/choose-model.tmpl
-%%DATADIR%%/templates/id/choose-serial.tmpl
-%%DATADIR%%/templates/id/choose-uri.tmpl
-%%DATADIR%%/templates/id/class-added.tmpl
-%%DATADIR%%/templates/id/class-confirm.tmpl
-%%DATADIR%%/templates/id/class-deleted.tmpl
-%%DATADIR%%/templates/id/class-jobs-header.tmpl
-%%DATADIR%%/templates/id/class-modified.tmpl
-%%DATADIR%%/templates/id/class.tmpl
-%%DATADIR%%/templates/id/classes-header.tmpl
-%%DATADIR%%/templates/id/classes.tmpl
-%%DATADIR%%/templates/id/command.tmpl
-%%DATADIR%%/templates/id/edit-config.tmpl
-%%DATADIR%%/templates/id/error-op.tmpl
-%%DATADIR%%/templates/id/error.tmpl
-%%DATADIR%%/templates/id/header.tmpl
-%%DATADIR%%/templates/id/help-header.tmpl
-%%DATADIR%%/templates/id/help-printable.tmpl
-%%DATADIR%%/templates/id/help-trailer.tmpl
-%%DATADIR%%/templates/id/job-cancel.tmpl
-%%DATADIR%%/templates/id/job-hold.tmpl
-%%DATADIR%%/templates/id/job-move.tmpl
-%%DATADIR%%/templates/id/job-moved.tmpl
-%%DATADIR%%/templates/id/job-release.tmpl
-%%DATADIR%%/templates/id/job-restart.tmpl
-%%DATADIR%%/templates/id/jobs-header.tmpl
-%%DATADIR%%/templates/id/jobs.tmpl
-%%DATADIR%%/templates/id/list-available-printers.tmpl
-%%DATADIR%%/templates/id/modify-class.tmpl
-%%DATADIR%%/templates/id/modify-printer.tmpl
-%%DATADIR%%/templates/id/norestart.tmpl
-%%DATADIR%%/templates/id/option-boolean.tmpl
-%%DATADIR%%/templates/id/option-conflict.tmpl
-%%DATADIR%%/templates/id/option-header.tmpl
-%%DATADIR%%/templates/id/option-pickmany.tmpl
-%%DATADIR%%/templates/id/option-pickone.tmpl
-%%DATADIR%%/templates/id/option-trailer.tmpl
-%%DATADIR%%/templates/id/pager.tmpl
-%%DATADIR%%/templates/id/printer-accept.tmpl
-%%DATADIR%%/templates/id/printer-added.tmpl
-%%DATADIR%%/templates/id/printer-configured.tmpl
-%%DATADIR%%/templates/id/printer-confirm.tmpl
-%%DATADIR%%/templates/id/printer-default.tmpl
-%%DATADIR%%/templates/id/printer-deleted.tmpl
-%%DATADIR%%/templates/id/printer-jobs-header.tmpl
-%%DATADIR%%/templates/id/printer-modified.tmpl
-%%DATADIR%%/templates/id/printer-purge.tmpl
-%%DATADIR%%/templates/id/printer-reject.tmpl
-%%DATADIR%%/templates/id/printer-start.tmpl
-%%DATADIR%%/templates/id/printer-stop.tmpl
-%%DATADIR%%/templates/id/printer.tmpl
-%%DATADIR%%/templates/id/printers-header.tmpl
-%%DATADIR%%/templates/id/printers.tmpl
-%%DATADIR%%/templates/id/restart.tmpl
-%%DATADIR%%/templates/id/samba-export.tmpl
-%%DATADIR%%/templates/id/samba-exported.tmpl
-%%DATADIR%%/templates/id/search.tmpl
-%%DATADIR%%/templates/id/set-printer-options-header.tmpl
-%%DATADIR%%/templates/id/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/id/subscription-added.tmpl
-%%DATADIR%%/templates/id/subscription-canceled.tmpl
-%%DATADIR%%/templates/id/test-page.tmpl
-%%DATADIR%%/templates/id/trailer.tmpl
-%%DATADIR%%/templates/id/users.tmpl
-%%DATADIR%%/templates/it/add-class.tmpl
-%%DATADIR%%/templates/it/add-printer.tmpl
-%%DATADIR%%/templates/it/add-rss-subscription.tmpl
-%%DATADIR%%/templates/it/admin.tmpl
-%%DATADIR%%/templates/it/choose-device.tmpl
-%%DATADIR%%/templates/it/choose-make.tmpl
-%%DATADIR%%/templates/it/choose-model.tmpl
-%%DATADIR%%/templates/it/choose-serial.tmpl
-%%DATADIR%%/templates/it/choose-uri.tmpl
-%%DATADIR%%/templates/it/class-added.tmpl
-%%DATADIR%%/templates/it/class-confirm.tmpl
-%%DATADIR%%/templates/it/class-deleted.tmpl
-%%DATADIR%%/templates/it/class-jobs-header.tmpl
-%%DATADIR%%/templates/it/class-modified.tmpl
-%%DATADIR%%/templates/it/class.tmpl
-%%DATADIR%%/templates/it/classes-header.tmpl
-%%DATADIR%%/templates/it/classes.tmpl
-%%DATADIR%%/templates/it/command.tmpl
-%%DATADIR%%/templates/it/edit-config.tmpl
-%%DATADIR%%/templates/it/error-op.tmpl
-%%DATADIR%%/templates/it/error.tmpl
-%%DATADIR%%/templates/it/help-header.tmpl
-%%DATADIR%%/templates/it/help-printable.tmpl
-%%DATADIR%%/templates/it/help-trailer.tmpl
-%%DATADIR%%/templates/it/job-cancel.tmpl
-%%DATADIR%%/templates/it/job-hold.tmpl
-%%DATADIR%%/templates/it/job-move.tmpl
-%%DATADIR%%/templates/it/job-moved.tmpl
-%%DATADIR%%/templates/it/job-release.tmpl
-%%DATADIR%%/templates/it/job-restart.tmpl
-%%DATADIR%%/templates/it/jobs-header.tmpl
-%%DATADIR%%/templates/it/jobs.tmpl
-%%DATADIR%%/templates/it/list-available-printers.tmpl
-%%DATADIR%%/templates/it/modify-class.tmpl
-%%DATADIR%%/templates/it/modify-printer.tmpl
-%%DATADIR%%/templates/it/norestart.tmpl
-%%DATADIR%%/templates/it/option-boolean.tmpl
-%%DATADIR%%/templates/it/option-conflict.tmpl
-%%DATADIR%%/templates/it/option-header.tmpl
-%%DATADIR%%/templates/it/option-pickmany.tmpl
-%%DATADIR%%/templates/it/option-pickone.tmpl
-%%DATADIR%%/templates/it/option-trailer.tmpl
-%%DATADIR%%/templates/it/pager.tmpl
-%%DATADIR%%/templates/it/printer-accept.tmpl
-%%DATADIR%%/templates/it/printer-added.tmpl
-%%DATADIR%%/templates/it/printer-configured.tmpl
-%%DATADIR%%/templates/it/printer-confirm.tmpl
-%%DATADIR%%/templates/it/printer-default.tmpl
-%%DATADIR%%/templates/it/printer-deleted.tmpl
-%%DATADIR%%/templates/it/printer-jobs-header.tmpl
-%%DATADIR%%/templates/it/printer-modified.tmpl
-%%DATADIR%%/templates/it/printer-purge.tmpl
-%%DATADIR%%/templates/it/printer-reject.tmpl
-%%DATADIR%%/templates/it/printer-start.tmpl
-%%DATADIR%%/templates/it/printer-stop.tmpl
-%%DATADIR%%/templates/it/printer.tmpl
-%%DATADIR%%/templates/it/printers-header.tmpl
-%%DATADIR%%/templates/it/printers.tmpl
-%%DATADIR%%/templates/it/restart.tmpl
-%%DATADIR%%/templates/it/samba-export.tmpl
-%%DATADIR%%/templates/it/samba-exported.tmpl
-%%DATADIR%%/templates/it/search.tmpl
-%%DATADIR%%/templates/it/set-printer-options-header.tmpl
-%%DATADIR%%/templates/it/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/it/subscription-added.tmpl
-%%DATADIR%%/templates/it/subscription-canceled.tmpl
-%%DATADIR%%/templates/it/test-page.tmpl
-%%DATADIR%%/templates/it/trailer.tmpl
-%%DATADIR%%/templates/it/users.tmpl
 %%DATADIR%%/templates/ja/add-class.tmpl
 %%DATADIR%%/templates/ja/add-printer.tmpl
 %%DATADIR%%/templates/ja/add-rss-subscription.tmpl
@@ -716,6 +393,7 @@
 %%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
@@ -722,7 +400,6 @@
 %%DATADIR%%/templates/ja/printer-deleted.tmpl
 %%DATADIR%%/templates/ja/printer-jobs-header.tmpl
 %%DATADIR%%/templates/ja/printer-modified.tmpl
-%%DATADIR%%/templates/ja/printer-purge.tmpl
 %%DATADIR%%/templates/ja/printer-reject.tmpl
 %%DATADIR%%/templates/ja/printer-start.tmpl
 %%DATADIR%%/templates/ja/printer-stop.tmpl
@@ -759,76 +436,9 @@
 %%DATADIR%%/templates/option-pickone.tmpl
 %%DATADIR%%/templates/option-trailer.tmpl
 %%DATADIR%%/templates/pager.tmpl
-%%DATADIR%%/templates/pl/add-class.tmpl
-%%DATADIR%%/templates/pl/add-printer.tmpl
-%%DATADIR%%/templates/pl/add-rss-subscription.tmpl
-%%DATADIR%%/templates/pl/admin.tmpl
-%%DATADIR%%/templates/pl/choose-device.tmpl
-%%DATADIR%%/templates/pl/choose-make.tmpl
-%%DATADIR%%/templates/pl/choose-model.tmpl
-%%DATADIR%%/templates/pl/choose-serial.tmpl
-%%DATADIR%%/templates/pl/choose-uri.tmpl
-%%DATADIR%%/templates/pl/class-added.tmpl
-%%DATADIR%%/templates/pl/class-confirm.tmpl
-%%DATADIR%%/templates/pl/class-deleted.tmpl
-%%DATADIR%%/templates/pl/class-jobs-header.tmpl
-%%DATADIR%%/templates/pl/class-modified.tmpl
-%%DATADIR%%/templates/pl/class.tmpl
-%%DATADIR%%/templates/pl/classes-header.tmpl
-%%DATADIR%%/templates/pl/classes.tmpl
-%%DATADIR%%/templates/pl/command.tmpl
-%%DATADIR%%/templates/pl/edit-config.tmpl
-%%DATADIR%%/templates/pl/error-op.tmpl
-%%DATADIR%%/templates/pl/error.tmpl
-%%DATADIR%%/templates/pl/header.tmpl
-%%DATADIR%%/templates/pl/help-header.tmpl
-%%DATADIR%%/templates/pl/help-printable.tmpl
-%%DATADIR%%/templates/pl/help-trailer.tmpl
-%%DATADIR%%/templates/pl/job-cancel.tmpl
-%%DATADIR%%/templates/pl/job-hold.tmpl
-%%DATADIR%%/templates/pl/job-move.tmpl
-%%DATADIR%%/templates/pl/job-moved.tmpl
-%%DATADIR%%/templates/pl/job-release.tmpl
-%%DATADIR%%/templates/pl/job-restart.tmpl
-%%DATADIR%%/templates/pl/jobs-header.tmpl
-%%DATADIR%%/templates/pl/jobs.tmpl
-%%DATADIR%%/templates/pl/list-available-printers.tmpl
-%%DATADIR%%/templates/pl/modify-class.tmpl
-%%DATADIR%%/templates/pl/modify-printer.tmpl
-%%DATADIR%%/templates/pl/option-boolean.tmpl
-%%DATADIR%%/templates/pl/option-conflict.tmpl
-%%DATADIR%%/templates/pl/option-header.tmpl
-%%DATADIR%%/templates/pl/option-pickmany.tmpl
-%%DATADIR%%/templates/pl/option-pickone.tmpl
-%%DATADIR%%/templates/pl/option-trailer.tmpl
-%%DATADIR%%/templates/pl/pager.tmpl
-%%DATADIR%%/templates/pl/printer-accept.tmpl
-%%DATADIR%%/templates/pl/printer-added.tmpl
-%%DATADIR%%/templates/pl/printer-configured.tmpl
-%%DATADIR%%/templates/pl/printer-confirm.tmpl
-%%DATADIR%%/templates/pl/printer-default.tmpl
-%%DATADIR%%/templates/pl/printer-deleted.tmpl
-%%DATADIR%%/templates/pl/printer-jobs-header.tmpl
-%%DATADIR%%/templates/pl/printer-modified.tmpl
-%%DATADIR%%/templates/pl/printer-purge.tmpl
-%%DATADIR%%/templates/pl/printer-reject.tmpl
-%%DATADIR%%/templates/pl/printer-start.tmpl
-%%DATADIR%%/templates/pl/printer-stop.tmpl
-%%DATADIR%%/templates/pl/printers-header.tmpl
-%%DATADIR%%/templates/pl/printers.tmpl
-%%DATADIR%%/templates/pl/restart.tmpl
-%%DATADIR%%/templates/pl/samba-export.tmpl
-%%DATADIR%%/templates/pl/samba-exported.tmpl
-%%DATADIR%%/templates/pl/search.tmpl
-%%DATADIR%%/templates/pl/set-printer-options-header.tmpl
-%%DATADIR%%/templates/pl/set-printer-options-trailer.tmpl
-%%DATADIR%%/templates/pl/subscription-added.tmpl
-%%DATADIR%%/templates/pl/subscription-canceled.tmpl
-%%DATADIR%%/templates/pl/test-page.tmpl
-%%DATADIR%%/templates/pl/trailer.tmpl
-%%DATADIR%%/templates/pl/users.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
@@ -835,12 +445,9 @@
 %%DATADIR%%/templates/printer-deleted.tmpl
 %%DATADIR%%/templates/printer-jobs-header.tmpl
 %%DATADIR%%/templates/printer-modified.tmpl
-%%DATADIR%%/templates/printer-purge.tmpl
 %%DATADIR%%/templates/printer-reject.tmpl
 %%DATADIR%%/templates/printer-start.tmpl
 %%DATADIR%%/templates/printer-stop.tmpl
-%%DATADIR%%/templates/pl/norestart.tmpl
-%%DATADIR%%/templates/pl/printer.tmpl
 %%DATADIR%%/templates/printer.tmpl
 %%DATADIR%%/templates/printers-header.tmpl
 %%DATADIR%%/templates/printers.tmpl
@@ -869,7 +476,6 @@
 %%DATADIR%%/templates/ru/header.tmpl
 %%DATADIR%%/templates/ru/help-header.tmpl
 %%DATADIR%%/templates/ru/help-printable.tmpl
-%%DATADIR%%/templates/ru/help-trailer.tmpl
 %%DATADIR%%/templates/ru/job-cancel.tmpl
 %%DATADIR%%/templates/ru/job-hold.tmpl
 %%DATADIR%%/templates/ru/job-move.tmpl
@@ -891,6 +497,7 @@
 %%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
@@ -897,7 +504,6 @@
 %%DATADIR%%/templates/ru/printer-deleted.tmpl
 %%DATADIR%%/templates/ru/printer-jobs-header.tmpl
 %%DATADIR%%/templates/ru/printer-modified.tmpl
-%%DATADIR%%/templates/ru/printer-purge.tmpl
 %%DATADIR%%/templates/ru/printer-reject.tmpl
 %%DATADIR%%/templates/ru/printer-start.tmpl
 %%DATADIR%%/templates/ru/printer-stop.tmpl
@@ -925,13 +531,12 @@
 %%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%%/eu/index.html
-%%DOCSDIR%%/fr/index.html
-%%DOCSDIR%%/hu/index.html
 %%DOCSDIR%%/help/accounting.html
 %%DOCSDIR%%/help/api-array.html
 %%DOCSDIR%%/help/api-cgi.html
@@ -951,10 +556,18 @@
 %%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-polld.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
@@ -968,7 +581,6 @@
 %%DOCSDIR%%/help/man-lpinfo.html
 %%DOCSDIR%%/help/man-lpmove.html
 %%DOCSDIR%%/help/man-lpoptions.html
-%%DOCSDIR%%/help/man-lppasswd.html
 %%DOCSDIR%%/help/man-lpq.html
 %%DOCSDIR%%/help/man-lpr.html
 %%DOCSDIR%%/help/man-lprm.html
@@ -981,6 +593,8 @@
 %%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
@@ -988,34 +602,20 @@
 %%DOCSDIR%%/help/postscript-driver.html
 %%DOCSDIR%%/help/ppd-compiler.html
 %%DOCSDIR%%/help/raster-driver.html
-%%DOCSDIR%%/help/ref-access_log.html
-%%DOCSDIR%%/help/ref-classes-conf.html
-%%DOCSDIR%%/help/ref-client-conf.html
-%%DOCSDIR%%/help/ref-cupsd-conf.html
-%%DOCSDIR%%/help/ref-error_log.html
-%%DOCSDIR%%/help/ref-mailto-conf.html
-%%DOCSDIR%%/help/ref-page_log.html
 %%DOCSDIR%%/help/ref-ppdcfile.html
-%%DOCSDIR%%/help/ref-printers-conf.html
-%%DOCSDIR%%/help/ref-snmp-conf.html
-%%DOCSDIR%%/help/ref-subscriptions-conf.html
 %%DOCSDIR%%/help/security.html
 %%DOCSDIR%%/help/sharing.html
 %%DOCSDIR%%/help/spec-banner.html
-%%DOCSDIR%%/help/spec-browsing.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-pdf.html
 %%DOCSDIR%%/help/spec-ppd.html
 %%DOCSDIR%%/help/spec-raster.html
 %%DOCSDIR%%/help/spec-stp.html
-%%DOCSDIR%%/help/standard.html
 %%DOCSDIR%%/help/translation.html
-%%DOCSDIR%%/help/whatsnew.html
-%%DOCSDIR%%/id/index.html
 %%DOCSDIR%%/images/color-wheel.png
 %%DOCSDIR%%/images/cups-block-diagram.png
 %%DOCSDIR%%/images/cups-command-chain.png
@@ -1034,120 +634,35 @@
 %%DOCSDIR%%/images/unsel.gif
 %%DOCSDIR%%/images/wait.gif
 %%DOCSDIR%%/index.html
-%%DATADIR%%/ipptool/create-printer-subscription.test
-%%DATADIR%%/ipptool/color.jpg
-%%DATADIR%%/ipptool/document-a4.pdf
-%%DATADIR%%/ipptool/document-a4.ps
-%%DATADIR%%/ipptool/document-letter.pdf
-%%DATADIR%%/ipptool/document-letter.ps
-%%DATADIR%%/ipptool/gray.jpg
-%%DATADIR%%/ipptool/ipp-2.2.test
-%%DATADIR%%/ipptool/onepage-a4.pdf
-%%DATADIR%%/ipptool/onepage-a4.ps
-%%DATADIR%%/ipptool/onepage-letter.pdf
-%%DATADIR%%/ipptool/onepage-letter.ps
-%%DATADIR%%/ipptool/get-completed-jobs.test
-%%DATADIR%%/ipptool/get-jobs.test
-%%DATADIR%%/ipptool/get-printer-attributes.test
-%%DATADIR%%/ipptool/ipp-1.1.test
-%%DATADIR%%/ipptool/ipp-2.0.test
-%%DATADIR%%/ipptool/ipp-2.1.test
-%%DATADIR%%/ipptool/testfile.jpg
-%%DATADIR%%/ipptool/testfile.pdf
-%%DATADIR%%/ipptool/testfile.ps
-%%DATADIR%%/ipptool/testfile.txt
-%%DOCSDIR%%/it/index.html
 %%DOCSDIR%%/ja/index.html
-%%DOCSDIR%%/pl/index.html
 %%DOCSDIR%%/robots.txt
 %%DOCSDIR%%/ru/index.html
-%%EXAMPLESDIR%%/ulpt-cupsd.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ulpt-cupsd.conf
 share/applications/cups.desktop
-share/icons/hicolor/16x16/apps/cups.png
-share/icons/hicolor/32x32/apps/cups.png
-share/icons/hicolor/64x64/apps/cups.png
-share/icons/hicolor/128x128/apps/cups.png
-share/locale/da/cups_da.po
+%%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/eu/cups_eu.po
-share/locale/fi/cups_fi.po
 share/locale/fr/cups_fr.po
-share/locale/hu/cups_hu.po
-share/locale/id/cups_id.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
-share/locale/ko/cups_ko.po
-share/locale/nl/cups_nl.po
-share/locale/no/cups_no.po
-share/locale/pl/cups_pl.po
-share/locale/pt/cups_pt.po
-share/locale/pt_BR/cups_pt_BR.po
 share/locale/ru/cups_ru.po
-share/locale/sv/cups_sv.po
-share/locale/zh/cups_zh.po
-share/locale/zh_TW/cups_zh_TW.po
- at dirrmtry share/icons/hicolor/16x16/apps
- at dirrmtry share/icons/hicolor/16x16
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/64x64/apps
- at dirrmtry share/icons/hicolor/64x64
- at dirrmtry share/icons/hicolor/128x128/apps
- at dirrmtry share/icons/hicolor/128x128
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons
- at dirrmtry share/applications
- at dirrm %%DOCSDIR%%/ru
- at dirrm %%DOCSDIR%%/pl
- at dirrm %%DOCSDIR%%/ja
- at dirrm %%DOCSDIR%%/it
- at dirrm %%DATADIR%%/ipptool
- at dirrm %%DOCSDIR%%/images
- at dirrm %%DOCSDIR%%/id
- at dirrm %%DOCSDIR%%/help
- at dirrm %%DOCSDIR%%/eu
- at dirrm %%DOCSDIR%%/es
- at dirrm %%DOCSDIR%%/de
- at dirrm %%DOCSDIR%%/fr
- at dirrm %%DOCSDIR%%/hu
- at dirrm %%DOCSDIR%%
- at dirrm %%EXAMPLESDIR%%
- at dirrm %%DATADIR%%/templates/ru
- at dirrm %%DATADIR%%/templates/pl
- at dirrm %%DATADIR%%/templates/ja
- at dirrm %%DATADIR%%/templates/it
- at dirrm %%DATADIR%%/templates/id
- at dirrm %%DATADIR%%/templates/eu
- at dirrm %%DATADIR%%/templates/es
- at dirrm %%DATADIR%%/templates/fr
- at dirrm %%DATADIR%%/templates/de
- at dirrm %%DATADIR%%/templates/hu
- at dirrm %%DATADIR%%/templates
- at exec  mkdir -p %D/%%DATADIR%%/profiles
- at dirrm %%DATADIR%%/profiles
- at dirrm %%DATADIR%%/ppdc
- at exec  mkdir -p %D/%%DATADIR%%/model
- at dirrmtry %%DATADIR%%/model
- at dirrm %%DATADIR%%/mime
- at dirrm %%DATADIR%%/fonts
- at dirrm %%DATADIR%%/examples
- at dirrm %%DATADIR%%/data
- at dirrm %%DATADIR%%/drv
- at dirrm %%DATADIR%%/charsets
- at dirrm %%DATADIR%%/banners
- at dirrmtry %%DATADIR%%
- at dirrm libexec/cups/notifier
- at dirrm libexec/cups/monitor
- at dirrmtry libexec/cups/filter
- at exec mkdir -p %D/libexec/cups/driver
- at dirrmtry libexec/cups/driver
- at dirrm libexec/cups/daemon
- at dirrm libexec/cups/cgi-bin
- at dirrmtry libexec/cups/backend
- at dirrmtry libexec/cups
-%%PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
- at dirrmtry etc/cups/interfaces
- at dirrmtry etc/cups/ppd
- at dirrmtry etc/cups/ssl
- at dirrmtry etc/cups
+ at dir etc/cups/interfaces
+ at dir etc/cups/ppd
+ at dir etc/cups/ssl
+ at dir etc/pam.d
+ at dir(,cups,) etc/cups
+ at dir libexec/cups/driver
+ at dir %%DATADIR%%/model
+ at dir %%DATADIR%%/profiles
+ at dir(root,cups,775) %%CACHEDIR%%/rss
+ at dir(root,cups,775) %%CACHEDIR%%
+ at dir(cups,daemon,) /var/log/cups
+ at dir(cups,wheel,) /var/run/cups/certs
+ at dir(root,cups,) /var/run/cups
+ at dir(root,cups,1710) /var/spool/cups/tmp
+ at dir(root,cups,) /var/spool/cups

Modified: trunk/print/cups-base/pkg-plist.client
===================================================================
--- trunk/print/cups-base/pkg-plist.client	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/pkg-plist.client	2015-07-09 01:08:35 UTC (rev 19559)
@@ -9,6 +9,8 @@
 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
@@ -15,4 +17,4 @@
 lib/libcups.a
 lib/libcups.so
 lib/libcups.so.2
- at dirrm include/cups
+man/man1/cups-config.1.gz

Modified: trunk/print/cups-base/pkg-plist.image
===================================================================
--- trunk/print/cups-base/pkg-plist.image	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-base/pkg-plist.image	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,12 +1,7 @@
-include/cups/image.h
-include/cups/raster.h
 lib/libcupsimage.so
 lib/libcupsimage.so.2
-libexec/cups/filter/bannertops
 libexec/cups/filter/commandtops
 libexec/cups/filter/gziptoany
-libexec/cups/filter/imagetops
-libexec/cups/filter/imagetoraster
 libexec/cups/filter/pstops
 libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
@@ -13,6 +8,3 @@
 libexec/cups/filter/rastertohp
 libexec/cups/filter/rastertolabel
 libexec/cups/filter/rastertopwg
-libexec/cups/filter/texttops
- at dirrm libexec/cups/filter
- at dirrm libexec/cups

Modified: trunk/print/cups-client/Makefile
===================================================================
--- trunk/print/cups-client/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-client/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -3,7 +3,7 @@
 
 CATEGORIES=	print
 
-MAINTAINER=	ports at MidnightBSD.ORG
+MAINTAINER=	ports at MidnightBSD.org
 
 LICENSE=	gpl2
 
@@ -11,8 +11,6 @@
  
 CUPS_CLIENT=	yes
 
-OPTIONS=	GNUTLS		"Build with GNUTLS instead of OpenSSL" off
-
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"
 .endif

Modified: trunk/print/cups-pstoraster/Makefile
===================================================================
--- trunk/print/cups-pstoraster/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-pstoraster/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cups-pstoraster
 PORTVERSION=	8.15.4
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	ghostscript/${PORTVERSION}
@@ -14,7 +15,7 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
+LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups-image
 
 ESPGS_VER=	${PORTVERSION}
 GS_VERSION=	8.15
@@ -25,13 +26,13 @@
 
 DATADIR=	${PREFIX}/share/espgs
 
-USES=		gmake tar:bzip2
+USES=		gmake iconv tar:bzip2
 # We just need the ghostscript fonts, nothing more
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+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"

Modified: trunk/print/cups-pstoraster/distinfo
===================================================================
--- trunk/print/cups-pstoraster/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-pstoraster/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,3 +1,2 @@
 SHA256 (ghostscript/espgs-8.15.4-source.tar.bz2) = 5afc038a12aa624836192940991081fcf95a9396a6e15f6fc707a2b5f2b7cacf
-RMD160 (ghostscript/espgs-8.15.4-source.tar.bz2) = 011480fd7e52d12e9fc4b3abe620caa034a172de
 SIZE (ghostscript/espgs-8.15.4-source.tar.bz2) = 8785497

Deleted: trunk/print/cups-pstoraster/files/patch-src:unixinst.mak
===================================================================
--- trunk/print/cups-pstoraster/files/patch-src:unixinst.mak	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-pstoraster/files/patch-src:unixinst.mak	2015-07-09 01:08:35 UTC (rev 19559)
@@ -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.

Copied: trunk/print/cups-pstoraster/files/patch-src__unixinst.mk (from rev 19527, trunk/print/cups-pstoraster/files/patch-src:unixinst.mak)
===================================================================
--- trunk/print/cups-pstoraster/files/patch-src__unixinst.mk	                        (rev 0)
+++ trunk/print/cups-pstoraster/files/patch-src__unixinst.mk	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,20 @@
+--- 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.

Modified: trunk/print/cups-pstoraster/pkg-plist
===================================================================
--- trunk/print/cups-pstoraster/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/cups-pstoraster/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -468,16 +468,3 @@
 etc/cups/pstoraster.convs
 share/cups/model/pxlcolor.ppd
 share/cups/model/pxlmono.ppd
- at dirrm %%DATADIR%%/%%GS_VERSION%%/lib/cjkv
- at dirrm %%DATADIR%%/%%GS_VERSION%%/lib
- at dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding
- at dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace
- at dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap
- at dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
- at dirrm %%DATADIR%%/%%GS_VERSION%%
- at dirrmtry %%DATADIR%%
- at dirrmtry libexec/cups/filter
- at dirrmtry libexec/cups
- at dirrmtry share/cups/model
- at dirrmtry share/cups
- at dirrmtry etc/cups

Modified: trunk/print/enscript-letter/Makefile
===================================================================
--- trunk/print/enscript-letter/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/enscript-letter/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,10 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME=	enscript
-PORTVERSION=	1.6.4
-PORTREVISION=	3
+PORTVERSION=	1.6.6
+PORTREVISION=	1
 CATEGORIES+=	print
-MASTER_SITES=	http://www.codento.com/people/mtr/genscript/
+MASTER_SITES=	GNU
 PKGNAMESUFFIX=	-${PAPERSIZE}
 DISTNAME=	enscript-${PORTVERSION}
 
@@ -13,17 +13,24 @@
 
 LICENSE=	gpl2
 
+USES=		cpe shebangfix perl5
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nls --with-media=${PS}
-NO_STAGE=	yes
+CONFIGURE_ARGS=	--with-media=${PS}
+SHEBANG_FILES=	scripts/diffpp.in scripts/sliceprint.in
+perl_OLD_CMD=	@PERLPROG@
 
-CONFLICTS?=	enscript-a4-* enscript-letterdj-*
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
+CONFLICTS?=	enscript-a4-[0-9]* enscript-letterdj-[0-9]*
+
 INFO=		enscript
-MAN1=		diffpp.1 enscript.1 sliceprint.1 states.1
+CPE_VENDOR=	gnu
 
-PAPERSIZE?=	letter
 PS?=		Letter
+PAPERSIZE?=	${PS:tl}
 
 .if (${PAPERSIZE} != a4 && ${PAPERSIZE} != letter && ${PAPERSIZE} != letterdj)
 .BEGIN:

Modified: trunk/print/enscript-letter/distinfo
===================================================================
--- trunk/print/enscript-letter/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/enscript-letter/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,2 +1,2 @@
-SHA256 (enscript-1.6.4.tar.gz) = 45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
-SIZE (enscript-1.6.4.tar.gz) = 1036734
+SHA256 (enscript-1.6.6.tar.gz) = 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb
+SIZE (enscript-1.6.6.tar.gz) = 1330493

Modified: trunk/print/enscript-letter/pkg-descr
===================================================================
--- trunk/print/enscript-letter/pkg-descr	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/enscript-letter/pkg-descr	2015-07-09 01:08:35 UTC (rev 19559)
@@ -4,4 +4,4 @@
 Tcl, and more, can optionally be pretty-printed instead of printed as
 plain-text.  Many printing options are available.
 
-WWW: http://www.codento.com/people/mtr/genscript/
+WWW: http://www.gnu.org/software/enscript/

Modified: trunk/print/enscript-letter/pkg-plist
===================================================================
--- trunk/print/enscript-letter/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/enscript-letter/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -5,6 +5,10 @@
 bin/sliceprint
 bin/states
 etc/enscript.cfg
+man/man1/diffpp.1.gz
+man/man1/enscript.1.gz
+man/man1/sliceprint.1.gz
+man/man1/states.1.gz
 %%DATADIR%%/88591.enc
 %%DATADIR%%/885910.enc
 %%DATADIR%%/88592.enc
@@ -14,6 +18,7 @@
 %%DATADIR%%/88597.enc
 %%DATADIR%%/88599.enc
 %%DATADIR%%/a2ps.hdr
+%%DATADIR%%/afm/MustRead.html
 %%DATADIR%%/afm/agd.afm
 %%DATADIR%%/afm/agdo.afm
 %%DATADIR%%/afm/agw.afm
@@ -84,6 +89,7 @@
 %%DATADIR%%/hl/diffu.st
 %%DATADIR%%/hl/elisp.st
 %%DATADIR%%/hl/enscript.st
+%%DATADIR%%/hl/f90.st
 %%DATADIR%%/hl/fortran.st
 %%DATADIR%%/hl/fortran_pp.st
 %%DATADIR%%/hl/haskell.st
@@ -113,7 +119,6 @@
 %%DATADIR%%/hl/pyrex.st
 %%DATADIR%%/hl/python.st
 %%DATADIR%%/hl/rfc.st
-%%DATADIR%%/hl/ruby.st
 %%DATADIR%%/hl/scheme.st
 %%DATADIR%%/hl/sh.st
 %%DATADIR%%/hl/skill.st
@@ -144,6 +149,16 @@
 %%DATADIR%%/simple.hdr
 %%DATADIR%%/squeeze.hdr
 %%DATADIR%%/vms.enc
- at dirrm %%DATADIR%%/afm
- at dirrm %%DATADIR%%/hl
- at dirrm %%DATADIR%%
+%%NLS%%share/locale/ca/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/da/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/de/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/es/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/enscript.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/enscript.mo

Modified: trunk/print/fontforge/Makefile
===================================================================
--- trunk/print/fontforge/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/fontforge/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	fontforge
-DISTVERSION=	20150430
+DISTVERSION=	20150612
 CATEGORIES=	print
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -15,7 +15,6 @@
 		${LOCALBASE}/bin/gnulib-tool:${PORTSDIR}/devel/gnulib
 LIB_DEPENDS=	libuninameslist.so:${PORTSDIR}/textproc/libuninameslist \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libgif.so:${PORTSDIR}/graphics/giflib \
 		libspiro.so:${PORTSDIR}/graphics/libspiro \
@@ -23,10 +22,9 @@
 		libltdl.so:${PORTSDIR}/devel/libltdl
 
 USE_GITHUB=	yes
-WRKSRC=		${WRKDIR}/fontforge-20150430
 
 USES=		autoreconf:build desktop-file-utils execinfo gettext gmake iconv \
-		libtool pkgconfig python shared-mime-info
+		jpeg libtool pkgconfig python shared-mime-info
 USE_XORG=	x11 xi ice xkbui
 USE_GNOME=	glib20 gtk20 libxml2 pango
 

Modified: trunk/print/fontforge/distinfo
===================================================================
--- trunk/print/fontforge/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/fontforge/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,2 +1,4 @@
-SHA256 (fontforge-20150430_GH0.tar.gz) = 430c6d02611c7ca948df743e9241994efe37eda25f81a94aeadd9b6dd286ff37
-SIZE (fontforge-20150430_GH0.tar.gz) = 24531572
+SHA256 (fontforge-fontforge-20150612_GH0.tar.gz) = af4997a07c96f7057f08cb5c7d71b19a0e8ac6336e0c48476471b471c0574247
+SIZE (fontforge-fontforge-20150612_GH0.tar.gz) = 24784438
+SHA256 (freetype-2.5.5.tar.bz2) = 387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9
+SIZE (freetype-2.5.5.tar.bz2) = 1714529

Modified: trunk/print/fontforge/files/patch-fontforge_splinefont.h
===================================================================
--- trunk/print/fontforge/files/patch-fontforge_splinefont.h	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/fontforge/files/patch-fontforge_splinefont.h	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,6 +1,6 @@
---- fontforge/splinefont.h~
+--- fontforge/splinefont.h.orig	2015-06-12 20:48:13 UTC
 +++ fontforge/splinefont.h
-@@ -3547,7 +3547,11 @@ char * delimit_null(const char * input, 
+@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input, 
  
  #include "ustring.h"
  

Modified: trunk/print/foomatic-db/Makefile
===================================================================
--- trunk/print/foomatic-db/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,10 +1,9 @@
 # $MidnightBSD$
 
 PORTNAME=	db
-PORTVERSION=	20140725
+PORTVERSION=	20150415
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL}
-MASTER_SITE_SUBDIR=	danilo
+MASTER_SITES=	FREEBSD_LOCAL/danilo
 		
 PKGNAMEPREFIX=	foomatic-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
@@ -17,8 +16,7 @@
 LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libcurl.so:${PORTSDIR}/ftp/curl
 
-USES=		gmake
-USE_AUTOTOOLS=	automake:env autoconf
+USES=		autoreconf gmake
 GNU_CONFIGURE=	yes
 
 FOOMATICVER=	4.0

Modified: trunk/print/foomatic-db/distinfo
===================================================================
--- trunk/print/foomatic-db/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,2 +1,2 @@
-SHA256 (foomatic-db-4.0-20140725.tar.gz) = 802fb15baa7df8e94c21e7e7ccc15223484071b3441cf6a455fe0f640032c090
-SIZE (foomatic-db-4.0-20140725.tar.gz) = 39879001
+SHA256 (foomatic-db-4.0-20150415.tar.gz) = 95518f1dff6439c6f52559bc868b56f45970fde631365244f0bd8a3d3a252e2e
+SIZE (foomatic-db-4.0-20150415.tar.gz) = 44119031

Modified: trunk/print/foomatic-db/pkg-plist
===================================================================
--- trunk/print/foomatic-db/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -131,6 +131,7 @@
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc1030_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc1045_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc1060_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc1120_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc224_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc232_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSc328_PS.ppd.gz
@@ -149,6 +150,12 @@
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm1525_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm1530_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm1533_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm2525_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm2530_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm2535_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm2540_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm2550_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm2560_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm415_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm615_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-DSm616_PS.ppd.gz
@@ -200,25 +207,32 @@
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2550B_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2550_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2553_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2554_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_2851_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3010_DSm730e_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_301_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3053_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3054_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3350B_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3350_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3351_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3353_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_3554_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4000B_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4000_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4001_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4002_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_401SPF_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_4054_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5000B_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5000_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5001_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5002_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_5054_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_6000_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_6001_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_6002_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_6054_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_7000_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_7001_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_7502_PS.ppd.gz
@@ -227,6 +241,7 @@
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_9001_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_9002_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2003_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2011_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2050_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2051_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP_C2503_PS.ppd.gz
@@ -317,6 +332,7 @@
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc1030_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc1045_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc1060_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc1120_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc424_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc428_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSc432_PXL.ppd.gz
@@ -326,6 +342,12 @@
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm1525_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm1530_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm1533_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm2525_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm2530_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm2535_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm2540_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm2550_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm2560_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm415_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm615_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-DSm616_PXL.ppd.gz
@@ -371,24 +393,30 @@
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2550B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2550_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2553_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_2851_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3010_DSm730e_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3053_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3350B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3350_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3351_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3353_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_3554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4000B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_4054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5000B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_5054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_6000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_6001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_6002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_6054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_7000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_7001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_7502_PXL.ppd.gz
@@ -397,6 +425,7 @@
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_9001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_9002_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2003_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2011_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2050_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2051_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP_C2503_PXL.ppd.gz
@@ -531,26 +560,32 @@
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2550B_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2550_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2553_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2554_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2851_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_2852_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_301_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3053_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3054_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3350B_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3350_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3351_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3352_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3353_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_3554_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4000B_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4000_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4001_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4002_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_4054_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5000B_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5000_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5001_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5002_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_5054_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_6000_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_6001_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_6002_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_6054_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_7000_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_7001_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_7502_PS.ppd.gz
@@ -560,6 +595,7 @@
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_9002_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2003Z_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2003_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2011_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2050_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2051_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-MP_C2503Z_PS.ppd.gz
@@ -611,6 +647,10 @@
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C5100S_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C5110S_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C7100S_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C7100_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C7110S_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-Pro_C7110_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-4353_MF_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-4452_MF_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-IS2022_PXL.ppd.gz
@@ -675,25 +715,31 @@
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2550B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2550_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2553_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2851_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_2852_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3053_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3350B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3350_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3351_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3352_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3353_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_3554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4000B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_4054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5000B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_5054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_6000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_6001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_6002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_6054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_7000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_7001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_7502_PXL.ppd.gz
@@ -703,6 +749,7 @@
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_9002_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2003Z_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2003_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2011_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2050_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2051_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-MP_C2503Z_PXL.ppd.gz
@@ -751,6 +798,10 @@
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_907EX_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C5100S_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C5110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C7100S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C7100_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C7110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-Pro_C7110_PXL.ppd.gz
 share/foomatic/db/source/PPD/KONICA_MINOLTA/KO1050UX.ppd.gz
 share/foomatic/db/source/PPD/KONICA_MINOLTA/KO500UX.ppd.gz
 share/foomatic/db/source/PPD/KONICA_MINOLTA/KO750UX.ppd.gz
@@ -1574,11 +1625,13 @@
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2550B_LD425B_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2550_LD425_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2553_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2554_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2851_LD528_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_2852_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3010_LD330_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_301_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3053_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3054_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3350B_LD433B_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3350_LD433_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3351_LD533_PS.ppd.gz
@@ -1585,19 +1638,24 @@
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3352_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3353_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3500_LD335_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_3554_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4000B_LD040B_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4000_LD040_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4001_LD140_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4002_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_401SPF_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4054_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_4500_LD345_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5000B_LD050B_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5000_LD050_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5001_LD150_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5002_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5054_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_5500_LD255_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6000_LD260_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6001_LD360_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6002_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6054_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_6500_LD265_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_7000_LD270_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_7001_LD370_PS.ppd.gz
@@ -1660,11 +1718,18 @@
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C5100S_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C5110S_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C7100S_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C7100_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C7110S_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-Pro_C7110_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4100NL_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4100N_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4110N_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4210N_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4310N_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4510DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4510SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_4520DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5200DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5200S_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-SP_5210DN_PS.ppd.gz
@@ -1743,10 +1808,12 @@
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2550B_LD425B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2550_LD425_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2553_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2851_LD528_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_2852_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3010_LD330_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3053_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3350B_LD433B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3350_LD433_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3351_LD533_PXL.ppd.gz
@@ -1753,19 +1820,23 @@
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3352_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3353_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3500_LD335_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_3554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4000B_LD040B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4000_LD040_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4001_LD140_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_4500_LD345_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5000B_LD050B_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5000_LD050_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5001_LD150_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_5500_LD255_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6000_LD260_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6001_LD360_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_6500_LD265_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_7000_LD270_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_7001_LD370_PXL.ppd.gz
@@ -1824,6 +1895,10 @@
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_907EX_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C5100S_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C5110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C7100S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C7100_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C7110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-Pro_C7110_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-SG3110SFNw_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lexmark/Lexmark_6500e_Series.ppd.gz
 share/foomatic/db/source/PPD/Lexmark/Lexmark_C2100_Series.ppd.gz
@@ -1997,11 +2072,13 @@
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2550B_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2550_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2553_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2554_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2851_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_2852_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3010_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_301_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3053_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3054_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3350B_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3350_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3351_PS.ppd.gz
@@ -2008,19 +2085,23 @@
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3352_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3353_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3500_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_3554_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4000B_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4000_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4001_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4002_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4054_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_4500_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5000B_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5000_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5001_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5002_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5054_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_5500_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6000_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6001_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6002_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6054_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_6500_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_7000_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_7001_PS.ppd.gz
@@ -2034,6 +2115,7 @@
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C1500sp_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2003Z_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2003_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2011_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2050_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2051_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2500_PS.ppd.gz
@@ -2110,11 +2192,17 @@
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C5100S_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C5110S_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C7100S_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C7100_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C7110S_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-Pro_C7110_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4100NL_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4100N_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4110N_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4210N_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4310N_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4510DN_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_4510SF_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5200DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5200S_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_5210DN_PS.ppd.gz
@@ -2190,10 +2278,12 @@
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2550B_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2550_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2553_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2554_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2851_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_2852_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3010_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3053_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3054_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3350B_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3350_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3351_PXL.ppd.gz
@@ -2200,19 +2290,23 @@
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3352_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3353_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3500_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_3554_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4000B_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4000_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4001_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4002_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4054_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_4500_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5000B_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5000_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5001_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5002_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5054_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_5500_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6000_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6001_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6002_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6054_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_6500_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_7000_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_7001_PXL.ppd.gz
@@ -2226,6 +2320,7 @@
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C1500sp_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2003Z_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2003_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2011_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2050_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2051_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2500_PXL.ppd.gz
@@ -2278,7 +2373,10 @@
 share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_907EX_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C5100S_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C5110S_PXL.ppd.gz
-share/foomatic/db/source/PPD/NRG/PXL/NRG-SG2100N_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C7100S_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C7100_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C7110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-Pro_C7110_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-SG3110DN_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-SG3110DNw_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-SG3110SFNw_PXL.ppd.gz
@@ -2527,11 +2625,22 @@
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_2001_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_2501_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_2553_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_2554J_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_2554_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_3053_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_3054J_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_3054_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_3353_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_3554J_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_3554_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_401SPF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_4054_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_5054_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_6054_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C1500_615C_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C2003Z_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C2003_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C2011_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C2503Z_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C2503_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-MP_C3003_PS.ppd.gz
@@ -2555,7 +2664,13 @@
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C5100S_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C5110S_PS.ppd.gz
-share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG2100N_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7100S_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7100_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7110S_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Pro_C7110_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_4510DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_4510SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-SP_4520DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG3110DN_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG3110DNw_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-AficioSG3110SFNw_PXL.ppd.gz
@@ -2679,11 +2794,21 @@
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2001_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2501_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2553_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2554J_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_2554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_3053_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_3054J_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_3054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_3353_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_3554J_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_3554_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_4054_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_5054_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_6054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C1500_615C_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C2003Z_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C2003_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C2011_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C2503Z_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C2503_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C3003_PXL.ppd.gz
@@ -2704,6 +2829,10 @@
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_907EX_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C5100S_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C5110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C7100S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C7100_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C7110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Pro_C7110_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-SG3120BSFNw_PXL.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_C140x_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_C145x_Series.ppd.gz
@@ -2741,6 +2870,7 @@
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_K401_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_K4350_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_M4370_5370_Series.ppd.gz
+share/foomatic/db/source/PPD/Samsung/PS/Samsung_M453x_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_M458x_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_M5270_Series.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PS/Samsung_ML-2150_Series.ppd.gz
@@ -2785,6 +2915,8 @@
 share/foomatic/db/source/PPD/Samsung/PXL/Samsung_CLP-620_Series_PXL.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PXL/Samsung_M262x_282x_Series_PXL.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PXL/Samsung_M267x_287x_Series_PXL.ppd.gz
+share/foomatic/db/source/PPD/Samsung/PXL/Samsung_M283x_Series_PXL.ppd.gz
+share/foomatic/db/source/PPD/Samsung/PXL/Samsung_M288x_Series_PXL.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PXL/Samsung_ML-2525W_Series_PXL.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PXL/Samsung_ML-2580_Series_PXL.ppd.gz
 share/foomatic/db/source/PPD/Samsung/PXL/Samsung_ML-2950_Series_PXL.ppd.gz
@@ -2943,14 +3075,21 @@
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2352_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2501_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2553_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2554_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_2852_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_301_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_3053_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MP_3054_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_3352_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_3353_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MP_3554_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_4002_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MP_401SPF_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MP_4054_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_5002_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MP_5054_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_6002_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MP_6054_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_7502_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_9002_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MP_C2003_PS.ppd.gz
@@ -2983,6 +3122,10 @@
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_907EX_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C5100S_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C5110S_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C7100S_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C7100_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C7110S_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-Pro_C7110_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SDC555_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SGC_1506_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SLP26_PS.ppd.gz
@@ -2990,6 +3133,9 @@
 share/foomatic/db/source/PPD/Savin/PS/Savin-SLP32_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SLP38c_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SP_4310N_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-SP_4510DN_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-SP_4510SF_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-SP_4520DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5200DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5200S_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-SP_5210DN_PS.ppd.gz
@@ -3102,13 +3248,19 @@
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2352_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2501_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2553_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_2852_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_3053_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_3054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_3352_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_3353_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_3554_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_4002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_4054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_5002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_5054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_6002_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_6054_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_7502_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_9002_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-MP_C2003_PXL.ppd.gz
@@ -3137,23 +3289,162 @@
 share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_907EX_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C5100S_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C5110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C7100S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C7100_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C7110S_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-Pro_C7110_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-SDC555_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-SG3110SFNw_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-SGC_1506_PXL.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-AR-N182FG-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-AR-N182G-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-1810U-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2010U-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300FG-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300G-ps-jp.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300G-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-2300N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2310F-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2310U-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2314N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2314NR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2514FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2610FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2610N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2614N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2614NR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2615N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2616N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2640FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2640N-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700FG-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700G-ps-jp.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700G-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-2700N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3110FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3110N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3111F-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3111U-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3114FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3114N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3114NR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3115N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3116N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3140FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3140N-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-3500FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3500N-ps-jp.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-3500N-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-3501FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3501N-ps-jp.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-3501N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3610FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3610N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3611F-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3614FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3640FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-3640N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4110FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4110N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4111FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4111N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4112N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4140FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4140N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4141FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4141N-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-4500FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4500N-ps-jp.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-4500N-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-4501FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-4501N-ps-jp.ppd.gz
 share/foomatic/db/source/PPD/Sharp/Sharp-MX-4501N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5110FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5110N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5111FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5111N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5112N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5140FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5140N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5141FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5141N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5500N-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-5500N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-6200N-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-6200N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-6240N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-6500N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-6540FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-7000N-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-7000N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-7040N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-7500N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C250-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C250E-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C250F-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C250FE-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C250FR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300E-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300F-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300P-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300PE-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300PL-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300W-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300W-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300WE-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C300WR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C301-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C301F-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-C301W-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M1054-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M1100-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M1100-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M1204-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M182-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M182D-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M202D-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M232D-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M260-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M260FP-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M260N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M264FP-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M264N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M264NR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M264NV-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M264U-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M310-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M310FP-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M310N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M314FP-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M314N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M314NR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M314NV-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M314U-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M354FP-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M354N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M354NR-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M354U-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M364N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M365FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M365N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M464FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M464N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M465FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M465N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M564FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M564N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M565FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M565N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M654FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M654N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M754FN-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M754N-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M850-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M860-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M904-ps.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M950-ps-jp.ppd.gz
+share/foomatic/db/source/PPD/Sharp/Sharp-MX-M950-ps.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sc170fpj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sc172fpj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sc260fpj.ppd.gz
@@ -3164,6 +3455,7 @@
 share/foomatic/db/source/PPD/Sharp/sh163fgj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sh163gj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sh200mj.ppd.gz
+share/foomatic/db/source/PPD/Sharp/sh202fpj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sh205fgj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sh205gj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sh266fpj.ppd.gz
@@ -3207,6 +3499,8 @@
 share/foomatic/db/source/PPD/Sharp/sham700u.ppd.gz
 share/foomatic/db/source/PPD/Sharp/shar168d.ppd.gz
 share/foomatic/db/source/PPD/Sharp/shar168s.ppd.gz
+share/foomatic/db/source/PPD/Sharp/shar208d.ppd.gz
+share/foomatic/db/source/PPD/Sharp/shar208s.ppd.gz
 share/foomatic/db/source/PPD/Sharp/shar5220.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sharm150.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sharm155.ppd.gz
@@ -3214,6 +3508,8 @@
 share/foomatic/db/source/PPD/Sharp/sharm161.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sharm162.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sharm165.ppd.gz
+share/foomatic/db/source/PPD/Sharp/sharm200.ppd.gz
+share/foomatic/db/source/PPD/Sharp/sharm201.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sharm205.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sharm206.ppd.gz
 share/foomatic/db/source/PPD/Sharp/sharm207.ppd.gz
@@ -3227,6 +3523,8 @@
 share/foomatic/db/source/PPD/Sharp/shc261mj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/shc261sj.ppd.gz
 share/foomatic/db/source/PPD/Sharp/shc262sj.ppd.gz
+share/foomatic/db/source/PPD/Sharp/shmb201d.ppd.gz
+share/foomatic/db/source/PPD/Sharp/shmxb201.ppd.gz
 share/foomatic/db/source/PPD/Toshiba/TOSHIBA_EST205_CUPS.ppd.gz
 share/foomatic/db/source/PPD/Toshiba/TOSHIBA_EST280_282_CUPS.ppd.gz
 share/foomatic/db/source/PPD/Toshiba/TOSHIBA_EST3510c_CUPS.ppd.gz
@@ -5069,6 +5367,7 @@
 share/foomatic/db/source/printer/Gestetner-DSc1030.xml
 share/foomatic/db/source/printer/Gestetner-DSc1045.xml
 share/foomatic/db/source/printer/Gestetner-DSc1060.xml
+share/foomatic/db/source/printer/Gestetner-DSc1120.xml
 share/foomatic/db/source/printer/Gestetner-DSc224.xml
 share/foomatic/db/source/printer/Gestetner-DSc232.xml
 share/foomatic/db/source/printer/Gestetner-DSc328.xml
@@ -5087,6 +5386,12 @@
 share/foomatic/db/source/printer/Gestetner-DSm1525.xml
 share/foomatic/db/source/printer/Gestetner-DSm1530.xml
 share/foomatic/db/source/printer/Gestetner-DSm1533.xml
+share/foomatic/db/source/printer/Gestetner-DSm2525.xml
+share/foomatic/db/source/printer/Gestetner-DSm2530.xml
+share/foomatic/db/source/printer/Gestetner-DSm2535.xml
+share/foomatic/db/source/printer/Gestetner-DSm2540.xml
+share/foomatic/db/source/printer/Gestetner-DSm2550.xml
+share/foomatic/db/source/printer/Gestetner-DSm2560.xml
 share/foomatic/db/source/printer/Gestetner-DSm415.xml
 share/foomatic/db/source/printer/Gestetner-DSm615.xml
 share/foomatic/db/source/printer/Gestetner-DSm616.xml
@@ -5138,25 +5443,32 @@
 share/foomatic/db/source/printer/Gestetner-MP_2550.xml
 share/foomatic/db/source/printer/Gestetner-MP_2550B.xml
 share/foomatic/db/source/printer/Gestetner-MP_2553.xml
+share/foomatic/db/source/printer/Gestetner-MP_2554.xml
 share/foomatic/db/source/printer/Gestetner-MP_2851.xml
 share/foomatic/db/source/printer/Gestetner-MP_301.xml
 share/foomatic/db/source/printer/Gestetner-MP_3010_DSm730e.xml
 share/foomatic/db/source/printer/Gestetner-MP_3053.xml
+share/foomatic/db/source/printer/Gestetner-MP_3054.xml
 share/foomatic/db/source/printer/Gestetner-MP_3350.xml
 share/foomatic/db/source/printer/Gestetner-MP_3350B.xml
 share/foomatic/db/source/printer/Gestetner-MP_3351.xml
 share/foomatic/db/source/printer/Gestetner-MP_3353.xml
+share/foomatic/db/source/printer/Gestetner-MP_3554.xml
 share/foomatic/db/source/printer/Gestetner-MP_4000.xml
 share/foomatic/db/source/printer/Gestetner-MP_4000B.xml
 share/foomatic/db/source/printer/Gestetner-MP_4001.xml
 share/foomatic/db/source/printer/Gestetner-MP_4002.xml
+share/foomatic/db/source/printer/Gestetner-MP_401SPF.xml
+share/foomatic/db/source/printer/Gestetner-MP_4054.xml
 share/foomatic/db/source/printer/Gestetner-MP_5000.xml
 share/foomatic/db/source/printer/Gestetner-MP_5000B.xml
 share/foomatic/db/source/printer/Gestetner-MP_5001.xml
 share/foomatic/db/source/printer/Gestetner-MP_5002.xml
+share/foomatic/db/source/printer/Gestetner-MP_5054.xml
 share/foomatic/db/source/printer/Gestetner-MP_6000.xml
 share/foomatic/db/source/printer/Gestetner-MP_6001.xml
 share/foomatic/db/source/printer/Gestetner-MP_6002.xml
+share/foomatic/db/source/printer/Gestetner-MP_6054.xml
 share/foomatic/db/source/printer/Gestetner-MP_7000.xml
 share/foomatic/db/source/printer/Gestetner-MP_7001.xml
 share/foomatic/db/source/printer/Gestetner-MP_7502.xml
@@ -5165,6 +5477,7 @@
 share/foomatic/db/source/printer/Gestetner-MP_9001.xml
 share/foomatic/db/source/printer/Gestetner-MP_9002.xml
 share/foomatic/db/source/printer/Gestetner-MP_C2003.xml
+share/foomatic/db/source/printer/Gestetner-MP_C2011.xml
 share/foomatic/db/source/printer/Gestetner-MP_C2050.xml
 share/foomatic/db/source/printer/Gestetner-MP_C2051.xml
 share/foomatic/db/source/printer/Gestetner-MP_C2503.xml
@@ -5912,26 +6225,32 @@
 share/foomatic/db/source/printer/Infotec-MP_2550.xml
 share/foomatic/db/source/printer/Infotec-MP_2550B.xml
 share/foomatic/db/source/printer/Infotec-MP_2553.xml
+share/foomatic/db/source/printer/Infotec-MP_2554.xml
 share/foomatic/db/source/printer/Infotec-MP_2851.xml
 share/foomatic/db/source/printer/Infotec-MP_2852.xml
 share/foomatic/db/source/printer/Infotec-MP_301.xml
 share/foomatic/db/source/printer/Infotec-MP_3053.xml
+share/foomatic/db/source/printer/Infotec-MP_3054.xml
 share/foomatic/db/source/printer/Infotec-MP_3350.xml
 share/foomatic/db/source/printer/Infotec-MP_3350B.xml
 share/foomatic/db/source/printer/Infotec-MP_3351.xml
 share/foomatic/db/source/printer/Infotec-MP_3352.xml
 share/foomatic/db/source/printer/Infotec-MP_3353.xml
+share/foomatic/db/source/printer/Infotec-MP_3554.xml
 share/foomatic/db/source/printer/Infotec-MP_4000.xml
 share/foomatic/db/source/printer/Infotec-MP_4000B.xml
 share/foomatic/db/source/printer/Infotec-MP_4001.xml
 share/foomatic/db/source/printer/Infotec-MP_4002.xml
+share/foomatic/db/source/printer/Infotec-MP_4054.xml
 share/foomatic/db/source/printer/Infotec-MP_5000.xml
 share/foomatic/db/source/printer/Infotec-MP_5000B.xml
 share/foomatic/db/source/printer/Infotec-MP_5001.xml
 share/foomatic/db/source/printer/Infotec-MP_5002.xml
+share/foomatic/db/source/printer/Infotec-MP_5054.xml
 share/foomatic/db/source/printer/Infotec-MP_6000.xml
 share/foomatic/db/source/printer/Infotec-MP_6001.xml
 share/foomatic/db/source/printer/Infotec-MP_6002.xml
+share/foomatic/db/source/printer/Infotec-MP_6054.xml
 share/foomatic/db/source/printer/Infotec-MP_7000.xml
 share/foomatic/db/source/printer/Infotec-MP_7001.xml
 share/foomatic/db/source/printer/Infotec-MP_7502.xml
@@ -5941,6 +6260,7 @@
 share/foomatic/db/source/printer/Infotec-MP_9002.xml
 share/foomatic/db/source/printer/Infotec-MP_C2003.xml
 share/foomatic/db/source/printer/Infotec-MP_C2003Z.xml
+share/foomatic/db/source/printer/Infotec-MP_C2011.xml
 share/foomatic/db/source/printer/Infotec-MP_C2050.xml
 share/foomatic/db/source/printer/Infotec-MP_C2051.xml
 share/foomatic/db/source/printer/Infotec-MP_C2503.xml
@@ -5992,6 +6312,10 @@
 share/foomatic/db/source/printer/Infotec-Pro_907EX.xml
 share/foomatic/db/source/printer/Infotec-Pro_C5100S.xml
 share/foomatic/db/source/printer/Infotec-Pro_C5110S.xml
+share/foomatic/db/source/printer/Infotec-Pro_C7100.xml
+share/foomatic/db/source/printer/Infotec-Pro_C7100S.xml
+share/foomatic/db/source/printer/Infotec-Pro_C7110.xml
+share/foomatic/db/source/printer/Infotec-Pro_C7110S.xml
 share/foomatic/db/source/printer/KONICA_MINOLTA-PagePro_1300W.xml
 share/foomatic/db/source/printer/KONICA_MINOLTA-PagePro_1350W.xml
 share/foomatic/db/source/printer/KONICA_MINOLTA-PagePro_1400W.xml
@@ -6315,11 +6639,13 @@
 share/foomatic/db/source/printer/Lanier-MP_2550B_LD425B.xml
 share/foomatic/db/source/printer/Lanier-MP_2550_LD425.xml
 share/foomatic/db/source/printer/Lanier-MP_2553.xml
+share/foomatic/db/source/printer/Lanier-MP_2554.xml
 share/foomatic/db/source/printer/Lanier-MP_2851_LD528.xml
 share/foomatic/db/source/printer/Lanier-MP_2852.xml
 share/foomatic/db/source/printer/Lanier-MP_301.xml
 share/foomatic/db/source/printer/Lanier-MP_3010_LD330.xml
 share/foomatic/db/source/printer/Lanier-MP_3053.xml
+share/foomatic/db/source/printer/Lanier-MP_3054.xml
 share/foomatic/db/source/printer/Lanier-MP_3350B_LD433B.xml
 share/foomatic/db/source/printer/Lanier-MP_3350_LD433.xml
 share/foomatic/db/source/printer/Lanier-MP_3351_LD533.xml
@@ -6326,19 +6652,24 @@
 share/foomatic/db/source/printer/Lanier-MP_3352.xml
 share/foomatic/db/source/printer/Lanier-MP_3353.xml
 share/foomatic/db/source/printer/Lanier-MP_3500_LD335.xml
+share/foomatic/db/source/printer/Lanier-MP_3554.xml
 share/foomatic/db/source/printer/Lanier-MP_4000B_LD040B.xml
 share/foomatic/db/source/printer/Lanier-MP_4000_LD040.xml
 share/foomatic/db/source/printer/Lanier-MP_4001_LD140.xml
 share/foomatic/db/source/printer/Lanier-MP_4002.xml
+share/foomatic/db/source/printer/Lanier-MP_401SPF.xml
+share/foomatic/db/source/printer/Lanier-MP_4054.xml
 share/foomatic/db/source/printer/Lanier-MP_4500_LD345.xml
 share/foomatic/db/source/printer/Lanier-MP_5000B_LD050B.xml
 share/foomatic/db/source/printer/Lanier-MP_5000_LD050.xml
 share/foomatic/db/source/printer/Lanier-MP_5001_LD150.xml
 share/foomatic/db/source/printer/Lanier-MP_5002.xml
+share/foomatic/db/source/printer/Lanier-MP_5054.xml
 share/foomatic/db/source/printer/Lanier-MP_5500_LD255.xml
 share/foomatic/db/source/printer/Lanier-MP_6000_LD260.xml
 share/foomatic/db/source/printer/Lanier-MP_6001_LD360.xml
 share/foomatic/db/source/printer/Lanier-MP_6002.xml
+share/foomatic/db/source/printer/Lanier-MP_6054.xml
 share/foomatic/db/source/printer/Lanier-MP_6500_LD265.xml
 share/foomatic/db/source/printer/Lanier-MP_7000_LD270.xml
 share/foomatic/db/source/printer/Lanier-MP_7001_LD370.xml
@@ -6401,6 +6732,10 @@
 share/foomatic/db/source/printer/Lanier-Pro_907EX.xml
 share/foomatic/db/source/printer/Lanier-Pro_C5100S.xml
 share/foomatic/db/source/printer/Lanier-Pro_C5110S.xml
+share/foomatic/db/source/printer/Lanier-Pro_C7100.xml
+share/foomatic/db/source/printer/Lanier-Pro_C7100S.xml
+share/foomatic/db/source/printer/Lanier-Pro_C7110.xml
+share/foomatic/db/source/printer/Lanier-Pro_C7110S.xml
 share/foomatic/db/source/printer/Lanier-SG3110DN.xml
 share/foomatic/db/source/printer/Lanier-SG3110DNw.xml
 share/foomatic/db/source/printer/Lanier-SG3110SFNw.xml
@@ -6409,6 +6744,9 @@
 share/foomatic/db/source/printer/Lanier-SP_4110N.xml
 share/foomatic/db/source/printer/Lanier-SP_4210N.xml
 share/foomatic/db/source/printer/Lanier-SP_4310N.xml
+share/foomatic/db/source/printer/Lanier-SP_4510DN.xml
+share/foomatic/db/source/printer/Lanier-SP_4510SF.xml
+share/foomatic/db/source/printer/Lanier-SP_4520DN.xml
 share/foomatic/db/source/printer/Lanier-SP_5200DN.xml
 share/foomatic/db/source/printer/Lanier-SP_5200S.xml
 share/foomatic/db/source/printer/Lanier-SP_5210DN.xml
@@ -6582,7 +6920,9 @@
 share/foomatic/db/source/printer/Lexmark-MX812.xml
 share/foomatic/db/source/printer/Lexmark-MX910.xml
 share/foomatic/db/source/printer/Lexmark-MX910de.xml
+share/foomatic/db/source/printer/Lexmark-MX911.xml
 share/foomatic/db/source/printer/Lexmark-MX911dte.xml
+share/foomatic/db/source/printer/Lexmark-MX912.xml
 share/foomatic/db/source/printer/Lexmark-MX912dxe.xml
 share/foomatic/db/source/printer/Lexmark-Optra_C710.xml
 share/foomatic/db/source/printer/Lexmark-Optra_Color_1200.xml
@@ -6827,11 +7167,13 @@
 share/foomatic/db/source/printer/NRG-MP_2550.xml
 share/foomatic/db/source/printer/NRG-MP_2550B.xml
 share/foomatic/db/source/printer/NRG-MP_2553.xml
+share/foomatic/db/source/printer/NRG-MP_2554.xml
 share/foomatic/db/source/printer/NRG-MP_2851.xml
 share/foomatic/db/source/printer/NRG-MP_2852.xml
 share/foomatic/db/source/printer/NRG-MP_301.xml
 share/foomatic/db/source/printer/NRG-MP_3010.xml
 share/foomatic/db/source/printer/NRG-MP_3053.xml
+share/foomatic/db/source/printer/NRG-MP_3054.xml
 share/foomatic/db/source/printer/NRG-MP_3350.xml
 share/foomatic/db/source/printer/NRG-MP_3350B.xml
 share/foomatic/db/source/printer/NRG-MP_3351.xml
@@ -6838,19 +7180,23 @@
 share/foomatic/db/source/printer/NRG-MP_3352.xml
 share/foomatic/db/source/printer/NRG-MP_3353.xml
 share/foomatic/db/source/printer/NRG-MP_3500.xml
+share/foomatic/db/source/printer/NRG-MP_3554.xml
 share/foomatic/db/source/printer/NRG-MP_4000.xml
 share/foomatic/db/source/printer/NRG-MP_4000B.xml
 share/foomatic/db/source/printer/NRG-MP_4001.xml
 share/foomatic/db/source/printer/NRG-MP_4002.xml
+share/foomatic/db/source/printer/NRG-MP_4054.xml
 share/foomatic/db/source/printer/NRG-MP_4500.xml
 share/foomatic/db/source/printer/NRG-MP_5000.xml
 share/foomatic/db/source/printer/NRG-MP_5000B.xml
 share/foomatic/db/source/printer/NRG-MP_5001.xml
 share/foomatic/db/source/printer/NRG-MP_5002.xml
+share/foomatic/db/source/printer/NRG-MP_5054.xml
 share/foomatic/db/source/printer/NRG-MP_5500.xml
 share/foomatic/db/source/printer/NRG-MP_6000.xml
 share/foomatic/db/source/printer/NRG-MP_6001.xml
 share/foomatic/db/source/printer/NRG-MP_6002.xml
+share/foomatic/db/source/printer/NRG-MP_6054.xml
 share/foomatic/db/source/printer/NRG-MP_6500.xml
 share/foomatic/db/source/printer/NRG-MP_7000.xml
 share/foomatic/db/source/printer/NRG-MP_7001.xml
@@ -6864,6 +7210,7 @@
 share/foomatic/db/source/printer/NRG-MP_C1500sp.xml
 share/foomatic/db/source/printer/NRG-MP_C2003.xml
 share/foomatic/db/source/printer/NRG-MP_C2003Z.xml
+share/foomatic/db/source/printer/NRG-MP_C2011.xml
 share/foomatic/db/source/printer/NRG-MP_C2050.xml
 share/foomatic/db/source/printer/NRG-MP_C2051.xml
 share/foomatic/db/source/printer/NRG-MP_C2500.xml
@@ -6940,6 +7287,10 @@
 share/foomatic/db/source/printer/NRG-Pro_907EX.xml
 share/foomatic/db/source/printer/NRG-Pro_C5100S.xml
 share/foomatic/db/source/printer/NRG-Pro_C5110S.xml
+share/foomatic/db/source/printer/NRG-Pro_C7100.xml
+share/foomatic/db/source/printer/NRG-Pro_C7100S.xml
+share/foomatic/db/source/printer/NRG-Pro_C7110.xml
+share/foomatic/db/source/printer/NRG-Pro_C7110S.xml
 share/foomatic/db/source/printer/NRG-SG3110DN.xml
 share/foomatic/db/source/printer/NRG-SG3110DNw.xml
 share/foomatic/db/source/printer/NRG-SG3110SFNw.xml
@@ -6948,6 +7299,8 @@
 share/foomatic/db/source/printer/NRG-SP_4110N.xml
 share/foomatic/db/source/printer/NRG-SP_4210N.xml
 share/foomatic/db/source/printer/NRG-SP_4310N.xml
+share/foomatic/db/source/printer/NRG-SP_4510DN.xml
+share/foomatic/db/source/printer/NRG-SP_4510SF.xml
 share/foomatic/db/source/printer/NRG-SP_5200DN.xml
 share/foomatic/db/source/printer/NRG-SP_5200S.xml
 share/foomatic/db/source/printer/NRG-SP_5210DN.xml
@@ -7399,11 +7752,22 @@
 share/foomatic/db/source/printer/Ricoh-MP_2001.xml
 share/foomatic/db/source/printer/Ricoh-MP_2501.xml
 share/foomatic/db/source/printer/Ricoh-MP_2553.xml
+share/foomatic/db/source/printer/Ricoh-MP_2554.xml
+share/foomatic/db/source/printer/Ricoh-MP_2554J.xml
 share/foomatic/db/source/printer/Ricoh-MP_3053.xml
+share/foomatic/db/source/printer/Ricoh-MP_3054.xml
+share/foomatic/db/source/printer/Ricoh-MP_3054J.xml
 share/foomatic/db/source/printer/Ricoh-MP_3353.xml
+share/foomatic/db/source/printer/Ricoh-MP_3554.xml
+share/foomatic/db/source/printer/Ricoh-MP_3554J.xml
+share/foomatic/db/source/printer/Ricoh-MP_401SPF.xml
+share/foomatic/db/source/printer/Ricoh-MP_4054.xml
+share/foomatic/db/source/printer/Ricoh-MP_5054.xml
+share/foomatic/db/source/printer/Ricoh-MP_6054.xml
 share/foomatic/db/source/printer/Ricoh-MP_C1500_615C.xml
 share/foomatic/db/source/printer/Ricoh-MP_C2003.xml
 share/foomatic/db/source/printer/Ricoh-MP_C2003Z.xml
+share/foomatic/db/source/printer/Ricoh-MP_C2011.xml
 share/foomatic/db/source/printer/Ricoh-MP_C2503.xml
 share/foomatic/db/source/printer/Ricoh-MP_C2503Z.xml
 share/foomatic/db/source/printer/Ricoh-MP_C3003.xml
@@ -7427,11 +7791,18 @@
 share/foomatic/db/source/printer/Ricoh-Pro_907EX.xml
 share/foomatic/db/source/printer/Ricoh-Pro_C5100S.xml
 share/foomatic/db/source/printer/Ricoh-Pro_C5110S.xml
+share/foomatic/db/source/printer/Ricoh-Pro_C7100.xml
+share/foomatic/db/source/printer/Ricoh-Pro_C7100S.xml
+share/foomatic/db/source/printer/Ricoh-Pro_C7110.xml
+share/foomatic/db/source/printer/Ricoh-Pro_C7110S.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_III_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_II_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_IV_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_I_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-SG3120BSFNw.xml
+share/foomatic/db/source/printer/Ricoh-SP_4510DN.xml
+share/foomatic/db/source/printer/Ricoh-SP_4510SF.xml
+share/foomatic/db/source/printer/Ricoh-SP_4520DN.xml
 share/foomatic/db/source/printer/Samsung-C140x.xml
 share/foomatic/db/source/printer/Samsung-C145x.xml
 share/foomatic/db/source/printer/Samsung-C1810.xml
@@ -7490,7 +7861,10 @@
 share/foomatic/db/source/printer/Samsung-K4350.xml
 share/foomatic/db/source/printer/Samsung-M262x_282x.xml
 share/foomatic/db/source/printer/Samsung-M267x_287x.xml
+share/foomatic/db/source/printer/Samsung-M283x.xml
+share/foomatic/db/source/printer/Samsung-M288x.xml
 share/foomatic/db/source/printer/Samsung-M4370_5370.xml
+share/foomatic/db/source/printer/Samsung-M453x.xml
 share/foomatic/db/source/printer/Samsung-M458x.xml
 share/foomatic/db/source/printer/Samsung-M5270.xml
 share/foomatic/db/source/printer/Samsung-ML-1000.xml
@@ -7753,14 +8127,21 @@
 share/foomatic/db/source/printer/Savin-MP_2352.xml
 share/foomatic/db/source/printer/Savin-MP_2501.xml
 share/foomatic/db/source/printer/Savin-MP_2553.xml
+share/foomatic/db/source/printer/Savin-MP_2554.xml
 share/foomatic/db/source/printer/Savin-MP_2852.xml
 share/foomatic/db/source/printer/Savin-MP_301.xml
 share/foomatic/db/source/printer/Savin-MP_3053.xml
+share/foomatic/db/source/printer/Savin-MP_3054.xml
 share/foomatic/db/source/printer/Savin-MP_3352.xml
 share/foomatic/db/source/printer/Savin-MP_3353.xml
+share/foomatic/db/source/printer/Savin-MP_3554.xml
 share/foomatic/db/source/printer/Savin-MP_4002.xml
+share/foomatic/db/source/printer/Savin-MP_401SPF.xml
+share/foomatic/db/source/printer/Savin-MP_4054.xml
 share/foomatic/db/source/printer/Savin-MP_5002.xml
+share/foomatic/db/source/printer/Savin-MP_5054.xml
 share/foomatic/db/source/printer/Savin-MP_6002.xml
+share/foomatic/db/source/printer/Savin-MP_6054.xml
 share/foomatic/db/source/printer/Savin-MP_7502.xml
 share/foomatic/db/source/printer/Savin-MP_9002.xml
 share/foomatic/db/source/printer/Savin-MP_C2003.xml
@@ -7793,6 +8174,10 @@
 share/foomatic/db/source/printer/Savin-Pro_907EX.xml
 share/foomatic/db/source/printer/Savin-Pro_C5100S.xml
 share/foomatic/db/source/printer/Savin-Pro_C5110S.xml
+share/foomatic/db/source/printer/Savin-Pro_C7100.xml
+share/foomatic/db/source/printer/Savin-Pro_C7100S.xml
+share/foomatic/db/source/printer/Savin-Pro_C7110.xml
+share/foomatic/db/source/printer/Savin-Pro_C7110S.xml
 share/foomatic/db/source/printer/Savin-SDC555.xml
 share/foomatic/db/source/printer/Savin-SG3110DN.xml
 share/foomatic/db/source/printer/Savin-SG3110DNw.xml
@@ -7803,6 +8188,9 @@
 share/foomatic/db/source/printer/Savin-SLP32.xml
 share/foomatic/db/source/printer/Savin-SLP38c.xml
 share/foomatic/db/source/printer/Savin-SP_4310N.xml
+share/foomatic/db/source/printer/Savin-SP_4510DN.xml
+share/foomatic/db/source/printer/Savin-SP_4510SF.xml
+share/foomatic/db/source/printer/Savin-SP_4520DN.xml
 share/foomatic/db/source/printer/Savin-SP_5200DN.xml
 share/foomatic/db/source/printer/Savin-SP_5200S.xml
 share/foomatic/db/source/printer/Savin-SP_5210DN.xml
@@ -7881,6 +8269,7 @@
 share/foomatic/db/source/printer/Sharp-AR-705M_PS.xml
 share/foomatic/db/source/printer/Sharp-AR-705S.xml
 share/foomatic/db/source/printer/Sharp-AR-705S_PS.xml
+share/foomatic/db/source/printer/Sharp-AR-B07.xml
 share/foomatic/db/source/printer/Sharp-AR-BC260.xml
 share/foomatic/db/source/printer/Sharp-AR-BC320.xml
 share/foomatic/db/source/printer/Sharp-AR-C170FP.xml
@@ -7927,6 +8316,7 @@
 share/foomatic/db/source/printer/Sharp-AR-M236_PS.xml
 share/foomatic/db/source/printer/Sharp-AR-M237.xml
 share/foomatic/db/source/printer/Sharp-AR-M237_PS.xml
+share/foomatic/db/source/printer/Sharp-AR-M256.xml
 share/foomatic/db/source/printer/Sharp-AR-M276.xml
 share/foomatic/db/source/printer/Sharp-AR-M276_PS.xml
 share/foomatic/db/source/printer/Sharp-AR-M277.xml
@@ -7945,8 +8335,13 @@
 share/foomatic/db/source/printer/Sharp-AR-M620U.xml
 share/foomatic/db/source/printer/Sharp-AR-M700N.xml
 share/foomatic/db/source/printer/Sharp-AR-M700U.xml
+share/foomatic/db/source/printer/Sharp-AR-N182FG.xml
+share/foomatic/db/source/printer/Sharp-AR-N182G.xml
+share/foomatic/db/source/printer/Sharp-AR-NB2A.xml
 share/foomatic/db/source/printer/Sharp-ARP350.xml
 share/foomatic/db/source/printer/Sharp-ARP450.xml
+share/foomatic/db/source/printer/Sharp-MX-1810U.xml
+share/foomatic/db/source/printer/Sharp-MX-2010U.xml
 share/foomatic/db/source/printer/Sharp-MX-2300FG.xml
 share/foomatic/db/source/printer/Sharp-MX-2300FG_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-2300G.xml
@@ -7953,6 +8348,19 @@
 share/foomatic/db/source/printer/Sharp-MX-2300G_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-2300N.xml
 share/foomatic/db/source/printer/Sharp-MX-2300N_PS.xml
+share/foomatic/db/source/printer/Sharp-MX-2310F.xml
+share/foomatic/db/source/printer/Sharp-MX-2310U.xml
+share/foomatic/db/source/printer/Sharp-MX-2314N.xml
+share/foomatic/db/source/printer/Sharp-MX-2314NR.xml
+share/foomatic/db/source/printer/Sharp-MX-2514FN.xml
+share/foomatic/db/source/printer/Sharp-MX-2610FN.xml
+share/foomatic/db/source/printer/Sharp-MX-2610N.xml
+share/foomatic/db/source/printer/Sharp-MX-2614N.xml
+share/foomatic/db/source/printer/Sharp-MX-2614NR.xml
+share/foomatic/db/source/printer/Sharp-MX-2615N.xml
+share/foomatic/db/source/printer/Sharp-MX-2616N.xml
+share/foomatic/db/source/printer/Sharp-MX-2640FN.xml
+share/foomatic/db/source/printer/Sharp-MX-2640N.xml
 share/foomatic/db/source/printer/Sharp-MX-2700FG.xml
 share/foomatic/db/source/printer/Sharp-MX-2700FG_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-2700G.xml
@@ -7959,6 +8367,17 @@
 share/foomatic/db/source/printer/Sharp-MX-2700G_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-2700N.xml
 share/foomatic/db/source/printer/Sharp-MX-2700N_PS.xml
+share/foomatic/db/source/printer/Sharp-MX-3110FN.xml
+share/foomatic/db/source/printer/Sharp-MX-3110N.xml
+share/foomatic/db/source/printer/Sharp-MX-3111F.xml
+share/foomatic/db/source/printer/Sharp-MX-3111U.xml
+share/foomatic/db/source/printer/Sharp-MX-3114FN.xml
+share/foomatic/db/source/printer/Sharp-MX-3114N.xml
+share/foomatic/db/source/printer/Sharp-MX-3114NR.xml
+share/foomatic/db/source/printer/Sharp-MX-3115N.xml
+share/foomatic/db/source/printer/Sharp-MX-3116N.xml
+share/foomatic/db/source/printer/Sharp-MX-3140FN.xml
+share/foomatic/db/source/printer/Sharp-MX-3140N.xml
 share/foomatic/db/source/printer/Sharp-MX-3500FN.xml
 share/foomatic/db/source/printer/Sharp-MX-3500FN_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-3500N.xml
@@ -7967,6 +8386,21 @@
 share/foomatic/db/source/printer/Sharp-MX-3501FN_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-3501N.xml
 share/foomatic/db/source/printer/Sharp-MX-3501N_PS.xml
+share/foomatic/db/source/printer/Sharp-MX-3610FN.xml
+share/foomatic/db/source/printer/Sharp-MX-3610N.xml
+share/foomatic/db/source/printer/Sharp-MX-3611F.xml
+share/foomatic/db/source/printer/Sharp-MX-3614FN.xml
+share/foomatic/db/source/printer/Sharp-MX-3640FN.xml
+share/foomatic/db/source/printer/Sharp-MX-3640N.xml
+share/foomatic/db/source/printer/Sharp-MX-4110FN.xml
+share/foomatic/db/source/printer/Sharp-MX-4110N.xml
+share/foomatic/db/source/printer/Sharp-MX-4111FN.xml
+share/foomatic/db/source/printer/Sharp-MX-4111N.xml
+share/foomatic/db/source/printer/Sharp-MX-4112N.xml
+share/foomatic/db/source/printer/Sharp-MX-4140FN.xml
+share/foomatic/db/source/printer/Sharp-MX-4140N.xml
+share/foomatic/db/source/printer/Sharp-MX-4141FN.xml
+share/foomatic/db/source/printer/Sharp-MX-4141N.xml
 share/foomatic/db/source/printer/Sharp-MX-4500FN.xml
 share/foomatic/db/source/printer/Sharp-MX-4500FN_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-4500N.xml
@@ -7975,6 +8409,87 @@
 share/foomatic/db/source/printer/Sharp-MX-4501FN_PS.xml
 share/foomatic/db/source/printer/Sharp-MX-4501N.xml
 share/foomatic/db/source/printer/Sharp-MX-4501N_PS.xml
+share/foomatic/db/source/printer/Sharp-MX-5110FN.xml
+share/foomatic/db/source/printer/Sharp-MX-5110N.xml
+share/foomatic/db/source/printer/Sharp-MX-5111FN.xml
+share/foomatic/db/source/printer/Sharp-MX-5111N.xml
+share/foomatic/db/source/printer/Sharp-MX-5112N.xml
+share/foomatic/db/source/printer/Sharp-MX-5140FN.xml
+share/foomatic/db/source/printer/Sharp-MX-5140N.xml
+share/foomatic/db/source/printer/Sharp-MX-5141FN.xml
+share/foomatic/db/source/printer/Sharp-MX-5141N.xml
+share/foomatic/db/source/printer/Sharp-MX-5500N.xml
+share/foomatic/db/source/printer/Sharp-MX-6200N.xml
+share/foomatic/db/source/printer/Sharp-MX-6240N.xml
+share/foomatic/db/source/printer/Sharp-MX-6500N.xml
+share/foomatic/db/source/printer/Sharp-MX-6540FN.xml
+share/foomatic/db/source/printer/Sharp-MX-7000N.xml
+share/foomatic/db/source/printer/Sharp-MX-7040N.xml
+share/foomatic/db/source/printer/Sharp-MX-7500N.xml
+share/foomatic/db/source/printer/Sharp-MX-C250.xml
+share/foomatic/db/source/printer/Sharp-MX-C250E.xml
+share/foomatic/db/source/printer/Sharp-MX-C250F.xml
+share/foomatic/db/source/printer/Sharp-MX-C250FE.xml
+share/foomatic/db/source/printer/Sharp-MX-C250FR.xml
+share/foomatic/db/source/printer/Sharp-MX-C300.xml
+share/foomatic/db/source/printer/Sharp-MX-C300E.xml
+share/foomatic/db/source/printer/Sharp-MX-C300F.xml
+share/foomatic/db/source/printer/Sharp-MX-C300P.xml
+share/foomatic/db/source/printer/Sharp-MX-C300PE.xml
+share/foomatic/db/source/printer/Sharp-MX-C300PL.xml
+share/foomatic/db/source/printer/Sharp-MX-C300W.xml
+share/foomatic/db/source/printer/Sharp-MX-C300WE.xml
+share/foomatic/db/source/printer/Sharp-MX-C300WR.xml
+share/foomatic/db/source/printer/Sharp-MX-C301.xml
+share/foomatic/db/source/printer/Sharp-MX-C301F.xml
+share/foomatic/db/source/printer/Sharp-MX-C301W.xml
+share/foomatic/db/source/printer/Sharp-MX-M1054.xml
+share/foomatic/db/source/printer/Sharp-MX-M1100.xml
+share/foomatic/db/source/printer/Sharp-MX-M1204.xml
+share/foomatic/db/source/printer/Sharp-MX-M182.xml
+share/foomatic/db/source/printer/Sharp-MX-M182D.xml
+share/foomatic/db/source/printer/Sharp-MX-M202D.xml
+share/foomatic/db/source/printer/Sharp-MX-M232D.xml
+share/foomatic/db/source/printer/Sharp-MX-M260.xml
+share/foomatic/db/source/printer/Sharp-MX-M260FP.xml
+share/foomatic/db/source/printer/Sharp-MX-M260N.xml
+share/foomatic/db/source/printer/Sharp-MX-M264FP.xml
+share/foomatic/db/source/printer/Sharp-MX-M264N.xml
+share/foomatic/db/source/printer/Sharp-MX-M264NR.xml
+share/foomatic/db/source/printer/Sharp-MX-M264NV.xml
+share/foomatic/db/source/printer/Sharp-MX-M264U.xml
+share/foomatic/db/source/printer/Sharp-MX-M310.xml
+share/foomatic/db/source/printer/Sharp-MX-M310FP.xml
+share/foomatic/db/source/printer/Sharp-MX-M310N.xml
+share/foomatic/db/source/printer/Sharp-MX-M314FP.xml
+share/foomatic/db/source/printer/Sharp-MX-M314N.xml
+share/foomatic/db/source/printer/Sharp-MX-M314NR.xml
+share/foomatic/db/source/printer/Sharp-MX-M314NV.xml
+share/foomatic/db/source/printer/Sharp-MX-M314U.xml
+share/foomatic/db/source/printer/Sharp-MX-M354FP.xml
+share/foomatic/db/source/printer/Sharp-MX-M354N.xml
+share/foomatic/db/source/printer/Sharp-MX-M354NR.xml
+share/foomatic/db/source/printer/Sharp-MX-M354U.xml
+share/foomatic/db/source/printer/Sharp-MX-M364N.xml
+share/foomatic/db/source/printer/Sharp-MX-M365FN.xml
+share/foomatic/db/source/printer/Sharp-MX-M365N.xml
+share/foomatic/db/source/printer/Sharp-MX-M464FN.xml
+share/foomatic/db/source/printer/Sharp-MX-M464N.xml
+share/foomatic/db/source/printer/Sharp-MX-M465FN.xml
+share/foomatic/db/source/printer/Sharp-MX-M465N.xml
+share/foomatic/db/source/printer/Sharp-MX-M564FN.xml
+share/foomatic/db/source/printer/Sharp-MX-M564N.xml
+share/foomatic/db/source/printer/Sharp-MX-M565FN.xml
+share/foomatic/db/source/printer/Sharp-MX-M565N.xml
+share/foomatic/db/source/printer/Sharp-MX-M654FN.xml
+share/foomatic/db/source/printer/Sharp-MX-M654N.xml
+share/foomatic/db/source/printer/Sharp-MX-M754FN.xml
+share/foomatic/db/source/printer/Sharp-MX-M754N.xml
+share/foomatic/db/source/printer/Sharp-MX-M850.xml
+share/foomatic/db/source/printer/Sharp-MX-M860.xml
+share/foomatic/db/source/printer/Sharp-MX-M904.xml
+share/foomatic/db/source/printer/Sharp-MX-M950.xml
+share/foomatic/db/source/printer/Sharp-MX-NB11.xml
 share/foomatic/db/source/printer/SiPix-Pocket_Printer_A6.xml
 share/foomatic/db/source/printer/Sony-IJP-V100.xml
 share/foomatic/db/source/printer/Sony-UP-DP10.xml
@@ -8235,100 +8750,3 @@
 share/foomatic/xmlschema/option.xsd
 share/foomatic/xmlschema/printer.xsd
 share/foomatic/xmlschema/types.xsd
- at dirrmtry share/cups/model
- at dirrmtry share/cups
- at dirrmtry share/foomatic/db/source/PPD/Brother
- at dirrmtry share/foomatic/db/source/PPD/Epson
- at dirrmtry share/foomatic/db/source/PPD/Gestetner/PS
- at dirrmtry share/foomatic/db/source/PPD/Gestetner/PXL
- at dirrmtry share/foomatic/db/source/PPD/Gestetner
- at dirrmtry share/foomatic/db/source/PPD/HP
- at dirrmtry share/foomatic/db/source/PPD/InfoPrint/PS
- at dirrmtry share/foomatic/db/source/PPD/InfoPrint/PXL
- at dirrmtry share/foomatic/db/source/PPD/InfoPrint
- at dirrmtry share/foomatic/db/source/PPD/Infotec/PS
- at dirrmtry share/foomatic/db/source/PPD/Infotec/PXL
- at dirrmtry share/foomatic/db/source/PPD/Infotec
- at dirrmtry share/foomatic/db/source/PPD/KONICA_MINOLTA
- at dirrmtry share/foomatic/db/source/PPD/Kyocera/de
- at dirrmtry share/foomatic/db/source/PPD/Kyocera/en
- at dirrmtry share/foomatic/db/source/PPD/Kyocera/es
- at dirrmtry share/foomatic/db/source/PPD/Kyocera/fr
- at dirrmtry share/foomatic/db/source/PPD/Kyocera/it
- at dirrmtry share/foomatic/db/source/PPD/Kyocera/pt
- at dirrmtry share/foomatic/db/source/PPD/Kyocera
- at dirrmtry share/foomatic/db/source/PPD/Lanier/PS
- at dirrmtry share/foomatic/db/source/PPD/Lanier/PXL
- at dirrmtry share/foomatic/db/source/PPD/Lanier
- at dirrmtry share/foomatic/db/source/PPD/Lexmark
- at dirrmtry share/foomatic/db/source/PPD/NRG/PS
- at dirrmtry share/foomatic/db/source/PPD/NRG/PXL
- at dirrmtry share/foomatic/db/source/PPD/NRG
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-3145PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-3145PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-3155PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-3155PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-3165PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-3165PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-8445PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-8445PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-8465PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-8465PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3073PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3073PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3074PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3074PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3093PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3093PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3094PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3094PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3113PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3113PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3114PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC3114PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC5115PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC5115PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC5160PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-PPC5160PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2045PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2045PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2050PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2050PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2055PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2055PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2060PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2060PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2065PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2065PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2070PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2070PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2090PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2090PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2100PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2100PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2105PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2105PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2110PS/1
- at dirrmtry share/foomatic/db/source/PPD/Oce/Oce-VarioPrint_2110PS
- at dirrmtry share/foomatic/db/source/PPD/Oce/Others
- at dirrmtry share/foomatic/db/source/PPD/Oce
- at dirrmtry share/foomatic/db/source/PPD/Oki
- at dirrmtry share/foomatic/db/source/PPD/Ricoh/PS
- at dirrmtry share/foomatic/db/source/PPD/Ricoh/PXL
- at dirrmtry share/foomatic/db/source/PPD/Ricoh
- at dirrmtry share/foomatic/db/source/PPD/Samsung/PS
- at dirrmtry share/foomatic/db/source/PPD/Samsung/PXL
- at dirrmtry share/foomatic/db/source/PPD/Samsung
- at dirrmtry share/foomatic/db/source/PPD/Savin/PS
- at dirrmtry share/foomatic/db/source/PPD/Savin/PXL
- at dirrmtry share/foomatic/db/source/PPD/Savin
- at dirrmtry share/foomatic/db/source/PPD/Sharp
- at dirrmtry share/foomatic/db/source/PPD/Toshiba
- at dirrmtry share/foomatic/db/source/PPD
- at dirrmtry share/foomatic/db/source/driver
- at dirrmtry share/foomatic/db/source/opt
- at dirrmtry share/foomatic/db/source/printer
- at dirrmtry share/foomatic/db/source
- at dirrmtry share/foomatic/db
- at dirrmtry share/foomatic/xmlschema
- at dirrmtry share/foomatic

Modified: trunk/print/foomatic-db-engine/distinfo
===================================================================
--- trunk/print/foomatic-db-engine/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db-engine/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,3 +1,2 @@
-SHA256 (foomatic/foomatic-db-engine-4.0.1.tar.gz) = 9fb085d2095823567a4a4d36ec54b72df438fbddcdd76e1e32b5dc2b234b9b98
-RMD160 (foomatic/foomatic-db-engine-4.0.1.tar.gz) = 8022b8d2a49b6e4a412c96f0a75e3139ece3536d
-SIZE (foomatic/foomatic-db-engine-4.0.1.tar.gz) = 341569
+SHA256 (foomatic/foomatic-db-engine-4.0.12.tar.gz) = 66143b76ed5b325b7025e261ad917b543de534c6d0a6e495d5489a20cace7c21
+SIZE (foomatic/foomatic-db-engine-4.0.12.tar.gz) = 360499

Added: trunk/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in
===================================================================
--- trunk/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in	                        (rev 0)
+++ trunk/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,44 @@
+Do not require bash -- BSD sh(1) is perfectly capable of executing
+this script.
+
+While here, replace use of perl in removal of some characters from
+streams with the much lighter tr(1) invocations. Strip out
+carriage-returns (\r) characters from remote printer's responses too.
+
+Remove useless braces around variable-names.
+
+	-mi
+
+--- foomatic-getpjloptions.in	2015-02-14 07:21:56.000000000 -0500
++++ foomatic-getpjloptions.in	2015-02-15 07:36:23.000000000 -0500
+@@ -1,3 +1,3 @@
+-#!@SH@
++#!/bin/sh
+ #
+ # Polls PJL options from local or network printers
+@@ -23,6 +23,5 @@
+ NC=@NC@
+ CAT=@CAT@
+-PRINTF=@PRINTF@
+-PERL=@PERL@
++PRINTF=printf	# sh builtin
+ 
+ usage(){
+@@ -63,12 +62,13 @@
+-	# We have two arguments, do ethernet printer request
++	# We have two arguments, do network printer request
+ 	# Poll the printer's answer and filter out the newpage characters
++	# as well as the carriage-returns (\r or, in octal, 015)
+-	${NC} -w 3 ${1} ${2} 2>/dev/null | ${PERL} -p -e "s/\014//"
++	$NC -w 3 $1 $2 2>/dev/null | tr -d "\015\014"
+     else
+ 	# We have one argument, do local printer request
+ 	# Send commands to printer port
+-	${CAT} > ${1}
++	$CAT > $1
+ 	# Wait ten seconds for the printer to process the request
+ 	sleep 10
+ 	# Poll the printer's answer and filter out the newpage and CR characters
+-	${CAT} < ${1} | ${PERL} -p -e "s/[\015\014]//"
++	exec tr -d "\015\014" < $1
+     fi


Property changes on: trunk/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/foomatic-db-engine/pkg-plist
===================================================================
--- trunk/print/foomatic-db-engine/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db-engine/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -4,8 +4,8 @@
 bin/foomatic-datafile
 bin/foomatic-perl-data
 bin/foomatic-ppd-options
+bin/foomatic-ppd-to-xml
 bin/foomatic-ppdfile
-bin/foomatic-ppd-to-xml
 bin/foomatic-printjob
 bin/foomatic-searchprinter
 %%SITE_PERL%%/Foomatic/DB.pm
@@ -12,8 +12,21 @@
 %%SITE_PERL%%/Foomatic/Defaults.pm
 %%SITE_PERL%%/Foomatic/PPD.pm
 %%SITE_PERL%%/Foomatic/UIElem.pm
+libexec/cups/driver/foomatic
+man/man1/foomatic-combo-xml.1.gz
+man/man1/foomatic-compiledb.1.gz
+man/man1/foomatic-configure.1.gz
+man/man1/foomatic-perl-data.1.gz
+man/man1/foomatic-ppd-options.1.gz
+man/man1/foomatic-ppdfile.1.gz
+man/man1/foomatic-printjob.1.gz
+man/man8/foomatic-addpjloptions.8.gz
+man/man8/foomatic-getpjloptions.8.gz
+man/man8/foomatic-kitload.8.gz
+man/man8/foomatic-preferred-driver.8.gz
 sbin/foomatic-addpjloptions
 sbin/foomatic-cleanupdrivers
+sbin/foomatic-extract-text
 sbin/foomatic-fix-xml
 sbin/foomatic-getpjloptions
 sbin/foomatic-kitload
@@ -21,12 +34,7 @@
 sbin/foomatic-preferred-driver
 sbin/foomatic-printermap-to-gutenprint-xml
 sbin/foomatic-replaceoldprinterids
-sbin/foomatic-extract-text
 share/foomatic/templates/pjl_enum_choice.xml
 share/foomatic/templates/pjl_enum_option.xml
 share/foomatic/templates/pjl_num_option.xml
- at dirrm share/foomatic/templates
- at dirrmtry share/foomatic
- at dirrm %%SITE_PERL%%/Foomatic
- at dirrmtry etc/foomatic
- at exec mkdir -p %D/etc/foomatic
+ at dir etc/foomatic

Modified: trunk/print/foomatic-db-hpijs/distinfo
===================================================================
--- trunk/print/foomatic-db-hpijs/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db-hpijs/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,3 +1,2 @@
 SHA256 (foomatic-db-hpijs-1.4-1.tar.gz) = 1e86ff50b9523fd062acac5be8fc054095605469fb9b1e27cd394c05399b0941
-RMD160 (foomatic-db-hpijs-1.4-1.tar.gz) = 33681b2ebadb6db32458ff4dfcbb5a20d49230f1
 SIZE (foomatic-db-hpijs-1.4-1.tar.gz) = 83326

Modified: trunk/print/foomatic-db-hpijs/pkg-descr
===================================================================
--- trunk/print/foomatic-db-hpijs/pkg-descr	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db-hpijs/pkg-descr	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,4 +1,4 @@
 Foomatic data for HP's HPIJS (http://hpinkjet.sourceforge.net)
 printer drivers. 
 
-WWW:	http://www.linuxprinting.org
+WWW: http://www.linuxprinting.org

Modified: trunk/print/foomatic-db-hpijs/pkg-plist
===================================================================
--- trunk/print/foomatic-db-hpijs/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/foomatic-db-hpijs/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -11,4 +11,4 @@
 share/foomatic/db/source/opt/hpijs-rss-Model.xml
 share/foomatic/db/source/opt/hpijs-rss-PageSize.xml
 share/foomatic/db/source/opt/hpijs-rss-Resolution.xml
-
+ at dir share/foomatic/db/source/printer

Modified: trunk/print/freetype/Makefile
===================================================================
--- trunk/print/freetype/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/freetype/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -3,13 +3,12 @@
 
 PORTNAME=	freetype
 PORTVERSION=	1.3.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	SF \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype1/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype1/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
 		ftp://ftp.freetype.org/freetype/freetupe1/
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -19,29 +18,12 @@
 LICENSE_NAME=	The FreeType Project LICENSE
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror
-#apple patent whore
 
 FAKE_OPTS+=	prefixhack
 
-USES=		libtool
+USES=		cpe libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
 
-PORTSCOUT=	limit:^1\.
-
-.ifdef USE_FREETYPE
-IGNORE=	cannot be installed: you have the 'USE_FREETYPE' variable defined either in environment or in make(1) arguments. Please undefine and try again
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
-
-post-install:
-	cd ${PREFIX}/lib && ln libttf.so.4.0 libttf.so.4
-
-#post-install:
-#	${LN} -fs ${PREFIX}/include/freetype/*.h ${PREFIX}/include
-
 .include <bsd.port.mk>

Modified: trunk/print/freetype/pkg-plist
===================================================================
--- trunk/print/freetype/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/freetype/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -13,7 +13,6 @@
 include/freetype1/freetype/ftxsbit.h
 include/freetype1/freetype/ftxwidth.h
 lib/libttf.a
-lib/libttf.so.4
-lib/libttf.so.4.0
- at dirrm include/freetype1/freetype
- at dirrm include/freetype1
+lib/libttf.so
+lib/libttf.so.2
+lib/libttf.so.2.2.0

Modified: trunk/print/freetype2/Makefile
===================================================================
--- trunk/print/freetype2/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/freetype2/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,6 +2,7 @@
 
 PORTNAME=	freetype2
 PORTVERSION=	2.5.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
@@ -8,7 +9,6 @@
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
 		ftp://ftp.freetype.org/freetype/freetype2/
 DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 
@@ -17,12 +17,14 @@
 
 LICENSE=	gpl2
 
-USES=		gmake libtool tar:bzip2
+USES=		cpe gmake libtool tar:bzip2
 MAKE_ENV=	TOP=""
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-harfbuzz
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
+CPE_PRODUCT=	freetype
+CPE_VENDOR=	freetype
 
 OPTIONS_DEFINE=		LCD_FILTERING PNG
 OPTIONS_DEFAULT=	LCD_FILTERING

Deleted: trunk/print/freetype2/files/patch-aa
===================================================================
--- trunk/print/freetype2/files/patch-aa	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/freetype2/files/patch-aa	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,24 +0,0 @@
---- builds/unix/detect.mk.orig	2013-03-21 13:55:46.000000000 -0500
-+++ builds/unix/detect.mk	2013-05-12 17:58:34.000000000 -0500
-@@ -22,6 +22,9 @@
-                      $(wildcard /usr/sbin/init) \
-                      $(wildcard /dev/null) \
-                      $(wildcard /hurd/auth))
-+  # FreeBSD is "unix" so just mandate this to fix the build in
-+  # jails that do not have init (see PR#113470).
-+  is_unix := true
-   ifneq ($(is_unix),)
- 
-     PLATFORM := unix
-@@ -81,9 +84,9 @@
-   ifdef must_configure
-     ifneq ($(have_Makefile),)
-       # we are building FT2 not in the src tree
--	      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
-+      #      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
-     else
--	      cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
-+      #     cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
-     endif
-   endif
- 

Copied: trunk/print/freetype2/files/patch-builds_unix_detect.mk (from rev 19527, trunk/print/freetype2/files/patch-aa)
===================================================================
--- trunk/print/freetype2/files/patch-builds_unix_detect.mk	                        (rev 0)
+++ trunk/print/freetype2/files/patch-builds_unix_detect.mk	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,24 @@
+--- builds/unix/detect.mk.orig	2013-03-21 13:55:46.000000000 -0500
++++ builds/unix/detect.mk	2013-05-12 17:58:34.000000000 -0500
+@@ -22,6 +22,9 @@
+                      $(wildcard /usr/sbin/init) \
+                      $(wildcard /dev/null) \
+                      $(wildcard /hurd/auth))
++  # FreeBSD is "unix" so just mandate this to fix the build in
++  # jails that do not have init (see PR#113470).
++  is_unix := true
+   ifneq ($(is_unix),)
+ 
+     PLATFORM := unix
+@@ -81,9 +84,9 @@
+   ifdef must_configure
+     ifneq ($(have_Makefile),)
+       # we are building FT2 not in the src tree
+-	      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
++      #      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
+     else
+-	      cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
++      #     cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
+     endif
+   endif
+ 

Modified: trunk/print/gimp-gutenprint/Makefile
===================================================================
--- trunk/print/gimp-gutenprint/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gimp-gutenprint/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,6 +1,6 @@
 # $MidnightBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMEPREFIX=	gimp-
 PKGNAMESUFFIX=	# empty

Modified: trunk/print/gsfonts/pkg-plist
===================================================================
--- trunk/print/gsfonts/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gsfonts/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -159,5 +159,3 @@
 %%FONTSDIR%%/STHeiti-Regular
 %%FONTSDIR%%/STSong-Light
 %%FONTSDIR%%/MSung-Light
- at dirrm %%FONTSDIR%%
- at dirrmtry share/ghostscript

Modified: trunk/print/gspdf/Makefile
===================================================================
--- trunk/print/gspdf/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gspdf/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,23 +1,24 @@
 # $MidnightBSD$
 
 PORTNAME=	gspdf
-PORTVERSION=	0.3
+PORTVERSION=	0.5
+PORTREVISION=	3
 CATEGORIES=	print gnustep
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	gap
+MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	GSPdf-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A Postscript and Pdf Viewer for GNUstep
+COMMENT=	Postscript and Pdf Viewer for GNUstep
+
 LICENSE=	gpl2
 
-USE_GNUSTEP=	yes
-USE_GNUSTEP_PREFIX=	yes
-USE_GNUSTEP_BACK=	yes
-USE_GNUSTEP_BUILD=	yes
-USE_GNUSTEP_INSTALL=	yes
+USES=		gnustep
+USE_GNUSTEP=	back build
 USE_GHOSTSCRIPT=	yes
 
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
+post-install:
+	${STRIP_CMD} ${PREFIX}/GNUstep/System/Applications/GSPdf.app/GSPdf
+
 .include <bsd.port.mk>

Modified: trunk/print/gspdf/distinfo
===================================================================
--- trunk/print/gspdf/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gspdf/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,3 +1,2 @@
-SHA256 (GSPdf-0.3.tar.gz) = 20ca37c50f60b592913e9c7eec150454325df26cc6892416b263f1965120f43e
-RMD160 (GSPdf-0.3.tar.gz) = 313fe91e1f72be6c9d1eb9a0a8027c6613188561
-SIZE (GSPdf-0.3.tar.gz) = 39926
+SHA256 (GSPdf-0.5.tar.gz) = b85e2184e90a46aa054d1bf6577fb19f0c3bd953f0e4ff1b8656528d0dfcf88b
+SIZE (GSPdf-0.5.tar.gz) = 44357

Modified: trunk/print/gspdf/pkg-descr
===================================================================
--- trunk/print/gspdf/pkg-descr	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gspdf/pkg-descr	2015-07-09 01:08:35 UTC (rev 19559)
@@ -3,5 +3,4 @@
 
 LICENSE: GPL2 or later
 
-WWW: http://www.gnustep.it/enrico/gspdf/
 WWW: http://gap.nongnu.org/gspdf/index.html

Modified: trunk/print/gspdf/pkg-plist
===================================================================
--- trunk/print/gspdf/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gspdf/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,30 +1,25 @@
-System/Applications/GSPdf.app/GSPdf
-System/Applications/GSPdf.app/Resources/FileEPS.tiff
-System/Applications/GSPdf.app/Resources/FilePDF.tiff
-System/Applications/GSPdf.app/Resources/FilePS.tiff
-System/Applications/GSPdf.app/Resources/GSPdf.desktop
-System/Applications/GSPdf.app/Resources/GSPdf.gorm/data.classes
-System/Applications/GSPdf.app/Resources/GSPdf.gorm/data.info
-System/Applications/GSPdf.app/Resources/GSPdf.gorm/objects.gorm
-System/Applications/GSPdf.app/Resources/GSPdfConsole.gorm/data.classes
-System/Applications/GSPdf.app/Resources/GSPdf.tiff
-System/Applications/GSPdf.app/Resources/GSPdfConsole.gorm/data.info
-System/Applications/GSPdf.app/Resources/GSPdfConsole.gorm/objects.gorm
-System/Applications/GSPdf.app/Resources/GSPdfDocument.gorm/data.classes
-System/Applications/GSPdf.app/Resources/GSPdfDocument.gorm/data.info
-System/Applications/GSPdf.app/Resources/GSPdfDocument.gorm/objects.gorm
-System/Applications/GSPdf.app/Resources/Info-gnustep.plist
-System/Applications/GSPdf.app/Resources/hand.tiff
-System/Applications/GSPdf.app/Resources/left.tiff
-System/Applications/GSPdf.app/Resources/page.tiff
-System/Applications/GSPdf.app/Resources/papersizes.plist
-System/Applications/GSPdf.app/Resources/right.tiff
-System/Applications/GSPdf.app/Resources/zoomin.tiff
-System/Applications/GSPdf.app/Resources/zoomout.tiff
-System/Applications/GSPdf.app/stamp.make
-System/Tools/GSPdf
- at dirrm System/Applications/GSPdf.app/Resources/GSPdfDocument.gorm
- at dirrm System/Applications/GSPdf.app/Resources/GSPdfConsole.gorm
- at dirrm System/Applications/GSPdf.app/Resources/GSPdf.gorm
- at dirrm System/Applications/GSPdf.app/Resources
- at dirrm System/Applications/GSPdf.app
+GNUstep/System/Applications/GSPdf.app/GSPdf
+GNUstep/System/Applications/GSPdf.app/Resources/FileEPS.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/FilePDF.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/FilePS.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdf.desktop
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdf.gorm/data.classes
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdf.gorm/data.info
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdf.gorm/objects.gorm
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdfConsole.gorm/data.classes
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdf.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdfConsole.gorm/data.info
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdfConsole.gorm/objects.gorm
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdfDocument.gorm/data.classes
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdfDocument.gorm/data.info
+GNUstep/System/Applications/GSPdf.app/Resources/GSPdfDocument.gorm/objects.gorm
+GNUstep/System/Applications/GSPdf.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/GSPdf.app/Resources/hand.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/left.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/page.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/papersizes.plist
+GNUstep/System/Applications/GSPdf.app/Resources/right.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/zoomin.tiff
+GNUstep/System/Applications/GSPdf.app/Resources/zoomout.tiff
+GNUstep/System/Applications/GSPdf.app/stamp.make
+GNUstep/System/Tools/GSPdf

Modified: trunk/print/gutenprint-base/Makefile
===================================================================
--- trunk/print/gutenprint-base/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gutenprint-base/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -14,7 +14,7 @@
 CONFLICTS=	gimp-print-[0-9]*
 
 USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
 USE_LDCONFIG=	yes
@@ -25,15 +25,16 @@
 .include <bsd.port.pre.mk>
 
 .if ${SLAVE_PORT}=="yes"
-LIB_DEPENDS+=	gutenprintui2.1:${PORTSDIR}/print/gutenprint-base
+LIB_DEPENDS+=	libgutenprintui2.so:${PORTSDIR}/print/gutenprint-base
 PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
 .else
+MAN1+=		escputil.1
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
-LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp-app \
-		gutenprint.2:${PORTSDIR}/print/gutenprint-base
+LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
+		libgutenprint.so:${PORTSDIR}/print/gutenprint-base
 CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
 BUILD_WRKSRC=	${WRKSRC}/src/gimp2
 INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
@@ -42,8 +43,8 @@
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client \
-		cupsimage.2:${PORTSDIR}/print/cups-image
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client \
+		libcupsimage.so:${PORTSDIR}/print/cups-image
 RUN_DEPENDS+=	espgs:${PORTSDIR}/print/cups-pstoraster
 CONFIGURE_ARGS+=	--with-cups=${PREFIX} \
 			--enable-cups-ppds \
@@ -55,7 +56,7 @@
 .endif
 
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="ijs"
-LIB_DEPENDS+=	ijs.1:${PORTSDIR}/print/libijs
+LIB_DEPENDS+=	libijs.so:${PORTSDIR}/print/libijs
 CONFIGURE_ARGS+=--with-ijs=yes
 BUILD_WRKSRC=	${WRKSRC}/src/ghost
 INSTALL_WRKSRC=	${WRKSRC}/src/ghost
@@ -66,7 +67,7 @@
 .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="foomatic"
 BUILD_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine
 RUN_DEPENDS+=	foomatic-combo-xml:${PORTSDIR}/print/foomatic-db-engine \
-		foomatic-db>0:${PORTSDIR}/print/foomatic-db
+		${LOCALBASE}/share/cups/model/foomatic-db-ppds:${PORTSDIR}/print/foomatic-db
 CONFIGURE_ARGS+=--with-foomatic=yes --with-foomatic3=yes
 BUILD_WRKSRC=	${WRKSRC}/src/foomatic
 INSTALL_WRKSRC=	${WRKSRC}/src/foomatic

Modified: trunk/print/gutenprint-base/pkg-plist
===================================================================
--- trunk/print/gutenprint-base/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gutenprint-base/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -341,22 +341,4 @@
 share/locale/vi/LC_MESSAGES/gutenprint.mo
 share/locale/zh_CN/LC_MESSAGES/gutenprint.mo
 share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
- at dirrm %%DATADIR%%/samples
- at dirrm %%DATADIR%%/doc/reference-html
- at dirrm %%DATADIR%%/doc
- at dirrm %%DATADIR%%/5.2/xml/escp2/weaves
- at dirrm %%DATADIR%%/5.2/xml/escp2/qualitypresets
- at dirrm %%DATADIR%%/5.2/xml/escp2/model
- at dirrm %%DATADIR%%/5.2/xml/escp2/mediasizes
- at dirrm %%DATADIR%%/5.2/xml/escp2/media
- at dirrm %%DATADIR%%/5.2/xml/escp2/inputslots
- at dirrm %%DATADIR%%/5.2/xml/escp2/inks
- at dirrm %%DATADIR%%/5.2/xml/escp2
- at dirrm %%DATADIR%%/5.2/xml
- at dirrm %%DATADIR%%/5.2
- at dirrm %%DATADIR%%
- at dirrmtry lib/gutenprint/5.2/modules
- at dirrmtry lib/gutenprint/5.2
- at dirrmtry lib/gutenprint
- at dirrm include/gutenprintui2
- at dirrm include/gutenprint
+ at dir lib/gutenprint/5.2/modules

Modified: trunk/print/gv/Makefile
===================================================================
--- trunk/print/gv/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/gv/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,18 +2,18 @@
 
 PORTNAME=	gv
 PORTVERSION=	3.7.4
+PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU/${PORTNAME}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A PostScript and PDF previewer
+COMMENT=	PostScript and PDF previewer
 
 LICENSE=	gpl3
 
-LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USES=		iconv gmake
+USES=		cpe iconv gmake
 USE_XORG=	xpm ice sm xext xmu x11
 USE_GHOSTSCRIPT=	yes
 USE_PERL5_BUILD=	yes
@@ -24,8 +24,7 @@
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/X11 \
 			--enable-setenv-code \
 			--enable-SIGCHLD-fallback
-
-MAN1=		gv.1 gv-update-userconfig.1
+CPE_VENDOR=	gnu
 INFO=		gv
 PLIST_FILES=	bin/gv \
 		bin/gv-update-userconfig \

Modified: trunk/print/harfbuzz/Makefile
===================================================================
--- trunk/print/harfbuzz/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/harfbuzz/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	harfbuzz
-PORTVERSION=	0.9.36
+PORTVERSION=	0.9.40
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 
@@ -25,6 +25,6 @@
 
 EXTRA_PATCHES=	${PATCHDIR}/extra-src_hb-open-type-private.hh
 
-PLIST_SUB+=	LIBVER=0.936.0
+PLIST_SUB+=	LIBVER=0.940.0
 
 .include <bsd.port.post.mk>

Modified: trunk/print/harfbuzz/distinfo
===================================================================
--- trunk/print/harfbuzz/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/harfbuzz/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,2 +1,2 @@
-SHA256 (harfbuzz-0.9.36.tar.bz2) = 3bfbf7b016167ee6b2a2f83948fef75cc1253081873d6a91022161815956b9be
-SIZE (harfbuzz-0.9.36.tar.bz2) = 1167900
+SHA256 (harfbuzz-0.9.40.tar.bz2) = 1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f
+SIZE (harfbuzz-0.9.40.tar.bz2) = 1182989

Modified: trunk/print/hs-hscolour/Makefile
===================================================================
--- trunk/print/hs-hscolour/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/hs-hscolour/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,59 +1,17 @@
 # $MidnightBSD$
 
 PORTNAME=	hscolour
-PORTVERSION=	1.10.1
-PORTREVISION=	1
+PORTVERSION=	1.20.3
+PORTREVISION=	8
+PORTEPOCH=	1
 CATEGORIES=	print haskell
-MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
-		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
-PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Colourise Haskell code
+
 LICENSE=	gpl2
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
+EXECUTABLE=	HsColour
 
-.if !defined(SLAVE)
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-.else
-NO_PKG_REGISTER=
-.endif
-
-GHC_VERSION=	6.8.3
-HSCOLOUR_VERSION=	${PORTVERSION}
-
-CABAL_CMD=	runghc Setup.hs
-
-DATADIR=		${PREFIX}/share/${DISTNAME}
-HSCOLOUR_LIBDIR_REL=	lib/${DISTNAME}
-DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
-
-PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		HSCOLOUR_LIBDIR_REL=${HSCOLOUR_LIBDIR_REL} \
-		HSCOLOUR_VERSION=${HSCOLOUR_VERSION} \
-
-.SILENT:
-
-do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
-	${MKDIR} ${PREFIX}/lib/hscolour-${PORTVERSION}
-
-do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build
-.if !defined(SLAVE)
-	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
-.endif
-
-do-install:
-	cd ${WRKSRC} && ${CABAL_CMD} install
-
-post-install:
-#	${STRIP_CMD} ${PREFIX}/bin/HsColour
-.if !defined(SLAVE)
-	${MKDIR} ${PREFIX}/${HSCOLOUR_LIBDIR_REL}
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSCOLOUR_LIBDIR_REL}/register.sh
-.endif
-	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>

Modified: trunk/print/hs-hscolour/distinfo
===================================================================
--- trunk/print/hs-hscolour/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/hs-hscolour/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,3 +1,2 @@
-SHA256 (hscolour-1.10.1.tar.gz) = 293f24b8373be1d70d9e5a4b8d3c527166ad645b4ac983c1a6fc5999c44a2d36
-RMD160 (hscolour-1.10.1.tar.gz) = a3fff87cfd825c3817618a4045a621dcedf2d1e5
-SIZE (hscolour-1.10.1.tar.gz) = 51292
+SHA256 (cabal/hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96
+SIZE (cabal/hscolour-1.20.3.tar.gz) = 25810

Modified: trunk/print/hs-hscolour/pkg-descr
===================================================================
--- trunk/print/hs-hscolour/pkg-descr	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/hs-hscolour/pkg-descr	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,28 +1,11 @@
 hscolour is a small Haskell script to colourise Haskell code.
-It currently has five output formats: 
+It currently has six output formats:
 
-- ANSI terminal codes
-- HTML 3.2 with <font> tags
-- HTML 4.01 with CSS
-- LaTeX
-- mIRC chat codes
+ - ANSI terminal codes,
+ - HTML 3.2 with <font> tags,
+ - HTML 4.01 with CSS,
+ - XHTML 1.0 with inline CSS styling,
+ - LaTeX,
+ - and mIRC chat codes.
 
-author:		Malcolm Wallace
-maintainer:	Malcolm Wallace
-license:	GPL
-WWW:		http://www.cs.york.ac.uk/fp/darcs/hscolour
-package-url:	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib
-
-Exposed-Modules: 
-	Language.Haskell.HsColour
-	Language.Haskell.HsColour.ANSI
-	Language.Haskell.HsColour.Anchors
-	Language.Haskell.HsColour.Classify
-	Language.Haskell.HsColour.ColourHighlight
-	Language.Haskell.HsColour.Colourise
-	Language.Haskell.HsColour.TTY
-	Language.Haskell.HsColour.HTML
-	Language.Haskell.HsColour.LaTeX
-	Language.Haskell.HsColour.General
-	Language.Haskell.HsColour.MIRC
-	Language.Haskell.HsColour.CSS
+WWW: http://code.haskell.org/~malcolm/hscolour/

Modified: trunk/print/libgnomecups/Makefile
===================================================================
--- trunk/print/libgnomecups/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/libgnomecups/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgnomecups
 PORTVERSION=	0.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
@@ -9,7 +9,7 @@
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	Support library for gnome cups admistration
+COMMENT=	Support library for gnome cups administration
 LICENSE=	gpl2
 
 LIB_DEPENDS=	libcups.so:${PORTSDIR}/print/cups-client

Modified: trunk/print/libgnomecups/pkg-plist
===================================================================
--- trunk/print/libgnomecups/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/libgnomecups/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -7,6 +7,7 @@
 lib/libgnomecups-1.0.la
 lib/libgnomecups-1.0.so
 lib/libgnomecups-1.0.so.1
+lib/libgnomecups-1.0.so.1.0.0
 libdata/pkgconfig/libgnomecups-1.0.pc
 share/locale/ar/LC_MESSAGES/libgnomecups.mo
 share/locale/bg/LC_MESSAGES/libgnomecups.mo
@@ -54,13 +55,3 @@
 share/locale/zh_CN/LC_MESSAGES/libgnomecups.mo
 share/locale/zh_HK/LC_MESSAGES/libgnomecups.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomecups.mo
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
- at dirrmtry include/libgnomecups-1/libgnomecups
- at dirrmtry include/libgnomecups-1

Modified: trunk/print/libgnomeprintmm/Makefile
===================================================================
--- trunk/print/libgnomeprintmm/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/libgnomeprintmm/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libgnomeprintmm
 PORTVERSION=	2.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2

Modified: trunk/print/libijs/Makefile
===================================================================
--- trunk/print/libijs/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/libijs/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libijs
 PORTVERSION=	0.35
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/ijs/download/
 DISTNAME=	ijs-${PORTVERSION}
@@ -10,6 +10,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	C library that supports plugin printer driver for Ghostscript
+
 LICENSE=	mit
 
 USES=		gmake libtool pkgconfig tar:bzip2
@@ -17,5 +18,6 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

Modified: trunk/print/libotf/Makefile
===================================================================
--- trunk/print/libotf/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/libotf/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,10 +2,9 @@
 
 PORTNAME=	libotf
 PORTVERSION=	0.9.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print devel
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}:m17n
-MASTER_SITE_SUBDIR=	m17n
+MASTER_SITES=	SAVANNAH/m17n
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Library for handling OpenType fonts

Modified: trunk/print/mp-letter/Makefile
===================================================================
--- trunk/print/mp-letter/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -10,10 +10,7 @@
 PORTNAME=	mp-${PAPERSIZE}
 PORTVERSION=	3.0.1
 CATEGORIES=	print
-MASTER_SITES=	ftp://relay.NUXI.org/pub/misc/ \
-		ftp://ftp.netsw.org/system/tools/print/ \
-#		ftp://ftp.fu-berlin.de/unix/tools/mp/
-#		ftp://ftp.inria.fr/system/user/
+MASTER_SITES=	FREEBSD_LOCAL/obrien
 DISTNAME=	mp-3.0.1
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -21,23 +18,18 @@
 LICENSE=	other
 
 WRKSRC=		${WRKDIR}/mp
-MAN1=		mp.1
-MLINKS=		mp.1 digestp.1	- filep.1	- filofaxp.1 \
-		- franklinp.1	- mailp.1	- newsp.1 \
-		- timemanp.1	- timesysp.1
+LINKS=		digestp filep filofaxp franklinp mailp newsp timemanp timesysp
 
 PAPERSIZE?=	letter
-.if ${PAPERSIZE:L} == a4
+.if ${PAPERSIZE:tl} == a4
 INSTALL_TARGET=	install-a4
 .endif
 
-pre-patch:
-	@${CP} ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's/<iostream\.h>/<iostream>
-using namespace std;/' \
-		-e 's/enum action_type/action_type/g' \
-		-e 's/enum text_type/text_type/g' \
-	    ${WRKSRC}/header.cc ${WRKSRC}/input.cc ${WRKSRC}/main.cc \
-	    ${WRKSRC}/print.cc ${WRKSRC}/print.hh
+MAKEFILE=	Makefile.dist
 
+post-install:
+.for a in ${LINKS}
+	${LN} -sf mp.1 ${PREFIX}/man/man1/${a}.1
+.endfor
+
 .include <bsd.port.mk>

Modified: trunk/print/mp-letter/distinfo
===================================================================
--- trunk/print/mp-letter/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,3 +1,2 @@
 SHA256 (mp-3.0.1.tar.gz) = b5a13554885a2e1d09956c1146ed86093777fe49276074d8f213d2183eb7cde5
-RMD160 (mp-3.0.1.tar.gz) = a7f62f7ae0f73b7878c279c7c8e1d71b88c634b4
 SIZE (mp-3.0.1.tar.gz) = 60185

Added: trunk/print/mp-letter/files/patch-Makefile.dist
===================================================================
--- trunk/print/mp-letter/files/patch-Makefile.dist	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-Makefile.dist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,111 @@
+--- Makefile.dist.orig	1993-08-01 20:28:21.000000000 +0000
++++ Makefile.dist
+@@ -45,11 +45,14 @@ PROLOGUE = -DPROLOGUE=\"$(MPLIBDIR)\"
+ #  Default locations where mp files will be installed.
+ #  You might wish to alter these values.
+ #
+-MPPATH     = /usr/local
++#MPPATH     = /usr/local
++MPPATH     = $(PREFIX)
+ MPBINDIR   = $(MPPATH)/bin
+-MPLIBDIR   = $(MPPATH)/lib
++#MPLIBDIR   = $(MPPATH)/lib
++MPLIBDIR   = $(MPPATH)/share/mp
+ MPMANDIR   = $(MPPATH)/man/man$(MPMANSECT)
+-MPMANSECT  = l
++#MPMANSECT  = l
++MPMANSECT  = 1
+ #---------------------------------------------------------------------
+ #  Alternate names for the mailp frontend
+ #
+@@ -58,11 +61,13 @@ MAILPNAMES = mailp newsp digestp filep f
+ #  Compilation flags and standard macro definitions.
+ #
+ CDEFS	 = $(GECOSFIELDS) $(GECOSLENGTH) $(PROLOGUE)
+-CCOMP	 = -O
++CXXFLAGS ?= $(CFLAGS)
++CCOMP	 := $(CXXFLAGS)
+ CCFLAGS  = $(CCOMP) $(CDEFS)
+ LDFLAGS  =
+ 
+-CCC	 = g++
++CXXFLAGS = $(CCFLAGS)	# needed for gmake's implicit rule
++CCC	=	$(CXX)
+ #=================================================================
+ 
+ .KEEPSTATE:
+@@ -95,7 +100,7 @@ mp:	$(OBJS) mp.man
+ SHELL = /bin/sh
+ install-a4: common-install
+ 	   @echo "      Adjusting for A4 paper"
+-	   - at cd $(MPLIBDIR); \
++	   @cd $(DESTDIR)$(MPLIBDIR); \
+ 		cp mp.common.ps /tmp/tmp-pro; \
+ 		sed < /tmp/tmp-pro > mp.common.ps \
+ 		   -e 's|^/fullwidth 8.5 inch def|/fullwidth 595 def|' \
+@@ -107,47 +112,19 @@ install:   common-install
+ 	   @echo "**IMPORTANT NOTE**"
+ 	   @echo
+ 	   @echo "Mp is setup by default to work with US Letter sized paper."
+-	   @echo "If you are using A4 sized paper, you should reinstall, by
++	   @echo "If you are using A4 sized paper, you should reinstall, by"
+ 	   @echo "doing a:"
+ 	   @echo
+-	   @echo "make install-a4"
++	   @echo "make PAPERSIZE=a4 reinstall"
+ 	   @echo
+ 
+ common-install: $(BINARIES)
+-#                                                     mp
+-	   -cp mp $(MPBINDIR)
+-	   -chmod 751 $(MPBINDIR)/mp
+-	   -strip $(MPBINDIR)/mp
+-#                                                     mp.1
+-	   -cp mp.1 $(MPMANDIR)/mp.$(MPMANSECT)
+-	   -chmod 644 $(MPMANDIR)/mp.$(MPMANSECT)
+-#                                                     mp.common.ps
+-	   -cp mp.common.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.common.ps
+-#                                                     mp.pro.ps
+-	   -cp mp.pro.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.ps
+-#                                                     mp.pro.l.ps
+-	   -cp mp.pro.l.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.l.ps
+-#                                                     mp.pro.alt.ps
+-	   -cp mp.pro.alt.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.alt.ps
+-#                                                     mp.pro.altl.ps
+-	   -cp mp.pro.altl.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.altl.ps
+-#                                                     mp.pro.ff.ps
+-	   -cp mp.pro.ff.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.ff.ps
+-#                                                     mp.pro.fp.ps
+-	   -cp mp.pro.fp.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.fp.ps
+-#                                                     mp.pro.tm.ps
+-	   -cp mp.pro.tm.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.tm.ps
+-#                                                     mp.pro.ts.ps
+-	   -cp mp.pro.ts.ps $(MPLIBDIR)
+-	   -chmod 644 $(MPLIBDIR)/mp.pro.ts.ps
++	$(BSD_INSTALL_PROGRAM) mp $(DESTDIR)$(MPBINDIR)
++	$(BSD_INSTALL_MAN) mp.1 $(DESTDIR)$(MPMANDIR)/mp.$(MPMANSECT)
++	mkdir -p $(DESTDIR)$(MPLIBDIR)
++	$(BSD_INSTALL_DATA) mp.common.ps mp.pro.ps mp.pro.l.ps \
++		mp.pro.alt.ps mp.pro.altl.ps mp.pro.ff.ps \
++		mp.pro.fp.ps mp.pro.tm.ps mp.pro.ts.ps $(DESTDIR)$(MPLIBDIR)
+ #
+ #  NOTE: If you don't want the mailp, newsp, filep ... symbolic links
+ #        installed, then you should comment out the following seven lines.
+@@ -155,8 +132,7 @@ common-install: $(BINARIES)
+ 	   @echo Making mp links
+ 	   - at for name in $(MAILPNAMES); do \
+ 		echo -n $$name " "; \
+-		rm -f $(MPBINDIR)/$$name; \
+-		ln -s $(MPBINDIR)/mp $(MPBINDIR)/$$name; \
++		ln -s mp $(DESTDIR)$(MPBINDIR)/$$name; \
+ 	   done
+ 	   @echo
+ 


Property changes on: trunk/print/mp-letter/files/patch-Makefile.dist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/print/mp-letter/files/patch-aa
===================================================================
--- trunk/print/mp-letter/files/patch-aa	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/files/patch-aa	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,58 +0,0 @@
---- Makefile.orig	Wed Jul 29 21:42:13 1998
-+++ Makefile	Wed Jul 29 21:42:24 1998
-@@ -45,11 +45,14 @@
- #  Default locations where mp files will be installed.
- #  You might wish to alter these values.
- #
--MPPATH     = /usr/local
-+#MPPATH     = /usr/local
-+MPPATH     = $(PREFIX)
- MPBINDIR   = $(MPPATH)/bin
--MPLIBDIR   = $(MPPATH)/lib
-+#MPLIBDIR   = $(MPPATH)/lib
-+MPLIBDIR   = $(MPPATH)/share/mp
- MPMANDIR   = $(MPPATH)/man/man$(MPMANSECT)
--MPMANSECT  = l
-+#MPMANSECT  = l
-+MPMANSECT  = 1
- #---------------------------------------------------------------------
- #  Alternate names for the mailp frontend
- #
-@@ -58,11 +61,13 @@
- #  Compilation flags and standard macro definitions.
- #
- CDEFS	 = $(GECOSFIELDS) $(GECOSLENGTH) $(PROLOGUE)
--CCOMP	 = -O
-+CXXFLAGS ?= $(CFLAGS)
-+CCOMP	 := $(CXXFLAGS)
- CCFLAGS  = $(CCOMP) $(CDEFS)
- LDFLAGS  =
- 
--CCC	 = g++
-+CXXFLAGS = $(CCFLAGS)	# needed for gmake's implicit rule
-+CCC	=	$(CXX)
- #=================================================================
- 
- .KEEPSTATE:
-@@ -107,10 +112,10 @@
- 	   @echo "**IMPORTANT NOTE**"
- 	   @echo
- 	   @echo "Mp is setup by default to work with US Letter sized paper."
--	   @echo "If you are using A4 sized paper, you should reinstall, by
-+	   @echo "If you are using A4 sized paper, you should reinstall, by"
- 	   @echo "doing a:"
- 	   @echo
--	   @echo "make install-a4"
-+	   @echo "make PAPERSIZE=a4 reinstall"
- 	   @echo
- 
- common-install: $(BINARIES)
-@@ -122,6 +127,8 @@
- 	   -cp mp.1 $(MPMANDIR)/mp.$(MPMANSECT)
- 	   -chmod 644 $(MPMANDIR)/mp.$(MPMANSECT)
- #                                                     mp.common.ps
-+	   -mkdir $(MPLIBDIR)
-+#
- 	   -cp mp.common.ps $(MPLIBDIR)
- 	   -chmod 644 $(MPLIBDIR)/mp.common.ps
- #                                                     mp.pro.ps

Deleted: trunk/print/mp-letter/files/patch-ab
===================================================================
--- trunk/print/mp-letter/files/patch-ab	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/files/patch-ab	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,27 +0,0 @@
---- input.cc.orig	Sun Aug  1 13:28:22 1993
-+++ input.cc	Sat Jan 29 17:59:31 2000
-@@ -134,6 +134,8 @@
- 
-       else if (!argcmp(argv[i], "-from", 4))     // Print originators name.
-         print_orig = 1 ;
-+      else if (!argcmp(argv[i], "-F", 2))     	// backward compatiblity
-+        print_orig = 1 ;
- 
-       else if (!argcmp(argv[i], "-help", 2))     // Print usage message.
-         usage() ;
-@@ -273,11 +275,11 @@
-       case DO_TEXT : prt.message_for = "Listing for ";
-                      digest = 0 ;
-                      break ;
--      case DO_MAIL : prt.message_for = digest ? "Mail digest for "
--                                              : "Mail for " ;
-+      case DO_MAIL : prt.message_for = digest ? (char *) "Mail digest for "
-+                                              : (char *) "Mail for " ;
-                      break ;
--      case DO_NEWS : prt.message_for = digest ? "News digest for "
--                                              : "News for " ;
-+      case DO_NEWS : prt.message_for = digest ? (char *) "News digest for "
-+                                              : (char *) "News for " ;
-                      break ;
-     }
- }

Deleted: trunk/print/mp-letter/files/patch-ac
===================================================================
--- trunk/print/mp-letter/files/patch-ac	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/files/patch-ac	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,23 +0,0 @@
---- mp.man.orig	Sun Aug  1 13:28:21 1993
-+++ mp.man	Sat Aug  3 17:11:20 1996
-@@ -82,6 +82,8 @@
- ] [
- .B \-wrap
- ] [
-+.B \-F
-+] [
- .I filename .\|.\|.
- ]
- .PP
-@@ -250,6 +252,11 @@
- Instead of printing who the mail article is for, the top header will
- contain who the mail article is from. A useful option for people with
- their own personal printer.
-+.TP
-+.B \-F
-+Synonym for
-+.B \-from
-+for backwards compatiblity with earier versions.
- .\"======================================
- .TP      
- .B \-help   

Deleted: trunk/print/mp-letter/files/patch-ad
===================================================================
--- trunk/print/mp-letter/files/patch-ad	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/files/patch-ad	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,11 +0,0 @@
---- mp.common.ps.orig	Sun Aug  1 13:28:21 1993
-+++ mp.common.ps	Wed Jan 29 05:17:22 1997
-@@ -22,7 +22,7 @@
- 
- % Define /ISOLatin1Encoding only if it's not already there.
- /ISOLatin1Encoding where { pop save true }{ false } ifelse
--  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /minus
-+  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /hyphen
-     StandardEncoding 46 98 getinterval aload pop /dotlessi /grave /acute
-     /circumflex /tilde /macron /breve /dotaccent /dieresis /.notdef /ring
-     /cedilla /.notdef /hungarumlaut /ogonek /caron /space /exclamdown /cent

Deleted: trunk/print/mp-letter/files/patch-ae
===================================================================
--- trunk/print/mp-letter/files/patch-ae	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/files/patch-ae	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,11 +0,0 @@
---- print.cc.orig	Sat Jun 19 18:04:15 1999
-+++ print.cc	Sat Jun 19 18:04:57 1999
-@@ -33,7 +33,7 @@
- {
-   char *ptr ;            // Pointer to current time or date string.
-   int len ;
--  long clock ;           // Used by the localtime function call.
-+  time_t clock ;           // Used by the localtime function call.
-   struct stat status ;   // Stat(2) information from current file (-modtime).
-   struct tm *tm ;        // Used by the localtime and asctime calls.
-   char *timenow ;        // Used to set TimeNow field with users name.

Added: trunk/print/mp-letter/files/patch-header.cc
===================================================================
--- trunk/print/mp-letter/files/patch-header.cc	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-header.cc	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,12 @@
+--- header.cc.orig	1993-08-02 05:28:21.000000000 +0900
++++ header.cc	2014-01-22 10:38:20.000000000 +0900
+@@ -11,7 +11,8 @@
+ //  to the comments or the code of this program, but if reported
+ //  to me then an attempt will be made to fix them.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h> 
+ #include <ctype.h>


Property changes on: trunk/print/mp-letter/files/patch-header.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/mp-letter/files/patch-input.cc
===================================================================
--- trunk/print/mp-letter/files/patch-input.cc	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-input.cc	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,37 @@
+--- input.cc.orig	1993-08-02 05:28:22.000000000 +0900
++++ input.cc	2014-01-22 10:40:22.000000000 +0900
+@@ -11,7 +11,8 @@
+ //  to the comments or the code of this program, but if reported
+ //  to me then an attempt will be made to fix them.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -134,6 +135,8 @@
+ 
+       else if (!argcmp(argv[i], "-from", 4))     // Print originators name.
+         print_orig = 1 ;
++      else if (!argcmp(argv[i], "-F", 2))     	// backward compatiblity
++        print_orig = 1 ;
+ 
+       else if (!argcmp(argv[i], "-help", 2))     // Print usage message.
+         usage() ;
+@@ -273,11 +276,11 @@
+       case DO_TEXT : prt.message_for = "Listing for ";
+                      digest = 0 ;
+                      break ;
+-      case DO_MAIL : prt.message_for = digest ? "Mail digest for "
+-                                              : "Mail for " ;
++      case DO_MAIL : prt.message_for = digest ? (char *) "Mail digest for "
++                                              : (char *) "Mail for " ;
+                      break ;
+-      case DO_NEWS : prt.message_for = digest ? "News digest for "
+-                                              : "News for " ;
++      case DO_NEWS : prt.message_for = digest ? (char *) "News digest for "
++                                              : (char *) "News for " ;
+                      break ;
+     }
+ }


Property changes on: trunk/print/mp-letter/files/patch-input.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/mp-letter/files/patch-main.cc
===================================================================
--- trunk/print/mp-letter/files/patch-main.cc	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-main.cc	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,12 @@
+--- main.cc.orig	1993-08-02 05:28:21.000000000 +0900
++++ main.cc	2014-01-22 10:40:54.000000000 +0900
+@@ -14,7 +14,8 @@
+ //  to the comments or the code of this program, but if reported
+ //  to me then an attempt will be made to fix them.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>


Property changes on: trunk/print/mp-letter/files/patch-main.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/mp-letter/files/patch-mp.common.ps
===================================================================
--- trunk/print/mp-letter/files/patch-mp.common.ps	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-mp.common.ps	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,11 @@
+--- mp.common.ps.orig	Sun Aug  1 13:28:21 1993
++++ mp.common.ps	Wed Jan 29 05:17:22 1997
+@@ -22,7 +22,7 @@
+ 
+ % Define /ISOLatin1Encoding only if it's not already there.
+ /ISOLatin1Encoding where { pop save true }{ false } ifelse
+-  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /minus
++  /ISOLatin1Encoding [ StandardEncoding 0 45 getinterval aload pop /hyphen
+     StandardEncoding 46 98 getinterval aload pop /dotlessi /grave /acute
+     /circumflex /tilde /macron /breve /dotaccent /dieresis /.notdef /ring
+     /cedilla /.notdef /hungarumlaut /ogonek /caron /space /exclamdown /cent


Property changes on: trunk/print/mp-letter/files/patch-mp.common.ps
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/mp-letter/files/patch-mp.man
===================================================================
--- trunk/print/mp-letter/files/patch-mp.man	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-mp.man	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,23 @@
+--- mp.man.orig	Sun Aug  1 13:28:21 1993
++++ mp.man	Sat Aug  3 17:11:20 1996
+@@ -82,6 +82,8 @@
+ ] [
+ .B \-wrap
+ ] [
++.B \-F
++] [
+ .I filename .\|.\|.
+ ]
+ .PP
+@@ -250,6 +252,11 @@
+ Instead of printing who the mail article is for, the top header will
+ contain who the mail article is from. A useful option for people with
+ their own personal printer.
++.TP
++.B \-F
++Synonym for
++.B \-from
++for backwards compatiblity with earier versions.
+ .\"======================================
+ .TP      
+ .B \-help   


Property changes on: trunk/print/mp-letter/files/patch-mp.man
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/mp-letter/files/patch-print.cc
===================================================================
--- trunk/print/mp-letter/files/patch-print.cc	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-print.cc	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,48 @@
+--- print.cc.orig	1993-08-02 05:28:21.000000000 +0900
++++ print.cc	2014-01-22 10:39:29.000000000 +0900
+@@ -11,7 +11,8 @@
+ //  to the comments or the code of this program, but if reported
+ //  to me then an attempt will be made to fix them.
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -33,7 +34,7 @@
+ {
+   char *ptr ;            // Pointer to current time or date string.
+   int len ;
+-  long clock ;           // Used by the localtime function call.
++  time_t clock ;           // Used by the localtime function call.
+   struct stat status ;   // Stat(2) information from current file (-modtime).
+   struct tm *tm ;        // Used by the localtime and asctime calls.
+   char *timenow ;        // Used to set TimeNow field with users name.
+@@ -68,7 +69,7 @@
+ 
+ 
+ void
+-Print::end(enum action_type op)
++Print::end(action_type op)
+ {
+   int pval ;
+ 
+@@ -316,7 +317,7 @@
+ 
+ 
+ void
+-Print::show_text(enum text_type op, char *hdr, char *str)
++Print::show_text(text_type op, char *hdr, char *str)
+ {
+   static char *fontstr[MAXTTYPES] = {
+                  "BoldFont ",              // T_BOLD.
+@@ -355,7 +356,7 @@
+ 
+ 
+ void
+-Print::start(enum action_type op)
++Print::start(action_type op)
+ {
+   switch (op)
+     {


Property changes on: trunk/print/mp-letter/files/patch-print.cc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/mp-letter/files/patch-print.hh
===================================================================
--- trunk/print/mp-letter/files/patch-print.hh	                        (rev 0)
+++ trunk/print/mp-letter/files/patch-print.hh	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,19 @@
+--- print.hh.orig	1993-08-02 05:28:22.000000000 +0900
++++ print.hh	2014-01-22 09:51:43.000000000 +0900
+@@ -43,13 +43,13 @@
+   FILE *ofp ;                   // Output file pointer (stdout or print cmd).
+ 
+        Print         () ;
+-  void end           (enum action_type) ;
++  void end           (action_type) ;
+   FILE *makecmd      (char *) ;
+   void print_extra   (void) ;
+   void show_prologue (char *) ;
+-  void show_text     (enum text_type, char *, char *) ;
++  void show_text     (text_type, char *, char *) ;
+   void show_trailer  (void) ;
+-  void start         (enum action_type) ;
++  void start         (action_type) ;
+ 
+   private:
+   void do_date       (void) ;


Property changes on: trunk/print/mp-letter/files/patch-print.hh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/mp-letter/pkg-descr
===================================================================
--- trunk/print/mp-letter/pkg-descr	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/pkg-descr	2015-07-09 01:08:35 UTC (rev 19559)
@@ -6,5 +6,3 @@
 programs.
 
 Includes mp.el an Emacs interface to mp.
-
--- David	(obrien at cs.ucdavis.edu)

Modified: trunk/print/mp-letter/pkg-plist
===================================================================
--- trunk/print/mp-letter/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/mp-letter/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,4 +1,3 @@
- at comment $FreeBSD: ports/print/mp-letter/pkg-plist,v 1.6 2000/11/22 00:23:37 obrien Exp $
 bin/digestp
 bin/filep
 bin/filofaxp
@@ -8,6 +7,15 @@
 bin/newsp
 bin/timemanp
 bin/timesysp
+man/man1/mp.1.gz
+man/man1/digestp.1.gz
+man/man1/filep.1.gz
+man/man1/filofaxp.1.gz
+man/man1/franklinp.1.gz
+man/man1/mailp.1.gz
+man/man1/newsp.1.gz
+man/man1/timemanp.1.gz
+man/man1/timesysp.1.gz
 share/mp/mp.common.ps
 share/mp/mp.pro.alt.ps
 share/mp/mp.pro.altl.ps
@@ -17,4 +25,3 @@
 share/mp/mp.pro.ps
 share/mp/mp.pro.tm.ps
 share/mp/mp.pro.ts.ps
- at dirrm share/mp

Modified: trunk/print/pdflib/Makefile
===================================================================
--- trunk/print/pdflib/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/pdflib/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pdflib
 PORTVERSION=	7.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print perl5 java
 MASTER_SITES=	http://www.pdflib.com/binaries/PDFlib/${PORTVERSION:S/.//g}/
 DISTNAME=	PDFlib-Lite-${PORTVERSION}p3

Modified: trunk/print/pdflib/pkg-plist
===================================================================
--- trunk/print/pdflib/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/pdflib/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -3,20 +3,18 @@
 bin/text2pdf
 include/pdflib.h
 lib/libpdf.a
-lib/libpdf.la
 lib/libpdf.so
 lib/libpdf.so.6
+lib/libpdf.so.6.0.5
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.pm
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.a
-%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.la
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/pdflib_pl.so.0.0.0
 %%JAVA%%lib/libpdf_java.a
-%%JAVA%%lib/libpdf_java.la
 %%JAVA%%lib/libpdf_java.so.0
+%%JAVA%%lib/libpdf_java.so.0.0.0
 %%JAVA%%lib/libpdf_java.so
 %%JAVA%%%%JAVAJARDIR%%/pdflib.jar
 %%DATADIR%%/fonts/pdflib.upr
 %%DATADIR%%/fonts/print_glyphs.ps
- at dirrm share/pdflib/fonts
- at dirrm share/pdflib

Modified: trunk/print/pecl-pdflib/Makefile
===================================================================
--- trunk/print/pecl-pdflib/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/pecl-pdflib/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	pdflib
-PORTVERSION=	2.1.10
+PORTVERSION=	3.0.4
 CATEGORIES=	print
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -9,11 +9,11 @@
 DIST_SUBDIR=	PECL
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A PECL extension to create PDF on the fly
+COMMENT=	PECL extension to create PDF on the fly
 
 LICENSE=	php
 
-LIB_DEPENDS=	pdf.6:${PORTSDIR}/print/pdflib
+LIB_DEPENDS=	libpdf.so:${PORTSDIR}/print/pdflib
 
 USE_PHP=	gd
 USE_PHP_BUILD=	yes
@@ -22,8 +22,4 @@
 
 CONFIGURE_ARGS=	--with-pdflib=${LOCALBASE}
 
-post-extract:
-	@${ECHO_CMD} "#define PHP_PDFLIB_VERSION \"${PORTVERSION}\"" > \
-		${WRKSRC}/php_pdflib.h
-
 .include <bsd.port.mk>

Modified: trunk/print/pecl-pdflib/distinfo
===================================================================
--- trunk/print/pecl-pdflib/distinfo	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/pecl-pdflib/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,2 +1,2 @@
-SHA256 (PECL/pdflib-2.1.10.tgz) = f5cd15b24d805698d688501498d6baf405f55ee0a53e40bcdb96c54c6f279569
-SIZE (PECL/pdflib-2.1.10.tgz) = 55880
+SHA256 (PECL/pdflib-3.0.4.tgz) = 18de7bf00983a5b0fbbd4f7e993ecf948217072ae6ebff9fbb0eef88b8984b7e
+SIZE (PECL/pdflib-3.0.4.tgz) = 27043

Added: trunk/print/qpdf/Makefile
===================================================================
--- trunk/print/qpdf/Makefile	                        (rev 0)
+++ trunk/print/qpdf/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,32 @@
+# $MidnightBSD$
+# $FreeBSD: head/print/qpdf/Makefile 369562 2014-09-29 22:38:09Z bdrewery $
+
+PORTNAME=	qpdf
+PORTVERSION=	5.1.2
+CATEGORIES=	print
+MASTER_SITES=	SF
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Command-line tools for transforming and inspecting PDF documents
+
+LICENSE=	artistic2
+
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+
+OPTIONS_DEFINE=	SDK
+OPTIONS_DEFAULT=	SDK
+OPTIONS_SUB=	yes
+
+SDK_DESC=	Install header files (required for cups-filters)
+
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USES=		gmake libtool
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+		-e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/make/libtool.mk
+
+.include <bsd.port.mk>


Property changes on: trunk/print/qpdf/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/qpdf/distinfo
===================================================================
--- trunk/print/qpdf/distinfo	                        (rev 0)
+++ trunk/print/qpdf/distinfo	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,2 @@
+SHA256 (qpdf-5.1.2.tar.gz) = e9dd8d5d0a322078ffd573f057f03d24a734cc5b7dd925b089ebcb0f6e867bfd
+SIZE (qpdf-5.1.2.tar.gz) = 7664268


Property changes on: trunk/print/qpdf/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/qpdf/files/patch-configure
===================================================================
--- trunk/print/qpdf/files/patch-configure	                        (rev 0)
+++ trunk/print/qpdf/files/patch-configure	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,66 @@
+--- ./configure.orig	2012-09-06 23:48:38.000000000 +0400
++++ ./configure	2013-01-05 00:13:47.000000000 +0400
+@@ -12,6 +12,12 @@
+ ## M4sh Initialization. ##
+ ## -------------------- ##
+ 
++CPPFLAGS="$CPPFLAGS -I/usr/local/include"
++LDFLAGS="$LDFLAGS -L/usr/local/lib"
++CONFIG_SHELL=/usr/local/bin/bash
++
++ac_make=gmake
++
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+@@ -1333,7 +1339,7 @@
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [PREFIX]
+ 
+-By default, \`make install' will install all the files in
++By default, \`${ac_make} install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+ an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+ for instance \`--prefix=\$HOME'.
+@@ -2381,7 +2387,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++  as_fn_error $? "run \`${ac_make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -8663,8 +8669,8 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
+   if test "$hard_links" = no; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&2;}
+     need_locks=warn
+   fi
+ else
+@@ -13795,8 +13801,8 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
+   if test "$hard_links" = no; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&5
++$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&2;}
+     need_locks=warn
+   fi
+ else
+@@ -15399,8 +15405,8 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu make >= 3.81" >&5
+ $as_echo_n "checking for gnu make >= 3.81... " >&6; }
+ make_okay=0
+-if make --version >/dev/null 2>&1; then
+-  v=`make --version | grep 'GNU Make' | sed -e 's/.*Make //'`
++if ${ac_make} --version >/dev/null 2>&1; then
++  v=`${ac_make} --version | grep 'GNU Make' | sed -e 's/.*Make //'`
+   maj=`echo $v | cut -d. -f 1`
+   min=`echo $v | cut -d. -f 2`
+   if test $maj -gt 3 -o '(' $maj -eq 3 -a $min -ge 81 ')'; then


Property changes on: trunk/print/qpdf/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/qpdf/files/patch-include_QPDFExc.hh
===================================================================
--- trunk/print/qpdf/files/patch-include_QPDFExc.hh	                        (rev 0)
+++ trunk/print/qpdf/files/patch-include_QPDFExc.hh	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,10 @@
+--- include/qpdf/QPDFExc.hh.orig	2013-10-22 10:56:42.542484811 +0400
++++ include/qpdf/QPDFExc.hh	2013-10-22 10:57:02.738482806 +0400
+@@ -13,6 +13,7 @@
+ 
+ #include <qpdf/Constants.h>
+ #include <stdexcept>
++#include <string>
+ 
+ class QPDFExc: public std::runtime_error
+ {


Property changes on: trunk/print/qpdf/files/patch-include_QPDFExc.hh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/qpdf/files/patch-include_QUtil.hh
===================================================================
--- trunk/print/qpdf/files/patch-include_QUtil.hh	                        (rev 0)
+++ trunk/print/qpdf/files/patch-include_QUtil.hh	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,10 @@
+--- include/qpdf/QUtil.hh.orig	2013-10-22 10:53:22.013499403 +0400
++++ include/qpdf/QUtil.hh	2013-10-22 10:53:41.216497407 +0400
+@@ -14,6 +14,7 @@
+ #include <list>
+ #include <stdexcept>
+ #include <stdio.h>
++#include <ctime>
+ 
+ namespace QUtil
+ {


Property changes on: trunk/print/qpdf/files/patch-include_QUtil.hh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/qpdf/files/patch-include_qpdf_QPDF.hh
===================================================================
--- trunk/print/qpdf/files/patch-include_qpdf_QPDF.hh	                        (rev 0)
+++ trunk/print/qpdf/files/patch-include_qpdf_QPDF.hh	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,10 @@
+--- include/qpdf/QPDF.hh.orig	2013-10-22 10:30:42.941592225 +0400
++++ include/qpdf/QPDF.hh	2013-10-22 10:30:54.303595364 +0400
+@@ -16,6 +16,7 @@
+ #include <map>
+ #include <list>
+ #include <iostream>
++#include <ctime>
+ 
+ #include <qpdf/QPDFObjGen.hh>
+ #include <qpdf/QPDFXRefEntry.hh>


Property changes on: trunk/print/qpdf/files/patch-include_qpdf_QPDF.hh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/qpdf/pkg-descr
===================================================================
--- trunk/print/qpdf/pkg-descr	                        (rev 0)
+++ trunk/print/qpdf/pkg-descr	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,18 @@
+QPDF is a program that can be used to linearize (web-optimize),
+encrypt (password-protect), decrypt, and inspect PDF files from the
+command-line.  It does these and other structural, content-preserving
+transformations on PDF files, reading a PDF file as input and
+creating a new one as output.  It also provides many useful
+capabilities to developers of PDF-producing software or for people
+who just want to look at the innards of a PDF file to learn more
+about how they work.
+
+QPDF understands PDF files that use compressed object streams
+(supported by newer PDF applications) and can convert such files into
+those that can be read with older viewers.  It can also be used for
+checking PDF files for structural errors, inspecting stream contents,
+or extracting objects from PDF files.  QPDF is not PDF content
+creation or viewing software -- it does not have the capability to
+create PDF files from scratch or to display PDF files.
+
+WWW: http://qpdf.sourceforge.net


Property changes on: trunk/print/qpdf/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/qpdf/pkg-plist
===================================================================
--- trunk/print/qpdf/pkg-plist	                        (rev 0)
+++ trunk/print/qpdf/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -0,0 +1,41 @@
+bin/fix-qdf
+bin/qpdf
+bin/zlib-flate
+%%SDK%%include/qpdf/Buffer.hh
+%%SDK%%include/qpdf/BufferInputSource.hh
+%%SDK%%include/qpdf/Constants.h
+%%SDK%%include/qpdf/DLL.h
+%%SDK%%include/qpdf/FileInputSource.hh
+%%SDK%%include/qpdf/InputSource.hh
+%%SDK%%include/qpdf/Pipeline.hh
+%%SDK%%include/qpdf/Pl_Buffer.hh
+%%SDK%%include/qpdf/Pl_Concatenate.hh
+%%SDK%%include/qpdf/Pl_Count.hh
+%%SDK%%include/qpdf/Pl_Discard.hh
+%%SDK%%include/qpdf/Pl_Flate.hh
+%%SDK%%include/qpdf/Pl_StdioFile.hh
+%%SDK%%include/qpdf/PointerHolder.hh
+%%SDK%%include/qpdf/QPDF.hh
+%%SDK%%include/qpdf/QPDFExc.hh
+%%SDK%%include/qpdf/QPDFObjGen.hh
+%%SDK%%include/qpdf/QPDFObject.hh
+%%SDK%%include/qpdf/QPDFObjectHandle.hh
+%%SDK%%include/qpdf/QPDFTokenizer.hh
+%%SDK%%include/qpdf/QPDFWriter.hh
+%%SDK%%include/qpdf/QPDFXRefEntry.hh
+%%SDK%%include/qpdf/QTC.hh
+%%SDK%%include/qpdf/QUtil.hh
+%%SDK%%include/qpdf/RandomDataProvider.hh
+%%SDK%%include/qpdf/Types.h
+%%SDK%%include/qpdf/qpdf-c.h
+lib/libqpdf.a
+lib/libqpdf.so
+lib/libqpdf.so.13
+lib/libqpdf.so.13.1.2
+libdata/pkgconfig/libqpdf.pc
+man/man1/fix-qdf.1.gz
+man/man1/qpdf.1.gz
+man/man1/zlib-flate.1.gz
+share/doc/qpdf/qpdf-manual.html
+share/doc/qpdf/qpdf-manual.pdf
+share/doc/qpdf/stylesheet.css


Property changes on: trunk/print/qpdf/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/t1utils/Makefile
===================================================================
--- trunk/print/t1utils/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/t1utils/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -2,6 +2,7 @@
 
 PORTNAME=	t1utils
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.lcdf.org/type/
 
@@ -9,8 +10,6 @@
 COMMENT=	Six utilities for manipulating t1 fonts
 LICENSE=	other
 
-MAN1=		t1ascii.1 t1binary.1 t1asm.1 t1disasm.1 t1unmac.1 t1mac.1
-
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>

Modified: trunk/print/t1utils/pkg-plist
===================================================================
--- trunk/print/t1utils/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/t1utils/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -4,3 +4,9 @@
 bin/t1disasm
 bin/t1mac
 bin/t1unmac
+man/man1/t1asm.1.gz
+man/man1/t1binary.1.gz
+man/man1/t1disasm.1.gz
+man/man1/t1mac.1.gz
+man/man1/t1unmac.1.gz
+man/man1/t1ascii.1.gz

Modified: trunk/print/ttf2pt1/Makefile
===================================================================
--- trunk/print/ttf2pt1/Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/ttf2pt1/Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ttf2pt1
 PORTVERSION=	3.4.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
@@ -10,15 +10,17 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	True Type Font to Postscript Type 1 Converter
+
 LICENSE=	bsd3
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	t1asm:${PORTSDIR}/print/t1utils
 
-USES=		pkgconfig shebangfix
-USE_PERL5=	yes
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}" \
-		INSTDIR="${PREFIX}" LIBXDIR="${PREFIX}/bin"
+USES=		pkgconfig shebangfix perl5 uidfix tar:tgz
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} ${CPPFLAGS}" LIBS="${LIBS}" \
+		INSTDIR="${PREFIX}" LIBXDIR="${PREFIX}/bin" \
+		OWNER=${BINOWN} GROUP=${BINGRP}
 SHEBANG_FILES=	app/TeX/sfd2map \
 		app/TeX/cjk-latex-config \
 		other/showdf \
@@ -31,11 +33,18 @@
 		scripts/t1fdir \
 		scripts/trans
 
-MAN1=		ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
 
 CPPFLAGS+=	`pkg-config --cflags freetype2` \
 		-I${LOCALBASE}/include -DUSE_FREETYPE
-LDFLAGS+=	`pkg-config --libs freetype2` \
+LIBS+=		`pkg-config --libs freetype2` \
 		-L${LOCALBASE}/lib -lm
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ttf2pt1
+	@${SED} -i '' 's,${STAGEDIR},,' ${STAGEDIR}${PREFIX}/bin/ttf2pt1_convert \
+		${STAGEDIR}${PREFIX}/man/man1/ttf2pt1_x2gs.1 \
+		${STAGEDIR}${PREFIX}/man/man1/ttf2pt1.1 \
+		${STAGEDIR}${PREFIX}/man/man1/ttf2pt1_convert.1 \
+		${STAGEDIR}${DATADIR}/scripts/convert
+
 .include <bsd.port.mk>

Modified: trunk/print/ttf2pt1/files/patch-Makefile
===================================================================
--- trunk/print/ttf2pt1/files/patch-Makefile	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/ttf2pt1/files/patch-Makefile	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,51 +1,10 @@
---- ./Makefile.orig	Fri Aug 30 14:03:07 2002
-+++ ./Makefile	Thu Nov  1 01:06:01 2007
-@@ -233,31 +233,30 @@
- 	scripts/unhtml <FONTS.hpux.html >FONTS.hpux
- 
- install: all
--	scripts/inst_dir $(BINDIR) $(OWNER) $(GROUP) 0755
--	scripts/inst_dir $(LIBXDIR) $(OWNER) $(GROUP) 0755
--	scripts/inst_dir $(SHAREDIR) $(OWNER) $(GROUP) 0755
--	scripts/inst_dir $(MANDIR)/man1 $(OWNER) $(GROUP) 0755
--	scripts/inst_dir $(MANDIR)/man5 $(OWNER) $(GROUP) 0755
--	cp -R $(TXTFILES) $(SUBDIRS) $(SHAREDIR)
--	chown -R $(OWNER) $(SHAREDIR)
--	chgrp -R $(GROUP) $(SHAREDIR)
--	chmod -R go-w $(SHAREDIR)
--	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
+--- Makefile.orig	Sun Oct 22 23:19:32 2006
++++ Makefile	Sun Oct 22 23:19:36 2006
+@@ -243,7 +243,6 @@
+ 	chgrp -R $(GROUP) $(SHAREDIR)
+ 	chmod -R go-w $(SHAREDIR)
+ 	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
 -	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
-+	scripts/inst_dir $(DESTDIR)$(BINDIR) $(OWNER) $(GROUP) 0755
-+	scripts/inst_dir $(DESTDIR)$(LIBXDIR) $(OWNER) $(GROUP) 0755
-+	scripts/inst_dir $(DESTDIR)$(SHAREDIR) $(OWNER) $(GROUP) 0755
-+	scripts/inst_dir $(DESTDIR)$(MANDIR)/man1 $(OWNER) $(GROUP) 0755
-+	scripts/inst_dir $(DESTDIR)$(MANDIR)/man5 $(OWNER) $(GROUP) 0755
-+	cp -R $(TXTFILES) $(SUBDIRS) $(DESTDIR)$(SHAREDIR)
-+	chown -R $(OWNER) $(DESTDIR)$(SHAREDIR)
-+	chgrp -R $(GROUP) $(DESTDIR)$(SHAREDIR)
-+	chmod -R go-w $(DESTDIR)$(SHAREDIR)
-+	scripts/inst_file ttf2pt1 $(DESTDIR)$(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
  	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
  		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
  		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
--	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
--	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
-+	scripts/inst_file cvt.tmp $(DESTDIR)$(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
-+	scripts/inst_file cvt.tmp $(DESTDIR)$(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
- 	rm cvt.tmp
--	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
-+	scripts/inst_file scripts/x2gs $(DESTDIR)$(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
- 	for i in $(MANS1); do { \
- 		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
- 			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
--			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
--		&& chown $(OWNER) $(MANDIR)/man1/$$i \
--		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
--		&& chmod 0644 $(MANDIR)/man1/$$i \
-+			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(DESTDIR)$(MANDIR)/man1/$$i \
-+		&& chown $(OWNER) $(DESTDIR)$(MANDIR)/man1/$$i \
-+		&& chgrp $(GROUP) $(DESTDIR)$(MANDIR)/man1/$$i \
-+		&& chmod 0644 $(DESTDIR)$(MANDIR)/man1/$$i \
- 		|| exit 1; \
- 	} done
- 

Modified: trunk/print/ttf2pt1/files/patch-ft.c
===================================================================
--- trunk/print/ttf2pt1/files/patch-ft.c	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/ttf2pt1/files/patch-ft.c	2015-07-09 01:08:35 UTC (rev 19559)
@@ -1,12 +1,20 @@
---- ./ft.c.orig	Wed Dec 31 16:30:50 2003
-+++ ./ft.c	Thu Nov  1 01:02:09 2007
-@@ -12,7 +12,8 @@
+--- ft.c.orig	2003-12-31 22:30:50.000000000 +0100
++++ ft.c	2013-12-16 16:50:37.000000000 +0100
+@@ -12,11 +12,12 @@
  #include <stdlib.h>
  #include <ctype.h>
  #include <sys/types.h>
 -#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftsnames.h>
+-#include <freetype/ttnameid.h>
+-#include <freetype/ftoutln.h>
 +#include <ft2build.h>
 +#include FT_FREETYPE_H
- #include <freetype/ftglyph.h>
- #include <freetype/ftsnames.h>
- #include <freetype/ttnameid.h>
++#include FT_GLYPH_H
++#include FT_SFNT_NAMES_H
++#include FT_TRUETYPE_IDS_H
++#include FT_OUTLINE_H
+ #include "pt1.h"
+ #include "global.h"
+ 

Modified: trunk/print/ttf2pt1/pkg-plist
===================================================================
--- trunk/print/ttf2pt1/pkg-plist	2015-07-09 00:35:59 UTC (rev 19558)
+++ trunk/print/ttf2pt1/pkg-plist	2015-07-09 01:08:35 UTC (rev 19559)
@@ -88,21 +88,6 @@
 %%DATADIR%%/scripts/trans
 %%DATADIR%%/scripts/unhtml
 %%DATADIR%%/scripts/x2gs
- at dirrm %%DATADIR%%/scripts
- at dirrm %%DATADIR%%/other
- at dirrm %%DATADIR%%/maps
- at dirrm %%DATADIR%%/encodings/russian
- at dirrm %%DATADIR%%/encodings/latin5
- at dirrm %%DATADIR%%/encodings/latin4
- at dirrm %%DATADIR%%/encodings/latin2
- at dirrm %%DATADIR%%/encodings/latin1
- at dirrm %%DATADIR%%/encodings/cyrillic
- at dirrm %%DATADIR%%/encodings/bulgarian
- at dirrm %%DATADIR%%/encodings/adobestd
- at dirrm %%DATADIR%%/encodings
- at dirrm %%DATADIR%%/app/netscape
- at dirrm %%DATADIR%%/app/X11
- at dirrm %%DATADIR%%/app/TeX
- at dirrm %%DATADIR%%/app/RPM
- at dirrm %%DATADIR%%/app
- at dirrm %%DATADIR%%
+man/man1/ttf2pt1.1.gz
+man/man1/ttf2pt1_convert.1.gz
+man/man1/ttf2pt1_x2gs.1.gz



More information about the Midnightbsd-cvs mailing list