Update cups to 1.1.5.2. No functional changes from 1.1.5.1, but NetBSD

changes were folded back into the main source tree.

12 files changed, 31 insertions, 323 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index ab6afb70c3a..a25700621c7 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2000/12/28 00:09:38 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/01/11 19:00:42 jlam Exp $
 #
 
-DISTNAME=		cups-${VERS}-1-source
-PKGNAME=		cups-${VERS}.1
+DISTNAME=		cups-${VERS}-2-source
+PKGNAME=		cups-${VERS}.2
 VERS=			1.1.5
 WRKSRC=			${WRKDIR}/cups-${VERS}
 CATEGORIES=		print
@@ -29,8 +29,6 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--sysconfdir=/etc
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--enable-libtool-unsupported="${LIBTOOL}"
-CONFIGURE_ARGS+=	--with-cups-user="${CUPS_USER}"
-CONFIGURE_ARGS+=	--with-cups-group="${CUPS_GROUP}"
 
 USE_SSL=		# defined
 CONFIGURE_ARGS+=	--enable-ssl
@@ -84,6 +82,9 @@ 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" \
diff --git a/print/cups/files/md5 b/print/cups/files/md5
index c8aeaeeecbf..43f287a6a3a 100644
--- a/print/cups/files/md5
+++ b/print/cups/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/12/21 16:59:32 jlam Exp $
+$NetBSD: md5,v 1.6 2001/01/11 19:00:42 jlam Exp $
 
-MD5 (cups-1.1.5-1-source.tar.bz2) = 2e96691f5ed846f9d1c005fd0b5a5417
+MD5 (cups-1.1.5-2-source.tar.bz2) = b8c25a0f01a887b5584d1e2166beff03
diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum
index b81d0c1e2f5..d8fa84be64b 100644
--- a/print/cups/files/patch-sum
+++ b/print/cups/files/patch-sum
@@ -1,13 +1,8 @@
-$NetBSD: patch-sum,v 1.8 2000/12/21 16:59:32 jlam Exp $
+$NetBSD: patch-sum,v 1.9 2001/01/11 19:00:42 jlam Exp $
 
-MD5 (patch-aa) = 53110457446460159d9c4c25d31d2c91
-MD5 (patch-ab) = 2f1eaecaa15170102f2338d7e63f3bb6
-MD5 (patch-ac) = 7ef2e9cff08d5157ecfffb7fe6a0d151
+MD5 (patch-aa) = bd3262a4a78bca35b8127c6c4e32188c
+MD5 (patch-ab) = 1fe6aa85344955313591068c984cccf4
+MD5 (patch-ac) = 56b2896936f298e07c26f3d065a26af6
 MD5 (patch-ad) = 4ea2faaf4cf0ef1a75a3b35d964683e1
-MD5 (patch-ae) = c50a8a409a9706f320784a294d082c50
-MD5 (patch-af) = d5f1fc6b8b42a6594de5fbaaa936f0fc
+MD5 (patch-af) = 4b31920208c56cc1dab19d782adbb574
 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 61f7c97445a..f1ca461a884 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,18 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2000/12/21 14:59:38 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/01/11 19:00:43 jlam Exp $
 
---- Makedefs.in.orig	Mon Oct 16 19:02:08 2000
+--- Makedefs.in.orig	Wed Jan  3 12:44:39 2001
 +++ Makedefs.in
-@@ -46,14 +46,21 @@
- SHELL	=	/bin/sh
- 
- #
-+# CUPS administrator user and group...
-+#
-+
-+CUPS_USER	=	@CUPS_USER@
-+CUPS_GROUP	=	@CUPS_GROUP@
-+
-+#
+@@ -48,11 +48,11 @@
  # Installation programs...
  #
  
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index ed0cd005e16..1cdbc6fcba7 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2000/12/21 16:59:32 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2001/01/11 19:00:43 jlam Exp $
 
---- Makefile.orig	Thu Dec 21 08:45:21 2000
+--- Makefile.orig	Wed Jan  3 12:44:40 2001
 +++ Makefile
 @@ -60,8 +60,8 @@
  		echo Installing in $$dir... ;\
@@ -13,12 +13,3 @@ $NetBSD: patch-ab,v 1.6 2000/12/21 16:59:32 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 \
- 		$(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 b68e6cb0123..8f0a41adfe8 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,82 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2000/12/21 16:59:32 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2001/01/11 19:00:43 jlam Exp $
 
---- backend/serial.c.orig	Thu Dec 21 08:45:21 2000
+--- backend/serial.c.orig	Wed Jan  3 12:44:40 2001
 +++ 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__ */
- 
- #ifdef __sgi
-@@ -484,10 +484,10 @@
- void
- list_devices(void)
- {
--#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#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 || __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
-+#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",
+@@ -800,7 +800,7 @@
               device, i + 1);
+     }
    }
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD__)
    int	i, j;		/* Looping vars */
    int	fd;		/* File descriptor */
    char	device[255];	/* Device filename */
-@@ -800,6 +800,43 @@
-              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 Prt #%d\"\n",
-+	       device, i, j + 1);
-+      }
-+    }
-+
- #endif
- }
- 
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
deleted file mode 100644
index 2015a2f7496..00000000000
--- a/print/cups/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2000/12/21 14:59:38 jlam Exp $
-
---- 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
index 8b528e51482..f84596f30af 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,119 +1,15 @@
-$NetBSD: patch-af,v 1.4 2000/12/21 16:59:32 jlam Exp $
+$NetBSD: patch-af,v 1.5 2001/01/11 19:00:43 jlam Exp $
 
---- configure.in.orig	Thu Dec 21 08:45:21 2000
+--- configure.in.orig	Wed Jan  3 12:44:40 2001
 +++ 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
-@@ -201,9 +209,24 @@
- 	SAVELIBS="$LIBS"
- 
--	LIBS="-lcrypto $LIBS"
--	AC_CHECK_LIB(ssl,SSL_new,
--		SSLLIBS="-lssl -lcrypto"
--		AC_DEFINE(HAVE_LIBSSL)
--	)
-+	dnl Some ELF systems can't resolve all the symbols in libcrypto
-+	dnl if libcrypto was linked against RSAREF, and fail to link the
-+	dnl test program correctly, even though a correct installation
-+	dnl of OpenSSL exists.  So we test the linking three times in
-+	dnl case the RSAREF libraries are needed.
-+	dnl
-+	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
- 
- 	LIBS="$SAVELIBS"
-@@ -257,4 +280,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.
-@@ -396,5 +420,5 @@
- 	else
- 		datadir="$prefix/share"
--        fi
-+	fi
- fi
- 
-@@ -429,9 +453,18 @@
- 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
- 
-@@ -510,11 +543,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...
-@@ -567,6 +600,6 @@
+@@ -591,8 +591,8 @@
+ AC_SUBST(CUPS_DATADIR)
  
  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='${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)
  
-@@ -574,5 +607,5 @@
- AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
- 
--AC_OUTPUT(Makedefs cups.sh)
-+AC_OUTPUT(Makedefs cups.sh conf/cupsd.conf)
- 
- dnl
+ dnl Set the CUPS_FONTPATH directory...
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
deleted file mode 100644
index 034a7cdbb9d..00000000000
--- a/print/cups/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 8414350ec61..00000000000
--- a/print/cups/patches/patch-ai
+++ /dev/null
@@ -1,32 +0,0 @@
-$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
deleted file mode 100644
index 1899c9ae64f..00000000000
--- a/print/cups/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 0f2fdaf18d1..00000000000
--- a/print/cups/patches/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
-$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
- 
- 
- #