Update cups to 1.1.5. Relevant changes since version 1.1.4 include lots of

bug and security fixes, improvements to the efficiency of the server and
utilities, improvements to the documentation, plus the following:

     * Security updates - new default configuration does not broadcast
       printer information and only allows access from the local system.
     * EXPERIMENTAL encryption support - CUPS now optionally supports TLS/SSL
       encryption via the OpenSSL library.
     * Updated PDF filter to Xpdf 0.91.
     * Added PPD files for 9-pin and 24-pin OKIDATA printers.
     * Changed all sprintf's that use string formats to snprintf's, even if
       the destination buffer is larger than the source string(s); this
       protects against buffer overflows caused outside of CUPS...
     * Changed all strcpy's to strncpy's between local and global variables,
       even if the destination buffer is larger than the source string; this
       protects against buffer overflows caused outside of CUPS...
     * Added new mime.types rules to allow automatic raw printing of PCL and
       ESC/P files; PJL headers are parsed to differentiate between
       PostScript and PCL job files. This should eliminate a lot of the
       reports of SAMBA printing problems due to the missing "-oraw" or "-l"
       options.
     * Jobs are now assigned to printers in a class round-robin style. This
       should prevent the first server in the class from bearing the brunt of
       the jobs.
     * The serial backend didn't support the higher baud rates with the old
       termios interface. It now supports 57600 and 115200 baud.
     * The serial backend now supports different types of flow control;
       previously it ignored the flow=XYZ option in the device URI.
     * The serial backend now supports DTR/DSR flow control, which is popular
       on dot-matrix printers (access with "flow=dtrdsr" in the device URI)
     * Added new job-originating-host-name attribute for jobs. The new
       attribute provides the hostname or IP address of the machine that
       submitted the job.
     * Added quota and allow/deny user support for printers and classes.

16 files changed, 420 insertions, 155 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 319a8851b16..35e2727f40a 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2000/12/14 17:04:44 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2000/12/21 14:59:37 jlam Exp $
 #
 
