Update CUPS to 1.1. Remove most of the patches; I worked closely with

the author to make this package compile more seamlessly on BSD systems,
and in particular with the NetBSD pkgsrc software collection.

CUPS 1.1 is the newest production (stable) release of CUPS.  It
provides many new features from the 1.0.x releases, including a
new Level 3 PostScript RIP, a new PDF filter, EPSON printer
drivers, IPP/1.1 support, banner page support, and LPD client
support.  Binaries for several platforms are also available.

Major changes in v1.1 include:

	- The text filter now embeds missing fonts.
	- Integrated Xpdf's pdftops filter into CUPS, which is a
	  lightweight and reliable replacement for Ghostscript's
	  PDF support.
	- The web administration interface now allows you to set
	  the default banner pages.
	- Images can now be positioned on the page using the new
	  "position" option.
	- Updated the serial, parallel, and usb backends to do
	  multiple writes and ignore ioctl() errors as needed;
	  this should fix problems with serial printing on old
	  serial drivers and with the UltraSPARC parallel port
	  driver under Solaris 2.7.
	- Now propagate LD_LIBRARY_PATH to child processes from
	  cupsd.
	- Queued remote jobs recreate remote printers as needed
	  when the scheduler is started.
	- Deleting a printer also purges all jobs on that
	  printer.
	- Old job and control files that don't belong to a
	  printer are automatically deleted.
	- cups-lpd now supports options set with lpoptions.
	- The IPP backend now switches to IPP/1.0 if a 1.1
	  request fails.

1 files changed, 30 insertions, 27 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 240db4f186d..3b8be45a21f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,39 +1,42 @@
-# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:40 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/07/12 20:09:33 jlam Exp $
 #
 
-DISTNAME=	cups-1.0.2-source
-PKGNAME=	${DISTNAME:S/-source//}
-VERS=		${PKGNAME:S/cups-//}
-WRKSRC=		${WRKDIR}/${PKGNAME}
-CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.easysw.com/pub/cups/${VERS}/ \
-		ftp://ftp2.easysw.com/pub/cups/${VERS}/ \
-		ftp://ftp.northamerica.net/pub/ESP/cups/${VERS}/ \
-		ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/cups/${VERS}/ \
-		ftp://ftp.fisek.com.tr/pub/cups/${VERS}/
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=		cups-1.1-source
+PKGNAME=		${DISTNAME:S/-source//}
+VERS=			${PKGNAME:S/cups-//}
+WRKSRC=			${WRKDIR}/${PKGNAME}
+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}/ \
+			ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/cups/${VERS}/ \
+			ftp://ftp.fisek.com.tr/pub/cups/${VERS}/
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	jlam@netbsd.org
-HOMEPAGE=	http://www.cups.org/
+MAINTAINER=		jlam@netbsd.org
+HOMEPAGE=		http://www.cups.org/
 
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png>=1.0.6:../../graphics/png
-DEPENDS+=	tiff-*:../../graphics/tiff
+BUILD_DEPENDS+=		autoconf:../../devel/autoconf
+DEPENDS+=		jpeg-6b:../../graphics/jpeg
+DEPENDS+=		png>=1.0.6:../../graphics/png
+DEPENDS+=		tiff-*:../../graphics/tiff
 
-USE_PKGLIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--enable-libtool-unsupported="${LIBTOOL}"
+CONFIGURE_ARGS+=	--disable-pam
+CONFIGURE_ARGS+=	--enable-rootconfig
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=		-I${LOCALBASE}/include
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
 
 post-install:
-.for DIR in interfaces logs ppd requests
-	${TOUCH} /var/cups/${DIR}/.directory
-.endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups
-	cd ${WRKSRC}/conf; ${INSTALL_DATA} classes.conf cupsd.conf \
-		cupsd.conf-personal cupsd.conf-professional mime.convs \
-		mime.types printcap printers.conf \
+	cd ${WRKSRC}/conf; ${INSTALL_DATA} *.conf mime.* \
 		${PREFIX}/share/examples/cups
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"