Update cups to 1.1.6.1. Changes from version 1.1.5.2 include bug fixes,

additions to the documentation, plus the following changes:

	- Fixed another possible DoS attack in httpGets().
	- Added check for "LANGUAGE = PCL" and "LANGUAGE = POSTSCRIPT" in
	  mime.types.
	- The printers.conf and classes.conf files are now written with
	  restricted permissions.
	- If LoadAllJobs() is unable to determine the file type of a print
	  job, assume "application/vnd.cups-raw".
	- The web interface now provides a job_printer_name value for any
	  corresponding job_printer_uri value.
	- The cups-lpd mini-daemon now logs the client address and hostname
	  as well as all commands and errors in the syslog file.
	- The IPP backend now detects the supported file formats and only
	  specifies the document format if it is supported.  This makes IPP
	  printing to network print servers and cards more reliable without
	  affecting the capabilities of CUPS servers.
	- The time_at_xyz attributes are now converted to human-readable
	  dates and times for the web interfaces.
	- The file type logging code in the scheduler referenced the optional
	  document-format attribute; the new code uses the resolved MIME type
	  instead.
	- The client.conf parsing code now removes trailing whitespace.
	- The lpadmin command now supports setting of options and user-level
	  access control.
	- Added "-E" option to all printing commands to force encryption.
	- The socket backend now starts retries at 5 seconds and increases
	  the interval to 30 seconds.  This should provide faster printing
	  when multiple jobs/files are queued for a printer.
	- The filters and backends no longer buffer output to stderr.  This
	  should provide much more accurate status reporting.

18 files changed, 399 insertions, 165 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index a25700621c7..e3195fc6d5c 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2001/01/11 19:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/01/28 02:05:36 jlam Exp $
 #
 
-DISTNAME=		cups-${VERS}-2-source
-PKGNAME=		cups-${VERS}.2
-VERS=			1.1.5
+DISTNAME=		cups-${VERS}-1-source
+PKGNAME=		cups-${VERS}.1
+VERS=			1.1.6
 WRKSRC=			${WRKDIR}/cups-${VERS}
 CATEGORIES=		print
 MASTER_SITES=		ftp://ftp2.easysw.com/pub/cups/${VERS}/ \
@@ -78,46 +78,50 @@ EGDIR=			${PREFIX}/share/examples/cups
 post-extract:
 	cd ${WRKSRC}/conf; ${MV} cupsd.conf cupsd.conf.in
 
+pre-patch:
+	${MKDIR} ${WRKSRC}/scripts
+
+post-patch:
+	cd ${WRKSRC}/scripts; ${CHMOD} +x netbsd sysv
+
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
 post-build:
