- Update to 1.2.0

PR: ports/97783 ports/97782 Submitted by: maintainer
author: ahze <ahze@FreeBSD.org> 2006-06-23 04:16:06 +0800
committer: ahze <ahze@FreeBSD.org> 2006-06-23 04:16:06 +0800
commit: 6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c (patch)
tree: 9009ecd1778597b4298ee687d91670da0ce243ce /print
parent: 8562926c459c7e6f375a2e8cb3321cf38e846752 (diff)
download: freebsd-ports-graphics-6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c.tar.gz
freebsd-ports-graphics-6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c.tar.zst
freebsd-ports-graphics-6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c.zip
16 files changed, 974 insertions, 1004 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 3caa20039b4..d59dae9258b 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -8,50 +8,157 @@
 #
 
 PORTNAME=	cups-base
-PORTVERSION=	${CUPS_PORTVER}
-PORTREVISION=	9
-PORTEPOCH=	${CUPS_PORTEPOCH}
+PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	${CUPS_MASTER_SITES}
+MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
+		ftp://ftp.ntua.gr/pub/gnu/cups/${PORTVERSION}/ \
+		ftp://ftp.easysw.com/pub/cups/${PORTVERSION}/ \
+		ftp://ftp.fisek.com.tr/pub/cups/${PORTVERSION}/ \
+		ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${PORTVERSION}/
+DISTNAME=	cups-${PORTVERSION}-source
 
 MAINTAINER=	asa@agava.com
-COMMENT=	The Common UNIX Printing System: headers, libs, & daemons
+COMMENT=	The Common UNIX Printing System
 
 INSTALLS_SHLIB=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_PERL5_RUN=	yes
+GNU_CONFIGURE=	yes
 USE_RC_SUBR=	cupsd
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-MANLANG=	"" es fr
+OPTIONS=	GNUTLS		"Build with GNUTLS library" on \
+		PHP		"Build PHP support" off \
+		PYTHON		"Build PYTHON support" off \
+		LIBPAPER	"Build with libpaper support" off
+
+CUPS_FILESDIR=	${.CURDIR}/../../print/cups/files
+CUPS_ETCDIR=	${PREFIX}/etc/cups
+CUPS_RCDIR=	${PREFIX}/etc/rc.d
+CUPS_DOCSDIR=	${PREFIX}/share/doc/cups
+CUPS_SPOOLDIR=	/var/spool/cups
+CUPS_SOCKET?=	/var/run/cups.sock
+WRKSRC=		${WRKDIR}/cups-${PORTVERSION}
+
+# file, dir ownership
+CUPSGRP=	cups
+CUPSOWN=	cups
+CUPSSYSGRP=	wheel
+
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff
+
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+CONFIGURE_ARGS+=	--localstatedir=/var			\
+			--disable-pam				\
+			--disable-slp				\
+			--with-cups-user=${CUPSOWN}		\
+			--with-cups-group=${CUPSGRP}		\
+			--with-system-groups=${CUPSSYSGRP}	\
+			--with-docdir=${CUPS_DOCSDIR}		\
+			--with-rcdir=${CUPS_RCDIR}		\
+			--with-domainsocket=${CUPS_SOCKET}
+
+.if !defined(WITHOUT_GNUTLS)
+CONFIGURE_ARGS+=	--enable-gnutls --disable-openssl
+LIB_DEPENDS+=		gnutls-openssl.15:${PORTSDIR}/security/gnutls
+.endif
+
+.if defined(WITH_PHP)
+CONFIGURE_ARGS+=	--with-php
+RUN_DEPENDS+=		php:${PORTSDIR}/lang/php4
+.endif
+
+.if defined(WITH_PYTHON)
+CONFIGURE_ARGS+=	--with-python
+USE_PYTHON=		yes
+.endif
+
+.if defined(WITH_LIBPAPER)
+CONFIGURE_ARGS+=	--enable-libpaper
+LIB_DEPENDS+=		paper.2:${PORTSDIR}/print/libpaper
+.endif
+
+CONFIGURE_ARGS+=	CPPFLAGS="-I.. -I${LOCALBASE}/include"
+CONFIGURE_ARGS+=	DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib"
+CONFIGURE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1EXT=	1
+MAN5EXT=	5
+MAN7EXT=	7
+MAN8EXT=	8
+
+MAN1=	cancel.$(MAN1EXT) \
+	cups-config.$(MAN1EXT) \
+	cupstestdsc.$(MAN1EXT) \
+	cupstestppd.$(MAN1EXT) \
+	lp.$(MAN1EXT) \
+	lpoptions.$(MAN1EXT) \
+	lppasswd.$(MAN1EXT) \
+	lpq.$(MAN1EXT) \
+	lprm.$(MAN1EXT) \
+	lpr.$(MAN1EXT) \
+	lpstat.$(MAN1EXT)
+MAN5=	classes.conf.$(MAN5EXT) \
+	client.conf.$(MAN5EXT) \
+	cups-snmp.conf.$(MAN5EXT) \
+	cupsd.conf.$(MAN5EXT) \
+	mime.convs.$(MAN5EXT) \
+	mime.types.$(MAN5EXT) \
+	printers.conf.$(MAN5EXT) \
+	subscriptions.conf.$(MAN5EXT)
+MAN7=	backend.$(MAN7EXT) \
+	filter.$(MAN7EXT)
+MAN8=	accept.$(MAN8EXT) \
+	cupsaddsmb.$(MAN8EXT) \
+	cups-deviced.$(MAN8EXT) \
+	cups-driverd.$(MAN8EXT) \
+	cups-lpd.$(MAN8EXT) \
+	cups-polld.$(MAN8EXT) \
+	cupsd.$(MAN8EXT) \
+	cupsenable.$(MAN8EXT) \
+	lpadmin.$(MAN8EXT) \
+	lpinfo.$(MAN8EXT) \
+	lpmove.$(MAN8EXT) \
+	lpc.$(MAN8EXT) \
+
+pre-configure::
+	@${ECHO_MSG} Configuring CUPS with options:
+	@${ECHO_MSG} ${CONFIGURE_ARGS} | fmt
 
 post-patch:
-	@${REINPLACE_CMD} -e '/SILENT/d' \
+	@${REINPLACE_CMD} -e '/SILENT/d;\
+		s|@SSLFLAGS@|@SSLFLAGS@ -I${LOCALBASE}/include|; \
+		s|@SSLLIBS@|@SSLLIBS@ -L${LOCALBASE}/lib|' \
 		${WRKSRC}/Makedefs.in
-	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
-		${WRKSRC}/man/Makefile ${WRKSRC}/man/es/Makefile
-	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
-		${WRKSRC}/man/Makefile ${WRKSRC}/man/fr/Makefile
 	@${REINPLACE_CMD} -e 's|/etc/cups|/usr/local/etc/cups|g' \
