From 2c593b06ebf55ffb02c01c8435511bb27386014d Mon Sep 17 00:00:00 2001 From: Alan Eldridge Date: Tue, 2 Jul 2002 10:08:17 +0000 Subject: [PATCH] Upgrade to 1.15.1. Fix PR 37505. Quiet down portlint. PR: 39053, 37505. Submitter: James Halstead --- print/cups-base/Makefile | 10 +- print/cups-base/distinfo | 2 +- print/cups-base/files/patch-Makefile | 8 +- print/cups-base/files/patch-configure | 18 ---- print/cups-base/files/patch-cups.sh.in | 23 ++-- print/cups-base/files/patch-man-Makefile | 98 ----------------- .../cups-base/files/patch-man-Makefile.common | 50 +++++++++ print/cups-base/pkg-message | 4 +- print/cups-base/pkg-plist | 100 +----------------- 9 files changed, 74 insertions(+), 239 deletions(-) delete mode 100644 print/cups-base/files/patch-configure delete mode 100644 print/cups-base/files/patch-man-Makefile create mode 100644 print/cups-base/files/patch-man-Makefile.common diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 7ad28981af76..dc5d46359bd8 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -6,8 +6,9 @@ # PORTNAME= cups-base -PORTVERSION= ${CUPS_VERSION} -CATEGORIES= print +PORTVERSION= ${CUPS_PORTVER} +CATEGORIES?= print + MAINTAINER= jah4007@cs.rit.edu INSTALLS_SHLIB= yes @@ -31,6 +32,5 @@ post-install: ${PREFIX}/etc/rc.d/cupsd.sh.sample @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} -.include -.include "${PORTSDIR}/print/cups/Makefile.inc" -.include +.include "${.CURDIR}/../../print/cups/Makefile.inc" +.include diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo index f871858bea1c..0edc8c761640 100644 --- a/print/cups-base/distinfo +++ b/print/cups-base/distinfo @@ -1 +1 @@ -MD5 (cups-1.1.14-source.tar.bz2) = 7cc9725d94568b24f5ade78fb7e26480 +MD5 (cups-1.1.15-1-source.tar.bz2) = 971a14d35f61ea19871616f437e199a2 diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile index 5b307dcbe15c..a68adf13011b 100644 --- a/print/cups-base/files/patch-Makefile +++ b/print/cups-base/files/patch-Makefile @@ -1,12 +1,12 @@ ---- Makefile.orig Wed Nov 28 20:24:11 2001 -+++ Makefile Wed Nov 28 21:46:19 2001 +--- Makefile.orig Fri Jun 7 20:09:07 2002 ++++ Makefile Fri Jun 7 20:14:39 2002 @@ -28,8 +28,8 @@ # Directories to make... # --DIRS = cups backend berkeley cgi-bin filter man pdftops pstoraster \ +-DIRS = cups backend berkeley cgi-bin filter man pdftops \ - scheduler systemv -+DIRS = cups backend cgi-bin filter man pdftops pstoraster \ ++DIRS = cups backend cgi-bin filter man pdftops \ + scheduler # diff --git a/print/cups-base/files/patch-configure b/print/cups-base/files/patch-configure deleted file mode 100644 index 9e48416b54e6..000000000000 --- a/print/cups-base/files/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.old Tue Feb 5 11:17:34 2002 -+++ configure Tue Feb 5 11:18:00 2002 -@@ -3224,13 +3224,13 @@ - DSO="\$(CC)" - DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.4,-soname,\$@ -shared \$(OPTIM)" - ;; -- OSF1* | Linux* | NetBSD* | OpenBSD*) -+ OSF1* | Linux* | NetBSD* | OpenBSD* | FreeBSD*) - LIBCUPS="libcups.so.2" - LIBCUPSIMAGE="libcupsimage.so.2" - DSO="\$(CC)" - DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)" - ;; -- Darwin* | FreeBSD*) -+ Darwin*) - LIBCUPS="libcups.2.dylib" - LIBCUPSIMAGE="libcupsimage.2.dylib" - DSO="ld" diff --git a/print/cups-base/files/patch-cups.sh.in b/print/cups-base/files/patch-cups.sh.in index cad2eaf28948..5789009bbe59 100644 --- a/print/cups-base/files/patch-cups.sh.in +++ b/print/cups-base/files/patch-cups.sh.in @@ -1,33 +1,22 @@ ---- cups.sh.in.orig Sat Feb 2 23:26:44 2002 -+++ cups.sh.in Sat Feb 2 23:27:07 2002 -@@ -78,6 +78,10 @@ - IS_ON=/bin/true - ;; - -+ FreeBSD*) -+ IS_ON=/usr/bin/true -+ ;; -+ - *) - IS_ON=/bin/true - ;; -@@ -141,7 +145,8 @@ +--- cups.sh.in.orig Fri Jun 7 20:15:29 2002 ++++ cups.sh.in Fri Jun 7 20:18:22 2002 +@@ -141,7 +141,8 @@ exec_prefix=@exec_prefix@ @sbindir@/cupsd fi - $ECHO "cups: scheduler ${1}ed." +# $ECHO "cups: scheduler ${1}ed." -+ echo -n "cupsd " ++ $ECHO " cupsd" else $ECHO "cups: scheduler stopped." fi -@@ -150,7 +155,8 @@ +@@ -150,7 +151,8 @@ stop) if test "$pid" != ""; then kill $pid - $ECHO "cups: scheduler stopped." +# $ECHO "cups: scheduler stopped." -+ echo -n "cupsd " ++ $ECHO " cupsd" fi ;; diff --git a/print/cups-base/files/patch-man-Makefile b/print/cups-base/files/patch-man-Makefile deleted file mode 100644 index 0513dfc8cae4..000000000000 --- a/print/cups-base/files/patch-man-Makefile +++ /dev/null @@ -1,98 +0,0 @@ ---- man/Makefile.orig Thu Oct 25 23:16:48 2001 -+++ man/Makefile Wed Nov 28 21:43:38 2001 -@@ -28,14 +28,11 @@ - # Man pages... - # - --MAN1 = backend.man filter.man lp.man lpoptions.man lppasswd.man \ -- lpq.man lprm.man lpr.man lpstat.man -+MAN1 = backend.man filter.man - MAN3 = cups-config.man - MAN5 = classes.conf.man cupsd.conf.man mime.convs.man mime.types.man \ - printers.conf.man --MAN8 = accept.man cupsaddsmb.man cups-lpd.man cups-polld.man \ -- cupsd.man enable.man lpadmin.man lpinfo.man lpmove.man \ -- lpc.man -+MAN8 = cups-lpd.man cups-polld.man cupsd.man - - CAT1 = $(MAN1:.man=.$(CAT1EXT)) - CAT3 = $(MAN3:.man=.$(CAT3EXT)) -@@ -47,7 +44,7 @@ - # Make everything... - # - --all: $(CAT1) $(CAT3) $(CAT5) $(CAT8) -+all: #$(CAT1) $(CAT3) $(CAT5) $(CAT8) - - - # -@@ -67,8 +64,8 @@ - for file in $(MAN1); do \ - $(INSTALL_MAN) $$file $(MANDIR)/man1/`basename $$file man`1; \ - done -- $(RM) $(MANDIR)/man1/cancel.1 -- $(LN) lp.1 $(MANDIR)/man1/cancel.1 -+# $(RM) $(MANDIR)/man1/cancel.1 -+# $(LN) lp.1 $(MANDIR)/man1/cancel.1 - $(INSTALL_DIR) $(PMANDIR)/man3 - for file in $(MAN3); do \ - $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \ -@@ -81,32 +78,32 @@ - for file in $(MAN8); do \ - $(INSTALL_MAN) $$file $(AMANDIR)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \ - done -- $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) -- $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) -- $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) -- $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) -- $(INSTALL_DIR) $(MANDIR)/cat1 -- for file in $(CAT1); do \ -- $(INSTALL_MAN) $$file $(MANDIR)/cat1; \ -- done -- $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT) -- $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT) -- $(INSTALL_DIR) $(PMANDIR)/cat3 -- for file in $(CAT3); do \ -- $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \ -- done -- $(INSTALL_DIR) $(MANDIR)/cat5 -- for file in $(CAT5); do \ -- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \ -- done -- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT) -- for file in $(CAT8); do \ -- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \ -- done -- $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT) -- $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT) -- $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT) -- $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT) -+# $(RM) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) -+# $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) -+# $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) -+# $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) -+# $(INSTALL_DIR) $(MANDIR)/cat1 -+# for file in $(CAT1); do \ -+# $(INSTALL_MAN) $$file $(MANDIR)/cat1; \ -+# done -+# $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT) -+# $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT) -+# $(INSTALL_DIR) $(PMANDIR)/cat3 -+# for file in $(CAT3); do \ -+# $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \ -+# done -+# $(INSTALL_DIR) $(MANDIR)/cat5 -+# for file in $(CAT5); do \ -+# $(INSTALL_MAN) $$file $(MANDIR)/cat5; \ -+# done -+# $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT) -+# for file in $(CAT8); do \ -+# $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \ -+# done -+# $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT) -+# $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT) -+# $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT) -+# $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT) - - - # diff --git a/print/cups-base/files/patch-man-Makefile.common b/print/cups-base/files/patch-man-Makefile.common new file mode 100644 index 000000000000..d6a61af83b12 --- /dev/null +++ b/print/cups-base/files/patch-man-Makefile.common @@ -0,0 +1,50 @@ +--- man/Makefile.common.orig Fri Jun 7 20:28:16 2002 ++++ man/Makefile.common Fri Jun 7 20:30:55 2002 +@@ -27,30 +27,30 @@ + # + + MAN1 = backend.man \ +- filter.man \ +- lp.man \ +- lpoptions.man \ +- lppasswd.man \ +- lpq.man \ +- lprm.man \ +- lpr.man \ +- lpstat.man ++ filter.man ++# lp.man \ ++# lpoptions.man \ ++# lppasswd.man \ ++# lpq.man \ ++# lprm.man \ ++# lpr.man \ ++# lpstat.man + MAN3 = cups-config.man + MAN5 = classes.conf.man \ + cupsd.conf.man \ + mime.convs.man \ + mime.types.man \ + printers.conf.man +-MAN8 = accept.man \ +- cupsaddsmb.man \ +- cups-lpd.man \ ++#MAN8 = accept.man \ ++# cupsaddsmb.man \ ++MAN8= cups-lpd.man \ + cups-polld.man \ +- cupsd.man \ +- enable.man \ +- lpadmin.man \ +- lpinfo.man \ +- lpmove.man \ +- lpc.man ++ cupsd.man ++# enable.man \ ++# lpadmin.man \ ++# lpinfo.man \ ++# lpmove.man \ ++# lpc.man + + CAT1 = backend.$(CAT1EXT) \ + filter.$(CAT1EXT) \ diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message index 3faa26d42eb9..bdf08a303a8d 100644 --- a/print/cups-base/pkg-message +++ b/print/cups-base/pkg-message @@ -1,3 +1,4 @@ +====================================================================== CUPS is now installed. @@ -6,7 +7,8 @@ on how to set up your printer to use CUPS. Basic template configuration files have been installed in %%PREFIX%%/etc/cups/ To install the BSD and system V compatibility binaries look to the port -print/cups-bin. These are no longer installed as part of the base cups port +print/cups-lpr. These are no longer installed as part of the base cups port because they have conflicting names with the native print binaries, and with other ports, such as lprNG. +====================================================================== diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist index 7c9c017bc8d5..3d626e4828a3 100644 --- a/print/cups-base/pkg-plist +++ b/print/cups-base/pkg-plist @@ -31,6 +31,7 @@ libexec/cups/backend/http libexec/cups/backend/ipp libexec/cups/backend/lpd libexec/cups/backend/parallel +libexec/cups/backend/scsi libexec/cups/backend/serial libexec/cups/backend/socket libexec/cups/backend/usb @@ -45,7 +46,6 @@ libexec/cups/filter/imagetops libexec/cups/filter/imagetoraster libexec/cups/filter/pdftops libexec/cups/filter/pstops -libexec/cups/filter/pstoraster libexec/cups/filter/rastertodymo libexec/cups/filter/rastertoepson libexec/cups/filter/rastertohp @@ -86,49 +86,10 @@ share/cups/charsets/windows-874 share/cups/data/HPGLprolog share/cups/data/psglyphs share/cups/data/testprint.ps -share/cups/fonts/AvantGarde-Book -share/cups/fonts/AvantGarde-BookOblique -share/cups/fonts/AvantGarde-Demi -share/cups/fonts/AvantGarde-DemiOblique -share/cups/fonts/Bookman-Demi -share/cups/fonts/Bookman-DemiItalic -share/cups/fonts/Bookman-Light -share/cups/fonts/Bookman-LightItalic -share/cups/fonts/Charter-Bold -share/cups/fonts/Charter-BoldItalic -share/cups/fonts/Charter-Italic -share/cups/fonts/Charter-Roman -share/cups/fonts/Courier share/cups/fonts/Courier-Bold share/cups/fonts/Courier-BoldOblique share/cups/fonts/Courier-Oblique -share/cups/fonts/Helvetica -share/cups/fonts/Helvetica-Bold -share/cups/fonts/Helvetica-BoldOblique -share/cups/fonts/Helvetica-Narrow -share/cups/fonts/Helvetica-Narrow-Bold -share/cups/fonts/Helvetica-Narrow-BoldOblique -share/cups/fonts/Helvetica-Narrow-Oblique -share/cups/fonts/Helvetica-Oblique -share/cups/fonts/NewCenturySchlbk-Bold -share/cups/fonts/NewCenturySchlbk-BoldItalic -share/cups/fonts/NewCenturySchlbk-Italic -share/cups/fonts/NewCenturySchlbk-Roman -share/cups/fonts/Palatino-Bold -share/cups/fonts/Palatino-BoldItalic -share/cups/fonts/Palatino-Italic -share/cups/fonts/Palatino-Roman share/cups/fonts/Symbol -share/cups/fonts/Times-Bold -share/cups/fonts/Times-BoldItalic -share/cups/fonts/Times-Italic -share/cups/fonts/Times-Roman -share/cups/fonts/Utopia-Bold -share/cups/fonts/Utopia-BoldItalic -share/cups/fonts/Utopia-Italic -share/cups/fonts/Utopia-Regular -share/cups/fonts/ZapfChancery-MediumItalic -share/cups/fonts/ZapfDingbats share/cups/model/deskjet.ppd share/cups/model/deskjet2.ppd share/cups/model/dymo.ppd @@ -141,44 +102,6 @@ share/cups/model/stcolor.ppd share/cups/model/stcolor2.ppd share/cups/model/stphoto.ppd share/cups/model/stphoto2.ppd -share/cups/pstoraster/Fontmap -share/cups/pstoraster/gs_btokn.ps -share/cups/pstoraster/gs_ccfnt.ps -share/cups/pstoraster/gs_cff.ps -share/cups/pstoraster/gs_cidfn.ps -share/cups/pstoraster/gs_cmap.ps -share/cups/pstoraster/gs_cmdl.ps -share/cups/pstoraster/gs_dbt_e.ps -share/cups/pstoraster/gs_diskf.ps -share/cups/pstoraster/gs_dpnxt.ps -share/cups/pstoraster/gs_dps.ps -share/cups/pstoraster/gs_dps1.ps -share/cups/pstoraster/gs_dps2.ps -share/cups/pstoraster/gs_epsf.ps -share/cups/pstoraster/gs_fform.ps -share/cups/pstoraster/gs_fonts.ps -share/cups/pstoraster/gs_init.ps -share/cups/pstoraster/gs_iso_e.ps -share/cups/pstoraster/gs_kanji.ps -share/cups/pstoraster/gs_ksb_e.ps -share/cups/pstoraster/gs_lev2.ps -share/cups/pstoraster/gs_ll3.ps -share/cups/pstoraster/gs_mex_e.ps -share/cups/pstoraster/gs_mro_e.ps -share/cups/pstoraster/gs_pfile.ps -share/cups/pstoraster/gs_res.ps -share/cups/pstoraster/gs_setpd.ps -share/cups/pstoraster/gs_statd.ps -share/cups/pstoraster/gs_std_e.ps -share/cups/pstoraster/gs_sym_e.ps -share/cups/pstoraster/gs_ttf.ps -share/cups/pstoraster/gs_typ32.ps -share/cups/pstoraster/gs_typ42.ps -share/cups/pstoraster/gs_type1.ps -share/cups/pstoraster/gs_wan_e.ps -share/cups/pstoraster/gs_wl1_e.ps -share/cups/pstoraster/gs_wl2_e.ps -share/cups/pstoraster/gs_wl5_e.ps share/cups/templates/add-class.tmpl share/cups/templates/add-printer.tmpl share/cups/templates/admin-op.tmpl @@ -200,6 +123,7 @@ share/cups/templates/error.tmpl share/cups/templates/header.tmpl share/cups/templates/job-cancel.tmpl share/cups/templates/job-hold.tmpl +share/cups/templates/job-op.tmpl share/cups/templates/job-release.tmpl share/cups/templates/job-restart.tmpl share/cups/templates/jobs.tmpl @@ -216,6 +140,7 @@ share/cups/templates/printer-configured.tmpl share/cups/templates/printer-confirm.tmpl share/cups/templates/printer-deleted.tmpl share/cups/templates/printer-modified.tmpl +share/cups/templates/printer-purge.tmpl share/cups/templates/printer-reject.tmpl share/cups/templates/printer-start.tmpl share/cups/templates/printer-stop.tmpl @@ -289,6 +214,8 @@ share/doc/cups/sum.html share/doc/cups/sum.pdf share/doc/cups/svd.html share/doc/cups/svd.pdf +share/doc/cups/translation.html +share/doc/cups/translation.pdf share/locale/C/cups_C share/locale/be/cups_be share/locale/cs/cups_cs @@ -330,24 +257,7 @@ share/locale/zh_CN/cups_zh_CN @dirrm share/cups/data @dirrm share/cups/fonts @dirrm share/cups/model -@dirrm share/cups/pstoraster @dirrm share/cups/templates @dirrm share/cups @dirrm share/doc/cups/images @dirrm share/doc/cups -@dirrm share/locale/C -@dirrm share/locale/be -@dirrm share/locale/cs -@dirrm share/locale/de -@dirrm share/locale/en -@dirrm share/locale/es -@dirrm share/locale/fr -@dirrm share/locale/he -@dirrm share/locale/it -@dirrm share/locale/ru_RU.cp1251 -@dirrm share/locale/ru_RU.koi8r -@dirrm share/locale/sv -@dirrm share/locale/uk -@dirrm share/locale/uk_UA.cp1251 -@dirrm share/locale/zh_CN -@dirrm share/locale