-	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g" \
-		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \
-		< ${WRKSRC}/conf/cupsd.conf.in > ${WRKSRC}/conf/cupsd.conf
-	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
-		< ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh
-	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
-		< ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam
+	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g"			\
+		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g"			\
+		${WRKSRC}/conf/cupsd.conf.in > ${WRKSRC}/conf/cupsd.conf
+	${SED}	-e "s,@PREFIX@,${PREFIX},g"				\
+		${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam
 
 pre-install:
-	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g" \
-		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \
-		-e "s,@CAT@,${CAT},g" \
-		-e "s,@RM@,${RM},g" \
-		-e "s,@RMDIR@,${RMDIR},g" \
-		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g" \
-		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \
-		-e "s,@ADDUSER@,${ADDUSER},g" \
-		-e "s,@ADDGROUP@,${ADDGROUP},g" \
-		-e "s,@CAT@,${CAT},g" \
-		-e "s,@CHGRP@,${CHGRP},g" \
-		-e "s,@CHMOD@,${CHMOD},g" \
-		-e "s,@CHOWN@,${CHOWN},g" \
-		-e "s,@CP@,${CP},g" \
-		-e "s,@GREP@,${GREP},g" \
-		-e "s,@MKDIR@,${MKDIR},g" \
-		-e "s,@RM@,${RM},g" \
-		-e "s,@TOUCH@,${TOUCH},g" \
-		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g"			\
+		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g"			\
+		-e "s,@CAT@,${CAT},g"					\
+		-e "s,@RM@,${RM},g"					\
+		-e "s,@RMDIR@,${RMDIR},g"				\
+		-e "s,@TRUE@,${TRUE},g"					\
+		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g"			\
+		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g"			\
+		-e "s,@ADDUSER@,${ADDUSER},g"				\
+		-e "s,@ADDGROUP@,${ADDGROUP},g"				\
+		-e "s,@CAT@,${CAT},g"					\
+		-e "s,@CHGRP@,${CHGRP},g"				\
+		-e "s,@CHMOD@,${CHMOD},g"				\
+		-e "s,@CHOWN@,${CHOWN},g"				\
+		-e "s,@CP@,${CP},g"					\
+		-e "s,@GREP@,${GREP},g"					\
+		-e "s,@MKDIR@,${MKDIR},g"				\
+		-e "s,@RM@,${RM},g"					\
+		-e "s,@TOUCH@,${TOUCH},g"				\
+		${PKGDIR}/INSTALL > ${INSTALL_FILE}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/cupsd.sh ${PREFIX}/etc/rc.d/cupsd
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	for file in ENCRYPTION LICENSE README; do \
-		${INSTALL_DATA} ${WRKSRC}/$${file}.txt ${DOCDIR}/$${file}; \
+	for file in ENCRYPTION.txt LICENSE.txt README.txt; do		\
+		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}/$${file};	\
 	done
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/conf; ${INSTALL_DATA} *.conf mime.* ${EGDIR}
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
deleted file mode 100644
index 71ccc2f4967..00000000000
--- a/print/cups/files/cupsd.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: cupsd.sh,v 1.2 2000/12/09 22:18:24 jlam Exp $
-#
-# PROVIDE: cupsd
-# REQUIRE: DAEMON
-
-name="cupsd"
-command=@PREFIX@/sbin/${name}
-
-pid=`ps -ax | awk '{print $1,$5}' | grep ${name} | awk '{print $1}'`
-
-cmd=${1:-start}
-
-case ${cmd} in
-start|restart)
-	if [ "$pid" = "" -a -x ${command} ]
-	then
-		echo "Starting ${name}."
-		${command}
-	else
-		echo "Restarting ${name}."
-		kill -HUP $pid
-	fi
-	;;
-
-stop)
-	if [ "$pid" != "" ]
-	then
-		echo "Stopping ${name}."
-		kill $pid
-	fi
-	;;
-
-status)
-	if [ "$pid" != "" ]
-	then
-		echo "${name} is running as pid ${pid}."
-	else
-		echo "${name} is not running."
-	fi
-	;;
-
-*)
-	echo 1>&2 "Usage: ${name} [restart|start|stop|status]"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/print/cups/files/md5 b/print/cups/files/md5
index 43f287a6a3a..557638763b9 100644
--- a/print/cups/files/md5
+++ b/print/cups/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2001/01/11 19:00:42 jlam Exp $
+$NetBSD: md5,v 1.7 2001/01/28 02:05:37 jlam Exp $
 
-MD5 (cups-1.1.5-2-source.tar.bz2) = b8c25a0f01a887b5584d1e2166beff03
+MD5 (cups-1.1.6-1-source.tar.bz2) = 83759c52574337e18a58f31e340ee64b
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index f943fa0adc5..11d4e7b29b9 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,8 +1,13 @@
-$NetBSD: patch-sum,v 1.10 2001/01/12 18:34:23 jlam Exp $
+$NetBSD: patch-sum,v 1.11 2001/01/28 02:05:37 jlam Exp $
 
-MD5 (patch-aa) = bd3262a4a78bca35b8127c6c4e32188c
-MD5 (patch-ab) = 1fe6aa85344955313591068c984cccf4
-MD5 (patch-ac) = 56b2896936f298e07c26f3d065a26af6
-MD5 (patch-ad) = 4ea2faaf4cf0ef1a75a3b35d964683e1
-MD5 (patch-af) = 15fc1099bd17c28afd657f22792d1b4e
-MD5 (patch-ag) = 6ec463d6b203a2e539f17b61461c8c2a
+MD5 (patch-aa) = 0d4f5503c08018b655b245368d546860
+MD5 (patch-ab) = 62c2fcd503f8eaa38cbca2028bd31a14
+MD5 (patch-ac) = 4ea2faaf4cf0ef1a75a3b35d964683e1
+MD5 (patch-ad) = ce1fd6b48d75462cd222c510f15f8c7c
+MD5 (patch-ae) = e23521560a35f929c3d6ec586cb8394b
+MD5 (patch-af) = 3b44eace3dde4d9f2f7df834013f76e5
+MD5 (patch-ag) = dfec81a5c1f8658c6ae99d23b07eb240
+MD5 (patch-ah) = e34733f587785c73087725a3c861c5e4
+MD5 (patch-ai) = 6777d3a4248f7dd8b746e2d96cf58a6e
+MD5 (patch-aj) = afe9775bfc8f2568edd9b443c0535292
+MD5 (patch-ak) = ef4c76ef21c68a8714eef2b8efac253c
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index f1ca461a884..e9d8eaa128b 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2001/01/11 19:00:43 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2001/01/28 02:05:37 jlam Exp $
 
---- Makedefs.in.orig	Wed Jan  3 12:44:39 2001
+--- Makedefs.in.orig	Mon Jan 22 10:03:15 2001
 +++ Makedefs.in
 @@ -48,11 +48,11 @@
  # Installation programs...
@@ -19,3 +19,15 @@ $NetBSD: patch-aa,v 1.6 2001/01/11 19:00:43 jlam Exp $
  INSTALL_SYSV	=	@INSTALL_SYSV@
  
  #
+@@ -137,6 +137,11 @@
+ CAT1EXT		=	@CAT1EXT@
+ CAT5EXT		=	@CAT5EXT@
+ CAT8EXT		=	@CAT8EXT@
++
++#
++# Init script installation script
++#
++INITSCRIPT	=	@INITSCRIPT@
+ 
+ #
+ # Rules...
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 1cdbc6fcba7..cb0a75e16b5 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2001/01/11 19:00:43 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2001/01/28 02:05:37 jlam Exp $
 
 --- Makefile.orig	Wed Jan  3 12:44:40 2001
 +++ Makefile
@@ -13,3 +13,26 @@ $NetBSD: patch-ab,v 1.7 2001/01/11 19:00:43 jlam Exp $
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
  	echo Installing in doc...
+@@ -75,21 +75,7 @@
+ 	echo Installing in templates...
+ 	(cd templates; $(MAKE) $(MFLAGS) install)
+ 	echo Installing startup script...
+-	if test "x$(INITDIR)" != "x"; then \
+-		$(MKDIR) $(prefix)/$(INITDIR)/init.d; \
+-		$(RM) $(prefix)/$(INITDIR)/init.d/cups; \
+-		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
+-		$(CHMOD) ugo+rx $(prefix)/$(INITDIR)/init.d/cups; \
+-		$(MKDIR) $(prefix)/$(INITDIR)/rc0.d; \
+-		$(RM) $(prefix)/$(INITDIR)/rc0.d/K00cups; \
+-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc0.d/K00cups; \
+-		$(MKDIR) $(prefix)/$(INITDIR)/rc3.d; \
+-		$(RM) $(prefix)/$(INITDIR)/rc3.d/S99cups; \
+-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc3.d/S99cups; \
+-		$(MKDIR) $(prefix)/$(INITDIR)/rc5.d; \
+-		$(RM) $(prefix)/$(INITDIR)/rc5.d/S99cups; \
+-		ln -s $(INITDDIR)/cups $(prefix)/$(INITDIR)/rc5.d/S99cups; \
+-	fi
++	$(INITSCRIPT)
+ 
+ #
+ # Make software distributions using EPM (http://www.easysw.com/epm)...
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
index 8f0a41adfe8..f714adf6b0a 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.6 2001/01/11 19:00:43 jlam Exp $
+$NetBSD: patch-ac,v 1.7 2001/01/28 02:05:37 jlam Exp $
 
