Update print/cups to 1.1.12. Relevant changes from version 1.1.10.1 include:

- Bug fixes.
- Start of internationalization support for banner and PPD files.
- Added support for embedded TrueType fonts in PDF files.
- Added support for PostScript functions in PDF files.
- Added new "cupsaddsmb" utility for exporting CUPS printer drivers to
  SAMBA/Windows clients.
- The ippRead() and ipp_read_file() functions could not handle more than
  IPP_MAX_VALUES (100) values in a 1setOf attribute.  These functions have
  been updated to dynamically allocate more memory as needed, and the
  IPP_MAX_VALUES constant now represents the allocation increment.  [this
  caused some versions of the GIMP-print drivers to fail since the number
  of media options exceeded 100...]
- The web interfaces did not always quote < and & in things like the job
  title.  This had the potential for browser-based security violations (on
  the browser's machine); bug report from SuSE.
- The scheduler now treats unauthenticated usernames as case-insensitive
  when doing quota and allow/deny processing.
- The PostScript filter (pstops) now handles EPS files, adding a showpage
  command to the files as needed.
- The cups-lpd mini-daemon did not support anonymous printing (no username
  specified).  While the username is REQUIRED by RFC-1179, MacOS clients do
  not send the REQUIRED username information when printing via LPD.
- The httpConnect*() functions now try all available addresses for a host
  when connecting for the first time.

1 files changed, 26 insertions, 24 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index b07d8be5e03..f7a3b7251f5 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2001/12/02 06:56:43 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2001/12/14 23:18:15 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
-BASE_VERS=		1.1.10
-DIST_VERS=		${BASE_VERS}-1
+BASE_VERS=		1.1.12
+DIST_VERS=		${BASE_VERS}
 VERS=			${DIST_VERS:S/-/./g}
 WRKSRC=			${WRKDIR}/cups-${BASE_VERS}
 CATEGORIES=		print
@@ -21,10 +21,10 @@ COMMENT=		Common UNIX Printing System
 
 CONFLICTS+=		LPRng-[0-9]* LPRng-core-[0-9]*
 
-USE_BUILDLINK_ONLY=	# defined
-USE_GMAKE=		# defined
-USE_LIBTOOL=		# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK_ONLY=	YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/cups
@@ -60,26 +60,28 @@ BUILD_DEFS+=		CUPS_USER CUPS_GROUP
 
 DOCDIR=			${PREFIX}/share/doc/cups
 EGDIR=			${PREFIX}/share/examples/cups
+CUPS_CONFDIR=		${PKG_SYSCONFDIR}/cups
+CUPS_LOGDIR=		/var/log/cups
+CUPS_REQUESTS=		/var/spool/cups
 
-PKG_GROUPS=	${CUPS_GROUP}
-PKG_USERS=	${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user:${SH}
+PKG_GROUPS=		${CUPS_GROUP}
+PKG_USERS=		${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user::${SH}
 
-CONF_FILES=	${EGDIR}/client.conf ${PKG_SYSCONFDIR}/cups/client.conf
-CONF_FILES+=	${EGDIR}/cupsd.conf ${PKG_SYSCONFDIR}/cups/cupsd.conf
-SUPPORT_FILES=	${EGDIR}/classes.conf ${PKG_SYSCONFDIR}/cups/classes.conf
-SUPPORT_FILES+=	${EGDIR}/mime.convs ${PKG_SYSCONFDIR}/cups/mime.convs
-SUPPORT_FILES+=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/cups/mime.types
-SUPPORT_FILES+=	${EGDIR}/printers.conf ${PKG_SYSCONFDIR}/cups/printers.conf
-RCD_SCRIPTS=	cupsd
+CONF_FILES=		${EGDIR}/client.conf ${CUPS_CONFDIR}/client.conf
+CONF_FILES+=		${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
+SUPPORT_FILES=		${EGDIR}/classes.conf ${CUPS_CONFDIR}/classes.conf
+SUPPORT_FILES+=		${EGDIR}/mime.convs ${CUPS_CONFDIR}/mime.convs
+SUPPORT_FILES+=		${EGDIR}/mime.types ${CUPS_CONFDIR}/mime.types
+SUPPORT_FILES+=		${EGDIR}/printers.conf ${CUPS_CONFDIR}/printers.conf
+RCD_SCRIPTS=		cupsd
 
-OWN_DIRS+=		${PKG_SYSCONFDIR}/cups
-OWN_DIRS+=		${PKG_SYSCONFDIR}/cups/interfaces
-OWN_DIRS+=		${PKG_SYSCONFDIR}/cups/ppd
-OWN_DIRS+=		/var/log/cups
-OWN_DIRS+=		/var/spool/cups
-OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/cups/certs			\
-			${CUPS_USER} ${CUPS_GROUP} 0711
-OWN_DIRS_PERMS+=	/var/spool/cups/tmp ${CUPS_USER} ${CUPS_GROUP} 1700
+OWN_DIRS=		${CUPS_CONFDIR}
+OWN_DIRS+=		${CUPS_CONFDIR}/interfaces
+OWN_DIRS+=		${CUPS_CONFDIR}/ppd
+OWN_DIRS+=		${CUPS_LOGDIR}
+OWN_DIRS_PERMS=		${CUPS_CONFDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711
+OWN_DIRS_PERMS+=	${CUPS_REQUESTS} ${CUPS_USER} ${CUPS_GROUP} 0700
+OWN_DIRS_PERMS+=	${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1700
 
 pre-install:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam