diff options
author | Volker Stolz <vs@FreeBSD.org> | 2004-12-17 14:27:38 +0000 |
---|---|---|
committer | Volker Stolz <vs@FreeBSD.org> | 2004-12-17 14:27:38 +0000 |
commit | bc713acfba65db56f6a6d4e435c2226f7a8ebb22 (patch) | |
tree | 8baada5dada93a75a10304891c7a293f6e3cad23 /print | |
parent | - cleanup option BATCH (diff) |
Fix printing with JDK14 (cf. http://www.cups.org/str.php?L1004)
PR: ports/74312
Submitted by: Gustavo De Nardin
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=124312
Diffstat (limited to 'print')
-rw-r--r-- | print/cups-lpr/files/patch-berkeley::lpc.c__status_all | 18 | ||||
-rw-r--r-- | print/cups-lpr/pkg-deinstall | 1 | ||||
-rw-r--r-- | print/cups-lpr/pkg-install | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/print/cups-lpr/files/patch-berkeley::lpc.c__status_all b/print/cups-lpr/files/patch-berkeley::lpc.c__status_all new file mode 100644 index 000000000000..fb8e4851295b --- /dev/null +++ b/print/cups-lpr/files/patch-berkeley::lpc.c__status_all @@ -0,0 +1,18 @@ +--- berkeley/lpc.c.orig Wed Feb 25 17:14:50 2004 ++++ berkeley/lpc.c Mon Nov 15 17:54:38 2004 +@@ -339,6 +339,15 @@ + } + + /* ++ * A single 'all' printer name is special, meaning all printers. ++ */ ++ ++ if (dests != NULL && compare_strings(dests, "all", 3) == 0) ++ { ++ dests = NULL; ++ } ++ ++ /* + * See if this is a printer we're interested in... + */ + diff --git a/print/cups-lpr/pkg-deinstall b/print/cups-lpr/pkg-deinstall index 8964ca0b4737..8cfdb58f98d1 100644 --- a/print/cups-lpr/pkg-deinstall +++ b/print/cups-lpr/pkg-deinstall @@ -10,6 +10,7 @@ REPLACES_BINARIES="/usr/bin/lpr case $2 in POST-DEINSTALL) for FILE in ${REPLACES_BINARIES}; do + [ -L "${FILE}" ] && rm "${FILE}" [ -e "${FILE}.bak" ] && mv "${FILE}.bak" "${FILE}" done ;; diff --git a/print/cups-lpr/pkg-install b/print/cups-lpr/pkg-install index 8a7f9ae61d7e..aa459049016c 100644 --- a/print/cups-lpr/pkg-install +++ b/print/cups-lpr/pkg-install @@ -10,7 +10,7 @@ REPLACES_BINARIES="/usr/bin/lpr case $2 in POST-INSTALL) for FILE in ${REPLACES_BINARIES}; do - [ -e "${FILE}" ] && chmod 000 "${FILE}" + [ -e "${FILE}" ] && mv "${FILE}" "${FILE}.bak" && ln -s "/usr/local/${FILE#/usr/}" "${FILE}" done ;; esac |