Update cups to 1.1.4. Changes from version 1.1 include a large number of

bugfixes, security fixes, improvements to the web admin interface, addition
of new printer drivers, improved documentation, and improvements to the CUPS
API for client development.

13 files changed, 390 insertions, 115 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 3b8be45a21f..2a3b928795b 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2000/07/12 20:09:33 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/12/07 20:33:05 jlam Exp $
 #
 
-DISTNAME=		cups-1.1-source
+DISTNAME=		cups-1.1.4-source
 PKGNAME=		${DISTNAME:S/-source//}
 VERS=			${PKGNAME:S/cups-//}
 WRKSRC=			${WRKDIR}/${PKGNAME}
@@ -25,15 +25,55 @@ USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-libtool-unsupported="${LIBTOOL}"
-CONFIGURE_ARGS+=	--disable-pam
 CONFIGURE_ARGS+=	--enable-rootconfig
+CONFIGURE_ARGS+=	--disable-pam
 
 CFLAGS+=		-I${LOCALBASE}/include
 
+.include "../../mk/bsd.prefs.mk"
+
+.if exists(/usr/sbin/user)
+USERDIR=		/usr/sbin
+.else
+DEPENDS+=		user>=20000313:../../sysutils/user
+USERDIR=		${LOCALBASE}/sbin
+.endif
+
+# CUPS_USER	username of the database administrator
+# CUPS_GROUP	group of the database administrator
+#
+CUPS_USER?=		lp
+CUPS_GROUP?=		sys
+
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
+
+pre-patch:
+	cd ${WRKSRC}/conf; ${MV} cupsd.conf cupsd.conf.in
+
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
+post-configure:
+	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g" \
+		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \
+		< ${WRKSRC}/conf/cupsd.conf.in > ${WRKSRC}/conf/cupsd.conf
+
+post-build:
+	${SED}	-e "s,@PREFIX@,${PREFIX},g" \
+		< ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh
+	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g" \
+		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED}	-e "s,@CUPS_USER@,${CUPS_USER},g" \
+		-e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \
+		-e "s,@USERDIR@,${USERDIR},g" \
+		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+
+pre-install:
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} 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
diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh
new file mode 100644
index 00000000000..d48a29208d9
--- /dev/null
+++ b/print/cups/files/cupsd.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# $NetBSD: cupsd.sh,v 1.1 2000/12/07 20:33:05 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" != "" ]
+	then
+		echo "Restarting ${name}."
+		kill -HUP $pid
+	else
+		echo "Starting ${name}."
+		${command}
+	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 9e3743e13ce..33abc8e92f6 100644
--- a/print/cups/files/md5
+++ b/print/cups/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/07/12 20:09:35 jlam Exp $
+$NetBSD: md5,v 1.3 2000/12/07 20:33:06 jlam Exp $
 
-MD5 (cups-1.1-source.tar.bz2) = 8dd8db34a30e2b4457b9d08bf248cef9
+MD5 (cups-1.1.4-source.tar.bz2) = c9f43f4f200e33458f84ca5e4a2bdebb
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index f679cf5f3dd..cd26252379d 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.4 2000/07/12 20:09:35 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/12/07 20:33:06 jlam Exp $
 
-MD5 (patch-aa) = aa04d679c1a6ee4e1c4269c97201d4be
-MD5 (patch-ab) = 60e0f0b91b4d403e77f7cdf5cae10938
-MD5 (patch-bb) = d6e760e450e715ba284f61ce320be2f2
-MD5 (patch-bc) = f0836fd83ce767b78e482c0fa11aaeb4
-MD5 (patch-bd) = c3eb7faea327283839ea836590421c89
+MD5 (patch-aa) = 487e0f2674d818f333aa75fcb959ea61
+MD5 (patch-ab) = 0b881c059a3ab2e831328484f3bce2d3
+MD5 (patch-ac) = e06be2ba8c1e2a8c113cfed05c989e32
+MD5 (patch-bb) = 69d0be20367413f54a3377d4f07d5d87
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index 2c23a7c8857..4747e8be301 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/07/12 20:09:35 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2000/12/07 20:33:06 jlam Exp $
 
---- Makedefs.in.orig	Fri Jul  7 15:13:52 2000
-+++ Makedefs.in	Wed Jul 12 00:46:06 2000
-@@ -48,11 +48,11 @@
+--- Makedefs.in.orig	Thu Sep 14 11:36:24 2000
++++ Makedefs.in
+@@ -49,12 +49,13 @@
  # Installation programs...
  #
  
@@ -17,5 +17,7 @@ $NetBSD: patch-aa,v 1.2 2000/07/12 20:09:35 jlam Exp $
 +INSTALL_MAN	=	$(BSD_INSTALL_MAN)
 +INSTALL_SCRIPT	=	$(BSD_INSTALL_SCRIPT)
  INSTALL_SYSV	=	@INSTALL_SYSV@
++INSTALL_INIT	=	@INSTALL_INIT@
  
  #
+ # Libraries...
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index ead5025b6cc..217360de37c 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,39 +1,51 @@
-$NetBSD: patch-ab,v 1.2 2000/07/12 20:09:35 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2000/12/07 20:33:06 jlam Exp $
 
---- Makefile.orig	Fri Jul  7 14:19:23 2000
-+++ Makefile	Wed Jul 12 00:49:00 2000
-@@ -60,8 +60,6 @@
+--- Makefile.orig	Tue Aug 29 16:33:48 2000
++++ Makefile
+@@ -55,25 +55,45 @@
+ # Install object and target files...
+ #
+ 
+-install:
++install:	install-cups install-data install-doc \
++		install-fonts install-locale install-ppd install-templates \
++		$(INSTALL_INIT)
++
++install-cups:
+ 	for dir in $(DIRS); do\
  		echo Installing in $$dir... ;\
  		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
  	done
--	echo Installing in conf...
--	(cd conf; $(MAKE) $(MFLAGS) install)
++
++install-conf:
+ 	echo Installing in conf...
+ 	(cd conf; $(MAKE) $(MFLAGS) install)
++
++install-data:
  	echo Installing in data...
  	(cd data; $(MAKE) $(MFLAGS) install)
++
++install-doc:
+ 	echo Installing in doc...
+ 	(cd doc; $(MAKE) $(MFLAGS) install)
++
++install-fonts:
  	echo Installing in fonts...
-@@ -72,25 +70,6 @@
+ 	(cd fonts; $(MAKE) $(MFLAGS) install)
++
++install-locale:
+ 	echo Installing in locale...
+ 	(cd locale; $(MAKE) $(MFLAGS) install)
++
++install-ppd:
+ 	echo Installing in ppd...
  	(cd ppd; $(MAKE) $(MFLAGS) install)
++
++install-templates:
  	echo Installing in templates...
  	(cd templates; $(MAKE) $(MFLAGS) install)
--	echo Installing startup script...
--	if test -d $(prefix)/sbin/init.d; then \
--		$(INSTALL_SCRIPT) cups.sh $(prefix)/sbin/init.d/cups; \
--		$(CHMOD) ugo+rx $(prefix)/sbin/init.d/cups; \
--		ln -s ../init.d/cups $(prefix)/sbin/rc0.d/K000cups; \
--		ln -s ../init.d/cups $(prefix)/sbin/rc2.d/S999cups; \
--	fi
--	if test -d $(prefix)/etc/rc.d/init.d; then \
--		$(INSTALL_SCRIPT) cups.sh $(prefix)/etc/rc.d/init.d/cups; \
--		$(CHMOD) ugo+rx $(prefix)/etc/rc.d/cups; \
--		ln -s ../init.d/cups $(prefix)/etc/rc.d/rc0.d/K00cups; \
--		ln -s ../init.d/cups $(prefix)/etc/rc.d/rc2.d/S99cups; \
--	fi
--	if test -d $(prefix)/etc/init.d; then \
--		$(INSTALL_SCRIPT) cups.sh $(prefix)/etc/init.d/cups; \
--		$(CHMOD) ugo+rx $(prefix)/etc/init.d/cups; \
--		ln -s ../init.d/cups $(prefix)/etc/rc0.d/K00cups; \
--		ln -s ../init.d/cups $(prefix)/etc/rc2.d/S99cups; \
--	fi
- 
- #
- # Make software distributions using EPM (http://www.easysw.com/epm)...
++
++install-init:
+ 	echo Installing startup script...
+ 	if test "x$INITDIR" != "x"; then \
+ 		$(MKDIR) $(prefix)/$(INITDIR)/init.d; \
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
new file mode 100644
index 00000000000..cceee6159e0
--- /dev/null
+++ b/print/cups/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2000/12/07 20:33:06 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...
+ #
+ 
+-#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-bb b/print/cups/patches/patch-bb
index 4fad15a680d..92f944a2792 100644
--- a/print/cups/patches/patch-bb
+++ b/print/cups/patches/patch-bb
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.1 2000/07/12 20:09:39 jlam Exp $
+$NetBSD: patch-bb,v 1.2 2000/12/07 20:33:06 jlam Exp $
 
---- configure.in.orig	Mon Jul 10 16:58:19 2000
-+++ configure.in	Wed Jul 12 01:04:23 2000
+--- configure.in.orig	Wed Sep 20 15:11:05 2000
++++ configure.in
 @@ -43,6 +43,9 @@
  CFLAGS="${CFLAGS:=}"
  CXXFLAGS="${CXXFLAGS:=}"
@@ -12,8 +12,70 @@ $NetBSD: patch-bb,v 1.1 2000/07/12 20:09:39 jlam Exp $
  AC_ARG_ENABLE(debug, [  --enable-debug        turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
  	OPTIM="-g "
  fi])
-@@ -403,13 +406,23 @@
- AC_SUBST(CAT8EXT)
+@@ -449,23 +452,25 @@
+ 	case "$uname" in
+ 		FreeBSD* | NetBSD* | OpenBSD*)
+ 			# *BSD
+-			INITDIR=""
+-			INITDDIR=""
++			INSTALL_INIT=""
+ 			;;
+ 
+ 		Linux*)
+ 			# Linux seems to choose an init.d directory at random...
+ 			if test -d /sbin/init.d; then
+ 				# SuSE
++				INSTALL_INIT="install-init"
+ 				INITDIR="/sbin/init.d"
+ 				INITDDIR=".."
+ 			else
+ 				if test -d /etc/rc.d; then
+ 					# RedHat
++					INSTALL_INIT="install-init"
+ 					INITDIR="/etc/rc.d"
+ 					INITDDIR="../init.d"
+ 				else
+ 					# Others
++					INSTALL_INIT="install-init"
+ 					INITDIR="/etc"
+ 					INITDDIR="../init.d"
+ 				fi
+@@ -473,32 +478,55 @@
+ 			;;
+ 
+ 		OSF1* | HP-UX*)
++			INSTALL_INIT="install-init"
+ 			INITDIR="/sbin"
+ 			INITDDIR="../init.d"
+ 			;;
+ 
+ 		*)
++			INSTALL_INIT="install-init"
+ 			INITDIR="/etc"
+ 			INITDDIR="../init.d"
+ 			;;
+ 
+ 	esac
+ else
+-	INITDIR="/etc"
+-	INITDDIR="../init.d"
++	case "$uname" in
++		FreeBSD* | NetBSD* | OpenBSD*)
++			INSTALL_INIT=""
++			INITDIR="/etc"
++			INITDDIR="../init.d"
++			;;
++		*)
++			INSTALL_INIT="install-init"
++			INITDIR="/etc"
++			INITDDIR="../init.d"
++			;;
++	esac
+ fi
+ 
++AC_SUBST(INSTALL_INIT)
+ AC_SUBST(INITDIR)
+ AC_SUBST(INITDDIR)
  
  dnl Setup default locations...
 -CUPS_SERVERROOT='${prefix}/etc/cups'
