From c77645cac0906671061c73e8857e3571c29d70d5 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 20 Oct 2002 18:57:37 +0000 Subject: Update print/cups from version 1.1.15.1 to version 1.1.16: CUPS 1.1.16 adds support for a new CUPS printer driver for Windows NT/2000/XP that provides accurate page accounting as well as support for the banner, job billing, job priority, and page label options. The new release also contains many small bug fixes and enhancements, including better USB printing support, support for printer names containing any printable character (123print, my-long-printer-name, etc.), and French language localization of the web interface and documentation. --- print/cups/Makefile | 27 ++++++++---- print/cups/PLIST | 102 +++++++++++++++++++++++++++++++++++++++++--- print/cups/distinfo | 11 +++-- print/cups/files/cups.pam | 6 +-- print/cups/patches/patch-ag | 6 +-- print/cups/patches/patch-aj | 23 ++++++++++ print/cups/patches/patch-ak | 40 +++++++++++++++++ print/cups/patches/patch-al | 13 ++++++ 8 files changed, 202 insertions(+), 26 deletions(-) create mode 100644 print/cups/patches/patch-aj create mode 100644 print/cups/patches/patch-ak create mode 100644 print/cups/patches/patch-al (limited to 'print/cups') diff --git a/print/cups/Makefile b/print/cups/Makefile index 9c709287e66..1b2e370fbcc 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.52 2002/09/19 09:04:20 jlam Exp $ +# $NetBSD: Makefile,v 1.53 2002/10/20 18:57:37 jlam Exp $ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} -BASE_VERS= 1.1.15 -DIST_VERS= ${BASE_VERS}-1 +BASE_VERS= 1.1.16 +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_BUILDLINK2= YES -USE_GMAKE= YES -USE_LIBTOOL= YES -GNU_CONFIGURE= YES +USE_BUILDLINK2= # defined +USE_GMAKE= # defined +USE_LIBTOOL= # defined +GNU_CONFIGURE= # defined UNLIMIT_RESOURCES= datasize memorysize CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} CONFIGURE_ARGS+= --localstatedir=/var @@ -39,7 +39,7 @@ CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" .include "../../mk/bsd.prefs.mk" .if defined(USE_PAM) -.include "../../security/PAM/buildlink2.mk" +. include "../../security/PAM/buildlink2.mk" BUILD_DEFS+= USE_PAM CONFIGURE_ARGS+= --enable-pam PLIST_SRC= ${PKGDIR}/PLIST.pam @@ -72,6 +72,7 @@ CUPS_REQUESTS= /var/spool/cups PKG_GROUPS= ${CUPS_GROUP} PKG_USERS= ${CUPS_USER}:${CUPS_GROUP}::Common\\ UNIX\\ Printing\\ System\\ user::${SH} +SPECIAL_PERMS= ${PREFIX}/bin/lppasswd ${CUPS_USER} ${CUPS_GROUP} 4755 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 @@ -97,7 +98,15 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}/$${file}; \ done ${INSTALL_DATA_DIR} ${EGDIR} - cd ${WRKSRC}/conf; ${INSTALL_DATA} *.conf mime.* ${EGDIR} + cd ${WRKSRC}/conf; for file in *.conf mime.*; do \ + case $${file} in \ + pam.conf) \ + ;; \ + *) \ + ${INSTALL_DATA} $${file} ${EGDIR}/$${file}; \ + ;; \ + esac; \ + done .if defined(USE_PAM) ${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR} .endif diff --git a/print/cups/PLIST b/print/cups/PLIST index 08522c8d8f7..699bad1d23d 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/09/18 22:58:47 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/10/20 18:57:37 jlam Exp $ bin/cancel bin/cups-config bin/disable @@ -203,14 +203,59 @@ share/cups/charsets/windows-1255 share/cups/charsets/windows-1256 share/cups/charsets/windows-1257 share/cups/charsets/windows-1258 -share/cups/charsets/windows-874 share/cups/data/HPGLprolog share/cups/data/psglyphs share/cups/data/testprint.ps +share/cups/fonts/Courier share/cups/fonts/Courier-Bold share/cups/fonts/Courier-BoldOblique share/cups/fonts/Courier-Oblique share/cups/fonts/Symbol +share/cups/fr/templates/add-class.tmpl +share/cups/fr/templates/add-printer.tmpl +share/cups/fr/templates/admin-op.tmpl +share/cups/fr/templates/admin.tmpl +share/cups/fr/templates/choose-device.tmpl +share/cups/fr/templates/choose-make.tmpl +share/cups/fr/templates/choose-members.tmpl +share/cups/fr/templates/choose-model.tmpl +share/cups/fr/templates/choose-serial.tmpl +share/cups/fr/templates/choose-uri.tmpl +share/cups/fr/templates/class-added.tmpl +share/cups/fr/templates/class-confirm.tmpl +share/cups/fr/templates/class-deleted.tmpl +share/cups/fr/templates/class-modified.tmpl +share/cups/fr/templates/classes.tmpl +share/cups/fr/templates/config-printer.tmpl +share/cups/fr/templates/config-printer2.tmpl +share/cups/fr/templates/error.tmpl +share/cups/fr/templates/header.tmpl +share/cups/fr/templates/job-cancel.tmpl +share/cups/fr/templates/job-hold.tmpl +share/cups/fr/templates/job-op.tmpl +share/cups/fr/templates/job-release.tmpl +share/cups/fr/templates/job-restart.tmpl +share/cups/fr/templates/jobs.tmpl +share/cups/fr/templates/modify-class.tmpl +share/cups/fr/templates/modify-printer.tmpl +share/cups/fr/templates/option-boolean.tmpl +share/cups/fr/templates/option-header.tmpl +share/cups/fr/templates/option-pickmany.tmpl +share/cups/fr/templates/option-pickone.tmpl +share/cups/fr/templates/option-trailer.tmpl +share/cups/fr/templates/printer-accept.tmpl +share/cups/fr/templates/printer-added.tmpl +share/cups/fr/templates/printer-configured.tmpl +share/cups/fr/templates/printer-confirm.tmpl +share/cups/fr/templates/printer-deleted.tmpl +share/cups/fr/templates/printer-modified.tmpl +share/cups/fr/templates/printer-purge.tmpl +share/cups/fr/templates/printer-reject.tmpl +share/cups/fr/templates/printer-start.tmpl +share/cups/fr/templates/printer-stop.tmpl +share/cups/fr/templates/printers.tmpl +share/cups/fr/templates/test-page.tmpl +share/cups/fr/templates/trailer.tmpl share/cups/model/deskjet.ppd share/cups/model/deskjet2.ppd share/cups/model/dymo.ppd @@ -251,6 +296,7 @@ share/cups/templates/jobs.tmpl share/cups/templates/modify-class.tmpl share/cups/templates/modify-printer.tmpl share/cups/templates/option-boolean.tmpl +share/cups/templates/option-conflict.tmpl share/cups/templates/option-header.tmpl share/cups/templates/option-pickmany.tmpl share/cups/templates/option-pickone.tmpl @@ -276,6 +322,43 @@ share/doc/html/cups/cmp.pdf share/doc/html/cups/cups.css share/doc/html/cups/cupsdoc.css share/doc/html/cups/documentation.html +share/doc/html/cups/fr/cups.css +share/doc/html/cups/fr/cupsdoc.css +share/doc/html/cups/fr/documentation.html +share/doc/html/cups/fr/images/accept-jobs.gif +share/doc/html/cups/fr/images/add-class.gif +share/doc/html/cups/fr/images/add-printer.gif +share/doc/html/cups/fr/images/cancel-job.gif +share/doc/html/cups/fr/images/cancel-jobs.gif +share/doc/html/cups/fr/images/cancel.gif +share/doc/html/cups/fr/images/config-printer.gif +share/doc/html/cups/fr/images/continue.gif +share/doc/html/cups/fr/images/delete-class.gif +share/doc/html/cups/fr/images/delete-printer.gif +share/doc/html/cups/fr/images/hold-job.gif +share/doc/html/cups/fr/images/manage-classes.gif +share/doc/html/cups/fr/images/manage-jobs.gif +share/doc/html/cups/fr/images/manage-printers.gif +share/doc/html/cups/fr/images/modify-class.gif +share/doc/html/cups/fr/images/modify-printer.gif +share/doc/html/cups/fr/images/navbar.gif +share/doc/html/cups/fr/images/print-test-page.gif +share/doc/html/cups/fr/images/reject-jobs.gif +share/doc/html/cups/fr/images/release-job.gif +share/doc/html/cups/fr/images/restart-job.gif +share/doc/html/cups/fr/images/show-active.gif +share/doc/html/cups/fr/images/show-completed.gif +share/doc/html/cups/fr/images/start-class.gif +share/doc/html/cups/fr/images/start-printer.gif +share/doc/html/cups/fr/images/stop-class.gif +share/doc/html/cups/fr/images/stop-printer.gif +share/doc/html/cups/fr/index.html +share/doc/html/cups/fr/overview.html +share/doc/html/cups/fr/overview.pdf +share/doc/html/cups/fr/sam.html +share/doc/html/cups/fr/sam.pdf +share/doc/html/cups/fr/sum.html +share/doc/html/cups/fr/sum.pdf share/doc/html/cups/idd.html share/doc/html/cups/idd.pdf share/doc/html/cups/images/accept-jobs.gif @@ -361,17 +444,22 @@ share/locale/sv/cups_sv share/locale/uk/cups_uk share/locale/uk_UA.cp1251/cups_uk_UA.cp1251 share/locale/zh_CN/cups_zh_CN -@dirrm share/locale/uk_UA.cp1251 -@dirrm share/locale/ru_RU.koi8r -@dirrm share/locale/ru_RU.cp1251 -@dirrm share/locale/be -@dirrm share/locale/C +share/cups/charsets/windows-874 +@unexec ${RMDIR} %D/share/locale/uk_UA.cp1251 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/locale/ru_RU.koi8r 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/locale/ru_RU.cp1251 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/locale/be 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/locale/C 2>/dev/null || ${TRUE} @dirrm share/examples/cups @dirrm share/doc/html/cups/images +@dirrm share/doc/html/cups/fr/images +@dirrm share/doc/html/cups/fr @dirrm share/doc/html/cups @dirrm share/doc/cups @dirrm share/cups/templates @dirrm share/cups/model +@dirrm share/cups/fr/templates +@dirrm share/cups/fr @dirrm share/cups/fonts @dirrm share/cups/data @dirrm share/cups/charsets diff --git a/print/cups/distinfo b/print/cups/distinfo index 930a3030c70..9a78156d800 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.16 2002/09/18 22:58:47 jlam Exp $ +$NetBSD: distinfo,v 1.17 2002/10/20 18:57:37 jlam Exp $ -SHA1 (cups-1.1.15-1-source.tar.bz2) = 1c277b0269476353211e6a60eb2d7a5518879904 -Size (cups-1.1.15-1-source.tar.bz2) = 2962392 bytes +SHA1 (cups-1.1.16-source.tar.bz2) = 648beac667f0757d046840b8a812252aa8667487 +Size (cups-1.1.16-source.tar.bz2) = 3394088 bytes SHA1 (patch-ab) = 00d438f297bee64411869ab605fc07fe6380f25d -SHA1 (patch-ag) = f7138afc017694db9a5c74d47b0c8cf109aec459 +SHA1 (patch-ag) = c570be2c7f833e8a17dedc393fef26572c974215 SHA1 (patch-ai) = b2d4d3d8d916c0ef3c22b93fe3b93a7d11f77632 +SHA1 (patch-aj) = cfdb158f11ad55236cbc68e49447c4ee2f9585b8 +SHA1 (patch-ak) = 7884b204e0b21226bb9159c712d8b3e5f0fc107c +SHA1 (patch-al) = 3928fd2348678b25b1607eb7317576d86eaf35df diff --git a/print/cups/files/cups.pam b/print/cups/files/cups.pam index bb50c387aa8..30e5a497ad3 100644 --- a/print/cups/files/cups.pam +++ b/print/cups/files/cups.pam @@ -1,6 +1,6 @@ -# $NetBSD: cups.pam,v 1.1 2000/12/12 16:04:06 jlam Exp $ +# $NetBSD: cups.pam,v 1.2 2002/10/20 18:57:38 jlam Exp $ # # PAM configuration for Common UNIX Printing System # -auth required @PREFIX@/lib/security/pam_unix.so nullok shadow -account required @PREFIX@/lib/security/pam_unix.so +auth required @LOCALBASE@/lib/security/pam_unix.so nullok +account required @LOCALBASE@/lib/security/pam_unix.so diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag index 3ea74d1e582..f8cd593d134 100644 --- a/print/cups/patches/patch-ag +++ b/print/cups/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.12 2002/09/18 22:58:49 jlam Exp $ +$NetBSD: patch-ag,v 1.13 2002/10/20 18:57:38 jlam Exp $ ---- filter/Makefile.orig Mon May 13 18:14:28 2002 +--- filter/Makefile.orig Tue Jul 30 15:09:27 2002 +++ filter/Makefile -@@ -154,7 +154,7 @@ libcupsimage_s.a: $(IMAGEOBJS) ../Makede +@@ -158,7 +158,7 @@ libcupsimage_s.a: $(IMAGEOBJS) ../Makede libcupsimage.la: $(IMAGEOBJS) ../Makedefs echo Linking $@... diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj new file mode 100644 index 00000000000..072a020ec48 --- /dev/null +++ b/print/cups/patches/patch-aj @@ -0,0 +1,23 @@ +$NetBSD: patch-aj,v 1.9 2002/10/20 18:57:38 jlam Exp $ + +--- pdftops/Makefile.orig Wed Sep 18 12:58:19 2002 ++++ pdftops/Makefile +@@ -24,7 +24,6 @@ LIBOBJS = Annot.o \ + Decrypt.o \ + Dict.o \ + Error.o \ +- FTFont.o \ + FontEncoding.o \ + FontEncodingTables.o \ + FontFile.o \ +@@ -47,10 +46,7 @@ LIBOBJS = Annot.o \ + Page.o \ + Params.o \ + Parser.o \ +- SFont.o \ + Stream.o \ +- T1Font.o \ +- TTFont.o \ + UnicodeMap.o \ + XRef.o \ + gfile.o \ diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak new file mode 100644 index 00000000000..57d01608a80 --- /dev/null +++ b/print/cups/patches/patch-ak @@ -0,0 +1,40 @@ +$NetBSD: patch-ak,v 1.9 2002/10/20 18:57:38 jlam Exp $ + +--- doc/Makefile.orig Sun Oct 20 13:19:53 2002 ++++ doc/Makefile +@@ -96,7 +96,7 @@ WEBIMAGES = images/accept-jobs.gif \ + # + + all: $(DOCUMENTS:.shtml=.pdf) $(DOCUMENTS:.shtml=.html) overview.pdf +- cd fr; make all ++ cd fr; $(MAKE) $(MFLAGS) all + + + # +@@ -104,7 +104,7 @@ all: $(DOCUMENTS:.shtml=.pdf) $(DOCUMENT + # + + ps: $(DOCUMENTS:.shtml=.ps) overview.ps +- cd fr; make ps ++ cd fr; $(MAKE) $(MFLAGS) ps + + + # +@@ -115,7 +115,7 @@ clean: + $(RM) $(DOCUMENTS:.shtml=.pdf) + $(RM) $(DOCUMENTS:.shtml=.html) + $(RM) overview.pdf +- cd fr; make clean ++ cd fr; $(MAKE) $(MFLAGS) clean + + + # +@@ -139,7 +139,7 @@ install: + for file in $(WEBIMAGES) $(DOCIMAGES); do \ + $(INSTALL_MAN) $$file $(DOCDIR)/images; \ + done +- cd fr; make install ++ cd fr; $(MAKE) $(MFLAGS) install + + + # diff --git a/print/cups/patches/patch-al b/print/cups/patches/patch-al new file mode 100644 index 00000000000..6b3adfa8cf1 --- /dev/null +++ b/print/cups/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.4 2002/10/20 18:57:38 jlam Exp $ + +--- templates/Makefile.orig Sun Oct 20 13:19:53 2002 ++++ templates/Makefile +@@ -99,7 +99,7 @@ install: + for file in $(FILES); do \ + $(INSTALL_DATA) $$file $(DATADIR)/templates; \ + done +- cd fr; make install ++ cd fr; $(MAKE) $(MFLAGS) install + + + # -- cgit v1.2.3