Update cups to 1.1.7. Changes from version 1.1.6nb3 include bugfixes,

documentation updates, better support of Apache options in configuration
files, and:

- Added support for "double" HostNameLookups.
- Added new "RunAsUser" directive to support non-root configurations on the
  standard (privileged) ports.
- Added support for non-root invocation of the lpd backend (does no reserve a
  priviledged port, which might not work with some LPD servers...)
- Added new PrintcapFormat directive to control the output format of the
  printcap file (BSD or Solaris formats are supported at present.)
- httpConnect() now looks up "localhost" by name and by address (127.0.0.1)
  for users that go to the trouble of removing the required localhost entry
  in /etc/hosts or on their DNS server...
- The EPSON drivers now send the "end packet mode" command when printing to
  USB devices.
- The LPD backend now supports a new "order" option:
  "lpd://server/queue?order=control,data" (default) and
  "lpd://server/queue?order=data,control".
- New "Classification" directive to force labeling of the current
  classification on each page.
- New "page-label" attribute to add per-page labels ("For Official Use Only",
  "Draft", etc.)
- Dropped the "file" backend from the device list that is reported, since it
  is only available for *testing* and should never be used in a production
  environment.  The file: device can still be used, but it won't show up in
  the list of devices from lpinfo or the web interface.
- Added META variables to the CGI header template to prevent caching of the
  results.
- Added two new directives - MaxJobsPerPrinter and MaxJobsPerUser - to allow
  an administrator to set the maximum number of pending jobs in a queue or
  submitted by a user.
- Added support for the Enable-Printer and Disable-Printer extension
  operations (same as CUPS-Accept-Jobs and CUPS-Reject-Jobs.)
- Added support for the DeskJet 900 series duplexer and CRET color modes in
  the HP driver.
- Added support for PPD-defined margins in the HP driver.
- Added new cupsGetJobs() and cupsFreeJobs() functions to manage print jobs.
- cupsEncodeOptions() would encode names of 0 length and cupsAddOption() and
  cupsParseOptions() would add names of 0 length.

1 files changed, 15 insertions, 13 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index c30beac5085..566f3f30bee 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.26 2001/03/27 03:20:13 hubertf Exp $
-#
+# $NetBSD: Makefile,v 1.27 2001/05/15 17:43:20 jlam Exp $
 
-DISTNAME=		cups-${VERS}-3-source
-PKGNAME=		cups-${VERS}.3nb2
-VERS=			1.1.6
+DISTNAME=		cups-${VERS}-source
+PKGNAME=		cups-${VERS}
+VERS=			1.1.7
 WRKSRC=			${WRKDIR}/cups-${VERS}
 CATEGORIES=		print
-MASTER_SITES=		ftp://ftp2.easysw.com/pub/cups/${VERS}/ \
-			ftp://ftp.easysw.com/pub/cups/${VERS}/ \
-			ftp://ftp.northamerica.net/pub/ESP/cups/${VERS}/ \
+MASTER_SITES=		ftp://ftp.easysw.com/pub/cups/${VERS}/ \
+			ftp://ftp2.easysw.com/pub/cups/${VERS}/ \
 			ftp://ftp.funet.fi/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}/
 EXTRACT_SUFX=		.tar.bz2
 
@@ -19,7 +19,6 @@ COMMENT=		Common UNIX Printing System
 
 CONFLICTS+=		LPRng-[0-9]* LPRng-core-[0-9]*
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		png>1.0.9:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
@@ -29,15 +28,21 @@ USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
 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+=	--enable-ssl
 
 CFLAGS+=		-I${LOCALBASE}/include
+CXXFLAGS+=		-I${LOCALBASE}/include
 
 .include "../../mk/bsd.prefs.mk"
 
+.if (${OPSYS} == "SunOS")
+DEPENDS+=		zlib>=1.1.3:../../devel/zlib
+.endif
+
 .if defined(USE_PAM)
 DEPENDS+=		PAM-*:../../security/PAM
 CONFIGURE_ARGS+=	--enable-pam
@@ -77,10 +82,7 @@ DOCDIR=			${PREFIX}/share/doc/cups
 EGDIR=			${PREFIX}/share/examples/cups
 
 post-extract:
-	cd ${WRKSRC}/conf; ${MV} cupsd.conf cupsd.conf.in
-
-pre-configure:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
+	cd ${WRKSRC}/conf; ${MV} -f cupsd.conf cupsd.conf.in
 
 post-build:
 	${SED}	-e "s|@CUPS_USER@|${CUPS_USER}|g"			\