diff options
Diffstat (limited to 'print/cups-base/files')
-rw-r--r-- | print/cups-base/files/patch-Makefile | 8 | ||||
-rw-r--r-- | print/cups-base/files/patch-configure | 18 | ||||
-rw-r--r-- | print/cups-base/files/patch-cups.sh.in | 23 | ||||
-rw-r--r-- | print/cups-base/files/patch-man-Makefile | 98 | ||||
-rw-r--r-- | print/cups-base/files/patch-man-Makefile.common | 50 |
5 files changed, 60 insertions, 137 deletions
diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile index 5b307dcbe15..a68adf13011 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 9e48416b54e..00000000000 --- 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 cad2eaf2894..5789009bbe5 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 0513dfc8cae..00000000000 --- 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 00000000000..d6a61af83b1 --- /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) \ |