-DISTNAME=		cups-1.1.4-source
+DISTNAME=		cups-1.1.5-source
 PKGNAME=		${DISTNAME:S/-source//}
 VERS=			${PKGNAME:S/cups-//}
 WRKSRC=			${WRKDIR}/${PKGNAME}
@@ -24,11 +24,15 @@ DEPENDS+=		tiff-*:../../graphics/tiff
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--sysconfdir=/etc
+CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--enable-libtool-unsupported="${LIBTOOL}"
-CONFIGURE_ARGS+=	--enable-rootconfig
 CONFIGURE_ARGS+=	--with-cups-user="${CUPS_USER}"
 CONFIGURE_ARGS+=	--with-cups-group="${CUPS_GROUP}"
 
+USE_SSL=		# defined
+CONFIGURE_ARGS+=	--enable-ssl
+
 CFLAGS+=		-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
@@ -68,7 +72,19 @@ ADDGROUP=		groupadd
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
-pre-patch:
+DOCDIR=			${PREFIX}/share/doc/cups
+EGDIR=			${PREFIX}/share/examples/cups
+
+# The Okidata PPD files are missing, but on the CUPS mailing list,
+# Michael Sweet says that the following should work.
+#
+post-extract:
+	${SED}	-e "s,EPSON24,OKIDAT24,g" \
+		-e "s,EPSON,OKIDATA,g" \
+		< ${WRKSRC}/ppd/epson24.ppd > ${WRKSRC}/ppd/okidat24.ppd
+	${SED}	-e "s,EPSON9,OKIDATA9,g" \
+		-e "s,EPSON,OKIDATA,g" \
+		< ${WRKSRC}/ppd/epson9.ppd > ${WRKSRC}/ppd/okidata9.ppd
 	cd ${WRKSRC}/conf; ${MV} cupsd.conf cupsd.conf.in
 
 pre-configure:
@@ -105,11 +121,14 @@ pre-install:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/cupsd.sh ${PREFIX}/etc/rc.d/cupsd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups
-	cd ${WRKSRC}/conf; ${INSTALL_DATA} *.conf mime.* \
-		${PREFIX}/share/examples/cups
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	for file in ENCRYPTION LICENSE README; do \
+		${INSTALL_DATA} ${WRKSRC}/$${file}.txt ${DOCDIR}/$${file}; \
+	done
+	${INSTALL_DATA_DIR} ${EGDIR}
+	cd ${WRKSRC}/conf; ${INSTALL_DATA} *.conf mime.* ${EGDIR}
 .if defined(USE_PAM)
-	${INSTALL_DATA} ${WRKDIR}/cups.pam ${PREFIX}/share/examples/cups
+	${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR}
 .endif
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
diff --git a/print/cups/files/md5 b/print/cups/files/md5
index 33abc8e92f6..1814eee5d60 100644
--- a/print/cups/files/md5
+++ b/print/cups/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/12/07 20:33:06 jlam Exp $
+$NetBSD: md5,v 1.4 2000/12/21 14:59:38 jlam Exp $
 
-MD5 (cups-1.1.4-source.tar.bz2) = c9f43f4f200e33458f84ca5e4a2bdebb
+MD5 (cups-1.1.5-source.tar.bz2) = 380f9c5c299a026f4f6a4ead11ee709f
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index d08aaac0fa2..8477a870253 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,8 +1,13 @@
-$NetBSD: patch-sum,v 1.6 2000/12/14 17:04:44 jlam Exp $
+$NetBSD: patch-sum,v 1.7 2000/12/21 14:59:38 jlam Exp $
 
-MD5 (patch-aa) = d2d5f49a3b305cbdf915cd44eadeaa9f
-MD5 (patch-ab) = 3f904cd7c7ed4ebe2e898e34a73edb88
-MD5 (patch-ac) = e06be2ba8c1e2a8c113cfed05c989e32
-MD5 (patch-ad) = b818bd9cf762083e1943dab3f67863d5
-MD5 (patch-ae) = ed5db3c3f7916e3ea247237491e7337b
-MD5 (patch-bb) = 0bd8c80b391e0eb5069fe97bb0490b63
+MD5 (patch-aa) = 53110457446460159d9c4c25d31d2c91
+MD5 (patch-ab) = 72eaff562a210e099db8e2d56d541fb5
+MD5 (patch-ac) = fc28a0c6645a8b196c4fe47fada597bc
+MD5 (patch-ad) = 4ea2faaf4cf0ef1a75a3b35d964683e1
+MD5 (patch-ae) = c50a8a409a9706f320784a294d082c50
+MD5 (patch-af) = 0f5879a4848e4bbb960f2001d9b0d130
+MD5 (patch-ag) = 6ec463d6b203a2e539f17b61461c8c2a
+MD5 (patch-ah) = 116f451ad6bcb3a503de727b1197ea07
+MD5 (patch-ai) = 721ac5183c1746596fbeaff662f68c62
+MD5 (patch-aj) = b1cff7bb0973d4edf329c6b8efa0bace
+MD5 (patch-ak) = 630bafecadc427b34548feac21fea441
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index 1c104bc15d0..61f7c97445a 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2000/12/14 17:04:45 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2000/12/21 14:59:38 jlam Exp $
 
---- Makedefs.in.orig	Thu Sep 14 11:36:24 2000
+--- Makedefs.in.orig	Mon Oct 16 19:02:08 2000
 +++ Makedefs.in
 @@ -46,14 +46,21 @@
  SHELL	=	/bin/sh
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 455de3fb8f8..98746e55f1a 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,13 +1,29 @@
-$NetBSD: patch-ab,v 1.4 2000/12/14 17:04:45 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2000/12/21 14:59:38 jlam Exp $
 
---- Makefile.orig	Tue Aug 29 16:33:48 2000
+--- Makefile.orig	Sun Dec 10 23:40:31 2000
 +++ Makefile
-@@ -60,8 +60,6 @@
+@@ -60,8 +60,8 @@
  		echo Installing in $$dir... ;\
  		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
  	done
 -	echo Installing in conf...
 -	(cd conf; $(MAKE) $(MFLAGS) install)
++#	echo Installing in conf...
++#	(cd conf; $(MAKE) $(MFLAGS) install)
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
  	echo Installing in doc...
+@@ -71,11 +71,11 @@
+ 	echo Installing in locale...
+ 	(cd locale; $(MAKE) $(MFLAGS) install)
+ 	echo Installing in ppd...
+-\	(cd ppd; $(MAKE) $(MFLAGS) install)
++	(cd ppd; $(MAKE) $(MFLAGS) install)
+ 	echo Installing in templates...
+ 	(cd templates; $(MAKE) $(MFLAGS) install)
+ 	echo Installing startup script...
+-	if test "x$INITDIR" != "x"; then \
++	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; \
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
index cceee6159e0..9e555f73b84 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,15 +1,81 @@
-$NetBSD: patch-ac,v 1.3 2000/12/07 20:33:06 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2000/12/21 14:59:38 jlam Exp $
 
---- conf/cupsd.conf.in.orig	Fri Sep 29 13:42:53 2000
-+++ conf/cupsd.conf.in
-@@ -213,8 +213,8 @@
- # program is run...
- #
+--- backend/serial.c.orig	Wed Dec  6 17:56:08 2000
++++ backend/serial.c
+@@ -48,9 +48,9 @@
+ #  include <unistd.h>
+ #  include <fcntl.h>
+ #  include <termios.h>
+-#  ifdef __linux
++#  ifdef HAVE_SYS_IOCTL_H
+ #    include <sys/ioctl.h>
+-#  endif /* __linux */
++#  endif /* HAVE_SYS_IOCTL_H */
+ #endif /* WIN32 || __EMX__ */
  
--#User lp
--#Group sys
-+User @CUPS_USER@
-+Group @CUPS_GROUP@
+ #ifdef __sgi
+@@ -484,10 +484,10 @@
+ void
+ list_devices(void)
+ {
+-#if defined(__hpux) || defined(__sgi) || defined(__sun)
++#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
+   static char	*funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
+ 				/* Funky hex numbering used for some devices */
+-#endif /* __hpux || __sgi || __sun */
++#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
+ 
+ #ifdef __linux
+   int	i;		/* Looping var */
+@@ -718,7 +718,7 @@
+       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
+              device, i + 1);
+   }
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+   int	i, j;		/* Looping vars */
+   int	fd;		/* File descriptor */
+   char	device[255];	/* Device filename */
+@@ -800,6 +800,42 @@
+              device, i + 1);
+     }
+   }
++#elif defined(__NetBSD__)
++  int	i, j;		/* Looping vars */
++  int	fd;		/* File descriptor */
++  char	device[255];	/* Device filename */
++
++
++ /*
++  * Standard serial ports...
++  */
++
++  for (i = 0; i < 4; i ++)
++  {
++    sprintf(device, "/dev/tty%02d", i);
++    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
++    {
++      close(fd);
++      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
++             device, i + 1);
++    }
++  }
++
++ /*
++  * Cyclades-Z ports...
++  */
++
++  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
++    for (j = 0; j < 64; j ++)
++    {
++      sprintf(device, "/dev/ttyCZ%02d%02d", i, j);
++      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
++      {
++	close(fd);
++	printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Port #%d\"\n",
++               device, i, j + 1);
++      }
++    }
+ #endif
+ }
  
