diff options
| author | dwcjr <dwcjr@FreeBSD.org> | 2001-11-19 22:17:29 +0000 |
|---|---|---|
| committer | dwcjr <dwcjr@FreeBSD.org> | 2001-11-19 22:17:29 +0000 |
| commit | c27d55b0a990f803e14d32f0304ec1db34914a84 (patch) | |
| tree | f0c133f7312566ae28ac17a8b01790f55bec71fb /print/cups-base/files | |
| parent | 9846ec2dface0c320c96362409086a95eb01e8f8 (diff) | |
| download | FreeBSD-ports-c27d55b0a990f803e14d32f0304ec1db34914a84.zip FreeBSD-ports-c27d55b0a990f803e14d32f0304ec1db34914a84.tar.gz | |
Update cups to 1.1.12
PR: 32062
Submitted by: maintainer
Diffstat (limited to 'print/cups-base/files')
| -rw-r--r-- | print/cups-base/files/patch-cups.sh.in | 42 | ||||
| -rw-r--r-- | print/cups-base/files/patch-data-Makefile (renamed from print/cups-base/files/patch-ac) | 0 | ||||
| -rw-r--r-- | print/cups-base/files/patch-man-Makefile (renamed from print/cups-base/files/patch-ab) | 23 |
3 files changed, 62 insertions, 3 deletions
diff --git a/print/cups-base/files/patch-cups.sh.in b/print/cups-base/files/patch-cups.sh.in new file mode 100644 index 0000000..66c8738 --- /dev/null +++ b/print/cups-base/files/patch-cups.sh.in @@ -0,0 +1,42 @@ +--- cups.sh.in.orig Fri Nov 2 15:43:10 2001 ++++ cups.sh.in Sat Nov 17 12:25:49 2001 +@@ -63,6 +63,10 @@ + IS_ON=: + ;; + ++ FreeBSD*) ++ IS_ON=/usr/bin/true ++ ;; ++ + *) + IS_ON=/bin/true + ;; +@@ -104,7 +108,7 @@ + OSF1*) + pid=`ps -e | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; +- Linux* | NetBSD* | Darwin*) ++ Linux* | NetBSD* | Darwin* | FreeBSD*) + pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` + ;; + *) +@@ -126,7 +130,8 @@ + exec_prefix=@exec_prefix@ + @sbindir@/cupsd + fi +- $ECHO "cups: scheduler ${1}ed." ++# $ECHO "cups: scheduler ${1}ed." ++ echo -n "cupsd " + else + $ECHO "cups: scheduler stopped." + fi +@@ -135,7 +140,8 @@ + stop) + if test "$pid" != ""; then + kill $pid +- $ECHO "cups: scheduler stopped." ++# $ECHO "cups: scheduler stopped." ++ echo -n "cupsd " + fi + ;; + diff --git a/print/cups-base/files/patch-ac b/print/cups-base/files/patch-data-Makefile index 508fc84..508fc84 100644 --- a/print/cups-base/files/patch-ac +++ b/print/cups-base/files/patch-data-Makefile diff --git a/print/cups-base/files/patch-ab b/print/cups-base/files/patch-man-Makefile index bc5690d..fc5ffa7 100644 --- a/print/cups-base/files/patch-ab +++ b/print/cups-base/files/patch-man-Makefile @@ -1,6 +1,15 @@ ---- man/Makefile.orig Sat Aug 18 10:31:11 2001 -+++ man/Makefile Sat Aug 18 10:37:49 2001 -@@ -78,24 +78,24 @@ +--- man/Makefile.orig Thu Oct 25 23:16:48 2001 ++++ man/Makefile Sat Nov 17 13:48:41 2001 +@@ -47,7 +47,7 @@ + # Make everything... + # + +-all: $(CAT1) $(CAT3) $(CAT5) $(CAT8) ++all: #$(CAT1) $(CAT3) $(CAT5) $(CAT8) + + + # +@@ -85,28 +85,28 @@ $(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT) $(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) $(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT) @@ -10,6 +19,10 @@ - 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; \ @@ -28,6 +41,10 @@ +# 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; \ |
