Updated print/cups to 1.1.17. Changes from version 1.1.16 include:

- Bug fixes to the backends and scheduler.
- Bug fixes to the image filters.
- The scheduler now allows accounts authenticated via PAM to not have a
  corresponding UNIX account, but group membership still requires the
  account name to be listed in the UNIX group file(s)...
- Added some startup performance enhancements to the scheduler so that the
  printer object information is regenerated fewer times and the MIME type
  database is not filled with lots of empty filters for raw/direct queues.
- The backends now ignore SIGPIPE so that failed job filters will not stop
  a print queue.
- User-defined classification strings are now printed verbatim.
- The lpstat command did not allow for destination lists.
- The LPD backend now sends the job title as the print filename.
- Added support for variable sizes in the EPSON dot matrix printer drivers.
  This allows for pages as short as 1/2" (1 row of labels) and does not do
  an automatic form feed.
- The Solaris USB backend now supports the new device URI syntax.
- The serial backend now enumerates serial ports under MacOS X.

11 files changed, 140 insertions, 214 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index a1278778121..f4632cd2111 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2002/10/20 23:33:42 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2002/12/19 22:24:51 jlam Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -6,7 +6,7 @@
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
-BASE_VERS=		1.1.16
+BASE_VERS=		1.1.17
 DIST_VERS=		${BASE_VERS}
 VERS=			${DIST_VERS:S/-/./g}
 WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
@@ -33,8 +33,11 @@ UNLIMIT_RESOURCES=	datasize memorysize
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/cups
+CONFIGURE_ARGS+=	--with-serverbindir=${PREFIX}/libexec/cups
+CONFIGURE_ARGS+=	--with-rcdir=${RCD_SCRIPTS_DIR}
 CONFIGURE_ARGS+=	--with-cups-user=${CUPS_USER}
 CONFIGURE_ARGS+=	--with-cups-group=${CUPS_GROUP}
+CONFIGURE_ARGS+=	--with-bsdmanext
 CONFIGURE_ARGS+=	--enable-libtool-unsupported="${PKGLIBTOOL}"
 CONFIGURE_ARGS+=	--enable-slp
 CONFIGURE_ARGS+=	--enable-ssl