-		${WRKSRC}/man/*.man
+		${WRKSRC}/man/*.man*
 	@${REINPLACE_CMD} -e 's|CXX="$$CC"||g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 pre-install:
 	@${ECHO_MSG} "===>" Stopping cupsd ...
 	-killall cupsd || ${TRUE}
-	${RMDIR} ${PREFIX}/etc/cups/certs/* || ${TRUE}
 
 post-install:
 	${MKDIR} ${CUPS_ETCDIR}
-.for f in classes.conf client.conf cupsd.conf printers.conf mime.convs mime.types
+.ifdef CUPS_OVERWRITE_BASE
+	${SH} ${PKGINSTALL} placeholder POST-INSTALL overwrite
+.endif
+	${SH} ${PKGINSTALL} placeholder POST-INSTALL
+.for f in cupsd.conf mime.convs mime.types
 	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
 	cd ${CUPS_ETCDIR}; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi
-.endfor # classes.conf client.conf cupsd.conf printers.conf
-	${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
+.endfor # cupsd.conf mime.convs mime.types
+#	${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
 	${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp
 	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}
 	${CHMOD} -R g+w ${CUPS_SPOOLDIR}
 	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
-.include "${.CURDIR}/../../print/cups/Makefile.common"
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
new file mode 100644
index 00000000000..b7cfa4c47c9
--- /dev/null
+++ b/print/cups-base/distinfo
@@ -0,0 +1,3 @@
+MD5 (cups-1.2.0-source.tar.bz2) = a168b0b1c8bb946060e659e1df2927c5
+SHA256 (cups-1.2.0-source.tar.bz2) = 893a91d96e68de51f767d97d36d2d321320b3611b7178ea9a9d17ad2777f5f9f
+SIZE (cups-1.2.0-source.tar.bz2) = 3456476
diff --git a/print/cups-base/files/manpages.mk b/print/cups-base/files/manpages.mk
deleted file mode 100644
index f0e221053f8..00000000000
--- a/print/cups-base/files/manpages.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-MAN1+=	backend.1
-MAN1+=	cups-config.1
-MAN1+=	filter.1
-MAN5+=	classes.conf.5
-MAN5+=	cupsd.conf.5
-MAN5+=	mime.convs.5
-MAN5+=	mime.types.5
-MAN5+=	printers.conf.5
-MAN8+=	cups-lpd.8
-MAN8+=	cups-polld.8
-MAN8+=	cupsd.8
diff --git a/print/cups-base/files/patch-CAN-2005-0064 b/print/cups-base/files/patch-CAN-2005-0064
deleted file mode 100644
index 5ea9006128e..00000000000
--- a/print/cups-base/files/patch-CAN-2005-0064
+++ /dev/null
@@ -1,14 +0,0 @@
-*** pdftops/XRef.cxx.orig	Wed Jan 12 17:10:53 2005
---- pdftops/XRef.cxx	Wed Jan 12 17:11:22 2005
-***************
-*** 793,798 ****
---- 793,801 ----
-  	} else {
-  	  keyLength = 5;
-  	}
-+ 	if (keyLength > 16) {
-+ 	  keyLength = 16;
-+ 	}
-  	permFlags = permissions.getInt();
-  	if (encVersion >= 1 && encVersion <= 2 &&
-  	    encRevision >= 2 && encRevision <= 3) {
diff --git a/print/cups-base/files/patch-CAN-2005-2097 b/print/cups-base/files/patch-CAN-2005-2097
deleted file mode 100644
index 6de18ba3e35..00000000000
--- a/print/cups-base/files/patch-CAN-2005-2097
+++ /dev/null
@@ -1,12 +0,0 @@
---- pdftops/FontFile.cxx.orig	Tue Feb  3 09:41:09 2004
-+++ pdftops/FontFile.cxx	Tue Sep  6 16:16:04 2005
-@@ -3572,6 +3573,9 @@
-     } else {
-       origLocaTable[i].pos = 2 * getUShort(pos + 2*i);
-     }
-+
-+    if (origLocaTable[i].pos < 0 || origLocaTable[i].pos > len)
-+      error(1, 0, "bad loca table pos value");
-   }
-   qsort(origLocaTable, nGlyphs + 1, sizeof(TrueTypeLoca), &cmpTrueTypeLocaPos);
-   for (i = 0; i < nGlyphs; ++i) {
diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile
index 6959f535f0e..fbb6d493b20 100644
--- a/print/cups-base/files/patch-Makefile
+++ b/print/cups-base/files/patch-Makefile
@@ -1,31 +1,59 @@
---- Makefile.orig	Mon Jan  3 11:29:44 2005
-+++ Makefile	Fri Jan 27 00:04:20 2006
-@@ -28,8 +28,8 @@
- # Directories to make...
- #
- 
--DIRS	=	cups backend berkeley cgi-bin filter man pdftops \
--		scheduler systemv
-+DIRS	=	cups backend cgi-bin filter man pdftops \
-+		scheduler
- 
- #
- # Make all targets...
-@@ -72,8 +72,6 @@
- 		echo Installing in $$dir... ;\
- 		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
- 	done
--	echo Installing in conf...
--	(cd conf; $(MAKE) $(MFLAGS) install)
- 	echo Installing in data...
- 	(cd data; $(MAKE) $(MFLAGS) install)
- 	echo Installing in doc...
-@@ -109,8 +107,6 @@
- 			$(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
- 			$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
- 			$(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+--- Makefile.orig	Thu May 18 13:38:50 2006
++++ Makefile	Thu May 18 13:40:07 2006
+@@ -99,56 +99,11 @@
+ 	echo Installing cups-config script...
+ 	$(INSTALL_DIR) -m 755 $(BINDIR)
+ 	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
+-	echo Installing startup script...
+-	if test "x$(INITDIR)" != x; then \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
+-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
+-		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
+-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
+-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
+-		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
+-	fi
+-	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
+-		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
+-		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+-			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+-			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
+-			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+-			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
+-		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+-			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
 -		else \
--			$(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
- 		fi \
+-			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
+-		fi \
+-	fi
+ 	if test "x$(DBUSDIR)" != x; then \
+ 		echo Installing cups.conf in $(DBUSDIR)...;\
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
+ 		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
  	fi
+-	if test "x$(XINETD)" != x; then \
+-		echo Installing xinetd configuration file for cups-lpd...; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+-		$(INSTALL_DATA) init/cups-lpd $(BUILDROOT)$(XINETD)/cups-lpd; \
+-	fi
+-	if test -d /usr/share/applications; then \
+-		echo Installing desktop icons...; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
+-		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
+-		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \
+-		$(INSTALL_DATA) desktop/cups-32.png $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps/cups.png; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps; \
+-		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
+-		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
+-		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
+-	fi
+-
  
+ #
+ # Install source and header files...
diff --git a/print/cups-base/files/patch-SA18303 b/print/cups-base/files/patch-SA18303
deleted file mode 100644
index bc29f678799..00000000000
--- a/print/cups-base/files/patch-SA18303
+++ /dev/null
@@ -1,253 +0,0 @@
-Index: pdftops/Stream.h
-===================================================================
---- pdftops/Stream.h
-+++ pdftops/Stream.h
-@@ -233,6 +233,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -250,6 +252,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
-Index: pdftops/Stream.cxx
-===================================================================
---- pdftops/Stream.cxx
-+++ pdftops/Stream.cxx
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <limits.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-@@ -412,13 +413,28 @@ StreamPredictor::StreamPredictor(Stream 
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
- 
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX/nBits ||
-+      width >= INT_MAX/nComps/nBits) {
-+    return;
-+  }
-   nVals = width * nComps;
-+  if (nVals * nBits + 7 <= 0) {
-+    return;
-+  }
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0) {
-+    return;
-+  }
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -1012,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1260,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+    error(-1, "invalid number of columns: %d", columns);
-+    exit(1);
-+  }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-   black = blackA;
-@@ -2897,6 +2921,11 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2923,6 +2952,11 @@ GBool DCTStream::readProgressiveSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2945,6 +2979,11 @@ GBool DCTStream::readScanInfo() {
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    scanInfo.numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -3019,12 +3058,12 @@ GBool DCTStream::readHuffmanTables() {
-   while (length > 0) {
-     index = str->getChar();
-     --length;
--    if ((index & 0x0f) >= 4) {
-+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
-       error(getPos(), "Bad DCT Huffman table");
-       return gFalse;
-     }
-     if (index & 0x10) {
--      index &= 0x0f;
-+      index &= 0x03;
-       if (index >= numACHuffTables)
- 	numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-@@ -3142,9 +3181,11 @@ int DCTStream::readMarker() {
-   do {
-     do {
-       c = str->getChar();
-+      if(c == EOF) return EOF;
-     } while (c != 0xff);
-     do {
-       c = str->getChar();
-+      if(c == EOF) return EOF;
-     } while (c == 0xff);
-   } while (c == 0x00);
-   return c;
-@@ -3255,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-Index: pdftops/JBIG2Stream.cxx
-===================================================================
---- pdftops/JBIG2Stream.cxx
-+++ pdftops/JBIG2Stream.cxx
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <config.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -681,7 +682,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
--  data = (Guchar *)gmalloc(h * line);
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    error(-1, "invalid width/height");
-+    data = NULL;
-+    return;
-+  }
-+
-+  // need to allocate one extra guard byte for use in combine()
-+  data = (Guchar *)gmalloc(h * line + 1);
-+  data[h * line] = 0;
- }
- 
- JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap):
-@@ -690,8 +700,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
--  data = (Guchar *)gmalloc(h * line);
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    error(-1, "invalid width/height");
-+    data = NULL;
-+    return;
-+  }
-+
-+  // need to allocate one extra guard byte for use in combine()
-+  data = (Guchar *)gmalloc(h * line + 1);
-   memcpy(data, bitmap->data, h * line);
-+  data[h * line] = 0;
- }
- 
- JBIG2Bitmap::~JBIG2Bitmap() {
-@@ -716,10 +735,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
-+    error(-1, "invalid width/height");
-+    gfree(data);
-+    data = NULL;
-     return;
-   }
--  data = (Guchar *)grealloc(data, newH * line);
-+  // need to allocate one extra guard byte for use in combine()
-+  data = (Guchar *)grealloc(data, newH * line + 1);
-   if (pixel) {
-     memset(data + h * line, 0xff, (newH - h) * line);
-   } else {
-@@ -2256,6 +2279,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (w == 0 || h >= INT_MAX / w) {
-+     error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-+
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -2887,6 +2919,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
-   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
-   int x, y, pix;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h) {
-+    error(-1, "invalid width/height");
-+    return NULL;
-+  }
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
-# vim: syntax=diff
diff --git a/print/cups-base/files/patch-man-Makefile.common b/print/cups-base/files/patch-man-Makefile.common
deleted file mode 100644
index c5cc7a68d89..00000000000
--- a/print/cups-base/files/patch-man-Makefile.common
+++ /dev/null
@@ -1,64 +0,0 @@
---- man/Makefile.common.orig	Thu May 27 22:51:30 2004
-+++ man/Makefile.common	Mon Jan 24 13:28:43 2005
-@@ -28,58 +28,16 @@
- 
- MAN1	=	backend.man \
- 		cups-config.man \
--		cupstestppd.man \
--		filter.man \
--		lp.man \
--		lpoptions.man \
--		lppasswd.man \
--		lpq.man \
--		lprm.man \
--		lpr.man \
--		lpstat.man
-+		filter.man
- MAN5	=	classes.conf.man \
- 		cupsd.conf.man \
- 		mime.convs.man \
- 		mime.types.man \
- 		printers.conf.man
--MAN8	=	accept.man \
--		cupsaddsmb.man \
-+MAN8	=	\
- 		cups-lpd.man \
- 		cups-polld.man \
--		cupsd.man \
--		enable.man \
--		lpadmin.man \
--		lpinfo.man \
--		lpmove.man \
--		lpc.man
--
--CAT1	=	backend.$(CAT1EXT) \
--		cups-config.$(CAT1EXT) \
--		cupstestppd.$(CAT1EXT) \
--		filter.$(CAT1EXT) \
--		lp.$(CAT1EXT) \
--		lpoptions.$(CAT1EXT) \
--		lppasswd.$(CAT1EXT) \
--		lpq.$(CAT1EXT) \
--		lprm.$(CAT1EXT) \
--		lpr.$(CAT1EXT) \
--		lpstat.$(CAT1EXT)
--CAT5	=	classes.conf.$(CAT5EXT) \
--		cupsd.conf.$(CAT5EXT) \
--		mime.convs.$(CAT5EXT) \
--		mime.types.$(CAT5EXT) \
--		printers.conf.$(CAT5EXT)
--CAT8	=	accept.$(CAT8EXT) \
--		cupsaddsmb.$(CAT8EXT) \
--		cups-lpd.$(CAT8EXT) \
--		cups-polld.$(CAT8EXT) \
--		cupsd.$(CAT8EXT) \
--		enable.$(CAT8EXT) \
--		lpadmin.$(CAT8EXT) \
--		lpinfo.$(CAT8EXT) \
--		lpmove.$(CAT8EXT) \
--		lpc.$(CAT8EXT)
--
-+		cupsd.man
- 
- #
- # End of "$Id: Makefile.common,v 1.5 2004/05/27 18:51:30 mike Exp $".
diff --git a/print/cups-base/pkg-descr b/print/cups-base/pkg-descr
index 635a3434c03..c9ab263133f 100644
--- a/print/cups-base/pkg-descr
+++ b/print/cups-base/pkg-descr
@@ -19,3 +19,4 @@ that use these filters. This software is available in the cups-pstoraster
 port.
 
 WWW: http://www.cups.org/
+[original text by greid@ukug.uk.freebsd.org]
diff --git a/print/cups-base/pkg-install b/print/cups-base/pkg-install
new file mode 100644
index 00000000000..aa32fa690b5
--- /dev/null
+++ b/print/cups-base/pkg-install
@@ -0,0 +1,50 @@
+#!/bin/sh
+PATH=/bin:/usr/sbin
+
+REPLACES_BINARIES="/usr/bin/lpr
+					/usr/bin/lp
+					/usr/bin/lpq
+					/usr/bin/lprm
+					/usr/bin/lpstat
+					/usr/sbin/lpc"
+
+case $2 in
+POST-INSTALL)
+	# Unshade binaries
+	if [ -n "${3}" ]; then
+		for FILE in ${REPLACES_BINARIES}; do
+			[ -e "${FILE}" ] && chmod 0 "${FILE}"
+		done
+	fi
+
+	# Create user
+	USER=cups
+	GROUP=${USER}
+	UID=193
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d /nonexistent -s /sbin/nologin -c "CUPS Owner"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+	;;
+esac
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index 65b0111aaa9..89ed604dac2 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -1,26 +1,4 @@
 ======================================================================
-
-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/
-
-To install the BSD and System V compatibility binaries look to the port
-print/cups-lpr. These are no longer installed as part of the base cups port
-because they have conflicting names with the native print binaries, and with
-other ports such as lprNG.
-
-NOTE: IF YOU USE A NON-POSTSCRIPT PRINTER:
-
-You will need to install the cups-pstoraster port in order to print to
-your printer. If you installed via the "cups" port, it will be installed
-automatically. Otherwise, you will need to install the port or the package
-yourself.
-
-======================================================================
-
-**********************************************************************
 PLEASE NOTE:
 ============
 
@@ -28,15 +6,4 @@ To enable printing under Gimp do the following:
 1) Uncomment application/octet-stream line in mime.types
 2) Uncomment application/octet-stream line in mime.convs
 3) Restart cupsd
-
-**********************************************************************
-
-The cups-base port now uses a new style rc.d startup
-script.  Please remove any old cups.sh* scripts you
-might have in /usr/local/etc/rc.d, or your local
-PREFIX.  You should also put the following line in
-/etc/rc.conf.local, or /etc/rc.conf to start cupsd
-automatically at boot time:
-
-cupsd_enable="yes"
-**********************************************************************
+======================================================================
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index d73ffab2b07..5812b0e5e87 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -1,13 +1,10 @@
 @exec /bin/echo "===>" Stopping cupsd ...
 @exec /usr/bin/killall cupsd || true
-@exec /bin/rmdir %D/etc/cups/certs/* > /dev/null 2>&1 || true
-bin/cups-config
-@unexec if cmp -s %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; then rm -f %D/etc/cups/classes.conf; fi
-etc/cups/classes.conf.N
-@exec if test ! -f %D/etc/cups/classes.conf; then cp -p %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; fi
-@unexec if cmp -s %D/etc/cups/client.conf.N %D/etc/cups/client.conf; then rm -f %D/etc/cups/client.conf; fi
-etc/cups/client.conf.N
-@exec if test ! -f %D/etc/cups/client.conf; then cp -p %D/etc/cups/client.conf.N %D/etc/cups/client.conf; fi
+@exec mkdir -p /var/spool/cups/tmp || true
+@exec chown -R root:daemon /var/spool/cups
+@exec mkdir %D/etc/cups/ppd || true
+@exec mkdir %D/etc/cups/interfaces || true
+@unexec rm -rf /var/spool/cups 2>&1 >/dev/null || true
 @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
 @exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi
@@ -17,59 +14,449 @@ etc/cups/mime.convs.N
 @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
 @exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi
-@unexec if cmp -s %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; then rm -f %D/etc/cups/printers.conf; fi
-etc/cups/printers.conf.N
-@exec if test ! -f %D/etc/cups/printers.conf; then cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; fi
+bin/cupstestdsc
+bin/lp
+bin/cancel
+bin/cupstestppd
+bin/lpoptions
+bin/lppasswd
+bin/lpq
+bin/lpr
+bin/lprm
+bin/lpstat
+bin/cups-config
+include/cups/adminutil.h
+include/cups/array.h
 include/cups/cups.h
+include/cups/dir.h
+include/cups/file.h
 include/cups/http.h
-include/cups/image.h
+include/cups/i18n.h
 include/cups/ipp.h
 include/cups/language.h
 include/cups/md5.h
 include/cups/ppd.h
+include/cups/transcode.h
+include/cups/image.h
 include/cups/raster.h
-lib/libcups.a
 lib/libcups.so
 lib/libcups.so.2
-lib/libcupsimage.a
 lib/libcupsimage.so
 lib/libcupsimage.so.2
-libexec/cups/backend/http
-libexec/cups/backend/ipp
-libexec/cups/backend/lpd
-libexec/cups/backend/parallel
-libexec/cups/backend/scsi
-libexec/cups/backend/serial
-libexec/cups/backend/socket
-libexec/cups/backend/usb
-libexec/cups/cgi-bin/admin.cgi
-libexec/cups/cgi-bin/classes.cgi
-libexec/cups/cgi-bin/jobs.cgi
-libexec/cups/cgi-bin/printers.cgi
-libexec/cups/daemon/cups-lpd
-libexec/cups/daemon/cups-polld
-libexec/cups/filter/gziptoany
-libexec/cups/filter/hpgltops
-libexec/cups/filter/imagetops
-libexec/cups/filter/imagetoraster
-libexec/cups/filter/pdftops
-libexec/cups/filter/pstops
-libexec/cups/filter/rastertodymo
-libexec/cups/filter/rastertoepson
-libexec/cups/filter/rastertohp
-libexec/cups/filter/texttops
-sbin/cupsd
+@comment Put man links here
+man/man8/reject.8
+man/man8/cupsdisable.8
+sbin/cupsdisable
+sbin/cupsenable
+sbin/reject
+share/doc/cups/cups.css
+share/doc/cups/cups-printable.css
+share/doc/cups/favicon.ico
+share/doc/cups/index.html
+share/doc/cups/robots.txt
+share/doc/cups/help/api-array.html
+share/doc/cups/help/api-cups.html
+share/doc/cups/help/api-filedir.html
+share/doc/cups/help/api-filter.html
+share/doc/cups/help/api-httpipp.html
+share/doc/cups/help/api-ppd.html
+share/doc/cups/help/api-raster.html
+share/doc/cups/help/cgi.html
+share/doc/cups/help/glossary.html
+share/doc/cups/help/license.html
+share/doc/cups/help/man-accept.html
+share/doc/cups/help/man-backend.html
+share/doc/cups/help/man-cancel.html
+share/doc/cups/help/man-classes.conf.html
+share/doc/cups/help/man-client.conf.html
+share/doc/cups/help/man-cups-config.html
+share/doc/cups/help/man-cups-lpd.html
+share/doc/cups/help/man-cups-polld.html
+share/doc/cups/help/man-cupsaddsmb.html
+share/doc/cups/help/man-cupsd.conf.html
+share/doc/cups/help/man-filter.html
+share/doc/cups/help/man-mime.convs.html
+share/doc/cups/help/man-mime.types.html
+share/doc/cups/help/man-printers.conf.html
+share/doc/cups/help/network.html
+share/doc/cups/help/options.html
+share/doc/cups/help/overview.html
+share/doc/cups/help/ref-access_log.html
+share/doc/cups/help/ref-classes-conf.html
+share/doc/cups/help/ref-client-conf.html
+share/doc/cups/help/ref-cupsd-conf.html
+share/doc/cups/help/ref-error_log.html
+share/doc/cups/help/ref-page_log.html
+share/doc/cups/help/ref-printers-conf.html
+share/doc/cups/help/ref-snmp-conf.html
+share/doc/cups/help/ref-subscriptions-conf.html
+share/doc/cups/help/security.html
+share/doc/cups/help/spec-cmp.html
+share/doc/cups/help/spec-command.html
+share/doc/cups/help/spec-design.html
+share/doc/cups/help/spec-ipp.html
+share/doc/cups/help/spec-ppd.html
+share/doc/cups/help/spec-raster.html
+share/doc/cups/help/spec-stp.html
+share/doc/cups/help/standard.html
+share/doc/cups/help/translation.html
+share/doc/cups/help/whatsnew.html
+share/doc/cups/help/man-cupsd.html
+share/doc/cups/help/man-cupsenable.html
+share/doc/cups/help/man-cupstestdsc.html
+share/doc/cups/help/man-cupstestppd.html
+share/doc/cups/help/man-lp.html
+share/doc/cups/help/man-lpadmin.html
+share/doc/cups/help/man-lpc.html
+share/doc/cups/help/man-lpinfo.html
+share/doc/cups/help/man-lpmove.html
+share/doc/cups/help/man-lpoptions.html
+share/doc/cups/help/man-lppasswd.html
+share/doc/cups/help/man-lpq.html
+share/doc/cups/help/man-lpr.html
+share/doc/cups/help/man-lprm.html
+share/doc/cups/help/man-lpstat.html
+share/doc/cups/images/bottom-left.gif
+share/doc/cups/images/bottom-right.gif
+share/doc/cups/images/classes.gif
+share/doc/cups/images/cups-block-diagram.gif
+share/doc/cups/images/esp-logo.gif
+share/doc/cups/images/happy.gif
+share/doc/cups/images/logo.gif
+share/doc/cups/images/printer-idle.gif
+share/doc/cups/images/printer-processing.gif
+share/doc/cups/images/printer-stopped.gif
+share/doc/cups/images/smiley.jpg
+share/doc/cups/images/tab-left.gif
+share/doc/cups/images/tab-right.gif
+share/doc/cups/images/top-left.gif
+share/doc/cups/images/top-middle.gif
+share/doc/cups/images/top-right.gif
+share/doc/cups/images/web-add-this-printer.gif
+share/doc/cups/images/web-password.gif
+share/doc/cups/images/web-test-page.gif
+share/doc/cups/images/web-printer-driver.gif
+share/doc/cups/images/web-printer-status.gif
+share/doc/cups/images/web-set-printer-options.gif
+share/doc/cups/images/button-accept-jobs.gif
+share/doc/cups/images/button-add-class.gif
+share/doc/cups/images/button-add-printer.gif
+share/doc/cups/images/button-add-this-printer.gif
+share/doc/cups/images/button-cancel-all-jobs.gif
+share/doc/cups/images/button-cancel-job.gif
+share/doc/cups/images/button-change-settings.gif
+share/doc/cups/images/button-clean-print-heads.gif
+share/doc/cups/images/button-clear.gif
+share/doc/cups/images/button-continue.gif
+share/doc/cups/images/button-delete-class.gif
+share/doc/cups/images/button-delete-printer.gif
+share/doc/cups/images/button-edit-configuration-file.gif
+share/doc/cups/images/button-export-samba.gif
+share/doc/cups/images/button-help.gif
+share/doc/cups/images/button-hold-job.gif
+share/doc/cups/images/button-manage-classes.gif
+share/doc/cups/images/button-manage-jobs.gif
+share/doc/cups/images/button-manage-printers.gif
+share/doc/cups/images/button-manage-server.gif
+share/doc/cups/images/button-modify-class.gif
+share/doc/cups/images/button-modify-printer.gif
+share/doc/cups/images/button-move-job.gif
+share/doc/cups/images/button-move-jobs.gif
+share/doc/cups/images/button-print-self-test-page.gif
+share/doc/cups/images/button-print-test-page.gif
+share/doc/cups/images/button-publish-printer.gif
+share/doc/cups/images/button-reject-jobs.gif
+share/doc/cups/images/button-release-job.gif
+share/doc/cups/images/button-restart-job.gif
+share/doc/cups/images/button-save-changes.gif
+share/doc/cups/images/button-search.gif
+share/doc/cups/images/button-set-allowed-users.gif
+share/doc/cups/images/button-set-as-default.gif
+share/doc/cups/images/button-set-printer-options.gif
+share/doc/cups/images/button-show-active.gif
+share/doc/cups/images/button-show-all.gif
+share/doc/cups/images/button-show-completed.gif
+share/doc/cups/images/button-show-next.gif
+share/doc/cups/images/button-show-previous.gif
+share/doc/cups/images/button-sort-ascending.gif
+share/doc/cups/images/button-sort-descending.gif
+share/doc/cups/images/button-start-class.gif
+share/doc/cups/images/button-start-printer.gif
+share/doc/cups/images/button-stop-class.gif
+share/doc/cups/images/button-stop-printer.gif
+share/doc/cups/images/button-unpublish-printer.gif
+share/doc/cups/images/button-use-default-config.gif
+share/doc/cups/images/button-view-access-log.gif
+share/doc/cups/images/button-view-error-log.gif
+share/doc/cups/images/button-view-page-log.gif
+share/doc/cups/images/button-view-printable-version.gif
+share/doc/cups/es/images/button-accept-jobs.gif
+share/doc/cups/es/images/button-add-class.gif
+share/doc/cups/es/images/button-add-printer.gif
+share/doc/cups/es/images/button-add-this-printer.gif
+share/doc/cups/es/images/button-cancel-all-jobs.gif
+share/doc/cups/es/images/button-cancel-job.gif
+share/doc/cups/es/images/button-change-settings.gif
+share/doc/cups/es/images/button-clean-print-heads.gif
+share/doc/cups/es/images/button-clear.gif
+share/doc/cups/es/images/button-continue.gif
+share/doc/cups/es/images/button-delete-class.gif
+share/doc/cups/es/images/button-delete-printer.gif
+share/doc/cups/es/images/button-edit-configuration-file.gif
+share/doc/cups/es/images/button-export-samba.gif
+share/doc/cups/es/images/button-help.gif
+share/doc/cups/es/images/button-hold-job.gif
+share/doc/cups/es/images/button-manage-classes.gif
+share/doc/cups/es/images/button-manage-jobs.gif
+share/doc/cups/es/images/button-manage-printers.gif
+share/doc/cups/es/images/button-manage-server.gif
+share/doc/cups/es/images/button-modify-class.gif
+share/doc/cups/es/images/button-modify-printer.gif
+share/doc/cups/es/images/button-move-job.gif
+share/doc/cups/es/images/button-move-jobs.gif
+share/doc/cups/es/images/button-print-self-test-page.gif
+share/doc/cups/es/images/button-print-test-page.gif
+share/doc/cups/es/images/button-publish-printer.gif
+share/doc/cups/es/images/button-reject-jobs.gif
+share/doc/cups/es/images/button-release-job.gif
+share/doc/cups/es/images/button-restart-job.gif
+share/doc/cups/es/images/button-save-changes.gif
+share/doc/cups/es/images/button-search.gif
+share/doc/cups/es/images/button-set-allowed-users.gif
+share/doc/cups/es/images/button-set-as-default.gif
+share/doc/cups/es/images/button-set-printer-options.gif
+share/doc/cups/es/images/button-show-active.gif
+share/doc/cups/es/images/button-show-all.gif
+share/doc/cups/es/images/button-show-completed.gif
+share/doc/cups/es/images/button-show-next.gif
+share/doc/cups/es/images/button-show-previous.gif
+share/doc/cups/es/images/button-sort-ascending.gif
+share/doc/cups/es/images/button-sort-descending.gif
+share/doc/cups/es/images/button-start-class.gif
+share/doc/cups/es/images/button-start-printer.gif
+share/doc/cups/es/images/button-stop-class.gif
+share/doc/cups/es/images/button-stop-printer.gif
+share/doc/cups/es/images/button-unpublish-printer.gif
+share/doc/cups/es/images/button-use-default-config.gif
+share/doc/cups/es/images/button-view-access-log.gif
+share/doc/cups/es/images/button-view-error-log.gif
+share/doc/cups/es/images/button-view-page-log.gif
+share/doc/cups/es/images/button-view-printable-version.gif
+share/doc/cups/es/index.html
+share/doc/cups/ja/images/button-accept-jobs.gif
+share/doc/cups/ja/images/button-add-class.gif
+share/doc/cups/ja/images/button-add-printer.gif
+share/doc/cups/ja/images/button-add-this-printer.gif
+share/doc/cups/ja/images/button-cancel-all-jobs.gif
+share/doc/cups/ja/images/button-cancel-job.gif
+share/doc/cups/ja/images/button-change-settings.gif
+share/doc/cups/ja/images/button-continue.gif
+share/doc/cups/ja/images/button-delete-class.gif
+share/doc/cups/ja/images/button-delete-printer.gif
+share/doc/cups/ja/images/button-edit-configuration-file.gif
+share/doc/cups/ja/images/button-export-samba.gif
+share/doc/cups/ja/images/button-help.gif
+share/doc/cups/ja/images/button-hold-job.gif
+share/doc/cups/ja/images/button-move-job.gif
+share/doc/cups/ja/images/button-manage-classes.gif
+share/doc/cups/ja/images/button-manage-jobs.gif
+share/doc/cups/ja/images/button-manage-printers.gif
+share/doc/cups/ja/images/button-manage-server.gif
+share/doc/cups/ja/images/button-modify-class.gif
+share/doc/cups/ja/images/button-modify-printer.gif
+share/doc/cups/ja/images/button-move-jobs.gif
+share/doc/cups/ja/images/button-print-test-page.gif
+share/doc/cups/ja/images/button-publish-printer.gif
+share/doc/cups/ja/images/button-reject-jobs.gif
+share/doc/cups/ja/images/button-release-job.gif
+share/doc/cups/ja/images/button-restart-job.gif
+share/doc/cups/ja/images/button-save-changes.gif
+share/doc/cups/ja/images/button-search.gif
+share/doc/cups/ja/images/button-set-allowed-users.gif
+share/doc/cups/ja/images/button-set-as-default.gif
+share/doc/cups/ja/images/button-set-printer-options.gif
+share/doc/cups/ja/images/button-show-active.gif
+share/doc/cups/ja/images/button-show-all.gif
+share/doc/cups/ja/images/button-show-completed.gif
+share/doc/cups/ja/images/button-show-next.gif
+share/doc/cups/ja/images/button-show-previous.gif
+share/doc/cups/ja/images/button-sort-ascending.gif
+share/doc/cups/ja/images/button-sort-descending.gif
+share/doc/cups/ja/images/button-start-class.gif
+share/doc/cups/ja/images/button-start-printer.gif
+share/doc/cups/ja/images/button-stop-class.gif
+share/doc/cups/ja/images/button-stop-printer.gif
+share/doc/cups/ja/images/button-unpublish-printer.gif
+share/doc/cups/ja/images/button-use-default-config.gif
+share/doc/cups/ja/images/button-view-access-log.gif
+share/doc/cups/ja/images/button-view-error-log.gif
+share/doc/cups/ja/images/button-view-page-log.gif
+share/doc/cups/ja/index.html
+share/doc/cups/pl/images/button-accept-jobs.gif
+share/doc/cups/pl/images/button-add-class.gif
+share/doc/cups/pl/images/button-add-printer.gif
+share/doc/cups/pl/images/button-add-this-printer.gif
+share/doc/cups/pl/images/button-cancel-all-jobs.gif
+share/doc/cups/pl/images/button-cancel-job.gif
+share/doc/cups/pl/images/button-change-settings.gif
+share/doc/cups/pl/images/button-clean-print-heads.gif
+share/doc/cups/pl/images/button-clear.gif
+share/doc/cups/pl/images/button-continue.gif
+share/doc/cups/pl/images/button-delete-class.gif
+share/doc/cups/pl/images/button-delete-printer.gif
+share/doc/cups/pl/images/button-edit-configuration-file.gif
+share/doc/cups/pl/images/button-export-samba.gif
+share/doc/cups/pl/images/button-help.gif
+share/doc/cups/pl/images/button-hold-job.gif
+share/doc/cups/pl/images/button-manage-classes.gif
+share/doc/cups/pl/images/button-manage-jobs.gif
+share/doc/cups/pl/images/button-manage-printers.gif
+share/doc/cups/pl/images/button-manage-server.gif
+share/doc/cups/pl/images/button-modify-class.gif
+share/doc/cups/pl/images/button-modify-printer.gif
+share/doc/cups/pl/images/button-move-job.gif
+share/doc/cups/pl/images/button-move-jobs.gif
+share/doc/cups/pl/images/button-print-self-test-page.gif
+share/doc/cups/pl/images/button-print-test-page.gif
+share/doc/cups/pl/images/button-publish-printer.gif
+share/doc/cups/pl/images/button-reject-jobs.gif
+share/doc/cups/pl/images/button-release-job.gif
+share/doc/cups/pl/images/button-restart-job.gif
+share/doc/cups/pl/images/button-save-changes.gif
+share/doc/cups/pl/images/button-search.gif
+share/doc/cups/pl/images/button-set-allowed-users.gif
+share/doc/cups/pl/images/button-set-as-default.gif
+share/doc/cups/pl/images/button-set-printer-options.gif
+share/doc/cups/pl/images/button-show-active.gif
+share/doc/cups/pl/images/button-show-all.gif
+share/doc/cups/pl/images/button-show-completed.gif
+share/doc/cups/pl/images/button-show-next.gif
+share/doc/cups/pl/images/button-show-previous.gif
+share/doc/cups/pl/images/button-sort-ascending.gif
+share/doc/cups/pl/images/button-sort-descending.gif
+share/doc/cups/pl/images/button-start-class.gif
+share/doc/cups/pl/images/button-start-printer.gif
+share/doc/cups/pl/images/button-stop-class.gif
+share/doc/cups/pl/images/button-stop-printer.gif
+share/doc/cups/pl/images/button-unpublish-printer.gif
+share/doc/cups/pl/images/button-use-default-config.gif
+share/doc/cups/pl/images/button-view-access-log.gif
+share/doc/cups/pl/images/button-view-error-log.gif
+share/doc/cups/pl/images/button-view-page-log.gif
+share/doc/cups/pl/images/button-view-printable-version.gif
+share/doc/cups/pl/index.html
+share/doc/cups/sv/images/button-accept-jobs.gif
+share/doc/cups/sv/images/button-add-class.gif
+share/doc/cups/sv/images/button-add-printer.gif
+share/doc/cups/sv/images/button-add-this-printer.gif
+share/doc/cups/sv/images/button-cancel-all-jobs.gif
+share/doc/cups/sv/images/button-cancel-job.gif
+share/doc/cups/sv/images/button-change-settings.gif
+share/doc/cups/sv/images/button-clean-print-heads.gif
+share/doc/cups/sv/images/button-clear.gif
+share/doc/cups/sv/images/button-continue.gif
+share/doc/cups/sv/images/button-delete-class.gif
+share/doc/cups/sv/images/button-delete-printer.gif
+share/doc/cups/sv/images/button-edit-configuration-file.gif
+share/doc/cups/sv/images/button-export-samba.gif
+share/doc/cups/sv/images/button-help.gif
+share/doc/cups/sv/images/button-hold-job.gif
+share/doc/cups/sv/images/button-manage-classes.gif
+share/doc/cups/sv/images/button-manage-jobs.gif
+share/doc/cups/sv/images/button-manage-printers.gif
+share/doc/cups/sv/images/button-manage-server.gif
+share/doc/cups/sv/images/button-modify-class.gif
+share/doc/cups/sv/images/button-modify-printer.gif
+share/doc/cups/sv/images/button-move-job.gif
+share/doc/cups/sv/images/button-move-jobs.gif
+share/doc/cups/sv/images/button-print-self-test-page.gif
+share/doc/cups/sv/images/button-print-test-page.gif
+share/doc/cups/sv/images/button-publish-printer.gif
+share/doc/cups/sv/images/button-reject-jobs.gif
+share/doc/cups/sv/images/button-release-job.gif
+share/doc/cups/sv/images/button-restart-job.gif
+share/doc/cups/sv/images/button-save-changes.gif
+share/doc/cups/sv/images/button-search.gif
+share/doc/cups/sv/images/button-set-allowed-users.gif
+share/doc/cups/sv/images/button-set-as-default.gif
+share/doc/cups/sv/images/button-set-printer-options.gif
+share/doc/cups/sv/images/button-show-active.gif
+share/doc/cups/sv/images/button-show-all.gif
+share/doc/cups/sv/images/button-show-completed.gif
+share/doc/cups/sv/images/button-show-next.gif
+share/doc/cups/sv/images/button-show-previous.gif
+share/doc/cups/sv/images/button-sort-ascending.gif
+share/doc/cups/sv/images/button-sort-descending.gif
+share/doc/cups/sv/images/button-start-class.gif
+share/doc/cups/sv/images/button-start-printer.gif
+share/doc/cups/sv/images/button-stop-class.gif
+share/doc/cups/sv/images/button-stop-printer.gif
+share/doc/cups/sv/images/button-unpublish-printer.gif
+share/doc/cups/sv/images/button-use-default-config.gif
+share/doc/cups/sv/images/button-view-access-log.gif
+share/doc/cups/sv/images/button-view-error-log.gif
+share/doc/cups/sv/images/button-view-page-log.gif
+share/doc/cups/sv/images/button-view-printable-version.gif
+share/doc/cups/sv/index.html
+share/locale/es/cups_es.po
+share/locale/ja/cups_ja.po
+share/locale/sv/cups_sv.po
 share/cups/banners/classified
 share/cups/banners/confidential
 share/cups/banners/secret
 share/cups/banners/standard
 share/cups/banners/topsecret
 share/cups/banners/unclassified
+share/cups/charmaps/euc-cn.txt
+share/cups/charmaps/euc-jp.txt
+share/cups/charmaps/euc-kr.txt
+share/cups/charmaps/euc-tw.txt
+share/cups/charmaps/iso-8859-10.txt
+share/cups/charmaps/iso-8859-11.txt
+share/cups/charmaps/iso-8859-13.txt
+share/cups/charmaps/iso-8859-14.txt
+share/cups/charmaps/iso-8859-15.txt
+share/cups/charmaps/iso-8859-16.txt
+share/cups/charmaps/iso-8859-1.txt
+share/cups/charmaps/iso-8859-2.txt
+share/cups/charmaps/iso-8859-3.txt
+share/cups/charmaps/iso-8859-4.txt
+share/cups/charmaps/iso-8859-5.txt
+share/cups/charmaps/iso-8859-6.txt
+share/cups/charmaps/iso-8859-7.txt
+share/cups/charmaps/iso-8859-8.txt
+share/cups/charmaps/iso-8859-9.txt
+share/cups/charmaps/koi8-r.txt
+share/cups/charmaps/koi8-u.txt
+share/cups/charmaps/mac-roman.txt
+share/cups/charmaps/windows-1250.txt
+share/cups/charmaps/windows-1251.txt
+share/cups/charmaps/windows-1252.txt
+share/cups/charmaps/windows-1253.txt
+share/cups/charmaps/windows-1254.txt
+share/cups/charmaps/windows-1255.txt
+share/cups/charmaps/windows-1256.txt
+share/cups/charmaps/windows-1257.txt
+share/cups/charmaps/windows-1258.txt
+share/cups/charmaps/windows-1361.txt
+share/cups/charmaps/windows-874.txt
+share/cups/charmaps/windows-932.txt
+share/cups/charmaps/windows-936.txt
+share/cups/charmaps/windows-949.txt
+share/cups/charmaps/windows-950.txt
+share/cups/charsets/windows-874
+share/cups/charsets/windows-1250
+share/cups/charsets/windows-1251
+share/cups/charsets/windows-1252
+share/cups/charsets/windows-1253
+share/cups/charsets/windows-1254
+share/cups/charsets/windows-1255
+share/cups/charsets/windows-1256
+share/cups/charsets/windows-1257
+share/cups/charsets/windows-1258
+share/cups/charsets/koi8-r
+share/cups/charsets/koi8-u
 share/cups/charsets/iso-8859-1
-share/cups/charsets/iso-8859-10
-share/cups/charsets/iso-8859-13
-share/cups/charsets/iso-8859-14
-share/cups/charsets/iso-8859-15
 share/cups/charsets/iso-8859-2
 share/cups/charsets/iso-8859-3
 share/cups/charsets/iso-8859-4
@@ -78,129 +465,82 @@ share/cups/charsets/iso-8859-6
 share/cups/charsets/iso-8859-7
 share/cups/charsets/iso-8859-8
 share/cups/charsets/iso-8859-9
-share/cups/charsets/koi8-r
-share/cups/charsets/koi8-u
+share/cups/charsets/iso-8859-10
+share/cups/charsets/iso-8859-13
+share/cups/charsets/iso-8859-14
+share/cups/charsets/iso-8859-15
 share/cups/charsets/utf-8
-share/cups/charsets/windows-1250
-share/cups/charsets/windows-1251
-share/cups/charsets/windows-1252
-share/cups/charsets/windows-1253
-share/cups/charsets/windows-1254
-share/cups/charsets/windows-1255
-share/cups/charsets/windows-1256
-share/cups/charsets/windows-1257
-share/cups/charsets/windows-1258
-share/cups/charsets/windows-874
-share/cups/data/HPGLprolog
-share/cups/data/psglyphs
-share/cups/data/testprint.ps
-share/cups/fonts/Courier
-share/cups/fonts/Courier-Bold
-share/cups/fonts/Courier-BoldOblique
-share/cups/fonts/Courier-Oblique
-share/cups/fonts/Symbol
 share/cups/model/deskjet.ppd
 share/cups/model/deskjet2.ppd
 share/cups/model/dymo.ppd
-share/cups/model/epson24.ppd
 share/cups/model/epson9.ppd
+share/cups/model/epson24.ppd
 share/cups/model/laserjet.ppd
-share/cups/model/okidat24.ppd
 share/cups/model/okidata9.ppd
+share/cups/model/okidat24.ppd
 share/cups/model/stcolor.ppd
 share/cups/model/stcolor2.ppd
 share/cups/model/stphoto.ppd
 share/cups/model/stphoto2.ppd
 share/cups/model/zebra.ppd
+share/cups/model/zebraep1.ppd
+share/cups/model/zebraep2.ppd
+share/cups/data/HPGLprolog
+share/cups/data/psglyphs
+share/cups/data/testprint.ps
+share/cups/fonts/Courier
+share/cups/fonts/Courier-Bold
+share/cups/fonts/Courier-BoldOblique
+share/cups/fonts/Courier-Oblique
+share/cups/fonts/Symbol
 share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
-share/cups/templates/admin-op.tmpl
 share/cups/templates/admin.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
-share/cups/templates/choose-members.tmpl
 share/cups/templates/choose-model.tmpl
 share/cups/templates/choose-serial.tmpl
 share/cups/templates/choose-uri.tmpl
 share/cups/templates/class-added.tmpl
 share/cups/templates/class-confirm.tmpl
 share/cups/templates/class-deleted.tmpl
+share/cups/templates/class-jobs-header.tmpl
 share/cups/templates/class-modified.tmpl
 share/cups/templates/classes.tmpl
-share/cups/templates/config-printer.tmpl
-share/cups/templates/config-printer2.tmpl
-share/cups/templates/printer-default.tmpl
-share/cups/templates/be/add-class.tmpl
-share/cups/templates/be/add-printer.tmpl
-share/cups/templates/be/admin-op.tmpl
-share/cups/templates/be/admin.tmpl
-share/cups/templates/be/choose-device.tmpl
-share/cups/templates/be/choose-make.tmpl
-share/cups/templates/be/choose-members.tmpl
-share/cups/templates/be/choose-model.tmpl
-share/cups/templates/be/choose-serial.tmpl
-share/cups/templates/be/choose-uri.tmpl
-share/cups/templates/be/class-added.tmpl
-share/cups/templates/be/class-confirm.tmpl
-share/cups/templates/be/class-deleted.tmpl
-share/cups/templates/be/class-modified.tmpl
-share/cups/templates/be/classes.tmpl
-share/cups/templates/be/config-printer.tmpl
-share/cups/templates/be/config-printer2.tmpl
-share/cups/templates/be/error.tmpl
-share/cups/templates/be/header.tmpl
-share/cups/templates/be/jobs.tmpl
-share/cups/templates/be/job-cancel.tmpl
-share/cups/templates/be/job-hold.tmpl
-share/cups/templates/be/job-op.tmpl
-share/cups/templates/be/job-release.tmpl
-share/cups/templates/be/job-restart.tmpl
-share/cups/templates/be/modify-class.tmpl
-share/cups/templates/be/modify-printer.tmpl
-share/cups/templates/be/option-boolean.tmpl
-share/cups/templates/be/option-conflict.tmpl
-share/cups/templates/be/option-header.tmpl
-share/cups/templates/be/option-pickmany.tmpl
-share/cups/templates/be/option-pickone.tmpl
-share/cups/templates/be/option-trailer.tmpl
-share/cups/templates/be/printers.tmpl
-share/cups/templates/be/printer-accept.tmpl
-share/cups/templates/be/printer-added.tmpl
-share/cups/templates/be/printer-configured.tmpl
-share/cups/templates/be/printer-confirm.tmpl
-share/cups/templates/be/printer-deleted.tmpl
-share/cups/templates/be/printer-modified.tmpl
-share/cups/templates/be/printer-purge.tmpl
-share/cups/templates/be/printer-reject.tmpl
-share/cups/templates/be/printer-start.tmpl
-share/cups/templates/be/printer-stop.tmpl
-share/cups/templates/be/test-page.tmpl
-share/cups/templates/be/trailer.tmpl
+share/cups/templates/classes-header.tmpl
+share/cups/templates/edit-config.tmpl
+share/cups/templates/error.tmpl
+share/cups/templates/error-op.tmpl
 share/cups/templates/es/add-class.tmpl
 share/cups/templates/es/add-printer.tmpl
-share/cups/templates/es/admin-op.tmpl
 share/cups/templates/es/admin.tmpl
 share/cups/templates/es/choose-device.tmpl
 share/cups/templates/es/choose-make.tmpl
-share/cups/templates/es/choose-members.tmpl
 share/cups/templates/es/choose-model.tmpl
 share/cups/templates/es/choose-serial.tmpl
 share/cups/templates/es/choose-uri.tmpl
 share/cups/templates/es/class-added.tmpl
 share/cups/templates/es/class-confirm.tmpl
 share/cups/templates/es/class-deleted.tmpl
+share/cups/templates/es/class-jobs-header.tmpl
 share/cups/templates/es/class-modified.tmpl
 share/cups/templates/es/classes.tmpl
-share/cups/templates/es/config-printer.tmpl
-share/cups/templates/es/config-printer2.tmpl
+share/cups/templates/es/classes-header.tmpl
+share/cups/templates/es/edit-config.tmpl
 share/cups/templates/es/error.tmpl
+share/cups/templates/es/error-op.tmpl
 share/cups/templates/es/header.tmpl
-share/cups/templates/es/jobs.tmpl
+share/cups/templates/es/help-header.tmpl
+share/cups/templates/es/help-printable.tmpl
 share/cups/templates/es/job-cancel.tmpl
 share/cups/templates/es/job-hold.tmpl
-share/cups/templates/es/job-op.tmpl
+share/cups/templates/es/job-move.tmpl
+share/cups/templates/es/job-moved.tmpl
 share/cups/templates/es/job-release.tmpl
 share/cups/templates/es/job-restart.tmpl
+share/cups/templates/es/jobs.tmpl
+share/cups/templates/es/jobs-header.tmpl
+share/cups/templates/es/maintenance.tmpl
 share/cups/templates/es/modify-class.tmpl
 share/cups/templates/es/modify-printer.tmpl
 share/cups/templates/es/option-boolean.tmpl
@@ -209,119 +549,42 @@ share/cups/templates/es/option-header.tmpl
 share/cups/templates/es/option-pickmany.tmpl
 share/cups/templates/es/option-pickone.tmpl
 share/cups/templates/es/option-trailer.tmpl
-share/cups/templates/es/printers.tmpl
+share/cups/templates/es/pager.tmpl
 share/cups/templates/es/printer-accept.tmpl
 share/cups/templates/es/printer-added.tmpl
 share/cups/templates/es/printer-configured.tmpl
 share/cups/templates/es/printer-confirm.tmpl
+share/cups/templates/es/printer-default.tmpl
 share/cups/templates/es/printer-deleted.tmpl
+share/cups/templates/es/printer-jobs-header.tmpl
 share/cups/templates/es/printer-modified.tmpl
 share/cups/templates/es/printer-purge.tmpl
 share/cups/templates/es/printer-reject.tmpl
 share/cups/templates/es/printer-start.tmpl
 share/cups/templates/es/printer-stop.tmpl
+share/cups/templates/es/printers.tmpl
+share/cups/templates/es/printers-header.tmpl
+share/cups/templates/es/restart.tmpl
+share/cups/templates/es/search.tmpl
+share/cups/templates/es/samba-export.tmpl
+share/cups/templates/es/samba-exported.tmpl
+share/cups/templates/es/set-printer-options-header.tmpl
+share/cups/templates/es/set-printer-options-trailer.tmpl
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
-share/cups/templates/de/add-class.tmpl
-share/cups/templates/de/add-printer.tmpl
-share/cups/templates/de/admin-op.tmpl
-share/cups/templates/de/admin.tmpl
-share/cups/templates/de/choose-device.tmpl
-share/cups/templates/de/choose-make.tmpl
-share/cups/templates/de/choose-members.tmpl
-share/cups/templates/de/choose-model.tmpl
-share/cups/templates/de/choose-serial.tmpl
-share/cups/templates/de/choose-uri.tmpl
-share/cups/templates/de/class-added.tmpl
-share/cups/templates/de/class-confirm.tmpl
-share/cups/templates/de/class-deleted.tmpl
-share/cups/templates/de/class-modified.tmpl
-share/cups/templates/de/classes.tmpl
-share/cups/templates/de/config-printer.tmpl
-share/cups/templates/de/config-printer2.tmpl
-share/cups/templates/de/error.tmpl
-share/cups/templates/de/header.tmpl
-share/cups/templates/de/job-cancel.tmpl
-share/cups/templates/de/job-hold.tmpl
-share/cups/templates/de/job-op.tmpl
-share/cups/templates/de/job-release.tmpl
-share/cups/templates/de/job-restart.tmpl
-share/cups/templates/de/jobs.tmpl
-share/cups/templates/de/modify-class.tmpl
-share/cups/templates/de/modify-printer.tmpl
-share/cups/templates/de/option-boolean.tmpl
-share/cups/templates/de/option-conflict.tmpl
-share/cups/templates/de/option-header.tmpl
-share/cups/templates/de/option-pickmany.tmpl
-share/cups/templates/de/option-pickone.tmpl
-share/cups/templates/de/option-trailer.tmpl
-share/cups/templates/de/printer-accept.tmpl
-share/cups/templates/de/printer-added.tmpl
-share/cups/templates/de/printer-configured.tmpl
-share/cups/templates/de/printer-confirm.tmpl
-share/cups/templates/de/printer-deleted.tmpl
-share/cups/templates/de/printer-modified.tmpl
-share/cups/templates/de/printer-purge.tmpl
-share/cups/templates/de/printer-reject.tmpl
-share/cups/templates/de/printer-start.tmpl
-share/cups/templates/de/printer-stop.tmpl
-share/cups/templates/de/printers.tmpl
-share/cups/templates/de/test-page.tmpl
-share/cups/templates/de/trailer.tmpl
-share/cups/templates/error.tmpl
-share/cups/templates/fr/add-class.tmpl
-share/cups/templates/fr/add-printer.tmpl
-share/cups/templates/fr/admin-op.tmpl
-share/cups/templates/fr/admin.tmpl
-share/cups/templates/fr/choose-device.tmpl
-share/cups/templates/fr/choose-make.tmpl
-share/cups/templates/fr/choose-members.tmpl
-share/cups/templates/fr/choose-model.tmpl
-share/cups/templates/fr/choose-serial.tmpl
-share/cups/templates/fr/choose-uri.tmpl
-share/cups/templates/fr/class-added.tmpl
-share/cups/templates/fr/class-confirm.tmpl
-share/cups/templates/fr/class-deleted.tmpl
-share/cups/templates/fr/class-modified.tmpl
-share/cups/templates/fr/classes.tmpl
-share/cups/templates/fr/config-printer.tmpl
-share/cups/templates/fr/config-printer2.tmpl
-share/cups/templates/fr/error.tmpl
-share/cups/templates/fr/header.tmpl
-share/cups/templates/fr/job-cancel.tmpl
-share/cups/templates/fr/job-hold.tmpl
-share/cups/templates/fr/job-op.tmpl
-share/cups/templates/fr/job-release.tmpl
-share/cups/templates/fr/job-restart.tmpl
-share/cups/templates/fr/jobs.tmpl
-share/cups/templates/fr/modify-class.tmpl
-share/cups/templates/fr/modify-printer.tmpl
-share/cups/templates/fr/option-boolean.tmpl
-share/cups/templates/fr/option-conflict.tmpl
-share/cups/templates/fr/option-header.tmpl
-share/cups/templates/fr/option-pickmany.tmpl
-share/cups/templates/fr/option-pickone.tmpl
-share/cups/templates/fr/option-trailer.tmpl
-share/cups/templates/fr/printer-accept.tmpl
-share/cups/templates/fr/printer-added.tmpl
-share/cups/templates/fr/printer-configured.tmpl
-share/cups/templates/fr/printer-confirm.tmpl
-share/cups/templates/fr/printer-deleted.tmpl
-share/cups/templates/fr/printer-modified.tmpl
-share/cups/templates/fr/printer-purge.tmpl
-share/cups/templates/fr/printer-reject.tmpl
-share/cups/templates/fr/printer-start.tmpl
-share/cups/templates/fr/printer-stop.tmpl
-share/cups/templates/fr/printers.tmpl
-share/cups/templates/fr/test-page.tmpl
-share/cups/templates/fr/trailer.tmpl
+share/cups/templates/es/users.tmpl
 share/cups/templates/header.tmpl
+share/cups/templates/help-header.tmpl
+share/cups/templates/help-printable.tmpl
 share/cups/templates/job-cancel.tmpl
 share/cups/templates/job-hold.tmpl
-share/cups/templates/job-op.tmpl
+share/cups/templates/job-move.tmpl
+share/cups/templates/job-moved.tmpl
 share/cups/templates/job-release.tmpl
 share/cups/templates/job-restart.tmpl
 share/cups/templates/jobs.tmpl
+share/cups/templates/jobs-header.tmpl
+share/cups/templates/maintenance.tmpl
 share/cups/templates/modify-class.tmpl
 share/cups/templates/modify-printer.tmpl
 share/cups/templates/option-boolean.tmpl
@@ -330,277 +593,287 @@ share/cups/templates/option-header.tmpl
 share/cups/templates/option-pickmany.tmpl
 share/cups/templates/option-pickone.tmpl
 share/cups/templates/option-trailer.tmpl
+share/cups/templates/pager.tmpl
 share/cups/templates/printer-accept.tmpl
 share/cups/templates/printer-added.tmpl
 share/cups/templates/printer-configured.tmpl
 share/cups/templates/printer-confirm.tmpl
+share/cups/templates/printer-default.tmpl
 share/cups/templates/printer-deleted.tmpl
+share/cups/templates/printer-jobs-header.tmpl
 share/cups/templates/printer-modified.tmpl
 share/cups/templates/printer-purge.tmpl
 share/cups/templates/printer-reject.tmpl
 share/cups/templates/printer-start.tmpl
 share/cups/templates/printer-stop.tmpl
 share/cups/templates/printers.tmpl
+share/cups/templates/printers-header.tmpl
+share/cups/templates/restart.tmpl
+share/cups/templates/search.tmpl
+share/cups/templates/samba-export.tmpl
+share/cups/templates/samba-exported.tmpl
+share/cups/templates/set-printer-options-header.tmpl
+share/cups/templates/set-printer-options-trailer.tmpl
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
-share/doc/cups/cmp.html
-share/doc/cups/cmp.pdf
-share/doc/cups/cups.css
-share/doc/cups/cupsdoc.css
-share/doc/cups/be/index.html
-share/doc/cups/be/documentation.html
-share/doc/cups/be/images/accept-jobs.gif
-share/doc/cups/be/images/add-class.gif
-share/doc/cups/be/images/add-printer.gif
-share/doc/cups/be/images/cancel-job.gif
-share/doc/cups/be/images/config-printer.gif
-share/doc/cups/be/images/continue.gif
-share/doc/cups/be/images/delete-class.gif
-share/doc/cups/be/images/delete-printer.gif
-share/doc/cups/be/images/hold-job.gif
-share/doc/cups/be/images/manage-classes.gif
-share/doc/cups/be/images/manage-jobs.gif
-share/doc/cups/be/images/manage-printers.gif
-share/doc/cups/be/images/modify-class.gif
-share/doc/cups/be/images/modify-printer.gif
-share/doc/cups/be/images/navbar.gif
-share/doc/cups/be/images/print-test-page.gif
-share/doc/cups/be/images/reject-jobs.gif
-share/doc/cups/be/images/release-job.gif
-share/doc/cups/be/images/restart-job.gif
-share/doc/cups/be/images/show-active.gif
-share/doc/cups/be/images/show-completed.gif
-share/doc/cups/be/images/start-class.gif
-share/doc/cups/be/images/start-printer.gif
-share/doc/cups/be/images/stop-class.gif
-share/doc/cups/be/images/stop-printer.gif
-share/doc/cups/es/index.html
-share/doc/cups/es/documentation.html
-share/doc/cups/es/images/accept-jobs.gif
-share/doc/cups/es/images/add-class.gif
-share/doc/cups/es/images/add-printer.gif
-share/doc/cups/es/images/cancel-job.gif
-share/doc/cups/es/images/config-printer.gif
-share/doc/cups/es/images/continue.gif
-share/doc/cups/es/images/delete-class.gif
-share/doc/cups/es/images/delete-printer.gif
-share/doc/cups/es/images/hold-job.gif
-share/doc/cups/es/images/manage-classes.gif
-share/doc/cups/es/images/manage-jobs.gif
-share/doc/cups/es/images/manage-printers.gif
-share/doc/cups/es/images/modify-class.gif
-share/doc/cups/es/images/modify-printer.gif
-share/doc/cups/es/images/navbar.gif
-share/doc/cups/es/images/print-test-page.gif
-share/doc/cups/es/images/reject-jobs.gif
-share/doc/cups/es/images/release-job.gif
-share/doc/cups/es/images/restart-job.gif
-share/doc/cups/es/images/set-as-default.gif
-share/doc/cups/es/images/show-active.gif
-share/doc/cups/es/images/show-completed.gif
-share/doc/cups/es/images/start-class.gif
-share/doc/cups/es/images/start-printer.gif
-share/doc/cups/es/images/stop-class.gif
-share/doc/cups/es/images/stop-printer.gif
-share/doc/cups/de/documentation.html
-share/doc/cups/de/images/accept-jobs.gif
-share/doc/cups/de/images/add-class.gif
-share/doc/cups/de/images/add-printer.gif
-share/doc/cups/de/images/cancel-job.gif
-share/doc/cups/de/images/config-printer.gif
-share/doc/cups/de/images/continue.gif
-share/doc/cups/de/images/delete-class.gif
-share/doc/cups/de/images/delete-printer.gif
-share/doc/cups/de/images/hold-job.gif
-share/doc/cups/de/images/manage-classes.gif
-share/doc/cups/de/images/manage-jobs.gif
-share/doc/cups/de/images/manage-printers.gif
-share/doc/cups/de/images/modify-class.gif
-share/doc/cups/de/images/modify-printer.gif
-share/doc/cups/de/images/navbar.gif
-share/doc/cups/de/images/print-test-page.gif
-share/doc/cups/de/images/reject-jobs.gif
-share/doc/cups/de/images/release-job.gif
-share/doc/cups/de/images/restart-job.gif
-share/doc/cups/de/images/show-active.gif
-share/doc/cups/de/images/show-completed.gif
-share/doc/cups/de/images/start-class.gif
-share/doc/cups/de/images/start-printer.gif
-share/doc/cups/de/images/stop-class.gif
-share/doc/cups/de/images/stop-printer.gif
-share/doc/cups/de/index.html
-share/doc/cups/documentation.html
-share/doc/cups/fr/cups.css
-share/doc/cups/fr/cupsdoc.css
-share/doc/cups/fr/documentation.html
-share/doc/cups/fr/images/accept-jobs.gif
-share/doc/cups/fr/images/add-class.gif
-share/doc/cups/fr/images/add-printer.gif
-share/doc/cups/fr/images/cancel-job.gif
-share/doc/cups/fr/images/config-printer.gif
-share/doc/cups/fr/images/continue.gif
-share/doc/cups/fr/images/delete-class.gif
-share/doc/cups/fr/images/delete-printer.gif
-share/doc/cups/fr/images/hold-job.gif
-share/doc/cups/fr/images/manage-classes.gif
-share/doc/cups/fr/images/manage-jobs.gif
-share/doc/cups/fr/images/manage-printers.gif
-share/doc/cups/fr/images/modify-class.gif
-share/doc/cups/fr/images/modify-printer.gif
-share/doc/cups/fr/images/navbar.gif
-share/doc/cups/fr/images/print-test-page.gif
-share/doc/cups/fr/images/reject-jobs.gif
-share/doc/cups/fr/images/release-job.gif
-share/doc/cups/fr/images/restart-job.gif
-share/doc/cups/fr/images/show-active.gif
-share/doc/cups/fr/images/show-completed.gif
-share/doc/cups/fr/images/start-class.gif
-share/doc/cups/fr/images/start-printer.gif
-share/doc/cups/fr/images/stop-class.gif
-share/doc/cups/fr/images/stop-printer.gif
-share/doc/cups/fr/index.html
-share/doc/cups/fr/overview.html
-share/doc/cups/fr/overview.pdf
-share/doc/cups/fr/sam.html
-share/doc/cups/fr/sam.pdf
-share/doc/cups/fr/sum.html
-share/doc/cups/fr/sum.pdf
-share/doc/cups/idd.html
-share/doc/cups/idd.pdf
-share/doc/cups/images/accept-jobs.gif
-share/doc/cups/images/add-class.gif
-share/doc/cups/images/add-printer.gif
-share/doc/cups/images/cancel-job.gif
-share/doc/cups/images/classes.gif
-share/doc/cups/images/config-printer.gif
-share/doc/cups/images/continue.gif
-share/doc/cups/images/cups-block-diagram.gif
-share/doc/cups/images/cups-large.gif
-share/doc/cups/images/cups-medium.gif
-share/doc/cups/images/cups-small.gif
-share/doc/cups/images/delete-class.gif
-share/doc/cups/images/delete-printer.gif
-share/doc/cups/images/hold-job.gif
-share/doc/cups/images/left.gif
-share/doc/cups/images/logo.gif
-share/doc/cups/images/manage-classes.gif
-share/doc/cups/images/manage-jobs.gif
-share/doc/cups/images/manage-printers.gif
-share/doc/cups/images/modify-class.gif
-share/doc/cups/images/modify-printer.gif
-share/doc/cups/images/navbar.gif
-share/doc/cups/images/print-test-page.gif
-share/doc/cups/images/printer-idle.gif
-share/doc/cups/images/printer-processing.gif
-share/doc/cups/images/printer-stopped.gif
-share/doc/cups/images/reject-jobs.gif
-share/doc/cups/images/release-job.gif
-share/doc/cups/images/restart-job.gif
-share/doc/cups/images/right.gif
-share/doc/cups/images/set-as-default.gif
-share/doc/cups/images/show-active.gif
-share/doc/cups/images/show-completed.gif
-share/doc/cups/images/start-class.gif
-share/doc/cups/images/start-printer.gif
-share/doc/cups/images/stop-class.gif
-share/doc/cups/images/stop-printer.gif
-share/doc/cups/index.html
-share/doc/cups/ipp.html
-share/doc/cups/ipp.pdf
-share/doc/cups/overview.html
-share/doc/cups/overview.pdf
-share/doc/cups/robots.txt
-share/doc/cups/sam.html
-share/doc/cups/sam.pdf
-share/doc/cups/sdd.html
-share/doc/cups/sdd.pdf
-share/doc/cups/spm.html
-share/doc/cups/spm.pdf
-share/doc/cups/sps.html
-share/doc/cups/sps.pdf
-share/doc/cups/ssr.html
-share/doc/cups/ssr.pdf
-share/doc/cups/stp.html
-share/doc/cups/stp.pdf
-share/doc/cups/sum.html
-share/doc/cups/sum.pdf
-share/doc/cups/svd.html
-share/doc/cups/svd.pdf
-share/doc/cups/translation.html
-share/doc/cups/translation.pdf
-share/locale/C/cups_C
-share/locale/be/cups_be
-share/locale/cs/cups_cs
-share/locale/de/cups_de
-share/locale/en/cups_en
-share/locale/en_US/cups_en_US
-share/locale/es/cups_es
-share/locale/fr/cups_fr
-share/locale/he/cups_he
-share/locale/it/cups_it
-share/locale/ru_RU/cups_ru_RU
-share/locale/sv/cups_sv
-share/locale/uk/cups_uk
-share/locale/uk_UA/cups_uk_UA
-share/locale/zh_CN/cups_zh_CN
-@dirrmtry man/fr/man8
-@dirrmtry man/fr/man5
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/es/man8
-@dirrmtry man/es/man5
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk_UA
-@dirrmtry share/locale/uk
+share/cups/templates/users.tmpl
+share/cups/templates/ja/add-class.tmpl
+share/cups/templates/ja/add-printer.tmpl
+share/cups/templates/ja/admin.tmpl
+share/cups/templates/ja/choose-device.tmpl
+share/cups/templates/ja/choose-make.tmpl
+share/cups/templates/ja/choose-model.tmpl
+share/cups/templates/ja/choose-serial.tmpl
+share/cups/templates/ja/choose-uri.tmpl
+share/cups/templates/ja/class-added.tmpl
+share/cups/templates/ja/class-confirm.tmpl
+share/cups/templates/ja/class-deleted.tmpl
+share/cups/templates/ja/class-jobs-header.tmpl
+share/cups/templates/ja/class-modified.tmpl
+share/cups/templates/ja/classes.tmpl
+share/cups/templates/ja/classes-header.tmpl
+share/cups/templates/ja/edit-config.tmpl
+share/cups/templates/ja/error.tmpl
+share/cups/templates/ja/error-op.tmpl
+share/cups/templates/ja/header.tmpl
+share/cups/templates/ja/help-header.tmpl
+share/cups/templates/ja/job-cancel.tmpl
+share/cups/templates/ja/job-hold.tmpl
+share/cups/templates/ja/job-move.tmpl
+share/cups/templates/ja/job-moved.tmpl
+share/cups/templates/ja/job-release.tmpl
+share/cups/templates/ja/job-restart.tmpl
+share/cups/templates/ja/jobs.tmpl
+share/cups/templates/ja/jobs-header.tmpl
+share/cups/templates/ja/maintenance.tmpl
+share/cups/templates/ja/modify-class.tmpl
+share/cups/templates/ja/modify-printer.tmpl
+share/cups/templates/ja/option-conflict.tmpl
+share/cups/templates/ja/option-trailer.tmpl
+share/cups/templates/ja/pager.tmpl
+share/cups/templates/ja/printer-accept.tmpl
+share/cups/templates/ja/printer-added.tmpl
+share/cups/templates/ja/printer-configured.tmpl
+share/cups/templates/ja/printer-confirm.tmpl
+share/cups/templates/ja/printer-default.tmpl
+share/cups/templates/ja/printer-deleted.tmpl
+share/cups/templates/ja/printer-jobs-header.tmpl
+share/cups/templates/ja/printer-modified.tmpl
+share/cups/templates/ja/printer-purge.tmpl
+share/cups/templates/ja/printer-reject.tmpl
+share/cups/templates/ja/printer-start.tmpl
+share/cups/templates/ja/printer-stop.tmpl
+share/cups/templates/ja/printers.tmpl
+share/cups/templates/ja/printers-header.tmpl
+share/cups/templates/ja/restart.tmpl
+share/cups/templates/ja/samba-export.tmpl
+share/cups/templates/ja/samba-exported.tmpl
+share/cups/templates/ja/search.tmpl
+share/cups/templates/ja/test-page.tmpl
+share/cups/templates/ja/users.tmpl
+share/cups/templates/pl/add-class.tmpl
+share/cups/templates/pl/add-printer.tmpl
+share/cups/templates/pl/admin.tmpl
+share/cups/templates/pl/choose-device.tmpl
+share/cups/templates/pl/choose-make.tmpl
+share/cups/templates/pl/choose-model.tmpl
+share/cups/templates/pl/choose-serial.tmpl
+share/cups/templates/pl/choose-uri.tmpl
+share/cups/templates/pl/class-added.tmpl
+share/cups/templates/pl/class-confirm.tmpl
+share/cups/templates/pl/class-deleted.tmpl
+share/cups/templates/pl/class-jobs-header.tmpl
+share/cups/templates/pl/class-modified.tmpl
+share/cups/templates/pl/classes.tmpl
+share/cups/templates/pl/classes-header.tmpl
+share/cups/templates/pl/edit-config.tmpl
+share/cups/templates/pl/error.tmpl
+share/cups/templates/pl/error-op.tmpl
+share/cups/templates/pl/header.tmpl
+share/cups/templates/pl/help-header.tmpl
+share/cups/templates/pl/help-printable.tmpl
+share/cups/templates/pl/job-cancel.tmpl
+share/cups/templates/pl/job-hold.tmpl
+share/cups/templates/pl/job-move.tmpl
+share/cups/templates/pl/job-moved.tmpl
+share/cups/templates/pl/job-release.tmpl
+share/cups/templates/pl/job-restart.tmpl
+share/cups/templates/pl/jobs.tmpl
+share/cups/templates/pl/jobs-header.tmpl
+share/cups/templates/pl/maintenance.tmpl
+share/cups/templates/pl/modify-class.tmpl
+share/cups/templates/pl/modify-printer.tmpl
+share/cups/templates/pl/option-boolean.tmpl
+share/cups/templates/pl/option-conflict.tmpl
+share/cups/templates/pl/option-header.tmpl
+share/cups/templates/pl/option-pickmany.tmpl
+share/cups/templates/pl/option-pickone.tmpl
+share/cups/templates/pl/option-trailer.tmpl
+share/cups/templates/pl/pager.tmpl
+share/cups/templates/pl/printer-accept.tmpl
+share/cups/templates/pl/printer-added.tmpl
+share/cups/templates/pl/printer-configured.tmpl
+share/cups/templates/pl/printer-confirm.tmpl
+share/cups/templates/pl/printer-default.tmpl
+share/cups/templates/pl/printer-deleted.tmpl
+share/cups/templates/pl/printer-jobs-header.tmpl
+share/cups/templates/pl/printer-modified.tmpl
+share/cups/templates/pl/printer-purge.tmpl
+share/cups/templates/pl/printer-reject.tmpl
+share/cups/templates/pl/printer-start.tmpl
+share/cups/templates/pl/printer-stop.tmpl
+share/cups/templates/pl/printers.tmpl
+share/cups/templates/pl/printers-header.tmpl
+share/cups/templates/pl/restart.tmpl
+share/cups/templates/pl/search.tmpl
+share/cups/templates/pl/samba-export.tmpl
+share/cups/templates/pl/samba-exported.tmpl
+share/cups/templates/pl/set-printer-options-header.tmpl
+share/cups/templates/pl/set-printer-options-trailer.tmpl
+share/cups/templates/pl/test-page.tmpl
+share/cups/templates/pl/trailer.tmpl
+share/cups/templates/pl/users.tmpl
+share/cups/templates/sv/add-class.tmpl
+share/cups/templates/sv/add-printer.tmpl
+share/cups/templates/sv/admin.tmpl
+share/cups/templates/sv/choose-device.tmpl
+share/cups/templates/sv/choose-make.tmpl
+share/cups/templates/sv/choose-model.tmpl
+share/cups/templates/sv/choose-serial.tmpl
+share/cups/templates/sv/choose-uri.tmpl
+share/cups/templates/sv/class-added.tmpl
+share/cups/templates/sv/class-confirm.tmpl
+share/cups/templates/sv/class-deleted.tmpl
+share/cups/templates/sv/class-jobs-header.tmpl
+share/cups/templates/sv/class-modified.tmpl
+share/cups/templates/sv/classes.tmpl
+share/cups/templates/sv/classes-header.tmpl
+share/cups/templates/sv/edit-config.tmpl
+share/cups/templates/sv/error.tmpl
+share/cups/templates/sv/error-op.tmpl
+share/cups/templates/sv/header.tmpl
+share/cups/templates/sv/help-header.tmpl
+share/cups/templates/sv/help-printable.tmpl
+share/cups/templates/sv/job-cancel.tmpl
+share/cups/templates/sv/job-hold.tmpl
+share/cups/templates/sv/job-move.tmpl
+share/cups/templates/sv/job-moved.tmpl
+share/cups/templates/sv/job-release.tmpl
+share/cups/templates/sv/job-restart.tmpl
+share/cups/templates/sv/jobs.tmpl
+share/cups/templates/sv/jobs-header.tmpl
+share/cups/templates/sv/maintenance.tmpl
+share/cups/templates/sv/modify-class.tmpl
+share/cups/templates/sv/modify-printer.tmpl
+share/cups/templates/sv/option-boolean.tmpl
+share/cups/templates/sv/option-conflict.tmpl
+share/cups/templates/sv/option-header.tmpl
+share/cups/templates/sv/option-pickmany.tmpl
+share/cups/templates/sv/option-pickone.tmpl
+share/cups/templates/sv/option-trailer.tmpl
+share/cups/templates/sv/pager.tmpl
+share/cups/templates/sv/printer-accept.tmpl
+share/cups/templates/sv/printer-added.tmpl
+share/cups/templates/sv/printer-configured.tmpl
+share/cups/templates/sv/printer-confirm.tmpl
+share/cups/templates/sv/printer-default.tmpl
+share/cups/templates/sv/printer-deleted.tmpl
+share/cups/templates/sv/printer-jobs-header.tmpl
+share/cups/templates/sv/printer-modified.tmpl
+share/cups/templates/sv/printer-purge.tmpl
+share/cups/templates/sv/printer-reject.tmpl
+share/cups/templates/sv/printer-start.tmpl
+share/cups/templates/sv/printer-stop.tmpl
+share/cups/templates/sv/printers.tmpl
+share/cups/templates/sv/printers-header.tmpl
+share/cups/templates/sv/restart.tmpl
+share/cups/templates/sv/search.tmpl
+share/cups/templates/sv/samba-export.tmpl
+share/cups/templates/sv/samba-exported.tmpl
+share/cups/templates/sv/set-printer-options-header.tmpl
+share/cups/templates/sv/set-printer-options-trailer.tmpl
+share/cups/templates/sv/test-page.tmpl
+share/cups/templates/sv/trailer.tmpl
+share/cups/templates/sv/users.tmpl
+etc/cups/cupsd.conf.default
+libexec/cups/backend/ipp
+libexec/cups/backend/lpd
+libexec/cups/backend/http
+libexec/cups/backend/parallel
+libexec/cups/backend/scsi
+libexec/cups/backend/serial
+libexec/cups/backend/snmp
+libexec/cups/backend/socket
+libexec/cups/backend/usb
+libexec/cups/cgi-bin/admin.cgi
+libexec/cups/cgi-bin/classes.cgi
+libexec/cups/cgi-bin/help.cgi
+libexec/cups/cgi-bin/jobs.cgi
+libexec/cups/cgi-bin/printers.cgi
+libexec/cups/monitor/bcp
+libexec/cups/monitor/tbcp
+libexec/cups/filter/gziptoany
+libexec/cups/filter/hpgltops
+libexec/cups/filter/texttops
+libexec/cups/filter/pstops
+libexec/cups/filter/imagetops
+libexec/cups/filter/imagetoraster
+libexec/cups/filter/rastertodymo
+libexec/cups/filter/rastertolabel
+libexec/cups/filter/rastertoepson
+libexec/cups/filter/rastertohp
+libexec/cups/filter/pdftops
+libexec/cups/notifier/mailto
+libexec/cups/notifier/testnotify
+libexec/cups/daemon/cups-deviced
+libexec/cups/daemon/cups-driverd
+libexec/cups/daemon/cups-lpd
+libexec/cups/daemon/cups-polld
+sbin/cupsd
+sbin/lpc
+sbin/accept
+sbin/cupsaddsmb
+sbin/lpadmin
+sbin/lpinfo
+sbin/lpmove
+@dirrmtry share/nls
 @dirrmtry share/locale/sv
-@dirrmtry share/locale/ru_RU
-@dirrmtry share/locale/it
-@dirrmtry share/locale/he
-@dirrmtry share/locale/fr
+@dirrmtry share/locale/ja
 @dirrmtry share/locale/es
-@dirrmtry share/locale/en
-@dirrmtry share/locale/en_US
-@dirrmtry share/locale/de
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/be
-@dirrmtry share/locale/C
-@dirrmtry share/locale
+@dirrm share/doc/cups/sv/images
+@dirrm share/doc/cups/sv
+@dirrm share/doc/cups/pl/images
+@dirrm share/doc/cups/pl
+@dirrm share/doc/cups/ja/images
+@dirrm share/doc/cups/ja
 @dirrm share/doc/cups/images
-@dirrm share/doc/cups/be/images
-@dirrm share/doc/cups/be
+@dirrm share/doc/cups/help
 @dirrm share/doc/cups/es/images
 @dirrm share/doc/cups/es
-@dirrm share/doc/cups/fr/images
-@dirrm share/doc/cups/fr
-@dirrm share/doc/cups/de/images
-@dirrm share/doc/cups/de
 @dirrm share/doc/cups
-@dirrm share/cups/templates/be
+@dirrmtry share/doc
+@dirrm share/cups/templates/sv
+@dirrm share/cups/templates/pl
+@dirrm share/cups/templates/ja
 @dirrm share/cups/templates/es
-@dirrm share/cups/templates/fr
-@dirrm share/cups/templates/de
 @dirrm share/cups/templates
+@dirrm share/cups/profiles
 @dirrm share/cups/model
 @dirrm share/cups/fonts
 @dirrm share/cups/data
 @dirrm share/cups/charsets
+@dirrm share/cups/charmaps
 @dirrm share/cups/banners
 @dirrm share/cups
+@dirrm libexec/cups/notifier
+@dirrm libexec/cups/monitor
 @dirrm libexec/cups/filter
+@dirrm libexec/cups/driver
 @dirrm libexec/cups/daemon
 @dirrm libexec/cups/cgi-bin
 @dirrm libexec/cups/backend
 @dirrm libexec/cups
 @dirrm include/cups
-@dirrm etc/cups/ppd
-@dirrm etc/cups/interfaces
-@dirrm etc/cups/certs
-@exec mkdir -p /var/spool/cups/tmp || true
-@exec chown -R root:daemon /var/spool/cups
-@exec mkdir %D/etc/cups/certs || true
-@exec mkdir %D/etc/cups/ppd || true
-@exec mkdir %D/etc/cups/interfaces || true
-@unexec rm -rf /var/spool/cups
+@dirrmtry etc/cups/ppd
+@dirrmtry etc/cups/interfaces
 @dirrmtry etc/cups
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 78f615796a8..de826a596d5 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -8,9 +8,7 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	${CUPS_PORTVER}
-PORTREVISION=	${CUPS_PORTREV}
-PORTEPOCH=	${CUPS_PORTEPOCH}
+PORTVERSION=	1.2.0
 CATEGORIES=	print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -19,23 +17,17 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	asa@agava.com
 COMMENT=	The Common UNIX Printing System: Metaport to install complete system
 
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
-RUN_DEPENDS+=	espgs:${PORTSDIR}/print/cups-pstoraster \
-		${LOCALBASE}/sbin/cupsaddsmb:${PORTSDIR}/print/cups-lpr
-
 .if make(package)
 DEPENDS_TARGET="package"
 .endif # make(package)
 
-USE_PERL5=	yes
+LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
+RUN_DEPENDS+=	espgs:${PORTSDIR}/print/cups-pstoraster
+
 NO_BUILD=	true
 
-do-patch:
-	${DO_NADA}
+do-build:
 
 do-install:
-	${DO_NADA}
 
-.include "${.CURDIR}/../../print/cups/Makefile.common"
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common
deleted file mode 100644
index 31db67605dc..00000000000
--- a/print/cups/Makefile.common
+++ /dev/null
@@ -1,93 +0,0 @@
-# ex:ts=8	-*-mode: makefile-*-
-# Common file for CUPS ports
-# $FreeBSD$
-
-CUPS_MASTER_SITES=\
-  ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
-  ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \
-  ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
-  ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
-  ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
-
-CUPS_VERSION=	1.1.23
-CUPS_REVISION=	0
-CUPS_PORTVER=	${CUPS_VERSION}.${CUPS_REVISION}
-CUPS_PORTREV=	1
-CUPS_PORTEPOCH=	0
-CUPS_FILESDIR=	${.CURDIR}/../../print/cups/files
-CUPS_ETCDIR=	${PREFIX}/etc/cups
-CUPS_RCDIR=	${PREFIX}/etc/rc.d
-CUPS_DOCSDIR=	${PREFIX}/share/doc/cups
-CUPS_SPOOLDIR=	/var/spool/cups
-
-# file, dir ownership
-CUPSGRP=	daemon
-CUPSOWN=	root
-
-######################################################################
-# The rest of the file is for components (cups-base, cups-lpr) only.
-######################################################################
-
-.if ${PORTNAME} == "cups-base" || ${PORTNAME} == "cups-lpr"
-
-MANLANG=	"" es fr
-
-.if ${CUPS_REVISION} < 1
-DISTNAME=	cups-${CUPS_VERSION}-source
-.else
-DISTNAME=	cups-${CUPS_VERSION}-${CUPS_REVISION}-source
-.endif # ${CUPS_REVISION} < 1
-
-DISTFILES=	${DISTNAME}.tar.bz2
-
-MD5_FILE=	${.CURDIR}/../../print/cups/distinfo
-WRKSRC=		${WRKDIR}/cups-${CUPS_VERSION}
-
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-.if defined(WITH_PHP)
-CONFIGURE_ARGS+=	--with-php
-RUN_DEPENDS+=		php:${PORTSDIR}/lang/php4
-.endif
-
-.if defined(WITH_PYTHON)
-CONFIGURE_ARGS+=	--with-python
-USE_PYTHON=	yes
-.endif
-
-.if defined(WITH_CUPS_LIBPAPER)
-CONFIGURE_ARGS+=	--enable-libpaper
-LIB_DEPENDS+=	paper.2:${PORTSDIR}/print/libpaper
-.endif
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PERL5_RUN=	yes
-GNU_CONFIGURE=	yes
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-
-CONFIGURE_ARGS+=	--localstatedir=/var		\
-			--disable-pam			\
-			--disable-slp			\
-			--with-cups-user=${CUPSOWN}	\
-			--with-cups-group=${CUPSGRP}	\
-			--with-docdir=${CUPS_DOCSDIR}	\
-			--with-rcdir=${CUPS_RCDIR}
-
-.if !defined(WITHOUT_GNUTLS)
-CONFIGURE_ARGS+=	--enable-gnutls --disable-openssl
-LIB_DEPENDS+=		gnutls-openssl.15:${PORTSDIR}/security/gnutls
-.endif
-
-CONFIGURE_ARGS+=	CPPFLAGS="-I.. -I${LOCALBASE}/include"
-CONFIGURE_ARGS+=	DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib"
-CONFIGURE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
-
-pre-configure::
-	@${ECHO_MSG} Configuring CUPS with options:
-	@${ECHO_MSG} ${CONFIGURE_ARGS} | fmt
-
-.endif # ${PORTNAME} != "cups"
diff --git a/print/cups/pkg-descr b/print/cups/pkg-descr
index 015c38731b0..c9ab263133f 100644
--- a/print/cups/pkg-descr
+++ b/print/cups/pkg-descr
@@ -19,7 +19,4 @@ that use these filters. This software is available in the cups-pstoraster
 port.
 
 WWW: http://www.cups.org/
-
-- AlanE (maintainer)
-alane@freebsd.org, ports@geeksrus.net
 [original text by greid@ukug.uk.freebsd.org]
diff --git a/print/cups/pkg-message b/print/cups/pkg-message
index a620d3960f6..9aae2ed3635 100644
--- a/print/cups/pkg-message
+++ b/print/cups/pkg-message
@@ -7,4 +7,3 @@ on how to set up your printer to use CUPS. Basic template configuration files
 have been installed in %%PREFIX%%/etc/cups/
 
 ======================================================================
-
author	ahze <ahze@FreeBSD.org>	2006-06-23 04:16:06 +0800
committer	ahze <ahze@FreeBSD.org>	2006-06-23 04:16:06 +0800
commit	6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c (patch)
tree	9009ecd1778597b4298ee687d91670da0ce243ce /print
parent	8562926c459c7e6f375a2e8cb3321cf38e846752 (diff)
download	freebsd-ports-graphics-6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c.tar.gz freebsd-ports-graphics-6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c.tar.zst freebsd-ports-graphics-6ae12a612cb33dfdcecac3de2ab7d5a7d3f2ce1c.zip