aboutsummaryrefslogtreecommitdiff
path: root/print/cups-base
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2001-12-04 04:11:38 +0000
committerWill Andrews <will@FreeBSD.org>2001-12-04 04:11:38 +0000
commitebcbe757d01f3dfe1c36d9db3f422f73f35f535b (patch)
treee3e0c1c5c55d8f1ceab8ef38f75921726b1896eb /print/cups-base
parent555fb0a8fd2952092014651d6363d8784661189d (diff)
downloadports-ebcbe757d01f3dfe1c36d9db3f422f73f35f535b.tar.gz
ports-ebcbe757d01f3dfe1c36d9db3f422f73f35f535b.zip
Notes
Diffstat (limited to 'print/cups-base')
-rw-r--r--print/cups-base/Makefile2
-rw-r--r--print/cups-base/files/patch-man-Makefile48
-rw-r--r--print/cups-base/pkg-plist3
3 files changed, 46 insertions, 7 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index ebc7ae7f7ef6..f9a67ed3dcb9 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cups-base
PORTVERSION= ${VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \
ftp://ftp2.easysw.com/pub/cups/${VERSION}/ \
diff --git a/print/cups-base/files/patch-man-Makefile b/print/cups-base/files/patch-man-Makefile
index fc5ffa7b770b..0513dfc8cae4 100644
--- a/print/cups-base/files/patch-man-Makefile
+++ b/print/cups-base/files/patch-man-Makefile
@@ -1,6 +1,23 @@
--- man/Makefile.orig Thu Oct 25 23:16:48 2001
-+++ man/Makefile Sat Nov 17 13:48:41 2001
-@@ -47,7 +47,7 @@
++++ 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...
#
@@ -9,10 +26,25 @@
#
-@@ -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)
+@@ -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; \
@@ -35,6 +67,10 @@
- $(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; \
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 6221ce5d5854..ab15b6c2ef9d 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -296,6 +296,9 @@ share/locale/it/cups_it
@exec mkdir -p /var/log/cups
@unexec rmdir /var/log/cups 2>/dev/null || true
@exec mkdir -p /var/spool/cups/tmp
+@exec chown -R daemon /var/spool/cups
+@exec chmod 700 /var/spool/cups
+@exec chmod 1700 /var/spool/cups/tmp
@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