- #
- # 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 b7d5757ede1..bef9332908e 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,16 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2000/12/14 17:04:45 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2000/12/21 14:59:38 jlam Exp $
 
---- doc/sam.shtml.orig	Mon Oct  2 10:48:23 2000
-+++ doc/sam.shtml
-@@ -230,6 +230,11 @@
- <!-- NEED 4in -->
- <H3><A NAME="INSTALLING">Installing the Software</A></H3>
+--- conf/cupsd.conf.in.orig	Wed Dec 20 08:41:12 2000
++++ conf/cupsd.conf.in
+@@ -247,8 +247,8 @@
+ # program is run...
+ #
  
-+<P>Before you install, you'll need to ensure that the CUPS administrator
-+user (lp) and group (sys) already exist on your system.  If not, then please
-+refer to your system documentation for the procedure to add new users and
-+groups.
-+
- <P>Use the "install" target to install the software:
+-#User lp
+-#Group sys
++User @CUPS_USER@
++Group @CUPS_GROUP@
  
- <UL><PRE>
+ #
+ # RIPCache: the amount of memory that each RIP should use to cache
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index 04fa6ff0da6..2015a2f7496 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.3 2000/12/14 17:04:45 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2000/12/21 14:59:38 jlam Exp $
 
---- scheduler/Makefile.orig	Thu Sep 14 11:36:25 2000
-+++ scheduler/Makefile
-@@ -68,10 +68,10 @@
- 	$(CHMOD) ugo+rx $(LOGDIR)
- 	-$(MKDIR) $(REQUESTS)
- 	$(CHMOD) u+rwx,go-rwx $(REQUESTS)
--	$(CHOWN) lp $(REQUESTS)
-+	$(CHOWN) $(CUPS_USER) $(REQUESTS)
- 	-$(MKDIR) $(REQUESTS)/tmp
- 	$(CHMOD) u+rwx,go-rwx,+t $(REQUESTS)/tmp
--	$(CHOWN) lp $(REQUESTS)/tmp
-+	$(CHOWN) $(CUPS_USER) $(REQUESTS)/tmp
+--- config.h.in.orig	Mon Oct 16 19:02:08 2000
++++ config.h.in
+@@ -89,6 +89,12 @@
+ #undef HAVE_CRYPT_H
  
