Update print/cups to 1.1.10.1. Changes from version 1.1.9.1 include:

+ Use our own cupsd rc.d-style script instead of using the one supplied
  with the CUPS sources.
- Bug fixes.
- Added a driver for DYMO label printers.
- Added new ClassifyOverride directive to allow users to override the
  classification of individual jobs.
- Added new BrowseProtocols directive to control which browse protocols
  are used (currently CUPS and SLP).
- Added SLPv2 support.
- The pdftops filter did not have the Japanese and Chinese text support
  compiled into it.

9 files changed, 19 insertions, 200 deletions

diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
deleted file mode 100644
index 75b0180cb8a..00000000000
--- a/print/cups/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2001/08/02 03:37:39 jlam Exp $
-
---- INSTALL.txt.orig	Thu Jul  5 11:34:37 2001
-+++ INSTALL.txt
-@@ -48,11 +48,12 @@
- 
- 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 9b0a21423d2..ae2f8a11548 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,24 +1,24 @@
-$NetBSD: patch-ab,v 1.10 2001/08/02 03:37:39 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2001/08/18 04:41:46 jlam Exp $
 
---- Makefile.orig	Thu Jun 28 12:20:08 2001
+--- Makefile.orig	Mon Aug  6 15:37:08 2001
 +++ Makefile
-@@ -60,8 +60,8 @@
+@@ -60,8 +60,6 @@
  		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...
-@@ -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; \
+@@ -86,10 +84,6 @@
+ 		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc3.d/S99cups; \
+ 		$(INSTALL_DIR) $(prefix)/$(INITDIR)/rc5.d; \
+ 		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/rc5.d/S99cups; \
+-	fi
+-	if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+-		$(INSTALL_DIR) $(prefix)/$(INITDDIR); \
+-		$(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDDIR)/cups; \
+ 	fi
+ 
+ 
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
deleted file mode 100644
index 4e619a3182f..00000000000
--- a/print/cups/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2001/08/02 03:37:39 jlam Exp $
-
---- 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
- 
- 
- #
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
deleted file mode 100644
index ed0a60c9362..00000000000
--- a/print/cups/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644
index 97a42e57994..00000000000
--- a/print/cups/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$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
deleted file mode 100644
index 56c509264a3..00000000000
--- a/print/cups/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
index 0a092a19028..8f1c0ea66f3 100644
--- a/print/cups/patches/patch-ag
+++ b/print/cups/patches/patch-ag
@@ -1,15 +1,13 @@
-$NetBSD: patch-ag,v 1.8 2001/08/02 03:37:40 jlam Exp $
+$NetBSD: patch-ag,v 1.9 2001/08/18 04:41:46 jlam Exp $
 
---- filter/Makefile.orig	Fri Jun 29 08:15:25 2001
+--- filter/Makefile.orig	Fri Aug 17 11:54:02 2001
 +++ filter/Makefile
-@@ -119,8 +119,8 @@
+@@ -122,7 +122,7 @@
  
  libcupsimage.la:       $(IMAGEOBJS) ../Makedefs
  	echo Linking $@...
--	$(CC) -o $@ $(IMAGEOBJS:.o=.lo) -rpath $(LIBDIR) \
--		-version-info 2:0
+-	$(DSO) -o $(DSOFLAGS) $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
 +	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
-+		-rpath $(LIBDIR) -version-info 2:0
+ 		-rpath $(LIBDIR) -version-info 2:0
  
  
- #
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
deleted file mode 100644
index f54446b53f0..00000000000
--- a/print/cups/patches/patch-ah
+++ /dev/null
@@ -1,53 +0,0 @@
-$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
deleted file mode 100644
index 79fc49d6702..00000000000
--- a/print/cups/patches/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.10 2001/08/06 18:06:25 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) $(SBINDIR)/accept $(BINDIR)/enable
-+	$(RM) $(BINDIR)/disable
-+	$(LN) $(SBINDIR)/accept $(BINDIR)/disable
- 	$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR)
- 
-