summaryrefslogtreecommitdiffstats
path: root/print/cups
diff options
context:
space:
mode:
authordwcjr <dwcjr@FreeBSD.org>2001-11-19 22:17:29 +0000
committerdwcjr <dwcjr@FreeBSD.org>2001-11-19 22:17:29 +0000
commitc27d55b0a990f803e14d32f0304ec1db34914a84 (patch)
treef0c133f7312566ae28ac17a8b01790f55bec71fb /print/cups
parent9846ec2dface0c320c96362409086a95eb01e8f8 (diff)
downloadFreeBSD-ports-c27d55b0a990f803e14d32f0304ec1db34914a84.zip
FreeBSD-ports-c27d55b0a990f803e14d32f0304ec1db34914a84.tar.gz
Update cups to 1.1.12
PR: 32062 Submitted by: maintainer
Diffstat (limited to 'print/cups')
-rw-r--r--print/cups/Makefile21
-rw-r--r--print/cups/distinfo2
-rw-r--r--print/cups/files/patch-cups.sh.in42
-rw-r--r--print/cups/files/patch-data-Makefile (renamed from print/cups/files/patch-ac)0
-rw-r--r--print/cups/files/patch-man-Makefile (renamed from print/cups/files/patch-ab)23
-rw-r--r--print/cups/pkg-message2
-rw-r--r--print/cups/pkg-plist36
7 files changed, 105 insertions, 21 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 9320384..fa1614a 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -6,18 +6,17 @@
#
PORTNAME= cups
-PORTVERSION= ${VERSION}.${REVISION}
+PORTVERSION= ${VERSION}#.${REVISION}
CATEGORIES= print
MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \
ftp://ftp2.easysw.com/pub/cups/${VERSION}/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \
ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/
-DISTNAME= ${PORTNAME}-${VERSION}-${REVISION}-source
+DISTNAME= ${PORTNAME}-${VERSION}-source
MAINTAINER= jah4007@cs.rit.edu
-VERSION= 1.1.10
-REVISION= 1
+VERSION= 1.1.12
USE_BZIP2= yes
INSTALLS_SHLIB= yes
@@ -29,13 +28,25 @@ CONFIGURE_ARGS+= --localstatedir=/var
MAN1= backend.1 cancel.1 filter.1 lp.1 lpoptions.1 lpq.1 \
lpr.1 lprm.1 lpstat.1 lppasswd.1
+MAN3= cups-config.3
MAN5= classes.conf.5 cupsd.conf.5 mime.convs.5 mime.types.5 \
printers.conf.5
MAN8= accept.8 cups-lpd.8 cups-polld.8 cupsd.8 disable.8 \
- enable.8 lpadmin.8 lpc.8 lpinfo.8 lpmove.8
+ enable.8 lpadmin.8 lpc.8 lpinfo.8 lpmove.8 \
+ cupsaddsmb.8
MLINKS= accept.8 reject.8
post-install:
+ @${INSTALL_DATA} ${WRKSRC}/conf/classes.conf \
+ ${PREFIX}/etc/cups/classes.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/conf/client.conf \
+ ${PREFIX}/etc/cups/client.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/conf/cupsd.conf \
+ ${PREFIX}/etc/cups/cupsd.conf.sample
+ @${INSTALL_DATA} ${WRKSRC}/conf/printers.conf \
+ ${PREFIX}/etc/cups/printers.conf.sample
+ @${INSTALL_SCRIPT} -m 751 ${WRKSRC}/cups.sh \
+ ${PREFIX}/etc/rc.d/cupsd.sh.sample
@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/print/cups/distinfo b/print/cups/distinfo
index da0aa06..14e6221 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.10-1-source.tar.bz2) = e5f2b25fa2caa5f26f21432ec1e9eaac
+MD5 (cups-1.1.12-source.tar.bz2) = 18e74aa115e9fdaa569685e6351f0ebc
diff --git a/print/cups/files/patch-cups.sh.in b/print/cups/files/patch-cups.sh.in
new file mode 100644
index 0000000..66c8738
--- /dev/null
+++ b/print/cups/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/files/patch-ac b/print/cups/files/patch-data-Makefile
index 508fc84..508fc84 100644
--- a/print/cups/files/patch-ac
+++ b/print/cups/files/patch-data-Makefile
diff --git a/print/cups/files/patch-ab b/print/cups/files/patch-man-Makefile
index bc5690d..fc5ffa7 100644
--- a/print/cups/files/patch-ab
+++ b/print/cups/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; \
diff --git a/print/cups/pkg-message b/print/cups/pkg-message
index c9dd1ec..26b5df5 100644
--- a/print/cups/pkg-message
+++ b/print/cups/pkg-message
@@ -8,7 +8,7 @@ have been installed in %%PREFIX%%/etc/cups/
Please note that the cups port installs tools with conflicting names to the
freebsd printing system. At a minimum users PATH environment should have
%%PREFIX%%/bin before /usr/bin to use the correct tools. You may also
-consider removing the freebsd printing tools and set NO_LPD=true in your
+consider removing the freebsd printing tools and set NO_LPR=true in your
/etc/make.conf to prevent them building in future make world's. This would
not of course prevent them from being reinstalled during a binary upgrade.
diff --git a/print/cups/pkg-plist b/print/cups/pkg-plist
index e200ad3..30e9710 100644
--- a/print/cups/pkg-plist
+++ b/print/cups/pkg-plist
@@ -1,4 +1,5 @@
bin/cancel
+bin/cups-config
bin/disable
bin/enable
bin/lp
@@ -8,12 +9,21 @@ bin/lpq
bin/lpr
bin/lprm
bin/lpstat
-etc/cups/classes.conf
-etc/cups/client.conf
-etc/cups/cupsd.conf
+etc/rc.d/cupsd.sh.sample
+@unexec if cmp -s %D/etc/cups/classes.conf %D/etc/cups/classes.conf.sample; then rm -f %D/etc/cups/classes.conf; fi
+etc/cups/classes.conf.sample
+@exec test -f %B/classes.conf || cp %B/%f %B/classes.conf
+@unexec if cmp -s %D/etc/cups/client.conf %D/etc/cups/client.conf.sample; then rm -f %D/etc/cups/client.conf; fi
+etc/cups/client.conf.sample
+@exec test -f %B/client.conf || cp %B/%f %B/client.conf
+@unexec if cmp -s %D/etc/cups/cupsd.conf %D/etc/cups/cupsd.conf.sample; then rm -f %D/etc/cups/cupsd.conf; fi
+etc/cups/cupsd.conf.sample
+@exec test -f %B/cupsd.conf || cp %B/%f %B/cupsd.conf
etc/cups/mime.convs
etc/cups/mime.types
-etc/cups/printers.conf
+@unexec if cmp -s %D/etc/cups/printers.conf %D/etc/cups/printers.conf.sample; then rm -f %D/etc/cups/printers.conf; fi
+etc/cups/printers.conf.sample
+@exec test -f %B/printers.conf || cp %B/%f %B/printers.conf
include/cups/cups.h
include/cups/http.h
include/cups/ipp.h
@@ -50,6 +60,7 @@ libexec/cups/filter/rastertoepson
libexec/cups/filter/rastertohp
libexec/cups/filter/texttops
sbin/accept
+sbin/cupsaddsmb
sbin/cupsd
sbin/lpadmin
sbin/lpc
@@ -204,6 +215,7 @@ share/cups/templates/header.tmpl
share/cups/templates/job-cancel.tmpl
share/cups/templates/job-hold.tmpl
share/cups/templates/job-release.tmpl
+share/cups/templates/job-restart.tmpl
share/cups/templates/jobs.tmpl
share/cups/templates/modify-class.tmpl
share/cups/templates/modify-printer.tmpl
@@ -292,23 +304,24 @@ share/doc/cups/sum.pdf
share/doc/cups/svd.html
share/doc/cups/svd.pdf
share/locale/C/cups_C
+share/locale/cs/cups_cs
share/locale/de/cups_de
share/locale/en/cups_en
share/locale/es/cups_es
share/locale/fr/cups_fr
share/locale/it/cups_it
@exec mkdir -p /var/log/cups
-@dirrm /var/log/cups
+@unexec rmdir /var/log/cups 2>/dev/null || true
@exec mkdir -p /var/spool/cups/tmp
-@dirrm /var/spool/cups/tmp
-@dirrm /var/spool/cups
+@unexec rmdir /var/spool/cups/tmp 2>/dev/null || true
+@unexec rmdir /var/spool/cups 2>/dev/null || true
@exec mkdir -p %D/etc/cups/certs
@exec mkdir -p %D/etc/cups/interfaces
@exec mkdir -p %D/etc/cups/ppd
-@dirrm etc/cups/certs
-@dirrm etc/cups/interfaces
-@dirrm etc/cups/ppd
-@dirrm etc/cups
+@unexec rmdir %D/etc/cups/certs 2>/dev/null || true
+@unexec rmdir %D/etc/cups/interfaces 2>/dev/null || true
+@unexec rmdir %D/etc/cups/ppd 2>/dev/null || true
+@unexec rmdir %D/etc/cups 2>/dev/null || true
@dirrm include/cups
@dirrm libexec/cups/backend
@dirrm libexec/cups/cgi-bin
@@ -326,6 +339,7 @@ share/locale/it/cups_it
@dirrm share/doc/cups/images
@dirrm share/doc/cups
@dirrm share/locale/C
+@dirrm share/locale/cs
@dirrm share/locale/de
@dirrm share/locale/en
@dirrm share/locale/es
OpenPOWER on IntegriCloud