---- backend/serial.c.orig	Wed Jan  3 12:44:40 2001
-+++ backend/serial.c
-@@ -800,7 +800,7 @@
-              device, i + 1);
-     }
-   }
--+#elif defined(__NetBSD__)
-+#elif defined(__NetBSD__)
-   int	i, j;		/* Looping vars */
-   int	fd;		/* File descriptor */
-   char	device[255];	/* Device filename */
+--- conf/cupsd.conf.in.orig	Wed Dec 20 08:41:12 2000
++++ conf/cupsd.conf.in
+@@ -247,8 +247,8 @@
+ # program is run...
+ #
+ 
+-#User lp
+-#Group sys
++User @CUPS_USER@
++Group @CUPS_GROUP@
+ 
+ #
+ # RIPCache: the amount of memory that each RIP should use to cache
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
index bef9332908e..4557039eecc 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,15 +1,72 @@
-$NetBSD: patch-ad,v 1.4 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2001/01/28 02:05:37 jlam Exp $
 
---- conf/cupsd.conf.in.orig	Wed Dec 20 08:41:12 2000
-+++ conf/cupsd.conf.in
-@@ -247,8 +247,8 @@
- # program is run...
- #
- 
--#User lp
--#Group sys
-+User @CUPS_USER@
-+Group @CUPS_GROUP@
- 
- #
- # RIPCache: the amount of memory that each RIP should use to cache
+--- configure.in.orig	Fri Jan 26 10:01:59 2001
++++ configure.in
+@@ -514,8 +514,14 @@
+ dnl Setup init.d locations...
+ case "$uname" in
+-	FreeBSD* | NetBSD* | OpenBSD*)
+-		# *BSD
++	FreeBSD* | OpenBSD*)
+ 		INITDIR=""
+ 		INITDDIR=""
++		INITSCRIPT=""
++		;;
++
++	NetBSD*)
++		INITDIR="/etc/rc.d"
++		INITDDIR=""
++		INITSCRIPT="scripts/netbsd"
+ 		;;
+ 
+@@ -526,4 +532,5 @@
+ 			INITDIR="/sbin/init.d"
+ 			INITDDIR=".."
++			INITSCRIPT="scripts/sysv"
+ 		else
+ 			if test -d /etc/rc.d; then
+@@ -531,8 +538,10 @@
+ 				INITDIR="/etc/rc.d"
+ 				INITDDIR="../init.d"
++				INITSCRIPT="scripts/sysv"
+ 			else
+ 				# Others
+ 				INITDIR="/etc"
+ 				INITDDIR="../init.d"
++				INITSCRIPT="scripts/sysv"
+ 			fi
+ 		fi
+@@ -542,4 +551,5 @@
+ 		INITDIR="/sbin"
+ 		INITDDIR="../init.d"
++		INITSCRIPT="scripts/sysv"
+ 		;;
+ 
+@@ -547,4 +557,5 @@
+ 		INITDIR="/etc"
+ 		INITDDIR="../init.d"
++		INITSCRIPT="scripts/sysv"
+ 		;;
+ 
+@@ -553,4 +564,5 @@
+ AC_SUBST(INITDIR)
+ AC_SUBST(INITDDIR)
++AC_SUBST(INITSCRIPT)
+ 
+ dnl Setup default locations...
+@@ -612,6 +624,6 @@
+ 
+ dnl Set the CUPS_DOCROOT directory...
+-CUPS_DOCROOT='${datadir}/doc/cups'
+-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups")
++CUPS_DOCROOT='${datadir}/doc/html/cups'
++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups")
+ AC_SUBST(CUPS_DOCROOT)
+ 
+@@ -619,5 +631,5 @@
+ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
+ 
+-AC_OUTPUT(Makedefs cups.sh)
++AC_OUTPUT(Makedefs cups.sh scripts/common)
+ 
+ dnl
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
new file mode 100644
index 00000000000..b6232527a20
--- /dev/null
+++ b/print/cups/patches/patch-ae
@@ -0,0 +1,37 @@
+$NetBSD: patch-ae,v 1.6 2001/01/28 02:05:37 jlam Exp $
+
+--- cups.sh.in.orig	Mon Jan 22 10:03:16 2001
++++ cups.sh.in
+@@ -10,6 +10,12 @@
+ #   description: Startup/shutdown script for the Common UNIX \
+ #                Printing System (CUPS).
+ #
++#   NetBSD 1.5+ rcorder script lines.  The format of the following two
++#   lines is very strict -- please don't add additional spaces!
++#
++# PROVIDE: cups
++# REQUIRE: DAEMON
++#
+ #   Copyright 1997-2001 by Easy Software Products, all rights reserved.
+ #
+ #   These coded instructions, statements, and computer programs are the
+@@ -35,6 +41,9 @@
+ 		IS_ON=/sbin/chkconfig
+ 		;;
+ 
++	NetBSD*)
++		IS_ON=:
++
+ 	*)
+ 		IS_ON=/bin/true
+ 		;;
+@@ -57,6 +66,9 @@
+ 		pid=`ps -e | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
+ 		;;
+ 	Linux)
++		pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
++		;;
++	NetBSD)
+ 		pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
+ 		;;
+ 	*)
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
index f505ac51f0e..e227186aa93 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,24 +1,22 @@
-$NetBSD: patch-af,v 1.6 2001/01/12 18:34:24 jlam Exp $
+$NetBSD: patch-af,v 1.7 2001/01/28 02:05:38 jlam Exp $
 
---- configure.in.orig	Wed Jan  3 12:44:40 2001
-+++ configure.in
-@@ -534,7 +534,7 @@
- AC_SUBST(INITDDIR)
+--- cups/Makefile.orig	Mon Jan 22 10:03:23 2001
++++ cups/Makefile
+@@ -87,7 +87,7 @@
  
- dnl Setup default locations...
--CUPS_SERVERROOT='${sysconfdif}/cups'
-+CUPS_SERVERROOT='${sysconfdir}/cups'
- CUPS_LOGDIR='${localstatedir}/log/cups'
- CUPS_REQUESTS='${localstatedir}/spool/cups'
+ libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(DSO) $@ $(LIBOBJS) $(SSLLIBS)
++	$(DSO) $@ $(LDFLAGS) $(LIBOBJS) $(SSLLIBS)
+ 	$(RM) `basename $@ .2`
+ 	$(LN) $@ `basename $@ .2`
  
-@@ -591,8 +591,8 @@
- AC_SUBST(CUPS_DATADIR)
+@@ -99,7 +99,7 @@
+ libcups.la:    $(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+ 	$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+-		-version-info 2:0 $(SSLLIBS) $(LIBS)
++		-version-info 2:0 $(SSLLIBS)
  
- dnl Set the CUPS_DOCROOT directory...
--CUPS_DOCROOT='${datadir}/doc/cups'
--AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups")
-+CUPS_DOCROOT='${datadir}/doc/html/cups'
-+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups")
- AC_SUBST(CUPS_DOCROOT)
  
- dnl Set the CUPS_FONTPATH directory...
+ #
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
index a1b7d8a761f..4e2846154d2 100644
--- a/print/cups/patches/patch-ag
+++ b/print/cups/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2001/01/28 02:05:38 jlam Exp $
 
---- cups/Makefile.orig	Mon Dec 18 16:38:55 2000
-+++ cups/Makefile
-@@ -98,7 +98,7 @@
+--- filter/Makefile.orig	Mon Jan 22 10:03:36 2001
++++ filter/Makefile
+@@ -102,7 +102,7 @@
  
- libcups.la:    $(LIBOBJS) ../Makedefs
+ libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS) ../Makedefs
  	echo Linking $@...
--	$(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) -version-info 2:0
-+	$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) $(SSLLIBS) -rpath $(LIBDIR) -version-info 2:0
+-	$(DSO) $@ $(IMAGEOBJS) $(DSOLIBS) -lm
++	$(DSO) $@ $(LDFLAGS) $(IMAGEOBJS) $(DSOLIBS) -lm
+ 	$(RM) `basename $@ .2`
+ 	$(LN) $@ `basename $@ .2`
  
- 
- #
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
new file mode 100644
index 00000000000..5cdcda199ce
--- /dev/null
+++ b/print/cups/patches/patch-ah
@@ -0,0 +1,52 @@
+$NetBSD: patch-ah,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- scripts/common.in.orig	Sat Jan 27 19:27:30 2001
++++ scripts/common.in
+@@ -0,0 +1,47 @@
++#
++#   Common shell variable definitions
++#
++#   Copyright 1997-2001 by Easy Software Products, all rights reserved.
++#
++#   These coded instructions, statements, and computer programs are the
++#   property of Easy Software Products and are protected by Federal
++#   copyright law.  Distribution and use rights are outlined in the file
++#   "LICENSE.txt" which should have been included with this file.  If this
++#   file is missing or damaged please contact Easy Software Products
++#   at:
++#
++#       Attn: CUPS Licensing Information
++#       Easy Software Products
++#       44141 Airport View Drive, Suite 204
++#       Hollywood, Maryland 20636-3111 USA
++#
++#       Voice: (301) 373-9603
++#       EMail: cups-info@cups.org
++#         WWW: http://www.cups.org
++#
++
++#
++# Programs...
++#
++
++CHMOD="@CHMOD@"
++CP="@CP@"
++LIBTOOL="@LIBTOOL@"
++LN="/bin/ln -sf"
++MKDIR="@MKDIR@ -p"
++MV="@MV@"
++RM="@RM@ -f"
++
++#
++# Installation programs...
++#
++
++INSTALL_SCRIPT="${CP}"
++
++#
++# Directories...
++#
++
++prefix="@prefix@"
++INITDIR="@INITDIR@"
++INITDDIR="@INITDDIR@"
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..a8ea9bed4ec
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,34 @@
+$NetBSD: patch-ai,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- scripts/netbsd.orig	Sat Jan 27 19:27:30 2001
++++ scripts/netbsd
+@@ -0,0 +1,29 @@
++#!/bin/sh
++#
++#   Startup script installation for NetBSD
++#
++#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
++#
++#   These coded instructions, statements, and computer programs are the
++#   property of Easy Software Products and are protected by Federal
++#   copyright law.  Distribution and use rights are outlined in the file
++#   "LICENSE.txt" which should have been included with this file.  If this
++#   file is missing or damaged please contact Easy Software Products
++#   at:
++#
++#       Attn: CUPS Licensing Information
++#       Easy Software Products
++#       44141 Airport View Drive, Suite 204
++#       Hollywood, Maryland 20636-3111 USA
++#
++#       Voice: (301) 373-9603
++#       EMail: cups-info@cups.org
++#         WWW: http://www.cups.org
++#
++
++. scripts/common
++
++${MKDIR} ${prefix}/${INITDIR}
++${RM} ${prefix}/${INITDIR}/cups
++${INSTALL_SCRIPT} cups.sh ${prefix}/${INITDIR}/cups
++${CHMOD} ugo+rx ${prefix}/${INITDIR}/cups
diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj
new file mode 100644
index 00000000000..d1e6b26945e
--- /dev/null
+++ b/print/cups/patches/patch-aj
@@ -0,0 +1,46 @@
+$NetBSD: patch-aj,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- scripts/sysv.orig	Sat Jan 27 19:27:30 2001
++++ scripts/sysv
+@@ -0,0 +1,41 @@
++#!/bin/sh
++#
++#   Startup script installation for SysV systems
++#
++#   Copyright 1997-2000 by Easy Software Products, all rights reserved.
++#
++#   These coded instructions, statements, and computer programs are the
++#   property of Easy Software Products and are protected by Federal
++#   copyright law.  Distribution and use rights are outlined in the file
++#   "LICENSE.txt" which should have been included with this file.  If this
++#   file is missing or damaged please contact Easy Software Products
++#   at:
++#
++#       Attn: CUPS Licensing Information
++#       Easy Software Products
++#       44141 Airport View Drive, Suite 204
++#       Hollywood, Maryland 20636-3111 USA
++#
++#       Voice: (301) 373-9603
++#       EMail: cups-info@cups.org
++#         WWW: http://www.cups.org
++#
++
++. scripts/common
++
++${MKDIR} ${prefix}/${INITDIR}/init.d
++${RM} ${prefix}/${INITDIR}/init.d/cups
++${INSTALL_SCRIPT} cups.sh ${prefix}/${INITDIR}/init.d/cups
++${CHMOD} ugo+rx ${prefix}/${INITDIR}/init.d/cups
++
++${MKDIR} ${prefix}/${INITDIR}/rc0.d
++${RM} ${prefix}/${INITDIR}/rc0.d/K00cups
++${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc0.d/K00cups
++
++${MKDIR} ${prefix}/${INITDIR}/rc3.d
++${RM} ${prefix}/${INITDIR}/rc3.d/S99cups
++${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc3.d/S99cups
++
++${MKDIR} ${prefix}/${INITDIR}/rc5.d
++${RM} ${prefix}/${INITDIR}/rc5.d/S99cups
++${LN} ${INITDDIR}/cups ${prefix}/${INITDIR}/rc5.d/S99cups
diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak
new file mode 100644
index 00000000000..ab90f559bf6
--- /dev/null
+++ b/print/cups/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.5 2001/01/28 02:05:38 jlam Exp $
+
+--- systemv/lpstat.c.orig	Fri Jan 26 09:22:00 2001
++++ systemv/lpstat.c
+@@ -761,6 +761,7 @@
+       */
+ 
+       printer = NULL;
++      printer_uri = NULL;
+       members = NULL;
+ 
+       while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
diff --git a/print/cups/pkg/DEINSTALL b/print/cups/pkg/DEINSTALL
index c46e335647b..ac6524d3288 100644
--- a/print/cups/pkg/DEINSTALL
+++ b/print/cups/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.5 2000/12/15 21:57:38 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.6 2001/01/28 02:05:38 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -11,6 +11,7 @@ GROUP="@CUPS_GROUP@"
 CAT="@CAT@"
 RM="@RM@"
 RMDIR="@RMDIR@"
+TRUE="@TRUE@"
 
 LOGDIR=/var/log/cups
 REQUESTDIR=/var/spool/cups
@@ -46,13 +47,13 @@ POST-DEINSTALL)
 		fi
 	done
 
-	${RMDIR} ${CONFDIR}/ppd 2>/dev/null || true
-	${RMDIR} ${CONFDIR}/interfaces 2>/dev/null || true
-	${RMDIR} ${CONFDIR}/certs 2>/dev/null || true
-	${RMDIR} ${CONFDIR} 2>/dev/null || true
-	${RMDIR} ${LOGDIR} 2>/dev/null || true
+	${RMDIR} ${CONFDIR}/ppd 2>/dev/null || ${TRUE}
+	${RMDIR} ${CONFDIR}/interfaces 2>/dev/null || ${TRUE}
+	${RMDIR} ${CONFDIR}/certs 2>/dev/null || ${TRUE}
+	${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE}
+	${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE}
 	${RM} -rf ${REQUESTDIR}/tmp
-	${RMDIR} ${REQUESTDIR} 2>/dev/null || true
+	${RMDIR} ${REQUESTDIR} 2>/dev/null || ${TRUE}
 
 	existing_dirs=''
 	for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR}
diff --git a/print/cups/pkg/MESSAGE b/print/cups/pkg/MESSAGE
index d30fc27d859..d1254767830 100644
--- a/print/cups/pkg/MESSAGE
+++ b/print/cups/pkg/MESSAGE
@@ -1,8 +1,8 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1 2000/07/12 20:09:40 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2001/01/28 02:05:38 jlam Exp $
 
-You may want to backup /etc/printcap before starting cupsd for the first
-time, as cupsd may overwrite this file with automatically generated
-content.
+You may want to backup /etc/printcap before starting CUPS for the first
+time, as the CUPS scheduler may overwrite this file with automatically
+generated content.
 
 ==========================================================================
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index ecf42a7c85c..6502f5a130f 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:54 agc Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/28 02:05:38 jlam Exp $
 bin/cancel
 bin/disable
 bin/enable
@@ -9,7 +9,7 @@ bin/lpq
 bin/lpr
 bin/lprm
 bin/lpstat
-etc/rc.d/cupsd
+etc/rc.d/cups
 include/cups/cups.h
 include/cups/http.h
 include/cups/ipp.h
@@ -270,9 +270,9 @@ share/cups/templates/printer-stop.tmpl
 share/cups/templates/printers.tmpl
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
-share/doc/cups/ENCRYPTION
-share/doc/cups/LICENSE
-share/doc/cups/README
+share/doc/cups/ENCRYPTION.txt
+share/doc/cups/LICENSE.txt
+share/doc/cups/README.txt
 share/doc/html/cups/cmp.html
 share/doc/html/cups/cmp.pdf
 share/doc/html/cups/cups.css