diff options
Diffstat (limited to 'print')
-rw-r--r-- | print/cups/MESSAGE | 10 | ||||
-rw-r--r-- | print/cups/Makefile | 19 | ||||
-rw-r--r-- | print/cups/PLIST | 109 | ||||
-rw-r--r-- | print/cups/distinfo | 17 | ||||
-rw-r--r-- | print/cups/patches/patch-aa | 21 | ||||
-rw-r--r-- | print/cups/patches/patch-ab | 53 | ||||
-rw-r--r-- | print/cups/patches/patch-ad | 22 | ||||
-rw-r--r-- | print/cups/patches/patch-ae | 17 | ||||
-rw-r--r-- | print/cups/patches/patch-af | 77 | ||||
-rw-r--r-- | print/cups/patches/patch-ag | 32 | ||||
-rw-r--r-- | print/cups/patches/patch-am | 22 | ||||
-rw-r--r-- | print/cups/patches/patch-ap | 13 | ||||
-rw-r--r-- | print/cups/patches/patch-at | 13 |
13 files changed, 322 insertions, 103 deletions
diff --git a/print/cups/MESSAGE b/print/cups/MESSAGE index f61d0277889..108d5769b78 100644 --- a/print/cups/MESSAGE +++ b/print/cups/MESSAGE @@ -1,15 +1,13 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.6 2003/03/20 18:49:33 jmmv Exp $ +$NetBSD: MESSAGE,v 1.7 2003/05/28 02:33:59 jlam Exp $ You will need to also install print/ghostscript-esp{,-nox11} if you wish to print to non-Postscript printers. +You may install additional PPD files for other printer models into +${PREFIX}/share/cups/model. + You may want to backup /etc/printcap before starting CUPS for the first time, as the CUPS scheduler may overwrite this file with automatically generated content. - -Beware: -------- -* Whats missing in the docs is that you can install additional PPD files in - ${PREFIX}/share/cups/model and select the model from there. =========================================================================== diff --git a/print/cups/Makefile b/print/cups/Makefile index ed826c7b414..fb0bb77790f 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2003/03/20 18:49:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.61 2003/05/28 02:33:59 jlam Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -6,8 +6,8 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} -PKGREVISION= 2 -BASE_VERS= 1.1.18 +PKGREVISION= # empty +BASE_VERS= 1.1.19 DIST_VERS= ${BASE_VERS} VERS= ${DIST_VERS:S/-/./g} WRKSRC= ${WRKDIR}/cups-${BASE_VERS} @@ -26,13 +26,16 @@ COMMENT= Common UNIX Printing System CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* +UNLIMIT_RESOURCES= datasize memorysize USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_GMAKE= yes + USE_LIBTOOL= yes +LIBTOOL_FLAGS+= --preserve-dup-deps + GNU_CONFIGURE= yes -UNLIMIT_RESOURCES= datasize memorysize CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/cups @@ -41,7 +44,7 @@ CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR} CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} CONFIGURE_ARGS+= --with-bsdmanext -CONFIGURE_ARGS+= --enable-libtool-unsupported="${PKGLIBTOOL}" +CONFIGURE_ARGS+= --enable-libtool-unsupported="${PKGLIBTOOL} ${LIBTOOL_FLAGS}" CONFIGURE_ARGS+= --enable-slp CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" @@ -96,8 +99,8 @@ 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 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${CUPS_USER} ${CUPS_GROUP} 0710 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1770 pre-configure: cd ${WRKSRC} && ${AUTOCONF} @@ -107,7 +110,7 @@ pre-install: post-install: ${INSTALL_DATA_DIR} ${DOCDIR} - for file in ENCRYPTION.txt LICENSE.txt README.txt; do \ + for file in CGI.txt ENCRYPTION.txt LICENSE.txt README.txt; do \ ${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR}/$${file}; \ done ${INSTALL_DATA_DIR} ${EGDIR} diff --git a/print/cups/PLIST b/print/cups/PLIST index e2a9f789947..e486b489a30 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.9 2002/12/20 06:59:59 jlam Exp $ +@comment $NetBSD: PLIST,v 1.10 2003/05/28 02:33:59 jlam Exp $ bin/cancel bin/cups-config +bin/cupstestppd bin/disable bin/enable bin/lp @@ -23,7 +24,7 @@ lib/libcups.a lib/libcups.la lib/libcups.so lib/libcups.so.2 -lib/libcups.so.2.4 +lib/libcups.so.2.5 lib/libcupsimage.a lib/libcupsimage.la lib/libcupsimage.so @@ -43,6 +44,7 @@ libexec/cups/cgi-bin/jobs.cgi libexec/cups/cgi-bin/printers.cgi libexec/cups/daemon/cups-lpd libexec/cups/daemon/cups-polld +libexec/cups/filter/gziptoany libexec/cups/filter/hpgltops libexec/cups/filter/imagetops libexec/cups/filter/imagetoraster @@ -171,7 +173,6 @@ man/man8/reject.8 sbin/accept sbin/cupsaddsmb sbin/cupsd -sbin/cupstestppd sbin/lpadmin sbin/lpc sbin/lpinfo @@ -246,6 +247,51 @@ share/cups/templates/class-modified.tmpl share/cups/templates/classes.tmpl share/cups/templates/config-printer.tmpl share/cups/templates/config-printer2.tmpl +share/cups/templates/de/add-class.tmpl +share/cups/templates/de/add-printer.tmpl +share/cups/templates/de/admin-op.tmpl +share/cups/templates/de/admin.tmpl +share/cups/templates/de/choose-device.tmpl +share/cups/templates/de/choose-make.tmpl +share/cups/templates/de/choose-members.tmpl +share/cups/templates/de/choose-model.tmpl +share/cups/templates/de/choose-serial.tmpl +share/cups/templates/de/choose-uri.tmpl +share/cups/templates/de/class-added.tmpl +share/cups/templates/de/class-confirm.tmpl +share/cups/templates/de/class-deleted.tmpl +share/cups/templates/de/class-modified.tmpl +share/cups/templates/de/classes.tmpl +share/cups/templates/de/config-printer.tmpl +share/cups/templates/de/config-printer2.tmpl +share/cups/templates/de/error.tmpl +share/cups/templates/de/header.tmpl +share/cups/templates/de/job-cancel.tmpl +share/cups/templates/de/job-hold.tmpl +share/cups/templates/de/job-op.tmpl +share/cups/templates/de/job-release.tmpl +share/cups/templates/de/job-restart.tmpl +share/cups/templates/de/jobs.tmpl +share/cups/templates/de/modify-class.tmpl +share/cups/templates/de/modify-printer.tmpl +share/cups/templates/de/option-boolean.tmpl +share/cups/templates/de/option-header.tmpl +share/cups/templates/de/option-pickmany.tmpl +share/cups/templates/de/option-pickone.tmpl +share/cups/templates/de/option-trailer.tmpl +share/cups/templates/de/printer-accept.tmpl +share/cups/templates/de/printer-added.tmpl +share/cups/templates/de/printer-configured.tmpl +share/cups/templates/de/printer-confirm.tmpl +share/cups/templates/de/printer-deleted.tmpl +share/cups/templates/de/printer-modified.tmpl +share/cups/templates/de/printer-purge.tmpl +share/cups/templates/de/printer-reject.tmpl +share/cups/templates/de/printer-start.tmpl +share/cups/templates/de/printer-stop.tmpl +share/cups/templates/de/printers.tmpl +share/cups/templates/de/test-page.tmpl +share/cups/templates/de/trailer.tmpl share/cups/templates/error.tmpl share/cups/templates/fr/add-class.tmpl share/cups/templates/fr/add-printer.tmpl @@ -320,6 +366,7 @@ share/cups/templates/printer-stop.tmpl share/cups/templates/printers.tmpl share/cups/templates/test-page.tmpl share/cups/templates/trailer.tmpl +share/doc/cups/CGI.txt share/doc/cups/ENCRYPTION.txt share/doc/cups/LICENSE.txt share/doc/cups/README.txt @@ -327,6 +374,33 @@ share/doc/html/cups/cmp.html share/doc/html/cups/cmp.pdf share/doc/html/cups/cups.css share/doc/html/cups/cupsdoc.css +share/doc/html/cups/de/documentation.html +share/doc/html/cups/de/images/accept-jobs.gif +share/doc/html/cups/de/images/add-class.gif +share/doc/html/cups/de/images/add-printer.gif +share/doc/html/cups/de/images/cancel-job.gif +share/doc/html/cups/de/images/config-printer.gif +share/doc/html/cups/de/images/continue.gif +share/doc/html/cups/de/images/delete-class.gif +share/doc/html/cups/de/images/delete-printer.gif +share/doc/html/cups/de/images/hold-job.gif +share/doc/html/cups/de/images/manage-classes.gif +share/doc/html/cups/de/images/manage-jobs.gif +share/doc/html/cups/de/images/manage-printers.gif +share/doc/html/cups/de/images/modify-class.gif +share/doc/html/cups/de/images/modify-printer.gif +share/doc/html/cups/de/images/navbar.gif +share/doc/html/cups/de/images/print-test-page.gif +share/doc/html/cups/de/images/reject-jobs.gif +share/doc/html/cups/de/images/release-job.gif +share/doc/html/cups/de/images/restart-job.gif +share/doc/html/cups/de/images/show-active.gif +share/doc/html/cups/de/images/show-completed.gif +share/doc/html/cups/de/images/start-class.gif +share/doc/html/cups/de/images/start-printer.gif +share/doc/html/cups/de/images/stop-class.gif +share/doc/html/cups/de/images/stop-printer.gif +share/doc/html/cups/de/index.html share/doc/html/cups/documentation.html share/doc/html/cups/fr/cups.css share/doc/html/cups/fr/cupsdoc.css @@ -335,8 +409,6 @@ 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 @@ -371,8 +443,6 @@ share/doc/html/cups/images/accept-jobs.gif share/doc/html/cups/images/add-class.gif share/doc/html/cups/images/add-printer.gif share/doc/html/cups/images/cancel-job.gif -share/doc/html/cups/images/cancel-jobs.gif -share/doc/html/cups/images/cancel.gif share/doc/html/cups/images/classes.gif share/doc/html/cups/images/config-printer.gif share/doc/html/cups/images/continue.gif @@ -382,7 +452,6 @@ share/doc/html/cups/images/cups-medium.gif share/doc/html/cups/images/cups-small.gif share/doc/html/cups/images/delete-class.gif share/doc/html/cups/images/delete-printer.gif -share/doc/html/cups/images/draft.gif share/doc/html/cups/images/hold-job.gif share/doc/html/cups/images/left.gif share/doc/html/cups/images/logo.gif @@ -411,6 +480,7 @@ share/doc/html/cups/ipp.html share/doc/html/cups/ipp.pdf share/doc/html/cups/overview.html share/doc/html/cups/overview.pdf +share/doc/html/cups/robots.txt share/doc/html/cups/sam.html share/doc/html/cups/sam.pdf share/doc/html/cups/sdd.html @@ -440,27 +510,29 @@ ${PKGLOCALEDIR}/locale/be/cups_be ${PKGLOCALEDIR}/locale/cs/cups_cs ${PKGLOCALEDIR}/locale/de/cups_de ${PKGLOCALEDIR}/locale/en/cups_en +${PKGLOCALEDIR}/locale/en_US/cups_en_US ${PKGLOCALEDIR}/locale/es/cups_es ${PKGLOCALEDIR}/locale/fr/cups_fr ${PKGLOCALEDIR}/locale/he/cups_he ${PKGLOCALEDIR}/locale/it/cups_it -${PKGLOCALEDIR}/locale/ru_RU.cp1251/cups_ru_RU.cp1251 -${PKGLOCALEDIR}/locale/ru_RU.koi8r/cups_ru_RU.koi8r +${PKGLOCALEDIR}/locale/ru_RU/cups_ru_RU ${PKGLOCALEDIR}/locale/sv/cups_sv ${PKGLOCALEDIR}/locale/uk/cups_uk -${PKGLOCALEDIR}/locale/uk_UA.cp1251/cups_uk_UA.cp1251 +${PKGLOCALEDIR}/locale/uk_UA/cups_uk_UA ${PKGLOCALEDIR}/locale/zh_CN/cups_zh_CN -@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/uk_UA.cp1251 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU.koi8r 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU.cp1251 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/uk_UA 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/${PKGLOCALEDIR}/locale/ru_RU 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/${PKGLOCALEDIR}/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/de/images +@dirrm share/doc/html/cups/de @dirrm share/doc/html/cups @dirrm share/doc/cups @dirrm share/cups/templates/fr +@dirrm share/cups/templates/de @dirrm share/cups/templates @dirrm share/cups/model @dirrm share/cups/fonts @@ -468,15 +540,6 @@ ${PKGLOCALEDIR}/locale/zh_CN/cups_zh_CN @dirrm share/cups/charsets @dirrm share/cups/banners @dirrm share/cups -@unexec ${RMDIR} %D/man/fr/man8 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr/man5 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr/man3 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr/man1 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr/cat8 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr/cat5 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr/cat3 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr/cat1 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/man/fr 2>/dev/null || ${TRUE} @dirrm libexec/cups/filter @dirrm libexec/cups/daemon @dirrm libexec/cups/cgi-bin diff --git a/print/cups/distinfo b/print/cups/distinfo index 584919cc183..d887bd0e6b5 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,9 +1,14 @@ -$NetBSD: distinfo,v 1.21 2003/03/20 17:30:17 fredb Exp $ +$NetBSD: distinfo,v 1.22 2003/05/28 02:33:59 jlam Exp $ -SHA1 (cups-1.1.18-source.tar.bz2) = 03973207391df399608691563e804ed5afce45b3 -Size (cups-1.1.18-source.tar.bz2) = 3491321 bytes -SHA1 (patch-aa) = d7d9d573dae58174dc2d3a0d032655bfb715827e -SHA1 (patch-ab) = 00d438f297bee64411869ab605fc07fe6380f25d -SHA1 (patch-ae) = e7f8883e9e12c822a4508ea121a27a5647f9823a +SHA1 (cups-1.1.19-source.tar.bz2) = 125f82618ca8221598079e275fa1c3e874b3211b +Size (cups-1.1.19-source.tar.bz2) = 3691376 bytes +SHA1 (patch-aa) = 931a6f35ec0d4f41240031abb98be3e7e4b6de38 +SHA1 (patch-ab) = 29c205c31a70229f46f0c99775e70fc9c56af1e8 +SHA1 (patch-ad) = a426a03e67800a66fc819e79762e64fd2a73c646 +SHA1 (patch-af) = e0de558fdc6bd960ceb26709ea6ff33bc33567e0 +SHA1 (patch-ag) = 317ba533794c9acf968f21c5a0f38aac4d74eedb +SHA1 (patch-am) = 67446886161f3062b89f3d9da56edc7faca4ad18 SHA1 (patch-an) = 5ef594098978476eaee13cc8afc05679b6321176 SHA1 (patch-ao) = cbe2edda168434d0c58214f2a8089555357de292 +SHA1 (patch-ap) = 04da658e62e9ef1765ae4d34ab1f809327d5cf8b +SHA1 (patch-at) = 331bfe986dbb1e7f894ec6f0a6baaa86b36307a5 diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa index 6de6539f2d2..4e24baec406 100644 --- a/print/cups/patches/patch-aa +++ b/print/cups/patches/patch-aa @@ -1,15 +1,12 @@ -$NetBSD: patch-aa,v 1.15 2003/03/20 17:30:18 fredb Exp $ +$NetBSD: patch-aa,v 1.16 2003/05/28 02:34:00 jlam Exp $ ---- Makedefs.in.orig Tue Dec 17 12:56:25 2002 +--- Makedefs.in.orig Thu Apr 17 10:20:47 2003 +++ Makedefs.in -@@ -28,8 +28,8 @@ +@@ -65,6 +65,7 @@ CUPS_GROUP = @CUPS_GROUP@ + # Libraries... + # - AR = @AR@ - AWK = @AWK@ --CC = @LIBTOOL@ @CC@ --CXX = @LIBTOOL@ @CXX@ -+CC = @LIBTOOL@ --preserve-dup-deps @CC@ -+CXX = @LIBTOOL@ --preserve-dup-deps @CXX@ - DSO = @DSO@ - HTMLDOC = @HTMLDOC@ - INSTALL = @INSTALL@ ++LIBCRYPT = @LIBCRYPT@ + LIBCUPS = @LIBCUPS@ + LIBCUPSIMAGE = @LIBCUPSIMAGE@ + LIBJPEG = @LIBJPEG@ diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab index 5674bcb30f4..d07e05deee1 100644 --- a/print/cups/patches/patch-ab +++ b/print/cups/patches/patch-ab @@ -1,8 +1,16 @@ -$NetBSD: patch-ab,v 1.15 2002/09/18 22:58:47 jlam Exp $ +$NetBSD: patch-ab,v 1.16 2003/05/28 02:34:00 jlam Exp $ ---- Makefile.orig Tue Apr 23 10:49:34 2002 +--- Makefile.orig Thu Mar 6 11:36:00 2003 +++ Makefile -@@ -72,8 +72,6 @@ install: installhdrs +@@ -67,13 +67,13 @@ + # Install object and target files... + # + +-install: installhdrs ++install: installcups installconf ++ ++installcups: installhdrs + for dir in $(DIRS); do\ echo Installing in $$dir... ;\ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ done @@ -11,34 +19,17 @@ $NetBSD: patch-ab,v 1.15 2002/09/18 22:58:47 jlam Exp $ echo Installing in data... (cd data; $(MAKE) $(MFLAGS) install) echo Installing in doc... -@@ -89,30 +87,6 @@ install: installhdrs +@@ -89,6 +89,13 @@ echo Installing cups-config script... $(INSTALL_DIR) $(BINDIR) $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config -- echo Installing startup script... -- if test "x$(INITDIR)" != "x"; then \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ -- fi -- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ -- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \ -- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ -- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ -- else \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ -- fi \ -- fi - - # - # Install source and header files... ++ ++# ++# Install config files... ++# ++installconf: ++ echo Installing in conf... ++ (cd conf; $(MAKE) $(MFLAGS) install) + echo Installing startup script... + if test "x$(INITDIR)" != "x"; then \ + $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad new file mode 100644 index 00000000000..2a60d94e490 --- /dev/null +++ b/print/cups/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.11 2003/05/28 02:34:00 jlam Exp $ + +--- config-scripts/cups-libtool.m4.orig Tue Dec 17 13:56:39 2002 ++++ config-scripts/cups-libtool.m4 +@@ -24,7 +24,7 @@ dnl + + AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported=LIBTOOL_PATH + turn on building with libtool (UNSUPPORTED!), default=no], +- [if test x$enable_libtool_unsupported != xno; then ++ [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." +@@ -36,7 +36,7 @@ AC_ARG_ENABLE(libtool_unsupported, [ -- + + AC_SUBST(LIBTOOL) + +-if test x$LIBTOOL != x; then ++if test x"$LIBTOOL" != x; then + LIBCUPS="libcups.la" + LIBCUPSIMAGE="libcupsimage.la" + LINKCUPS="../cups/\$(LIBCUPS)" diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae deleted file mode 100644 index ee29da5e634..00000000000 --- a/print/cups/patches/patch-ae +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ae,v 1.12 2003/03/20 17:30:18 fredb Exp $ - ---- config-scripts/cups-openssl.m4.orig Tue Dec 17 12:56:39 2002 -+++ config-scripts/cups-openssl.m4 -@@ -45,7 +45,12 @@ if test x$enable_ssl != xno; then - dnl of OpenSSL exists. So we test the linking three times in - dnl case the RSAREF libraries are needed. - -+ dnl NetBSD 1.6 has a crypt() in both -lcrypt and -lcrypto, but only -+ dnl the one in -lcrypt supports blowfish and other password salts, -+ dnl so always link -lcrypt in first, if possible. -+ - for libcrypto in \ -+ "-lcrypt -lcrypto" \ - "-lcrypto" \ - "-lcrypto -lrsaref" \ - "-lcrypto -lRSAglue -lrsaref" diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af new file mode 100644 index 00000000000..73575714283 --- /dev/null +++ b/print/cups/patches/patch-af @@ -0,0 +1,77 @@ +$NetBSD: patch-af,v 1.12 2003/05/28 02:34:00 jlam Exp $ + +--- cups/Makefile.orig Wed Mar 19 21:45:21 2003 ++++ cups/Makefile +@@ -93,8 +93,8 @@ install: all installhdrs + fi + if test $(LIBCUPS) != "libcups.a"; then \ + $(INSTALL_LIB) libcups.a $(LIBDIR); \ ++ $(RANLIB) $(LIBDIR)/libcups.a; \ + fi +- $(RANLIB) $(LIBDIR)/libcups.a + + installhdrs: + $(INSTALL_DIR) $(INCLUDEDIR)/cups +@@ -109,7 +109,7 @@ installhdrs: + + libcups.so.2 libcups.sl.2: $(LIBOBJS) ../Makedefs + echo Linking $@... +- $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) ++ $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) + $(RM) `basename $@ .2` + $(LN) $@ `basename $@ .2` + +@@ -124,7 +124,7 @@ libcups.2.dylib: $(LIBOBJS) ../Makedefs + -install_name $(libdir)/$@ \ + -current_version 2.5.0 \ + -compatibility_version 2.0.0 \ +- $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) ++ $(LIBOBJS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) + $(RM) libcups.dylib + $(LN) $@ libcups.dylib + +@@ -137,7 +137,7 @@ libcups_s.a: $(LIBOBJS) ../Makedefs + echo Creating $@... + $(RM) libcups_s.exp + (echo _ipp_add_attr; echo _ipp_free_attr) >libcups_s.exp +- $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm ++ $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) -lm + $(RM) $@ + $(AR) $(ARFLAGS) $@ libcups_s.o + +@@ -149,7 +149,7 @@ libcups_s.a: $(LIBOBJS) ../Makedefs + libcups.la: $(LIBOBJS) ../Makedefs + echo Linking $@... + $(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ +- -version-info 2:5 $(SSLLIBS) $(COMMONLIBS) ++ -version-info 2:5 $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) + + + # +@@ -179,7 +179,7 @@ cups_C.h: ../locale/C/cups_C + + testhttp: testhttp.o libcups.a + echo Linking $@... +- $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) ++ $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) + + + # +@@ -188,7 +188,7 @@ testhttp: testhttp.o libcups.a + + testipp: testipp.o libcups.a + echo Linking $@... +- $(CC) $(LDFLAGS) -o $@ testipp.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) ++ $(CC) $(LDFLAGS) -o $@ testipp.o libcups.a $(NETLIBS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) + + + # +@@ -197,7 +197,7 @@ testipp: testipp.o libcups.a + + testlang: testlang.o libcups.a + echo Linking $@... +- $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(SSLLIBS) $(COMMONLIBS) ++ $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a $(NETLIBS) $(LIBCRYPT) $(SSLLIBS) $(COMMONLIBS) + + + # diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag new file mode 100644 index 00000000000..49e95301e49 --- /dev/null +++ b/print/cups/patches/patch-ag @@ -0,0 +1,32 @@ +$NetBSD: patch-ag,v 1.15 2003/05/28 02:34:00 jlam Exp $ + +--- filter/Makefile.orig Tue May 27 21:29:11 2003 ++++ filter/Makefile +@@ -27,7 +27,7 @@ + include ../Makedefs + + TARGETS = gziptoany hpgltops texttops pstops imagetops imagetoraster \ +- rastertodymo rastertoepson rastertohp libcupsimage.a ++ rastertodymo rastertoepson rastertohp + + HPGLOBJS = hpgl-attr.o hpgl-config.o hpgl-main.o hpgl-prolog.o \ + hpgl-char.o hpgl-input.o hpgl-polygon.o hpgl-vector.o +@@ -45,7 +45,7 @@ OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOB + # Make all targets... + # + +-all: $(TARGETS) libcupsimage.a ++all: $(TARGETS) $(LIBCUPSIMAGE) libcupsimage.a + + + # +@@ -87,8 +87,8 @@ install: all installhdrs + fi + -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \ + $(INSTALL_LIB) libcupsimage.a $(LIBDIR); \ ++ $(RANLIB) $(LIBDIR)/libcupsimage.a; \ + fi +- $(RANLIB) $(LIBDIR)/libcupsimage.a + + installhdrs: + $(INSTALL_DIR) $(INCLUDEDIR)/cups diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am new file mode 100644 index 00000000000..285b5956ed7 --- /dev/null +++ b/print/cups/patches/patch-am @@ -0,0 +1,22 @@ +$NetBSD: patch-am,v 1.5 2003/05/28 02:34:01 jlam Exp $ + +--- config-scripts/cups-common.m4.orig Wed May 14 14:24:38 2003 ++++ config-scripts/cups-common.m4 +@@ -81,8 +81,16 @@ dnl Architecture checks... + AC_C_BIGENDIAN + + dnl Check for libraries... +-AC_SEARCH_LIBS(crypt, crypt) + AC_SEARCH_LIBS(getspent, sec gen) ++ ++dnl Check for crypt() in libcrypt. We need to link -lcrypt ahead of any ++dnl OpenSSL libraries because the system crypt() is usually smarter than ++dnl the libcrypto crypt() routine. ++LIBCRYPT="" ++AC_CHECK_LIB(crypt, crypt, LIBCRYPT="-lcrypt", LIBS="$LIBS -lcrypt") ++EXPORT_LIBCRYPT="$LIBCRYPT" ++AC_SUBST(LIBCRYPT) ++AC_SUBST(EXPORT_LIBCRYPT) + + LIBMALLOC="" + AC_ARG_ENABLE(mallinfo, [ --enable-mallinfo turn on malloc debug information, default=no]) diff --git a/print/cups/patches/patch-ap b/print/cups/patches/patch-ap new file mode 100644 index 00000000000..6054ff3a158 --- /dev/null +++ b/print/cups/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.3 2003/05/28 02:34:01 jlam Exp $ + +--- cups-config.in.orig Mon Apr 14 15:55:37 2003 ++++ cups-config.in +@@ -40,7 +40,7 @@ cups_serverroot=@CUPS_SERVERROOT@ + # flags for C++ compiler: + CFLAGS="" + LDFLAGS="@EXPORT_LDFLAGS@" +-LIBS="@EXPORT_SSLLIBS@ @NETLIBS@" ++LIBS="@EXPORT_LIBCRYPT@ @EXPORT_SSLLIBS@ @NETLIBS@" + IMGLIBS="@EXPORT_LIBTIFF@ @EXPORT_LIBJPEG@ @EXPORT_LIBPNG@ @EXPORT_LIBZ@" + + if test $includedir != /usr/include; then diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at new file mode 100644 index 00000000000..d6f9146ea67 --- /dev/null +++ b/print/cups/patches/patch-at @@ -0,0 +1,13 @@ +$NetBSD: patch-at,v 1.3 2003/05/28 02:34:01 jlam Exp $ + +--- scheduler/Makefile.orig Thu Apr 10 10:30:48 2003 ++++ scheduler/Makefile +@@ -81,7 +81,7 @@ install: all + cupsd: $(CUPSDOBJS) libmime.a ../cups/$(LIBCUPS) + echo Linking $@... + $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) libmime.a \ +- $(LIBZ) $(SSLLIBS) $(LIBSLP) $(PAMLIBS) $(LIBS) \ ++ $(LIBZ) $(LIBCRYPT) $(SSLLIBS) $(LIBSLP) $(PAMLIBS) $(LIBS) \ + $(LIBPAPER) $(LIBMALLOC) + + |