Update cups to 1.1.9.1. Changes from version 1.1.8 include:

  * Bug fixes to the pstoraster filter, the DeskJet printer driver,
    digest authentication.
  * Optimized PPD file scanner so servers with lots of PPD files start
    much faster (up to 40%).
  * Fixed the "N * N copy bug" where N * N copies were sent when N were
    specified.
  * Added new DeskJet and Stylus Photo printer drivers.
  * Workaround buggy IPP implementations in some HP JetDirect servers.

13 files changed, 243 insertions, 68 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 608a482af1e..157e5aad283 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.34 2001/07/13 07:09:23 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2001/08/02 03:37:39 jlam Exp $
 
-DISTNAME=		cups-${VERS}-source
+DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
-VERS=			1.1.8
-WRKSRC=			${WRKDIR}/cups-${VERS}
+BASE_VERS=		1.1.9
+DIST_VERS=		${BASE_VERS}-1
+VERS=			${DIST_VERS:S/-/./g}
+WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
 CATEGORIES=		print
-MASTER_SITES=		ftp://ftp.easysw.com/pub/cups/${VERS}/ \
-			ftp://ftp2.easysw.com/pub/cups/${VERS}/ \
-			ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERS}/ \
-			ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERS}/ \
-			ftp://ftp.ntua.gr/pub/gnu/cups/${VERS}/ \
-			ftp://ftp.fisek.com.tr/pub/cups/${VERS}/
+MASTER_SITES=		ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
+			ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
+			ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${BASE_VERS}/ \
+			ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${BASE_VERS}/ \
+			ftp://ftp.ntua.gr/pub/gnu/cups/${BASE_VERS}/ \
+			ftp://ftp.fisek.com.tr/pub/cups/${BASE_VERS}/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jlam@netbsd.org
@@ -27,16 +29,12 @@ CONFIGURE_ARGS+=	--sysconfdir=/etc
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/cups
 CONFIGURE_ARGS+=	--enable-libtool-unsupported="${LIBTOOL}"
-
-#USE_SSL=		# defined
+CONFIGURE_ARGS+=	--with-cups-user=${CUPS_USER}
+CONFIGURE_ARGS+=	--with-cups-group=${CUPS_GROUP}
 CONFIGURE_ARGS+=	--enable-ssl
+CONFIGURE_ENV+=		DSOFLAGS="${LDFLAGS}"
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../devel/zlib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
 
 .if defined(USE_PAM)
 .include "../../security/PAM/buildlink.mk"
@@ -95,15 +93,8 @@ FILES_SUBST+=		TOUCH=${TOUCH:Q}
 FILES_SUBST+=		TRUE=${TRUE:Q}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 