+ /*
++ * Do we have <sys/ioctl.h>?
++ */
++
++#undef HAVE_SYS_IOCTL_H
++
++/*
+  * Do we have the strXXX() functions?
+  */
  
- #
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
new file mode 100644
index 00000000000..f7ce9ee4136
--- /dev/null
+++ b/print/cups/patches/patch-af
@@ -0,0 +1,155 @@
+$NetBSD: patch-af,v 1.3 2000/12/21 14:59:38 jlam Exp $
+
+--- configure.in.orig	Wed Dec 20 13:46:14 2000
++++ configure.in
+@@ -117,4 +117,12 @@
+ AC_ARG_WITH(fontpath, [  --with-fontpath     set font path for pstoraster],fontpath="$withval",fontpath="")
+ 
++AC_ARG_WITH(cups-user, [  --with-cups-user=USERID
++                          use USERID as cups userid [default=lp]], CUPS_USER="$withval", CUPS_USER="lp")
++AC_ARG_WITH(cups-group, [  --with-cups-group=GROUPID
++                          use GROUPID as cups group [default=sys]], CUPS_GROUP="$withval", CUPS_GROUP="sys")
++
++AC_SUBST(CUPS_USER)
++AC_SUBST(CUPS_GROUP)
++
+ dnl Checks for programs...
+ AC_PROG_AWK
+@@ -197,8 +205,25 @@
+ 
+ if test "$enable_ssl" = "yes"; then
+-	AC_CHECK_LIB(ssl,SSL_new,
+-		SSLLIBS="-lssl -lcrypto"
+-		AC_DEFINE(HAVE_LIBSSL)
+-	)
++	#
++	# Some ELF systems can't resolve all the symbols in libcrypto
++	# if libcrypto was linked against RSAREF, and fail to link the
++	# test program correctly, even though a correct installation
++	# of OpenSSL exists.  So we test the linking three times in
++	# case the RSAREF libraries are needed.
++	#
++	for libcrypto in \
++		"-lcrypto" \
++		"-lcrypto -lrsaref" \
++		"-lcrypto -lRSAglue -lrsaref"
++	do
++		AC_CHECK_LIB(ssl,SSL_new,
++			[SSLLIBS="-lssl $libcrypto"
++			 AC_DEFINE(HAVE_LIBSSL)],,
++			$libcrypto
++		)
++		if test "x${SSLLIBS}" != "x"; then
++			break
++		fi
++	done
+ fi
+ 
+@@ -250,4 +275,5 @@
+ AC_CHECK_HEADER(stddef.h,AC_DEFINE(HAVE_STDDEF_H))
+ AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
++AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
+ 
+ dnl Checks for string functions.
+@@ -384,10 +410,6 @@
+ 
+ dnl Fix "datadir" variable if it hasn't been specified...
+-if test "$datadir" = "\${prefix}/share"; then
+-	if test "$prefix" = "/"; then
+-		datadir="/usr/share"
+-	else
+-		datadir="$prefix/share"
+-        fi
++if test "$datadir" = "\${prefix}/share" -a "$prefix" = "/"; then
++	datadir="/usr/share"
+ fi
+ 
+@@ -398,19 +420,11 @@
+ 
+ dnl Fix "localstatedir" variable if it hasn't been specified...
+-if test "$localstatedir" = "\${prefix}/var"; then
+-	if test "$prefix" = "/"; then
+-		localstatedir="/var"
+-	else
+-		localstatedir="$prefix/var"
+-	fi
++if test "$localstatedir" = "\${prefix}/var" -a "$prefix" = "/"; then
++	localstatedir="/var"
+ fi
+ 
+ dnl Fix "sysconfdir" variable if it hasn't been specified...
+-if test "$sysconfdir" = "\${prefix}/etc"; then
+-	if test "$prefix" = "/"; then
+-		sysconfdir="/etc"
+-	else
+-		sysconfdir="$prefix/etc"
+-	fi
++if test "$sysconfdir" = "\${prefix}/etc" -a "$prefix" = "/"; then
++	sysconfdir="/etc"
+ fi
+ 
+@@ -422,14 +436,23 @@
+ dnl Fix "mandir" variable...
+ if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
+-	if test "$uname" = "IRIX"; then
+-		mandir="/usr/share/catman"
+-	else
+-		mandir="/usr/man"
+-	fi
++	case "$uname" in
++		FreeBSD* | NetBSD* | OpenBSD*)
++			# *BSD
++			mandir="/usr/share/man"
++			;;
++		IRIX*)
++			# SGI IRIX
++			mandir="/usr/share/catman"
++			;;
++		*)
++			# All others
++			mandir="/usr/man"
++			;;
++	esac
+ fi
+ 
+ dnl Fix "fontpath" variable...
+ if test "x$fontpath" = "x"; then
+-	fontpath="$datadir/cups/fonts"
++	fontpath="$exec_prefix/share/cups/fonts"
+ fi
+ 
+@@ -503,11 +526,11 @@
+ 
+ dnl Setup default locations...
+-CUPS_SERVERROOT='${prefix}/etc/cups'
+-CUPS_LOGDIR='${prefix}/var/log/cups'
+-CUPS_REQUESTS='${prefix}/var/spool/cups'
+-
+-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
+-AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups")
+-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups")
++CUPS_SERVERROOT='${sysconfdir}/cups'
++CUPS_LOGDIR='${localstatedir}/log/cups'
++CUPS_REQUESTS='${localstatedir}/spool/cups'
++
++AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
++AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
++AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
+ 
+ dnl See what directory to put server executables...
+@@ -560,6 +583,6 @@
+ 
+ dnl Set the CUPS_DOCROOT directory...
+-CUPS_DOCROOT='${exec_prefix}/share/doc/cups'
+-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups")
++CUPS_DOCROOT='${exec_prefix}/share/doc/html/cups'
++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups")
+ AC_SUBST(CUPS_DOCROOT)
+ 
+@@ -567,5 +590,5 @@
+ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
+ 
+-AC_OUTPUT(Makedefs cups.sh)
++AC_OUTPUT(Makedefs cups.sh conf/cupsd.conf)
+ 
+ dnl
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
new file mode 100644
index 00000000000..a1b7d8a761f
--- /dev/null
+++ b/print/cups/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2000/12/21 14:59:38 jlam Exp $
+
+--- cups/Makefile.orig	Mon Dec 18 16:38:55 2000
++++ cups/Makefile
+@@ -98,7 +98,7 @@
+ 
+ libcups.la:    $(LIBOBJS) ../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
+ 
+ 
+ #
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
new file mode 100644
index 00000000000..034a7cdbb9d
--- /dev/null
+++ b/print/cups/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.3 2000/12/21 14:59:38 jlam Exp $
+
+--- doc/sam.shtml.orig	Wed Dec 20 12:56:33 2000
++++ doc/sam.shtml
+@@ -243,6 +243,11 @@
+ <!-- NEED 4in -->
+ <H3><A NAME="INSTALLING">Installing the Software</A></H3>
+ 
++<P>Before you install, you'll need to ensure that the CUPS administrator
++user (lp) and group (sys) already exist on your system.  If not, then please
++refer to your system documentation for the procedure to add new users and
++groups.
++
+ <P>Use the "install" target to install the software:
+ 
+ <UL><PRE>
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..8414350ec61
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,32 @@
+$NetBSD: patch-ai,v 1.3 2000/12/21 14:59:39 jlam Exp $
+
+--- filter/Makefile.orig	Fri Sep 29 13:42:54 2000
++++ filter/Makefile
+@@ -59,6 +59,13 @@
+ #
+ 
+ install:
++	-$(MKDIR) $(LIBDIR)
++	$(CHMOD) ugo+rx $(LIBDIR)
++	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
++	-if test $(LIBCUPSIMAGE) != "libcupsimage.a" -a $(LIBCUPSIMAGE) != "libcupsimage.la"; then \
++		$(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
++		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
++	fi
+ 	-$(MKDIR) $(SERVERBIN)/filter
+ 	$(CHMOD) ugo+rx $(SERVERBIN)
+ 	$(CHMOD) ugo+rx $(SERVERBIN)/filter
+@@ -67,13 +74,6 @@
+ 	$(CHMOD) ugo+rx $(INCLUDEDIR)
+ 	$(CHMOD) ugo+rx $(INCLUDEDIR)/cups
+ 	$(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
+-	-$(MKDIR) $(LIBDIR)
+-	$(CHMOD) ugo+rx $(LIBDIR)
+-	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
+-	-if test $(LIBCUPSIMAGE) != "libcupsimage.a" -a $(LIBCUPSIMAGE) != "libcupsimage.la"; then \
+-		$(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
+-		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
+-	fi
+ 
+ 
+ #
diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj
new file mode 100644
index 00000000000..1899c9ae64f
--- /dev/null
+++ b/print/cups/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.3 2000/12/21 14:59:39 jlam Exp $
+
+--- pdftops/Makefile.orig	Thu Oct 12 22:05:10 2000
++++ pdftops/Makefile
+@@ -18,8 +18,7 @@
+ 		Array.o Catalog.o Dict.o Error.o FontEncoding.o \
+ 		FontFile.o FormWidget.o Gfx.o GfxFont.o GfxState.o \
+ 		Lexer.o Link.o Object.o OutputDev.o Page.o Params.o \
+-		Parser.o PDFDoc.o PSOutputDev.o SFont.o Stream.o \
+-		T1Font.o TTFont.o XRef.o
++		Parser.o PDFDoc.o PSOutputDev.o Stream.o XRef.o
+ OBJS	=	pdftops.o $(LIBOBJS)
+ 
+ #
diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak
new file mode 100644
index 00000000000..0f2fdaf18d1
--- /dev/null
+++ b/print/cups/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.3 2000/12/21 14:59:39 jlam Exp $
+
+--- scheduler/Makefile.orig	Mon Dec 18 16:38:58 2000
++++ scheduler/Makefile
+@@ -69,10 +69,10 @@
+ 	$(CHMOD) ugo+rx $(LOGDIR)
+ 	-$(MKDIR) $(REQUESTS)
+ 	$(CHMOD) u+rwx,go-rwx $(REQUESTS)
+-	$(CHOWN) lp $(REQUESTS)
++	$(CHOWN) $(CUPS_USER) $(REQUESTS)
+ 	-$(MKDIR) $(REQUESTS)/tmp
+ 	$(CHMOD) u+rwx,go-rwx,+t $(REQUESTS)/tmp
+-	$(CHOWN) lp $(REQUESTS)/tmp
++	$(CHOWN) $(CUPS_USER) $(REQUESTS)/tmp
+ 
+ 
+ #
diff --git a/print/cups/patches/patch-bb b/print/cups/patches/patch-bb
deleted file mode 100644
index 9e221502c15..00000000000
--- a/print/cups/patches/patch-bb
+++ /dev/null
@@ -1,93 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2000/12/14 17:04:45 jlam Exp $
-
---- configure.in.orig	Wed Sep 20 15:11:05 2000
-+++ configure.in
-@@ -44,8 +44,11 @@
- CXXFLAGS="${CXXFLAGS:=}"
- 
--AC_ARG_ENABLE(debug, [  --enable-debug        turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
-+AC_ARG_ENABLE(rootconfig, [  --enable-rootconfig
-+                          set root of CUPS configuration to root directory
-+                          [default=no]])
-+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
- 	OPTIM="-g "
- fi])
--AC_ARG_ENABLE(shared, [  --enable-shared        turn on shared libraries [default=yes]])
-+AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=yes]])
- AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
-                           turn on building with libtool (UNSUPPORTED!) [default=no]],[if eval "test x$enable_libtool_unsupported != xno"; then
-@@ -116,4 +119,12 @@
- AC_ARG_WITH(fontpath, [  --with-fontpath     set font path for pstoraster],fontpath="$withval",fontpath="")
- 
-+AC_ARG_WITH(cups-user, [  --with-cups-user=USERID
-+                          use USERID as cups userid [default=lp]], CUPS_USER="$withval", CUPS_USER="lp")
-+AC_ARG_WITH(cups-group, [  --with-cups-group=GROUPID
-+                          use GROUPID as cups group [default=sys]], CUPS_GROUP="$withval", CUPS_GROUP="sys")
-+
-+AC_SUBST(CUPS_USER)
-+AC_SUBST(CUPS_GROUP)
-+
- dnl Checks for programs...
- AC_PROG_AWK
-@@ -485,6 +496,14 @@
- 	esac
- else
--	INITDIR="/etc"
--	INITDDIR="../init.d"
-+	case "$uname" in
-+		FreeBSD* | NetBSD* | OpenBSD*)
-+			INITDIR=""
-+			INITDDIR=""
-+			;;
-+		*)
-+			INITDIR="/etc"
-+			INITDDIR="../init.d"
-+			;;
-+	esac
- fi
- 
-@@ -493,11 +512,21 @@
- 
- dnl Setup default locations...
--CUPS_SERVERROOT='${prefix}/etc/cups'
--CUPS_LOGDIR='${prefix}/var/log/cups'
--CUPS_REQUESTS='${prefix}/var/spool/cups'
--
--AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
--AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups")
--AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups")
-+if test "$enable_rootconfig" = "yes"; then
-+	CUPS_SERVERROOT='/etc/cups'
-+	CUPS_LOGDIR='/var/log/cups'
-+	CUPS_REQUESTS='/var/spool/cups'
-+
-+	AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "/etc/cups")
-+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "/var/log/cups")
-+	AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "/var/spool/cups")
-+else
-+	CUPS_SERVERROOT='${prefix}/etc/cups'
-+	CUPS_LOGDIR='${prefix}/var/log/cups'
-+	CUPS_REQUESTS='${prefix}/var/spool/cups'
-+
-+	AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
-+	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups")
-+	AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups")
-+fi
- 
- dnl See what directory to put server executables...
-@@ -550,6 +579,6 @@
- 
- dnl Set the CUPS_DOCROOT directory...
--CUPS_DOCROOT='${exec_prefix}/share/doc/cups'
--AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups")
-+CUPS_DOCROOT='${exec_prefix}/share/doc/html/cups'
-+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups")
- AC_SUBST(CUPS_DOCROOT)
- 
-@@ -557,5 +586,5 @@
- AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
- 
--AC_OUTPUT(Makedefs cups.sh)
-+AC_OUTPUT(Makedefs cups.sh conf/cupsd.conf)
- 
- dnl
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index aa8f5837110..0329eb62d27 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/07 20:33:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/12/21 14:59:39 jlam Exp $
 bin/cancel
 bin/disable
 bin/enable
@@ -182,6 +182,8 @@ share/cups/model/deskjet.ppd
 share/cups/model/epson24.ppd
 share/cups/model/epson9.ppd
 share/cups/model/laserjet.ppd
+share/cups/model/okidat24.ppd
+share/cups/model/okidata9.ppd
 share/cups/model/stcolor.ppd
 share/cups/model/stphoto.ppd
 share/cups/pstoraster/Fontmap
@@ -264,6 +266,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/html/cups/cmp.html
 share/doc/html/cups/cmp.pdf
 share/doc/html/cups/cups.css
@@ -346,6 +351,7 @@ share/locale/it/cups_it
 @dirrm share/examples/cups
 @dirrm share/doc/html/cups/images
 @dirrm share/doc/html/cups
+@dirrm share/doc/cups
 @dirrm share/cups/templates
 @dirrm share/cups/pstoraster
 @dirrm share/cups/model