aboutsummaryrefslogtreecommitdiffstats
path: root/print
diff options
context:
space:
mode:
authorgreid <greid@FreeBSD.org>2001-08-27 19:48:15 +0800
committergreid <greid@FreeBSD.org>2001-08-27 19:48:15 +0800
commit6f83103f717dc4bc5a1917022311dcfb9f43b808 (patch)
treef26aa2ed03deed73f93c14b78576c46f707482ab /print
parent20e8d90a9c1435a9b94b3a130a4ae02545d25b20 (diff)
downloadfreebsd-ports-gnome-6f83103f717dc4bc5a1917022311dcfb9f43b808.tar.gz
freebsd-ports-gnome-6f83103f717dc4bc5a1917022311dcfb9f43b808.tar.zst
freebsd-ports-gnome-6f83103f717dc4bc5a1917022311dcfb9f43b808.zip
Update to version 1.1.10 and give maintainership to submitter
PR: 29859 Submitted by: James Halstead <jah4007@cs.rit.edu>
Diffstat (limited to 'print')
-rw-r--r--print/cups-base/Makefile9
-rw-r--r--print/cups-base/distinfo2
-rw-r--r--print/cups-base/files/patch-ab70
-rw-r--r--print/cups-base/files/patch-ac25
-rw-r--r--print/cups-base/pkg-message11
-rw-r--r--print/cups-base/pkg-plist19
-rw-r--r--print/cups-lpr/Makefile9
-rw-r--r--print/cups-lpr/distinfo2
-rw-r--r--print/cups-lpr/files/patch-ab70
-rw-r--r--print/cups-lpr/files/patch-ac25
-rw-r--r--print/cups-lpr/pkg-message11
-rw-r--r--print/cups-lpr/pkg-plist19
-rw-r--r--print/cups/Makefile9
-rw-r--r--print/cups/distinfo2
-rw-r--r--print/cups/files/patch-ab70
-rw-r--r--print/cups/files/patch-ac25
-rw-r--r--print/cups/pkg-message11
-rw-r--r--print/cups/pkg-plist19
18 files changed, 252 insertions, 156 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 1c5f6461896b..932038484bab 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \
ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/
DISTNAME= ${PORTNAME}-${VERSION}-${REVISION}-source
-MAINTAINER= greid@ukug.uk.freebsd.org
+MAINTAINER= jah4007@cs.rit.edu
-VERSION= 1.1.6
-REVISION= 2
+VERSION= 1.1.10
+REVISION= 1
USE_BZIP2= yes
INSTALLS_SHLIB= yes
@@ -25,9 +25,10 @@ INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --localstatedir=/var
MAN1= backend.1 cancel.1 filter.1 lp.1 lpoptions.1 lpq.1 \
- lpr.1 lprm.1 lpstat.1
+ lpr.1 lprm.1 lpstat.1 lppasswd.1
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 \
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index 88eee72d5f1d..da0aa067d5d0 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.6-2-source.tar.bz2) = 1cef7a1bc8b4995842d01516f4193dde
+MD5 (cups-1.1.10-1-source.tar.bz2) = e5f2b25fa2caa5f26f21432ec1e9eaac
diff --git a/print/cups-base/files/patch-ab b/print/cups-base/files/patch-ab
index c93ff4cf53d7..bc5690db9bc1 100644
--- a/print/cups-base/files/patch-ab
+++ b/print/cups-base/files/patch-ab
@@ -1,39 +1,45 @@
---- man/Makefile.orig Fri Jan 5 15:56:34 2001
-+++ man/Makefile Fri Jan 5 15:59:31 2001
-@@ -82,21 +82,21 @@
- $(LN) accept.8 $(MANDIR)/man8/reject.8
- $(RM) $(MANDIR)/man8/disable.8
- $(LN) enable.8 $(MANDIR)/man8/disable.8
-- -$(MKDIR) $(MANDIR)/cat1
-- -$(CHMOD) ugo+rx $(MANDIR)/cat1
-- $(INSTALL_MAN) $(CAT1) $(MANDIR)/cat1
+--- man/Makefile.orig Sat Aug 18 10:31:11 2001
++++ man/Makefile Sat Aug 18 10:37:49 2001
+@@ -78,24 +78,24 @@
+ $(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; \
+- done
- $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
- $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-- -$(MKDIR) $(MANDIR)/cat5
-- -$(CHMOD) ugo+rx $(MANDIR)/cat5
-- $(INSTALL_MAN) $(CAT5) $(MANDIR)/cat5
-- -$(MKDIR) $(MANDIR)/cat8
-- -$(CHMOD) ugo+rx $(MANDIR)/cat8
-- $(INSTALL_MAN) $(CAT8) $(MANDIR)/cat8
-- $(RM) $(MANDIR)/cat8/reject.$(CAT1EXT)
-- $(LN) accept.$(CAT1EXT) $(MANDIR)/cat8/reject.$(CAT1EXT)
-- $(RM) $(MANDIR)/cat8/disable.$(CAT1EXT)
-- $(LN) enable.$(CAT1EXT) $(MANDIR)/cat8/disable.$(CAT1EXT)
-+# -$(MKDIR) $(MANDIR)/cat1
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat1
-+# $(INSTALL_MAN) $(CAT1) $(MANDIR)/cat1
+- $(INSTALL_DIR) $(MANDIR)/cat5
+- for file in $(CAT5); do \
+- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
+- done
+- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
+- for file in $(CAT8); do \
+- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
+- done
+- $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+- $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++# $(INSTALL_DIR) $(MANDIR)/cat1
++# for file in $(CAT1); do \
++# $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
++# done
+# $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+# $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-+# -$(MKDIR) $(MANDIR)/cat5
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat5
-+# $(INSTALL_MAN) $(CAT5) $(MANDIR)/cat5
-+# -$(MKDIR) $(MANDIR)/cat8
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat8
-+# $(INSTALL_MAN) $(CAT8) $(MANDIR)/cat8
-+# $(RM) $(MANDIR)/cat8/reject.$(CAT1EXT)
-+# $(LN) accept.$(CAT1EXT) $(MANDIR)/cat8/reject.$(CAT1EXT)
-+# $(RM) $(MANDIR)/cat8/disable.$(CAT1EXT)
-+# $(LN) enable.$(CAT1EXT) $(MANDIR)/cat8/disable.$(CAT1EXT)
++# $(INSTALL_DIR) $(MANDIR)/cat5
++# for file in $(CAT5); do \
++# $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
++# done
++# $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
++# for file in $(CAT8); do \
++# $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
++# done
++# $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++# $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++# $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++# $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
#
diff --git a/print/cups-base/files/patch-ac b/print/cups-base/files/patch-ac
index 9a5806604854..508fc84eea58 100644
--- a/print/cups-base/files/patch-ac
+++ b/print/cups-base/files/patch-ac
@@ -1,18 +1,25 @@
---- data/Makefile.orig Fri Jan 5 17:03:23 2001
-+++ data/Makefile Fri Jan 5 17:03:53 2001
-@@ -91,15 +91,6 @@
- -$(MKDIR) $(DATADIR)/data
- $(CHMOD) ugo+rx $(DATADIR)/data
- $(INSTALL_DATA) $(DATAFILES) $(DATADIR)/data
-- -if test "$(PAMDIR)" != ""; then \
-- $(MKDIR) $(PAMDIR); \
-- $(CHMOD) ugo+rx $(PAMDIR); \
+--- data/Makefile.orig Sat Aug 18 10:38:01 2001
++++ data/Makefile Sat Aug 18 10:39:25 2001
+@@ -93,14 +93,14 @@
+ for file in $(DATAFILES); do \
+ $(INSTALL_DATA) $$file $(DATADIR)/data; \
+ done
+- -if test x$(PAMDIR) != x; then \
+- $(INSTALL_DIR) $(PAMDIR); \
- if test -f /lib/security/pam_unix.so; then \
- $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
- else \
- $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
- fi \
- fi
++# -if test x$(PAMDIR) != x; then \
++# $(INSTALL_DIR) $(PAMDIR); \
++# if test -f /lib/security/pam_unix.so; then \
++# $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
++# else \
++# $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
++# fi \
++# fi
#
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index 2935218a830c..c9dd1ecedbef 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -4,3 +4,14 @@ 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_LPD=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]*
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index d930cc05db71..e200ad399446 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -45,6 +45,7 @@ libexec/cups/filter/imagetoraster
libexec/cups/filter/pdftops
libexec/cups/filter/pstops
libexec/cups/filter/pstoraster
+libexec/cups/filter/rastertodymo
libexec/cups/filter/rastertoepson
libexec/cups/filter/rastertohp
libexec/cups/filter/texttops
@@ -132,13 +133,17 @@ share/cups/fonts/Utopia-Regular
share/cups/fonts/ZapfChancery-MediumItalic
share/cups/fonts/ZapfDingbats
share/cups/model/deskjet.ppd
+share/cups/model/deskjet2.ppd
+share/cups/model/dymo.ppd
share/cups/model/epson24.ppd
share/cups/model/epson9.ppd
share/cups/model/laserjet.ppd
share/cups/model/okidat24.ppd
share/cups/model/okidata9.ppd
share/cups/model/stcolor.ppd
+share/cups/model/stcolor2.ppd
share/cups/model/stphoto.ppd
+share/cups/model/stphoto2.ppd
share/cups/pstoraster/Fontmap
share/cups/pstoraster/gs_btokn.ps
share/cups/pstoraster/gs_ccfnt.ps
@@ -292,6 +297,14 @@ 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
+@exec mkdir -p /var/spool/cups/tmp
+@dirrm /var/spool/cups/tmp
+@dirrm /var/spool/cups
+@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
@@ -319,9 +332,3 @@ share/locale/it/cups_it
@dirrm share/locale/fr
@dirrm share/locale/it
@dirrm share/locale
-@dirrm var/log/cups
-@dirrm var/log
-@dirrm var/spool/cups/tmp
-@dirrm var/spool/cups
-@dirrm var/spool
-@dirrm var
diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index 1c5f6461896b..932038484bab 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \
ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/
DISTNAME= ${PORTNAME}-${VERSION}-${REVISION}-source
-MAINTAINER= greid@ukug.uk.freebsd.org
+MAINTAINER= jah4007@cs.rit.edu
-VERSION= 1.1.6
-REVISION= 2
+VERSION= 1.1.10
+REVISION= 1
USE_BZIP2= yes
INSTALLS_SHLIB= yes
@@ -25,9 +25,10 @@ INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --localstatedir=/var
MAN1= backend.1 cancel.1 filter.1 lp.1 lpoptions.1 lpq.1 \
- lpr.1 lprm.1 lpstat.1
+ lpr.1 lprm.1 lpstat.1 lppasswd.1
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 \
diff --git a/print/cups-lpr/distinfo b/print/cups-lpr/distinfo
index 88eee72d5f1d..da0aa067d5d0 100644
--- a/print/cups-lpr/distinfo
+++ b/print/cups-lpr/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.6-2-source.tar.bz2) = 1cef7a1bc8b4995842d01516f4193dde
+MD5 (cups-1.1.10-1-source.tar.bz2) = e5f2b25fa2caa5f26f21432ec1e9eaac
diff --git a/print/cups-lpr/files/patch-ab b/print/cups-lpr/files/patch-ab
index c93ff4cf53d7..bc5690db9bc1 100644
--- a/print/cups-lpr/files/patch-ab
+++ b/print/cups-lpr/files/patch-ab
@@ -1,39 +1,45 @@
---- man/Makefile.orig Fri Jan 5 15:56:34 2001
-+++ man/Makefile Fri Jan 5 15:59:31 2001
-@@ -82,21 +82,21 @@
- $(LN) accept.8 $(MANDIR)/man8/reject.8
- $(RM) $(MANDIR)/man8/disable.8
- $(LN) enable.8 $(MANDIR)/man8/disable.8
-- -$(MKDIR) $(MANDIR)/cat1
-- -$(CHMOD) ugo+rx $(MANDIR)/cat1
-- $(INSTALL_MAN) $(CAT1) $(MANDIR)/cat1
+--- man/Makefile.orig Sat Aug 18 10:31:11 2001
++++ man/Makefile Sat Aug 18 10:37:49 2001
+@@ -78,24 +78,24 @@
+ $(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; \
+- done
- $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
- $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-- -$(MKDIR) $(MANDIR)/cat5
-- -$(CHMOD) ugo+rx $(MANDIR)/cat5
-- $(INSTALL_MAN) $(CAT5) $(MANDIR)/cat5
-- -$(MKDIR) $(MANDIR)/cat8
-- -$(CHMOD) ugo+rx $(MANDIR)/cat8
-- $(INSTALL_MAN) $(CAT8) $(MANDIR)/cat8
-- $(RM) $(MANDIR)/cat8/reject.$(CAT1EXT)
-- $(LN) accept.$(CAT1EXT) $(MANDIR)/cat8/reject.$(CAT1EXT)
-- $(RM) $(MANDIR)/cat8/disable.$(CAT1EXT)
-- $(LN) enable.$(CAT1EXT) $(MANDIR)/cat8/disable.$(CAT1EXT)
-+# -$(MKDIR) $(MANDIR)/cat1
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat1
-+# $(INSTALL_MAN) $(CAT1) $(MANDIR)/cat1
+- $(INSTALL_DIR) $(MANDIR)/cat5
+- for file in $(CAT5); do \
+- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
+- done
+- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
+- for file in $(CAT8); do \
+- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
+- done
+- $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+- $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++# $(INSTALL_DIR) $(MANDIR)/cat1
++# for file in $(CAT1); do \
++# $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
++# done
+# $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+# $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-+# -$(MKDIR) $(MANDIR)/cat5
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat5
-+# $(INSTALL_MAN) $(CAT5) $(MANDIR)/cat5
-+# -$(MKDIR) $(MANDIR)/cat8
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat8
-+# $(INSTALL_MAN) $(CAT8) $(MANDIR)/cat8
-+# $(RM) $(MANDIR)/cat8/reject.$(CAT1EXT)
-+# $(LN) accept.$(CAT1EXT) $(MANDIR)/cat8/reject.$(CAT1EXT)
-+# $(RM) $(MANDIR)/cat8/disable.$(CAT1EXT)
-+# $(LN) enable.$(CAT1EXT) $(MANDIR)/cat8/disable.$(CAT1EXT)
++# $(INSTALL_DIR) $(MANDIR)/cat5
++# for file in $(CAT5); do \
++# $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
++# done
++# $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
++# for file in $(CAT8); do \
++# $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
++# done
++# $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++# $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++# $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++# $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
#
diff --git a/print/cups-lpr/files/patch-ac b/print/cups-lpr/files/patch-ac
index 9a5806604854..508fc84eea58 100644
--- a/print/cups-lpr/files/patch-ac
+++ b/print/cups-lpr/files/patch-ac
@@ -1,18 +1,25 @@
---- data/Makefile.orig Fri Jan 5 17:03:23 2001
-+++ data/Makefile Fri Jan 5 17:03:53 2001
-@@ -91,15 +91,6 @@
- -$(MKDIR) $(DATADIR)/data
- $(CHMOD) ugo+rx $(DATADIR)/data
- $(INSTALL_DATA) $(DATAFILES) $(DATADIR)/data
-- -if test "$(PAMDIR)" != ""; then \
-- $(MKDIR) $(PAMDIR); \
-- $(CHMOD) ugo+rx $(PAMDIR); \
+--- data/Makefile.orig Sat Aug 18 10:38:01 2001
++++ data/Makefile Sat Aug 18 10:39:25 2001
+@@ -93,14 +93,14 @@
+ for file in $(DATAFILES); do \
+ $(INSTALL_DATA) $$file $(DATADIR)/data; \
+ done
+- -if test x$(PAMDIR) != x; then \
+- $(INSTALL_DIR) $(PAMDIR); \
- if test -f /lib/security/pam_unix.so; then \
- $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
- else \
- $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
- fi \
- fi
++# -if test x$(PAMDIR) != x; then \
++# $(INSTALL_DIR) $(PAMDIR); \
++# if test -f /lib/security/pam_unix.so; then \
++# $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
++# else \
++# $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
++# fi \
++# fi
#
diff --git a/print/cups-lpr/pkg-message b/print/cups-lpr/pkg-message
index 2935218a830c..c9dd1ecedbef 100644
--- a/print/cups-lpr/pkg-message
+++ b/print/cups-lpr/pkg-message
@@ -4,3 +4,14 @@ 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_LPD=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]*
diff --git a/print/cups-lpr/pkg-plist b/print/cups-lpr/pkg-plist
index d930cc05db71..e200ad399446 100644
--- a/print/cups-lpr/pkg-plist
+++ b/print/cups-lpr/pkg-plist
@@ -45,6 +45,7 @@ libexec/cups/filter/imagetoraster
libexec/cups/filter/pdftops
libexec/cups/filter/pstops
libexec/cups/filter/pstoraster
+libexec/cups/filter/rastertodymo
libexec/cups/filter/rastertoepson
libexec/cups/filter/rastertohp
libexec/cups/filter/texttops
@@ -132,13 +133,17 @@ share/cups/fonts/Utopia-Regular
share/cups/fonts/ZapfChancery-MediumItalic
share/cups/fonts/ZapfDingbats
share/cups/model/deskjet.ppd
+share/cups/model/deskjet2.ppd
+share/cups/model/dymo.ppd
share/cups/model/epson24.ppd
share/cups/model/epson9.ppd
share/cups/model/laserjet.ppd
share/cups/model/okidat24.ppd
share/cups/model/okidata9.ppd
share/cups/model/stcolor.ppd
+share/cups/model/stcolor2.ppd
share/cups/model/stphoto.ppd
+share/cups/model/stphoto2.ppd
share/cups/pstoraster/Fontmap
share/cups/pstoraster/gs_btokn.ps
share/cups/pstoraster/gs_ccfnt.ps
@@ -292,6 +297,14 @@ 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
+@exec mkdir -p /var/spool/cups/tmp
+@dirrm /var/spool/cups/tmp
+@dirrm /var/spool/cups
+@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
@@ -319,9 +332,3 @@ share/locale/it/cups_it
@dirrm share/locale/fr
@dirrm share/locale/it
@dirrm share/locale
-@dirrm var/log/cups
-@dirrm var/log
-@dirrm var/spool/cups/tmp
-@dirrm var/spool/cups
-@dirrm var/spool
-@dirrm var
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 1c5f6461896b..932038484bab 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -14,10 +14,10 @@ MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \
ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/
DISTNAME= ${PORTNAME}-${VERSION}-${REVISION}-source
-MAINTAINER= greid@ukug.uk.freebsd.org
+MAINTAINER= jah4007@cs.rit.edu
-VERSION= 1.1.6
-REVISION= 2
+VERSION= 1.1.10
+REVISION= 1
USE_BZIP2= yes
INSTALLS_SHLIB= yes
@@ -25,9 +25,10 @@ INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --localstatedir=/var
MAN1= backend.1 cancel.1 filter.1 lp.1 lpoptions.1 lpq.1 \
- lpr.1 lprm.1 lpstat.1
+ lpr.1 lprm.1 lpstat.1 lppasswd.1
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 \
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 88eee72d5f1d..da0aa067d5d0 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.6-2-source.tar.bz2) = 1cef7a1bc8b4995842d01516f4193dde
+MD5 (cups-1.1.10-1-source.tar.bz2) = e5f2b25fa2caa5f26f21432ec1e9eaac
diff --git a/print/cups/files/patch-ab b/print/cups/files/patch-ab
index c93ff4cf53d7..bc5690db9bc1 100644
--- a/print/cups/files/patch-ab
+++ b/print/cups/files/patch-ab
@@ -1,39 +1,45 @@
---- man/Makefile.orig Fri Jan 5 15:56:34 2001
-+++ man/Makefile Fri Jan 5 15:59:31 2001
-@@ -82,21 +82,21 @@
- $(LN) accept.8 $(MANDIR)/man8/reject.8
- $(RM) $(MANDIR)/man8/disable.8
- $(LN) enable.8 $(MANDIR)/man8/disable.8
-- -$(MKDIR) $(MANDIR)/cat1
-- -$(CHMOD) ugo+rx $(MANDIR)/cat1
-- $(INSTALL_MAN) $(CAT1) $(MANDIR)/cat1
+--- man/Makefile.orig Sat Aug 18 10:31:11 2001
++++ man/Makefile Sat Aug 18 10:37:49 2001
+@@ -78,24 +78,24 @@
+ $(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; \
+- done
- $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
- $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-- -$(MKDIR) $(MANDIR)/cat5
-- -$(CHMOD) ugo+rx $(MANDIR)/cat5
-- $(INSTALL_MAN) $(CAT5) $(MANDIR)/cat5
-- -$(MKDIR) $(MANDIR)/cat8
-- -$(CHMOD) ugo+rx $(MANDIR)/cat8
-- $(INSTALL_MAN) $(CAT8) $(MANDIR)/cat8
-- $(RM) $(MANDIR)/cat8/reject.$(CAT1EXT)
-- $(LN) accept.$(CAT1EXT) $(MANDIR)/cat8/reject.$(CAT1EXT)
-- $(RM) $(MANDIR)/cat8/disable.$(CAT1EXT)
-- $(LN) enable.$(CAT1EXT) $(MANDIR)/cat8/disable.$(CAT1EXT)
-+# -$(MKDIR) $(MANDIR)/cat1
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat1
-+# $(INSTALL_MAN) $(CAT1) $(MANDIR)/cat1
+- $(INSTALL_DIR) $(MANDIR)/cat5
+- for file in $(CAT5); do \
+- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
+- done
+- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
+- for file in $(CAT8); do \
+- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
+- done
+- $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+- $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+- $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++# $(INSTALL_DIR) $(MANDIR)/cat1
++# for file in $(CAT1); do \
++# $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
++# done
+# $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+# $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
-+# -$(MKDIR) $(MANDIR)/cat5
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat5
-+# $(INSTALL_MAN) $(CAT5) $(MANDIR)/cat5
-+# -$(MKDIR) $(MANDIR)/cat8
-+# -$(CHMOD) ugo+rx $(MANDIR)/cat8
-+# $(INSTALL_MAN) $(CAT8) $(MANDIR)/cat8
-+# $(RM) $(MANDIR)/cat8/reject.$(CAT1EXT)
-+# $(LN) accept.$(CAT1EXT) $(MANDIR)/cat8/reject.$(CAT1EXT)
-+# $(RM) $(MANDIR)/cat8/disable.$(CAT1EXT)
-+# $(LN) enable.$(CAT1EXT) $(MANDIR)/cat8/disable.$(CAT1EXT)
++# $(INSTALL_DIR) $(MANDIR)/cat5
++# for file in $(CAT5); do \
++# $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
++# done
++# $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
++# for file in $(CAT8); do \
++# $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
++# done
++# $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++# $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
++# $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
++# $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
#
diff --git a/print/cups/files/patch-ac b/print/cups/files/patch-ac
index 9a5806604854..508fc84eea58 100644
--- a/print/cups/files/patch-ac
+++ b/print/cups/files/patch-ac
@@ -1,18 +1,25 @@
---- data/Makefile.orig Fri Jan 5 17:03:23 2001
-+++ data/Makefile Fri Jan 5 17:03:53 2001
-@@ -91,15 +91,6 @@
- -$(MKDIR) $(DATADIR)/data
- $(CHMOD) ugo+rx $(DATADIR)/data
- $(INSTALL_DATA) $(DATAFILES) $(DATADIR)/data
-- -if test "$(PAMDIR)" != ""; then \
-- $(MKDIR) $(PAMDIR); \
-- $(CHMOD) ugo+rx $(PAMDIR); \
+--- data/Makefile.orig Sat Aug 18 10:38:01 2001
++++ data/Makefile Sat Aug 18 10:39:25 2001
+@@ -93,14 +93,14 @@
+ for file in $(DATAFILES); do \
+ $(INSTALL_DATA) $$file $(DATADIR)/data; \
+ done
+- -if test x$(PAMDIR) != x; then \
+- $(INSTALL_DIR) $(PAMDIR); \
- if test -f /lib/security/pam_unix.so; then \
- $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
- else \
- $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
- fi \
- fi
++# -if test x$(PAMDIR) != x; then \
++# $(INSTALL_DIR) $(PAMDIR); \
++# if test -f /lib/security/pam_unix.so; then \
++# $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \
++# else \
++# $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \
++# fi \
++# fi
#
diff --git a/print/cups/pkg-message b/print/cups/pkg-message
index 2935218a830c..c9dd1ecedbef 100644
--- a/print/cups/pkg-message
+++ b/print/cups/pkg-message
@@ -4,3 +4,14 @@ 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_LPD=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]*
diff --git a/print/cups/pkg-plist b/print/cups/pkg-plist
index d930cc05db71..e200ad399446 100644
--- a/print/cups/pkg-plist
+++ b/print/cups/pkg-plist
@@ -45,6 +45,7 @@ libexec/cups/filter/imagetoraster
libexec/cups/filter/pdftops
libexec/cups/filter/pstops
libexec/cups/filter/pstoraster
+libexec/cups/filter/rastertodymo
libexec/cups/filter/rastertoepson
libexec/cups/filter/rastertohp
libexec/cups/filter/texttops
@@ -132,13 +133,17 @@ share/cups/fonts/Utopia-Regular
share/cups/fonts/ZapfChancery-MediumItalic
share/cups/fonts/ZapfDingbats
share/cups/model/deskjet.ppd
+share/cups/model/deskjet2.ppd
+share/cups/model/dymo.ppd
share/cups/model/epson24.ppd
share/cups/model/epson9.ppd
share/cups/model/laserjet.ppd
share/cups/model/okidat24.ppd
share/cups/model/okidata9.ppd
share/cups/model/stcolor.ppd
+share/cups/model/stcolor2.ppd
share/cups/model/stphoto.ppd
+share/cups/model/stphoto2.ppd
share/cups/pstoraster/Fontmap
share/cups/pstoraster/gs_btokn.ps
share/cups/pstoraster/gs_ccfnt.ps
@@ -292,6 +297,14 @@ 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
+@exec mkdir -p /var/spool/cups/tmp
+@dirrm /var/spool/cups/tmp
+@dirrm /var/spool/cups
+@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
@@ -319,9 +332,3 @@ share/locale/it/cups_it
@dirrm share/locale/fr
@dirrm share/locale/it
@dirrm share/locale
-@dirrm var/log/cups
-@dirrm var/log
-@dirrm var/spool/cups/tmp
-@dirrm var/spool/cups
-@dirrm var/spool
-@dirrm var