-post-extract:
-	cd ${WRKSRC}/conf; ${MV} -f cupsd.conf cupsd.conf.in
-
-post-build:
-	cd ${WRKSRC}; \
-	${SED} ${FILES_SUBST_SED} conf/cupsd.conf.in > conf/cupsd.conf
-	${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam
-
 pre-install:
+	${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam
 	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
@@ -120,4 +111,9 @@ post-install:
 .endif
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../devel/zlib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/tiff/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cups/distinfo b/print/cups/distinfo
index a2f6c3801ed..4c882cc2108 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.4 2001/05/24 03:17:18 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/08/02 03:37:39 jlam Exp $
 
-SHA1 (cups-1.1.8-source.tar.bz2) = 4039415164266be847aa2085f1a1781529f64164
-Size (cups-1.1.8-source.tar.bz2) = 5378746 bytes
-SHA1 (patch-aa) = 19ff305dc89ad4ffce750af36b68a11e06247912
-SHA1 (patch-ab) = b1d7878e470af8f84a42162275562d28773d94bf
-SHA1 (patch-ac) = 087cffe07d650df4632fc3700ef0f7afb8016c57
+SHA1 (cups-1.1.9-1-source.tar.bz2) = f279f04a2a029884df44bf739d76e8c49b3417b6
+Size (cups-1.1.9-1-source.tar.bz2) = 5376229 bytes
+SHA1 (patch-aa) = 2a8c259d379ddd011ab2b8bfd486be96a9368b08
+SHA1 (patch-ab) = 87fd79bb9d8110874e0c0e57af7023cca4741d21
+SHA1 (patch-ac) = f5f9de12ee1e3f8d177a644b799e876580e3a74c
+SHA1 (patch-ad) = d04b44e989bcd36de4f078d51e4e01617d99d859
+SHA1 (patch-ae) = 947c9878d74a79114ddecf63fc597e9667759793
+SHA1 (patch-af) = 0a86aef54b435d86f8f3dbbc76f9df0406ec9548
+SHA1 (patch-ag) = ecd7957eb20b29a0d206cff26f2355ab3c9bd4a9
+SHA1 (patch-ah) = 4acf8fd37a8acdaf0e7c551633bd3390d2aad21a
+SHA1 (patch-ai) = 485b1482157ddd142f11387fe1173e71e588eb83
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index 779bacaf65a..75b0180cb8a 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,21 +1,27 @@
-$NetBSD: patch-aa,v 1.9 2001/05/15 17:43:21 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2001/08/02 03:37:39 jlam Exp $
 
---- Makedefs.in.orig	Mon Apr 30 13:53:01 2001
-+++ Makedefs.in
-@@ -48,11 +48,11 @@
- # Installation programs...
- #
+--- INSTALL.txt.orig	Thu Jul  5 11:34:37 2001
++++ INSTALL.txt
+@@ -48,11 +48,12 @@
  
--INSTALL_BIN	=	$(LIBTOOL) $(CP)
--INSTALL_DATA	=	$(CP)
--INSTALL_LIB	=	$(LIBTOOL) $(CP)
--INSTALL_MAN	=	$(CP)
--INSTALL_SCRIPT	=	$(CP)
-+INSTALL_BIN	=	$(LIBTOOL) $(BSD_INSTALL_PROGRAM)
-+INSTALL_DATA	=	$(BSD_INSTALL_DATA)
-+INSTALL_LIB	=	$(LIBTOOL) $(BSD_INSTALL_DATA)
-+INSTALL_MAN	=	$(BSD_INSTALL_MAN)
-+INSTALL_SCRIPT	=	$(BSD_INSTALL_SCRIPT)
- INSTALL_SYSV	=	@INSTALL_SYSV@
+ If the PNG, JPEG, TIFF, and ZLIB libraries are not installed in
+ a system default location (typically "/usr/include" and
+-"/usr/lib") you'll need to set the CFLAGS, CXXFLAGS, and LDFLAGS
+-environment variables prior to running configure:
++"/usr/lib") you'll need to set the CFLAGS, CXXFLAGS, DSOFLAGS,
++and LDFLAGS environment variables prior to running configure:
+ 
+     setenv CFLAGS "-I/some/directory" ENTER
+     setenv CXXFLAGS "-I/some/directory" ENTER
++    setenv DSOFLAGS "-L/some/directory" ENTER
+     setenv LDFLAGS "-L/some/directory" ENTER
+     ./configure ... ENTER
+ 
+@@ -60,6 +61,7 @@
+ 
+     CFLAGS="-I/some/directory"; export CFLAGS ENTER
+     CXXFLAGS="-I/some/directory"; export CXXFLAGS ENTER
++    DSOFLAGS="-L/some/directory"; export LDFLAGS ENTER
+     LDFLAGS="-L/some/directory"; export LDFLAGS ENTER
+     ./configure ... ENTER
  
- #
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 8004026616a..9b0a21423d2 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2001/02/08 19:05:01 jlam Exp $
+$NetBSD: patch-ab,v 1.10 2001/08/02 03:37:39 jlam Exp $
 
---- Makefile.orig	Fri Feb  2 11:37:43 2001
+--- Makefile.orig	Thu Jun 28 12:20:08 2001
 +++ Makefile
 @@ -60,8 +60,8 @@
  		echo Installing in $$dir... ;\
@@ -13,3 +13,12 @@ $NetBSD: patch-ab,v 1.9 2001/02/08 19:05:01 jlam Exp $
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
  	echo Installing in doc...
+@@ -75,7 +75,7 @@
+ 	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 \
+ 		$(INSTALL_DIR) $(prefix)/$(INITDIR)/init.d; \
+ 		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
+ 		$(INSTALL_DIR) $(prefix)/$(INITDIR)/rc0.d; \
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
index b441d18da09..4e619a3182f 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.9 2001/05/15 17:43:21 jlam Exp $
+$NetBSD: patch-ac,v 1.10 2001/08/02 03:37:39 jlam Exp $
 
---- conf/cupsd.conf.in.orig	Wed Mar 14 08:45:30 2001
-+++ conf/cupsd.conf.in
-@@ -258,8 +258,8 @@
- # program is run...
- #
+--- backend/Makefile.orig	Wed Jun 27 17:53:07 2001
++++ backend/Makefile
+@@ -50,7 +50,9 @@
+ 
+ install:
+ 	$(INSTALL_DIR) $(SERVERBIN)/backend
+-	$(INSTALL_BIN) $(BACKENDS) http $(SERVERBIN)/backend
++	$(INSTALL_BIN) $(BACKENDS) $(SERVERBIN)/backend
++	$(RM) $(SERVERBIN)/backend/http
++	$(LN) ipp $(SERVERBIN)/backend/http
  
--#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
new file mode 100644
index 00000000000..ed0a60c9362
--- /dev/null
+++ b/print/cups/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.9 2001/08/02 03:37:39 jlam Exp $
+
+--- config-scripts/cups-libtool.m4.orig	Wed Jun 27 15:06:45 2001
++++ config-scripts/cups-libtool.m4
+@@ -24,8 +24,8 @@
+ 
+ AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=LIBTOOL_PATH
+                           turn on building with libtool (UNSUPPORTED!) [default=no]],
+-	[if test x$enable_libtool != xno; then
+-		LIBTOOL="$enable_libtool"
++	[if test x$enable_libtool_unsupported != xno; then
++		LIBTOOL="$enable_libtool_unsupported"
+ 		enable_shared=no
+ 		echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
+ 		echo "         WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS."
+@@ -41,8 +41,7 @@
+ 	LIBCUPSIMAGE="libcupsimage.la"
+ 	LINKCUPS="../cups/\$(LIBCUPS)"
+ 	LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+-	DSO=":"
+-	DSOFLAGS=""
++	DSO="\$(CC)"
+ fi
+ 
+ dnl
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
new file mode 100644
index 00000000000..97a42e57994
--- /dev/null
+++ b/print/cups/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.10 2001/08/02 03:37:40 jlam Exp $
+
+--- configure.orig	Thu Jul 12 08:42:35 2001
++++ configure
+@@ -3351,8 +3351,8 @@
+ # Check whether --enable-libtool_unsupported or --disable-libtool_unsupported was given.
+ if test "${enable_libtool_unsupported+set}" = set; then
+   enableval="$enable_libtool_unsupported"
+-  if test x$enable_libtool != xno; then
+-		LIBTOOL="$enable_libtool"
++  if test x$enable_libtool_unsupported != xno; then
++		LIBTOOL="$enable_libtool_unsupported"
+ 		enable_shared=no
+ 		echo "WARNING: libtool is not supported or endorsed by Easy Software Products."
+ 		echo "         WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS."
+@@ -3370,8 +3370,7 @@
+ 	LIBCUPSIMAGE="libcupsimage.la"
+ 	LINKCUPS="../cups/\$(LIBCUPS)"
+ 	LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
+-	DSO=":"
+-	DSOFLAGS=""
++	DSO="\$(CC)"
+ fi
+ 
+ 
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
new file mode 100644
index 00000000000..56c509264a3
--- /dev/null
+++ b/print/cups/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.10 2001/08/02 03:37:40 jlam Exp $
+
+--- cups/Makefile.orig	Fri Jun 29 08:15:25 2001
++++ cups/Makefile
+@@ -107,7 +107,7 @@
+ 
+ libcups.la:    $(LIBOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
++	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
+ 		-version-info 2:3 $(SSLLIBS)
+ 
+ 
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
new file mode 100644
index 00000000000..0a092a19028
--- /dev/null
+++ b/print/cups/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.8 2001/08/02 03:37:40 jlam Exp $
+
+--- filter/Makefile.orig	Fri Jun 29 08:15:25 2001
++++ filter/Makefile
+@@ -119,8 +119,8 @@
+ 
+ libcupsimage.la:       $(IMAGEOBJS) ../Makedefs
+ 	echo Linking $@...
+-	$(CC) -o $@ $(IMAGEOBJS:.o=.lo) -rpath $(LIBDIR) \
+-		-version-info 2:0
++	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
++		-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..f54446b53f0
--- /dev/null
+++ b/print/cups/patches/patch-ah
@@ -0,0 +1,53 @@
+$NetBSD: patch-ah,v 1.9 2001/08/02 03:37:40 jlam Exp $
+
+--- man/Makefile.orig	Mon Jul  2 16:18:31 2001
++++ man/Makefile
+@@ -64,9 +64,8 @@
+ 	for file in $(MAN1); do \
+ 		$(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \
+ 	done
+-	$(RM) cancel.1
+-	$(LN) lp.1 cancel.1
+-	$(INSTALL_MAN) cancel.1 $(MANDIR)/man1
++	$(RM) $(MANDIR)/man1/cancel.1
++	$(LN) lp.1 $(MANDIR)/man1/cancel.1
+ 	$(INSTALL_DIR) $(MANDIR)/man5
+ 	for file in $(MAN5); do \
+ 		$(INSTALL_MAN) $$file $(MANDIR)/man5/`basename $$file man`5; \
+@@ -75,27 +74,22 @@
+ 	for file in $(MAN8); do \
+ 		$(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
+ 	done
+-	$(RM) reject.$(MAN8EXT)
+-	$(LN) accept.$(MAN8EXT) reject.$(MAN8EXT)
+-	$(INSTALL_MAN) reject.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)
++	$(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
++	$(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
+ 	$(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
+-	$(LN) enable.$(MAN8EXT) disable.$(MAN8EXT)
+-	$(INSTALL_MAN) disable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)
++	$(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
+ 	$(INSTALL_DIR) $(MANDIR)/cat1
+ 	$(INSTALL_MAN) $(CAT1) $(MANDIR)/cat1
+-	$(RM) cancel.$(CAT1EXT)
+-	$(LN) lp.$(CAT1EXT) cancel.$(CAT1EXT)
+-	$(INSTALL_MAN) cancel.$(CAT1EXT) $(MANDIR)/cat1
++	$(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
++	$(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+ 	$(INSTALL_DIR) $(MANDIR)/cat5
+ 	$(INSTALL_MAN) $(CAT5) $(MANDIR)/cat5
+ 	$(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
+ 	$(INSTALL_MAN) $(CAT8) $(AMANDIR)/cat$(MAN8EXT)
+-	$(RM) reject.$(CAT8EXT)
+-	$(LN) accept.$(CAT8EXT) reject.$(CAT8EXT)
+-	$(INSTALL_MAN) reject.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)
+-	$(RM) disable.$(CAT8EXT)
+-	$(LN) enable.$(CAT8EXT) disable.$(CAT8EXT)
+-	$(INSTALL_MAN) disable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)
++	$(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++	$(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++	$(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++	$(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+ 
+ 
+ #
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..59d3be8c8fc
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.9 2001/08/02 03:37:40 jlam Exp $
+
+--- systemv/Makefile.orig	Thu Jul  5 11:58:47 2001
++++ systemv/Makefile
+@@ -51,8 +51,14 @@
+ 
+ install:
+ 	$(INSTALL_DIR) $(BINDIR)
+-	$(INSTALL_BIN) accept reject lpadmin lpinfo lpmove $(SBINDIR)
+-	$(INSTALL_BIN) cancel disable enable lp lpoptions lpstat $(BINDIR)
++	$(INSTALL_BIN) accept lpadmin lpinfo lpmove $(SBINDIR)
++	$(INSTALL_BIN) cancel lp lpoptions lpstat $(BINDIR)
++	$(RM) $(SBINDIR)/reject
++	$(LN) accept $(SBINDIR)/reject
++	$(RM) $(BINDIR)/enable
++	$(LN) accept $(BINDIR)/enable
++	$(RM) $(BINDIR)/disable
++	$(LN) accept $(BINDIR)/disable
+ 	$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
+ 
+ 
diff --git a/print/cups/pkg/INSTALL b/print/cups/pkg/INSTALL
index a516125ecb6..6c23fc07ab1 100644
--- a/print/cups/pkg/INSTALL
+++ b/print/cups/pkg/INSTALL
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.8 2000/12/28 02:22:18 jlam Exp $
+# $NetBSD: INSTALL,v 1.9 2001/08/02 03:37:40 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -51,7 +51,7 @@ PRE-INSTALL)
 	if [ $? -eq 0 ]
 	then
 		echo "Creating '${USER}' user..."
-		${ADDUSER} -c "CUPS User" -g ${GROUP} -s /bin/sh ${USER}
+		${ADDUSER} -c "Common UNIX Printing System user" -g ${GROUP} -s /bin/sh ${USER}
 		echo "Done."
 	else
 		echo "User '${USER}' already exists...proceeding."
@@ -61,15 +61,16 @@ PRE-INSTALL)
 POST-INSTALL)
 	${MKDIR} ${CONFDIR}
 	${MKDIR} ${CONFDIR}/certs
-	${CHMOD} ugo+x,go-rw ${CONFDIR}/certs
+	${CHMOD} 711 ${CONFDIR}/certs
+	${CHOWN} ${USER}:${GROUP} ${CONFDIR}/certs
 	${MKDIR} ${CONFDIR}/interfaces
 	${MKDIR} ${CONFDIR}/ppd
         ${MKDIR} ${LOGDIR}
         ${MKDIR} ${REQUESTDIR}
-	${CHMOD} u+rwx,go-rwx ${REQUESTDIR}
+	${CHMOD} 700 ${REQUESTDIR}
 	${CHOWN} ${USER}:${GROUP} ${REQUESTDIR}
 	${MKDIR} ${REQUESTDIR}/tmp
-	${CHMOD} u+rwx,go-rwx,+t ${REQUESTDIR}/tmp
+	${CHMOD} 1700 ${REQUESTDIR}/tmp
 	${CHOWN} ${USER}:${GROUP} ${REQUESTDIR}/tmp
 
 	echo "Installing configuration files:"
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index cb37d6ad7f4..6b1e1342d26 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/05/15 17:43:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/08/02 03:37:40 jlam Exp $
 bin/cancel
 bin/disable
 bin/enable
@@ -54,6 +54,7 @@ man/cat1/cancel.0
 man/cat1/filter.0
 man/cat1/lp.0
 man/cat1/lpoptions.0
+man/cat1/lppasswd.0
 man/cat1/lpq.0
 man/cat1/lpr.0
 man/cat1/lprm.0
@@ -79,6 +80,7 @@ man/man1/cancel.1
 man/man1/filter.1
 man/man1/lp.1
 man/man1/lpoptions.1
+man/man1/lppasswd.1
 man/man1/lpq.1
 man/man1/lpr.1
 man/man1/lprm.1
@@ -190,7 +192,9 @@ share/cups/model/laserjet.ppd
 share/cups/model/okidat24.ppd
 share/cups/model/okidata9.ppd
 share/cups/model/stcolor.ppd
+share/cups/model/stcolor2.ppd
 share/cups/model/stphoto.ppd
+share/cups/model/stphoto2.ppd
 share/cups/pstoraster/Fontmap
 share/cups/pstoraster/gs_btokn.ps
 share/cups/pstoraster/gs_ccfnt.ps
@@ -353,6 +357,7 @@ share/locale/en/cups_en
 share/locale/es/cups_es
 share/locale/fr/cups_fr
 share/locale/it/cups_it
+@dirrm share/locale/C
 @dirrm share/examples/cups
 @dirrm share/doc/html/cups/images
 @dirrm share/doc/html/cups