@@ -43,7 +105,7 @@ $NetBSD: patch-bb,v 1.1 2000/07/12 20:09:39 jlam Exp $
  
  dnl See what directory to put server executables...
  case "$uname" in
-@@ -460,8 +473,8 @@
+@@ -549,8 +577,8 @@
  AC_SUBST(CUPS_DATADIR)
  
  dnl Set the CUPS_DOCROOT directory...
@@ -53,4 +115,4 @@ $NetBSD: patch-bb,v 1.1 2000/07/12 20:09:39 jlam Exp $
 +AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups")
  AC_SUBST(CUPS_DOCROOT)
  
- AC_OUTPUT(Makedefs cups.sh)
+ dnl Set the CUPS_FONTPATH directory...
diff --git a/print/cups/patches/patch-bc b/print/cups/patches/patch-bc
deleted file mode 100644
index 75985bd33b9..00000000000
--- a/print/cups/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2000/07/12 20:09:40 jlam Exp $
-
---- filter/Makefile.orig	Fri Jul  7 13:02:42 2000
-+++ filter/Makefile	Wed Jul 12 01:53:04 2000
-@@ -69,7 +69,7 @@
- 	$(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups
- 	-$(MKDIR) $(LIBDIR)
- 	$(CHMOD) ugo+rx $(LIBDIR)
--	$(INSTALL_DATA) $(LIBCUPSIMAGE) $(LIBDIR)
-+	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
- 	-if test $(LIBCUPSIMAGE) != "libcupsimage.a" -a $(LIBCUPSIMAGE) != "libcupsimage.la"; then \
- 		$(RM) `basename $(LIBCUPSIMAGE) .2`; \
- 		$(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .2`; \
diff --git a/print/cups/patches/patch-bd b/print/cups/patches/patch-bd
deleted file mode 100644
index e43ba8520be..00000000000
--- a/print/cups/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2000/07/12 20:09:40 jlam Exp $
-
---- pstoraster/Makefile.orig	Fri Jul  7 13:02:47 2000
-+++ pstoraster/Makefile	Wed Jul 12 01:49:12 2000
-@@ -344,7 +344,7 @@
- 		gs_fform.ps gs_fonts.ps gs_init.ps gs_iso_e.ps \
- 		gs_kanji.ps gs_ksb_e.ps gs_lev2.ps \
- 		gs_ll3.ps gs_mex_e.ps gs_mro_e.ps \
--		gs_pdf_e.ps gs_pfile.ps gs_res.ps gs_setpd.ps \
-+		gs_pfile.ps gs_res.ps gs_setpd.ps \
- 		gs_statd.ps gs_std_e.ps gs_sym_e.ps gs_ttf.ps \
- 		gs_typ32.ps gs_typ42.ps gs_type1.ps gs_wan_e.ps \
- 		gs_wl1_e.ps gs_wl2_e.ps gs_wl5_e.ps
diff --git a/print/cups/pkg/DEINSTALL b/print/cups/pkg/DEINSTALL
index d43c78af690..fea1e0698cf 100644
--- a/print/cups/pkg/DEINSTALL
+++ b/print/cups/pkg/DEINSTALL
@@ -1,31 +1,99 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2000/07/12 20:09:40 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2000/12/07 20:33:06 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
+USER=@CUPS_USER@
+
+LOGDIR=/var/log/cups
+REQUESTDIR=/var/spool/cups
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/cups
+CONFDIR=/etc/cups
+CONFFILES="classes.conf client.conf cupsd.conf mime.convs mime.types printers.conf"
+
 case ${STAGE} in
 DEINSTALL)
+	# Remove configuration files if they don't differ from the default
+	# config file.
+	#
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}
+		if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+		then
+			rm -f ${FILE}
+		fi
+	done
 	;;
+
 POST-DEINSTALL)
-	SERVERROOT=/etc/cups
-	LOGDIR=/var/log/cups
-	REQUESTDIR=/var/spool/cups
+	modified_files=''
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		if [ -f ${FILE} ]
+		then
+			modified_files="${modified_files} ${FILE}"
+		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
+	rm -rf ${REQUESTDIR}/tmp
+	rmdir ${REQUESTDIR} 2>/dev/null || true
+
+	existing_dirs=''
+	for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR}
+	do
+		if [ -d ${dir} ]
+		then
+			existing_dirs="${existing_dirs} ${dir}"
+		fi
+	done
 
 	cat << EOF
 ===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-following directories:
+If you won't be using ${PKGNAME} any longer, you may want to remove:
+
+  * the \`${USER}' user 
+EOF
+	if [ -n "${modified_files}" ]
+	then
+		cat << EOF
 
-	${SERVERROOT}
-	${LOGDIR}
-	${REQUESTDIR}
+  * the following files:
+
+EOF
+		for file in ${modified_files}
+		do
+			echo "	${file}"
+		done
+	fi
+	if [ -n "${existing_dirs}" ]
+	then
+		cat << EOF
+
+  * the following directories:
+
+EOF
+		for dir in ${existing_dirs}
+		do
+			echo "	${dir}"
+		done
+	fi
+	cat << EOF
 ===========================================================================
 EOF
 	;;
+
 *)
-	echo "Unexpected argument: $2"
+	echo "Unexpected argument: ${STAGE}"
 	exit 1
 	;;
 esac
diff --git a/print/cups/pkg/INSTALL b/print/cups/pkg/INSTALL
index ded966fdfa0..ec5fa12e39d 100644
--- a/print/cups/pkg/INSTALL
+++ b/print/cups/pkg/INSTALL
@@ -1,48 +1,90 @@
-#!/bin/sh
+#! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2000/07/13 01:01:11 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2000/12/07 20:33:06 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
 
+USER=@CUPS_USER@
+GROUP=@CUPS_GROUP@
+USERDIR=@USERDIR@
+
+LOGDIR=/var/log/cups
+REQUESTDIR=/var/spool/cups
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/cups
+CONFDIR=/etc/cups
+CONFFILES="classes.conf client.conf cupsd.conf mime.convs mime.types printers.conf"
+
 case ${STAGE} in
 PRE-INSTALL)
+	# We need to check that ${GROUP} exists before adding the user.
+        #
+	if ${USERDIR}/group info -e ${GROUP}
+	then
+		echo "Group '${GROUP}' already exists...proceeding."
+	else
+		echo "Creating '${GROUP}' group..."
+		${USERDIR}/group add ${GROUP}
+		echo "Done."
+	fi
+
+	# use finger to be able to use NIS, ...
+	#
+	if finger ${USER} 2>&1 | grep >/dev/null "no such user"
+	then
+		echo "Creating '${USER}' user..."
+		${USERDIR}/user add \
+			-c "CUPS pseudo-user" \
+			-g ${GROUP} -s /sbin/nologin ${USER}
+		echo "Done."
+	else
+		echo "User '${USER}' already exists...proceeding."
+	fi
 	;;
-POST-INSTALL)
-	SERVERROOT=/etc/cups
-	LOGDIR=/var/log/cups
-	REQUESTDIR=/var/spool/cups
 
-	mkdir -p ${SERVERROOT}
-	mkdir -p ${SERVERROOT}/certs
-	mkdir -p ${SERVERROOT}/interfaces
-	mkdir -p ${SERVERROOT}/ppd
-	mkdir -p ${LOGDIR}
-	mkdir -p ${REQUESTDIR}
+POST-INSTALL)
+	mkdir -p ${CONFDIR}
+	mkdir -p ${CONFDIR}/certs
+	mkdir -p ${CONFDIR}/interfaces
+	mkdir -p ${CONFDIR}/ppd
+        mkdir -p ${LOGDIR}
+        mkdir -p ${REQUESTDIR}
+	chown ${USER}:${GROUP} ${REQUESTDIR}/tmp
+	mkdir -p ${REQUESTDIR}/tmp
+	chmod u+rwx,go-rwx,+t ${REQUESTDIR}/tmp
+	chown ${USER}:${GROUP} ${REQUESTDIR}/tmp
 
 	echo "Installing configuration files:"
-	for file in \
-		classes.conf \
-		client.conf \
-		cupsd.conf \
-		mime.convs \
-		mime.types \
-		printers.conf
+	for file in ${CONFFILES}
 	do
-		if [ -f ${SERVERROOT}/${file} ]
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}
+		if [ -f ${FILE} ]
 		then
-			echo "  ${SERVERROOT}/${file} already exists"
+			echo "    ${FILE} already exists"
 		else
-			echo "  ${PKG_PREFIX}/share/examples/cups/${file} --> ${SERVERROOT}/${file}"
-			cp ${PKG_PREFIX}/share/examples/cups/${file} \
-				${SERVERROOT}/${file}
-			chmod 644 ${SERVERROOT}/${file}
+			echo "    ${FILE}"
+			cp ${SAMPLEFILE} ${FILE}
+			chmod 644 ${FILE}
 		fi
 	done
-	echo "done."
+	cat << EOF
+===========================================================================
+Some files you might need to customize include the following:
+
+EOF
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		echo "	${FILE}"
+	done
+	cat << EOF
+===========================================================================
+EOF
 	;;
+
 *)
-	echo "Unexpected argument: $2"
+	echo "Unexpected argument: ${STAGE}"
 	exit 1
 	;;
 esac
diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST
index 44a7581cfbf..aa8f5837110 100644
--- a/print/cups/pkg/PLIST
+++ b/print/cups/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/12 20:09:40 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/12/07 20:33:06 jlam Exp $
 bin/cancel
 bin/disable
 bin/enable
@@ -9,6 +9,7 @@ bin/lpq
 bin/lpr
 bin/lprm
 bin/lpstat
+etc/rc.d/cupsd
 include/cups/cups.h
 include/cups/http.h
 include/cups/ipp.h
@@ -178,6 +179,8 @@ share/cups/fonts/Utopia-Regular
 share/cups/fonts/ZapfChancery-MediumItalic
 share/cups/fonts/ZapfDingbats
 share/cups/model/deskjet.ppd
+share/cups/model/epson24.ppd
+share/cups/model/epson9.ppd
 share/cups/model/laserjet.ppd
 share/cups/model/stcolor.ppd
 share/cups/model/stphoto.ppd
@@ -299,6 +302,7 @@ share/doc/html/cups/images/printer-processing.gif
 share/doc/html/cups/images/printer-stopped.gif
 share/doc/html/cups/images/reject-jobs.gif
 share/doc/html/cups/images/release-job.gif
+share/doc/html/cups/images/restart-job.gif
 share/doc/html/cups/images/right.gif
 share/doc/html/cups/images/show-active.gif
 share/doc/html/cups/images/show-completed.gif
@@ -317,6 +321,8 @@ share/doc/html/cups/sdd.html
 share/doc/html/cups/sdd.pdf
 share/doc/html/cups/spm.html
 share/doc/html/cups/spm.pdf
+share/doc/html/cups/sps.html
+share/doc/html/cups/sps.pdf
 share/doc/html/cups/ssr.html
 share/doc/html/cups/ssr.pdf
 share/doc/html/cups/stp.html
@@ -331,6 +337,12 @@ share/examples/cups/cupsd.conf
 share/examples/cups/mime.convs
 share/examples/cups/mime.types
 share/examples/cups/printers.conf
+share/locale/C/cups_C
+share/locale/de/cups_de
+share/locale/en/cups_en
+share/locale/es/cups_es
+share/locale/fr/cups_fr
+share/locale/it/cups_it
 @dirrm share/examples/cups
 @dirrm share/doc/html/cups/images
 @dirrm share/doc/html/cups