Deal with init script in a better way. Also update various patches to

versions sent back to Easy Software.

7 files changed, 90 insertions, 113 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index acba5acb45f..319a8851b16 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/12/12 16:03:13 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2000/12/14 17:04:44 jlam Exp $
 #
 
 DISTNAME=		cups-1.1.4-source
@@ -26,6 +26,8 @@ USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-libtool-unsupported="${LIBTOOL}"
 CONFIGURE_ARGS+=	--enable-rootconfig
+CONFIGURE_ARGS+=	--with-cups-user="${CUPS_USER}"
+CONFIGURE_ARGS+=	--with-cups-group="${CUPS_GROUP}"
 
 CFLAGS+=		-I${LOCALBASE}/include
 
@@ -72,11 +74,6 @@ pre-patch:
 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
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index cd26252379d..d08aaac0fa2 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.5 2000/12/07 20:33:06 jlam Exp $
+$NetBSD: patch-sum,v 1.6 2000/12/14 17:04:44 jlam Exp $
 
-MD5 (patch-aa) = 487e0f2674d818f333aa75fcb959ea61
-MD5 (patch-ab) = 0b881c059a3ab2e831328484f3bce2d3
+MD5 (patch-aa) = d2d5f49a3b305cbdf915cd44eadeaa9f
+MD5 (patch-ab) = 3f904cd7c7ed4ebe2e898e34a73edb88
 MD5 (patch-ac) = e06be2ba8c1e2a8c113cfed05c989e32
-MD5 (patch-bb) = 69d0be20367413f54a3377d4f07d5d87
+MD5 (patch-ad) = b818bd9cf762083e1943dab3f67863d5
+MD5 (patch-ae) = ed5db3c3f7916e3ea247237491e7337b
+MD5 (patch-bb) = 0bd8c80b391e0eb5069fe97bb0490b63
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index 4747e8be301..1c104bc15d0 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,8 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2000/12/07 20:33:06 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2000/12/14 17:04:45 jlam Exp $
 
 --- Makedefs.in.orig	Thu Sep 14 11:36:24 2000
 +++ Makedefs.in
-@@ -49,12 +49,13 @@
+@@ -46,14 +46,21 @@
+ SHELL	=	/bin/sh
+ 
+ #
++# CUPS administrator user and group...
++#
++
++CUPS_USER	=	@CUPS_USER@
++CUPS_GROUP	=	@CUPS_GROUP@
++
++#
  # Installation programs...
  #
  
@@ -17,7 +27,5 @@ $NetBSD: patch-aa,v 1.3 2000/12/07 20:33:06 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 217360de37c..455de3fb8f8 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,51 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/12/07 20:33:06 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2000/12/14 17:04:45 jlam Exp $
 
 --- 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\
+@@ -60,8 +60,6 @@
  		echo Installing in $$dir... ;\
  		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
  	done
-+
-+install-conf:
- 	echo Installing in conf...
- 	(cd conf; $(MAKE) $(MFLAGS) install)
-+
-+install-data:
+-	echo Installing in conf...
+-	(cd conf; $(MAKE) $(MFLAGS) install)
  	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...
- 	(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)
-+
-+install-init:
- 	echo Installing startup script...
- 	if test "x$INITDIR" != "x"; then \
- 		$(MKDIR) $(prefix)/$(INITDIR)/init.d; \
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
new file mode 100644
index 00000000000..b7d5757ede1
--- /dev/null
+++ b/print/cups/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.3 2000/12/14 17:04:45 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>
+ 
++<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-ae b/print/cups/patches/patch-ae
new file mode 100644
index 00000000000..04fa6ff0da6
--- /dev/null
+++ b/print/cups/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.3 2000/12/14 17:04:45 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
+ 
+ 
+ #
diff --git a/print/cups/patches/patch-bb b/print/cups/patches/patch-bb
index 92f944a2792..9e221502c15 100644
--- a/print/cups/patches/patch-bb
+++ b/print/cups/patches/patch-bb
@@ -1,81 +1,52 @@
-$NetBSD: patch-bb,v 1.2 2000/12/07 20:33:06 jlam Exp $
+$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
-@@ -43,6 +43,9 @@
- CFLAGS="${CFLAGS:=}"
+@@ -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
++AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
  	OPTIM="-g "
  fi])
-@@ -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"
- 			;;
+-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*)
-+			INSTALL_INIT=""
-+			INITDIR="/etc"
-+			INITDDIR="../init.d"
++			INITDIR=""
++			INITDDIR=""
 +			;;
 +		*)
-+			INSTALL_INIT="install-init"
 +			INITDIR="/etc"
 +			INITDDIR="../init.d"
 +			;;
 +	esac
  fi
  
-+AC_SUBST(INSTALL_INIT)
- AC_SUBST(INITDIR)
- AC_SUBST(INITDDIR)
+@@ -493,11 +512,21 @@
  
  dnl Setup default locations...
 -CUPS_SERVERROOT='${prefix}/etc/cups'
@@ -104,9 +75,7 @@ $NetBSD: patch-bb,v 1.2 2000/12/07 20:33:06 jlam Exp $
 +fi
  
  dnl See what directory to put server executables...
- case "$uname" in
-@@ -549,8 +577,8 @@
- AC_SUBST(CUPS_DATADIR)
+@@ -550,6 +579,6 @@
  
  dnl Set the CUPS_DOCROOT directory...
 -CUPS_DOCROOT='${exec_prefix}/share/doc/cups'
@@ -115,4 +84,10 @@ $NetBSD: patch-bb,v 1.2 2000/12/07 20:33:06 jlam Exp $
 +AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups")
  AC_SUBST(CUPS_DOCROOT)
  
- dnl Set the CUPS_FONTPATH directory...
+@@ -557,5 +586,5 @@
+ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
+ 
+-AC_OUTPUT(Makedefs cups.sh)
++AC_OUTPUT(Makedefs cups.sh conf/cupsd.conf)
+ 
+ dnl