@@ -93,6 +96,9 @@ OWN_DIRS_PERMS=		${CUPS_CONFDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711
 OWN_DIRS_PERMS+=	${CUPS_REQUESTS} ${CUPS_USER} ${CUPS_GROUP} 0700
 OWN_DIRS_PERMS+=	${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1700
 
+pre-configure:
+	cd ${WRKSRC} && ${AUTOCONF}
+
 pre-install:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam
 
@@ -122,5 +128,6 @@ post-install:
 .include "../../net/openslp/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
+.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 32ff1a873e5..320f4beff78 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/10/25 10:49:03 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/12/19 22:24:51 jlam Exp $
 bin/cancel
 bin/cups-config
 bin/disable
@@ -211,51 +211,51 @@ share/cups/fonts/Courier-Bold
 share/cups/fonts/Courier-BoldOblique
 share/cups/fonts/Courier-Oblique
 share/cups/fonts/Symbol
-share/cups/fr/templates/add-class.tmpl 
-share/cups/fr/templates/add-printer.tmpl
-share/cups/fr/templates/admin-op.tmpl
-share/cups/fr/templates/admin.tmpl
-share/cups/fr/templates/choose-device.tmpl
-share/cups/fr/templates/choose-make.tmpl
-share/cups/fr/templates/choose-members.tmpl
-share/cups/fr/templates/choose-model.tmpl
-share/cups/fr/templates/choose-serial.tmpl
-share/cups/fr/templates/choose-uri.tmpl
-share/cups/fr/templates/class-added.tmpl
-share/cups/fr/templates/class-confirm.tmpl
-share/cups/fr/templates/class-deleted.tmpl
-share/cups/fr/templates/class-modified.tmpl
-share/cups/fr/templates/classes.tmpl
-share/cups/fr/templates/config-printer.tmpl
-share/cups/fr/templates/config-printer2.tmpl
-share/cups/fr/templates/error.tmpl
-share/cups/fr/templates/header.tmpl
-share/cups/fr/templates/job-cancel.tmpl
-share/cups/fr/templates/job-hold.tmpl
-share/cups/fr/templates/job-op.tmpl
-share/cups/fr/templates/job-release.tmpl
-share/cups/fr/templates/job-restart.tmpl
-share/cups/fr/templates/jobs.tmpl
-share/cups/fr/templates/modify-class.tmpl
-share/cups/fr/templates/modify-printer.tmpl
-share/cups/fr/templates/option-boolean.tmpl
-share/cups/fr/templates/option-header.tmpl
-share/cups/fr/templates/option-pickmany.tmpl
-share/cups/fr/templates/option-pickone.tmpl
-share/cups/fr/templates/option-trailer.tmpl
-share/cups/fr/templates/printer-accept.tmpl
-share/cups/fr/templates/printer-added.tmpl
-share/cups/fr/templates/printer-configured.tmpl
-share/cups/fr/templates/printer-confirm.tmpl
-share/cups/fr/templates/printer-deleted.tmpl
-share/cups/fr/templates/printer-modified.tmpl
-share/cups/fr/templates/printer-purge.tmpl
-share/cups/fr/templates/printer-reject.tmpl
-share/cups/fr/templates/printer-start.tmpl
-share/cups/fr/templates/printer-stop.tmpl
-share/cups/fr/templates/printers.tmpl
-share/cups/fr/templates/test-page.tmpl
-share/cups/fr/templates/trailer.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-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/model/deskjet.ppd
 share/cups/model/deskjet2.ppd
 share/cups/model/dymo.ppd
@@ -456,10 +456,9 @@ share/cups/charsets/windows-874
 @dirrm share/doc/html/cups/fr
 @dirrm share/doc/html/cups
 @dirrm share/doc/cups
+@dirrm share/cups/templates/fr
 @dirrm share/cups/templates
 @dirrm share/cups/model
-@dirrm share/cups/fr/templates
-@dirrm share/cups/fr
 @dirrm share/cups/fonts
 @dirrm share/cups/data
 @dirrm share/cups/charsets
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 79ee16bfe6c..f396bb9566c 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.18 2002/10/25 10:49:03 bouyer Exp $
+$NetBSD: distinfo,v 1.19 2002/12/19 22:24:51 jlam Exp $
 
-SHA1 (cups-1.1.16-source.tar.bz2) = 648beac667f0757d046840b8a812252aa8667487
-Size (cups-1.1.16-source.tar.bz2) = 3394088 bytes
+SHA1 (cups-1.1.17-source.tar.bz2) = bd1469a441472139e4ffb64a6d62ba2dd8971dda
+Size (cups-1.1.17-source.tar.bz2) = 3442020 bytes
 SHA1 (patch-ab) = 00d438f297bee64411869ab605fc07fe6380f25d
-SHA1 (patch-ag) = c570be2c7f833e8a17dedc393fef26572c974215
-SHA1 (patch-ai) = b2d4d3d8d916c0ef3c22b93fe3b93a7d11f77632
-SHA1 (patch-aj) = cfdb158f11ad55236cbc68e49447c4ee2f9585b8
-SHA1 (patch-ak) = 7884b204e0b21226bb9159c712d8b3e5f0fc107c
-SHA1 (patch-al) = 3928fd2348678b25b1607eb7317576d86eaf35df
-SHA1 (patch-am) = 9209b5366315951b4e5663f9d5e52d940faaf145
+SHA1 (patch-an) = 5ef594098978476eaee13cc8afc05679b6321176
+SHA1 (patch-ao) = cbe2edda168434d0c58214f2a8089555357de292
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
deleted file mode 100644
index f8cd593d134..00000000000
--- a/print/cups/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.13 2002/10/20 18:57:38 jlam Exp $
-
---- filter/Makefile.orig	Tue Jul 30 15:09:27 2002
-+++ filter/Makefile
-@@ -158,7 +158,7 @@ libcupsimage_s.a:	$(IMAGEOBJS) ../Makede
- 
- libcupsimage.la:       $(IMAGEOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) -o $(DSOFLAGS) $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
-+	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
- 		-rpath $(LIBDIR) -version-info 2:1
- 
- 
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
deleted file mode 100644
index 6c9ecbfcd60..00000000000
--- a/print/cups/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.12 2002/09/18 22:58:49 jlam Exp $
-
---- man/Makefile.orig	Mon Sep 16 14:35:20 2002
-+++ man/Makefile
-@@ -40,7 +40,7 @@ LANGDIRS =	fr
- all:	$(CAT1) $(CAT3) $(CAT5) $(CAT8)
- 	for dir in $(LANGDIRS); do \
- 		echo "Making all in man/$$dir..."; \
--		(cd $$dir; make all); \
-+		(cd $$dir; $(MAKE) $(MFLAGS) all); \
- 	done
- 
- 
-@@ -52,7 +52,7 @@ clean:
- 	$(RM) $(CAT1) $(CAT3) $(CAT5) $(CAT8)
- 	for dir in $(LANGDIRS); do \
- 		echo "Cleaning all in man/$$dir..."; \
--		(cd $$dir; make clean); \
-+		(cd $$dir; $(MAKE) $(MFLAGS) clean); \
- 	done
- 
- 
-@@ -114,7 +114,7 @@ install:	all
- 	$(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
- 	for dir in $(LANGDIRS); do \
- 		echo "Installing all in man/$$dir..."; \
--		(cd $$dir; make install); \
-+		(cd $$dir; $(MAKE) $(MFLAGS) install); \
- 	done
- 
- 
diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj
deleted file mode 100644
index 072a020ec48..00000000000
--- a/print/cups/patches/patch-aj
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aj,v 1.9 2002/10/20 18:57:38 jlam Exp $
-
---- pdftops/Makefile.orig	Wed Sep 18 12:58:19 2002
-+++ pdftops/Makefile
-@@ -24,7 +24,6 @@ LIBOBJS	=	Annot.o \
- 		Decrypt.o \
- 		Dict.o \
- 		Error.o \
--		FTFont.o \
- 		FontEncoding.o \
- 		FontEncodingTables.o \
- 		FontFile.o \
-@@ -47,10 +46,7 @@ LIBOBJS	=	Annot.o \
- 		Page.o \
- 		Params.o \
- 		Parser.o \
--		SFont.o \
- 		Stream.o \
--		T1Font.o \
--		TTFont.o \
- 		UnicodeMap.o \
- 		XRef.o \
- 		gfile.o \
diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak
deleted file mode 100644
index 57d01608a80..00000000000
--- a/print/cups/patches/patch-ak
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.9 2002/10/20 18:57:38 jlam Exp $
-
---- doc/Makefile.orig	Sun Oct 20 13:19:53 2002
-+++ doc/Makefile
-@@ -96,7 +96,7 @@ WEBIMAGES	=	images/accept-jobs.gif \
- #
- 
- all:	$(DOCUMENTS:.shtml=.pdf) $(DOCUMENTS:.shtml=.html) overview.pdf
--	cd fr; make all
-+	cd fr; $(MAKE) $(MFLAGS) all
- 
- 
- #
-@@ -104,7 +104,7 @@ all:	$(DOCUMENTS:.shtml=.pdf) $(DOCUMENT
- #
- 
- ps:	$(DOCUMENTS:.shtml=.ps) overview.ps
--	cd fr; make ps
-+	cd fr; $(MAKE) $(MFLAGS) ps
- 
- 
- #
-@@ -115,7 +115,7 @@ clean:
- 	$(RM) $(DOCUMENTS:.shtml=.pdf)
- 	$(RM) $(DOCUMENTS:.shtml=.html)
- 	$(RM) overview.pdf
--	cd fr; make clean
-+	cd fr; $(MAKE) $(MFLAGS) clean
- 
- 
- #
-@@ -139,7 +139,7 @@ install:
- 	for file in $(WEBIMAGES) $(DOCIMAGES); do \
- 		$(INSTALL_MAN) $$file $(DOCDIR)/images; \
- 	done
--	cd fr; make install
-+	cd fr; $(MAKE) $(MFLAGS) install
- 
- 
- #
diff --git a/print/cups/patches/patch-al b/print/cups/patches/patch-al
deleted file mode 100644
index 6b3adfa8cf1..00000000000
--- a/print/cups/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.4 2002/10/20 18:57:38 jlam Exp $
-
---- templates/Makefile.orig	Sun Oct 20 13:19:53 2002
-+++ templates/Makefile
-@@ -99,7 +99,7 @@ install:
- 	for file in $(FILES); do \
- 		$(INSTALL_DATA) $$file $(DATADIR)/templates; \
- 	done
--	cd fr; make install
-+	cd fr; $(MAKE) $(MFLAGS) install
- 
- 
- #
diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am
deleted file mode 100644
index 1f3361bf333..00000000000
--- a/print/cups/patches/patch-am
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-am,v 1.3 2002/10/25 10:49:03 bouyer Exp $
-
---- configure.orig	Mon Oct  7 17:40:29 2002
-+++ configure	Fri Oct 25 12:23:54 2002
-@@ -5963,9 +5963,9 @@
- 	*)
- 		# All others
- 		INSTALL_SYSV="install-sysv"
--		CUPS_SERVERBIN="$exec_prefix/lib/cups"
-+		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
- 		cat >>confdefs.h <<_ACEOF
--#define CUPS_SERVERBIN "$exec_prefix/lib/cups"
-+#define CUPS_SERVERBIN "$exec_prefix/libexec/cups"
- _ACEOF
- 
- 		;;
-@@ -6085,12 +6085,12 @@
- 		;;
- 	SunOS* | HP-UX*)
- 		# Solaris and HP-UX
--		CAT1EXT=1
--		CAT3EXT=3
--		CAT5EXT=5
--		CAT8EXT=1m
--		MAN8EXT=1m
--		MAN8DIR=1m
-+		CAT1EXT=0
-+		CAT3EXT=0
-+		CAT5EXT=0
-+		CAT8EXT=0
-+		MAN8EXT=8
-+		MAN8DIR=8
- 		;;
- 	*)
- 		# All others
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an
new file mode 100644
index 00000000000..042cfb5135b
--- /dev/null
+++ b/print/cups/patches/patch-an
@@ -0,0 +1,50 @@
+$NetBSD: patch-an,v 1.3 2002/12/19 22:24:55 jlam Exp $
+
+--- config-scripts/cups-directories.m4.orig	Thu Oct 17 13:05:37 2002
++++ config-scripts/cups-directories.m4
+@@ -28,6 +28,7 @@ AC_ARG_WITH(fontpath, [  --with-fontpath
+ AC_ARG_WITH(docdir, [  --with-docdir           set path for documentation],docdir="$withval",docdir="")
+ AC_ARG_WITH(logdir, [  --with-logdir           set path for log files],logdir="$withval",logdir="")
+ AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
++AC_ARG_WITH(serverbindir, [  --with-serverbindir     set path for server helper programs],serverbindir="$withval",serverbindir="")
+ 
+ dnl Fix "prefix" variable if it hasn't been specified...
+ if test "$prefix" = "NONE"; then
+@@ -174,20 +175,23 @@ else
+ fi
+ 
+ dnl See what directory to put server executables...
+-case "$uname" in
+-	*BSD* | Darwin*)
+-		# *BSD and Darwin (MacOS X)
+-		INSTALL_SYSV=""
+-		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
+-		;;
+-	*)
+-		# All others
+-		INSTALL_SYSV="install-sysv"
+-		CUPS_SERVERBIN="$libdir/cups"
+-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
+-		;;
+-esac
++if test x$serverbindir = x; then
++	case "$uname" in
++		*BSD* | Darwin*)
++			# *BSD and Darwin (MacOS X)
++			CUPS_SERVERBIN="$exec_prefix/libexec/cups"
++			AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
++			;;
++		*)
++			# All others
++			CUPS_SERVERBIN="$libdir/cups"
++			AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
++			;;
++	esac
++else
++	CUPS_SERVERBIN="$serverbindir"
++	AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$serverbindir")
++fi
+ 
+ AC_SUBST(INSTALL_SYSV)
+ AC_SUBST(CUPS_SERVERROOT)
diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-ao
new file mode 100644
index 00000000000..0bfa7f95945
--- /dev/null
+++ b/print/cups/patches/patch-ao
@@ -0,0 +1,29 @@
+$NetBSD: patch-ao,v 1.4 2002/12/19 22:24:55 jlam Exp $
+
+--- config-scripts/cups-manpages.m4.orig	Wed Jan  2 13:50:43 2002
++++ config-scripts/cups-manpages.m4
+@@ -22,6 +22,8 @@ dnl       EMail: cups-info@cups.org
+ dnl         WWW: http://www.cups.org
+ dnl
+ 
++AC_ARG_WITH(bsdmanext, [  --with-bsdmanext        use BSD manpage extensions],bsdmanext="yes",bsdmanext="no")
++
+ dnl Fix "mandir" variable...
+ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
+ 	case "$uname" in
+@@ -91,6 +93,15 @@ case "$uname" in
+ 		MAN8DIR=8
+ 		;;
+ esac
++
++if test x$bsdmanext = xyes; then
++	CAT1EXT=0
++	CAT3EXT=0
++	CAT5EXT=0
++	CAT8EXT=0
++	MAN8EXT=8
++	MAN8DIR=8
++fi
+ 
+ AC_SUBST(CAT1EXT)
+ AC_SUBST(CAT3EXT)