summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2001-12-04 04:11:38 +0000
committerwill <will@FreeBSD.org>2001-12-04 04:11:38 +0000
commit0eeaf08e979b5c4398c8fe86fd649510b8bb962b (patch)
treecbdbc26248a73b06513a3d0debb12a1be6ce6a3f
parent4b9baaae1d77a6dfbb01853d79eda1b83374c1ae (diff)
downloadFreeBSD-ports-0eeaf08e979b5c4398c8fe86fd649510b8bb962b.zip
FreeBSD-ports-0eeaf08e979b5c4398c8fe86fd649510b8bb962b.tar.gz
1) Fix minor errors in the print/cups breakup.
2) Make sure CUPS is installed correctly permissions wise. 3) Bump PORTREVISION to acknowledge #2. Reported by: Alan Eldridge <alane@geeksrus.net> (#2) Submitted by: maintainer
-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
-rw-r--r--print/cups-lpr/files/patch-man-Makefile25
-rw-r--r--print/cups/pkg-message17
5 files changed, 68 insertions, 27 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index ebc7ae7..f9a67ed 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 fc5ffa7..0513dfc 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 6221ce5..ab15b6c 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
diff --git a/print/cups-lpr/files/patch-man-Makefile b/print/cups-lpr/files/patch-man-Makefile
index fc5ffa7..b549382 100644
--- a/print/cups-lpr/files/patch-man-Makefile
+++ b/print/cups-lpr/files/patch-man-Makefile
@@ -1,6 +1,25 @@
--- 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 22:34:11 2001
+@@ -28,13 +28,12 @@
+ # Man pages...
+ #
+
+-MAN1 = backend.man filter.man lp.man lpoptions.man lppasswd.man \
++MAN1 = 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 cups-polld.man \
+- cupsd.man enable.man lpadmin.man lpinfo.man lpmove.man \
++MAN3 =
++MAN5 =
++MAN8 = accept.man cupsaddsmb.man \
++ enable.man lpadmin.man lpinfo.man lpmove.man \
+ lpc.man
+
+ CAT1 = $(MAN1:.man=.$(CAT1EXT))
+@@ -47,7 +46,7 @@
# Make everything...
#
@@ -9,7 +28,7 @@
#
-@@ -85,28 +85,28 @@
+@@ -85,28 +84,28 @@
$(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
$(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
$(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
diff --git a/print/cups/pkg-message b/print/cups/pkg-message
deleted file mode 100644
index 26b5df5..0000000
--- a/print/cups/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-
-CUPS is now installed.
-
-Please read the documentation in %%PREFIX%%/share/doc/cups/ for information
-on how to set up your printer to use CUPS. Basic template configuration files
-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_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.
-
-The relevant files for the freebsd printing system are:
-/usr/bin/lp* /usr/sbin/lpc /usr/sbin/lpd /usr/share/man/cat*/lp*
-/usr/share/man/man1/lp.* /usr/share/man/man1/lp[a-s,u-z]*
OpenPOWER on IntegriCloud