aboutsummaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorAlan Eldridge <alane@FreeBSD.org>2003-01-22 13:54:55 +0000
committerAlan Eldridge <alane@FreeBSD.org>2003-01-22 13:54:55 +0000
commit7a8ec77ba3661bc9f23b1bfc876311a0d893ee3f (patch)
tree0ea8682fbdd0a54ca5bb5040857eb367f9a34e04 /print
parent8fb7c2db6338ef131719f1774c232422787bf989 (diff)
downloadports-7a8ec77ba3661bc9f23b1bfc876311a0d893ee3f.tar.gz
ports-7a8ec77ba3661bc9f23b1bfc876311a0d893ee3f.zip
Notes
Diffstat (limited to 'print')
-rw-r--r--print/cups-base/Makefile47
-rw-r--r--print/cups-base/distinfo2
-rw-r--r--print/cups-base/files/manpages.mk13
-rw-r--r--print/cups-base/files/patch-Makefile4
-rw-r--r--print/cups-base/files/patch-backend-usb.c-1.1.1648
-rw-r--r--print/cups-base/files/patch-cups.sh.in22
-rw-r--r--print/cups-base/files/patch-data-Makefile25
-rw-r--r--print/cups-base/files/patch-filter-pstops.c50
-rw-r--r--print/cups-base/files/patch-man-Makefile.common62
-rw-r--r--print/cups-base/files/patch-scheduler-mime.c-1.1.1645
-rw-r--r--print/cups-base/pkg-message21
-rw-r--r--print/cups-base/pkg-plist305
-rw-r--r--print/cups-lpr/Makefile38
-rw-r--r--print/cups-lpr/distinfo2
-rw-r--r--print/cups-lpr/files/manpages.mk18
-rw-r--r--print/cups-lpr/files/patch-Makefile121
-rw-r--r--print/cups-lpr/files/patch-man-Makefile.common55
-rw-r--r--print/cups-lpr/pkg-message20
-rw-r--r--print/cups-lpr/pkg-plist3
-rw-r--r--print/cups-pstoraster/Makefile12
-rw-r--r--print/cups/Makefile35
-rw-r--r--print/cups/Makefile.common97
-rw-r--r--print/cups/Makefile.inc55
-rw-r--r--print/cups/distinfo1
-rw-r--r--print/cups/files/fr-patch-man-Makefile11
-rw-r--r--print/cups/files/patch-Makedefs.in13
-rw-r--r--print/cups/files/patch-config-scripts-cups-common.m411
-rw-r--r--print/cups/files/patch-man-Makefile53
-rw-r--r--print/cups/files/patch-man-fr-Makefile53
-rw-r--r--print/cups/pkg-plist2
30 files changed, 493 insertions, 751 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 7b74ae1a810f..d8a1aef53462 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -1,37 +1,32 @@
-# New ports collection makefile for: cups-base
-# Date created: 29 November 2001
-# Whom: James Halstead <jah4007@cs.rit.edu>
+# ex:ts=8 -*-mode: makefile-*-
+#
+# New ports collection makefile for: cups
+# Date created: 2003-01-22
+# Whom: Alan Eldridge <alane@geeksrus.net>
#
# $FreeBSD$
#
PORTNAME= cups-base
PORTVERSION= ${CUPS_PORTVER}
-PORTREVISION= 4
-CATEGORIES?= print
+PORTREVISION= 0
+PORTEPOCH= ${CUPS_PORTEPOCH}
+CATEGORIES= print
+MASTER_SITES= ${CUPS_MASTER_SITES}
MAINTAINER= alane@FreeBSD.org
-INSTALLS_SHLIB= yes
-
-MAN1= backend.1 filter.1
-MAN3= cups-config.3
-MAN5= classes.conf.5 cupsd.conf.5 mime.convs.5 mime.types.5 \
- printers.conf.5
-MAN8= cups-lpd.8 cups-polld.8 cupsd.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}
+ ${MKDIR} ${PREFIX}/etc/cups/certs/0
+ cd ${PREFIX}/etc/rc.d; ${MV} cups cups.sh.sample
+ ${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
+ ${FIND} ${PREFIX}/man/fr/cat* -type l -name '*.0' -delete
+ ${MKDIR} ${CUPS_SPOOLDIR}
+ ${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}
+
+.include "${.CURDIR}/../../print/cups/Makefile.common"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages.mk"
+.include <bsd.port.post.mk>
-.include "${.CURDIR}/../../print/cups/Makefile.inc"
-.include <bsd.port.mk>
+#EOF
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index 0edc8c761640..7c4c9f612542 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.15-1-source.tar.bz2) = 971a14d35f61ea19871616f437e199a2
+MD5 (cups-1.1.18-source.tar.bz2) = 4a8a423a8268d088bffa19f6515883a7
diff --git a/print/cups-base/files/manpages.mk b/print/cups-base/files/manpages.mk
new file mode 100644
index 000000000000..43e19a112605
--- /dev/null
+++ b/print/cups-base/files/manpages.mk
@@ -0,0 +1,13 @@
+MAN1+= backend.1
+MAN1+= cupstestppd.1
+MAN1+= filter.1
+MAN3+= cups-config.3
+MAN5+= classes.conf.5
+MAN5+= cupsd.conf.5
+MAN5+= mime.convs.5
+MAN5+= mime.types.5
+MAN5+= printers.conf.5
+MAN8+= cups-lpd.8
+MAN8+= cups-polld.8
+MAN8+= cupsaddsmb.8
+MAN8+= cupsd.8
diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile
index a68adf13011b..55c49f2ec9aa 100644
--- a/print/cups-base/files/patch-Makefile
+++ b/print/cups-base/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Fri Jun 7 20:09:07 2002
-+++ Makefile Fri Jun 7 20:14:39 2002
+--- Makefile.orig Tue Dec 17 13:56:25 2002
++++ Makefile Wed Jan 22 06:18:57 2003
@@ -28,8 +28,8 @@
# Directories to make...
#
diff --git a/print/cups-base/files/patch-backend-usb.c-1.1.16 b/print/cups-base/files/patch-backend-usb.c-1.1.16
deleted file mode 100644
index 29a034512dcb..000000000000
--- a/print/cups-base/files/patch-backend-usb.c-1.1.16
+++ /dev/null
@@ -1,48 +0,0 @@
---- backend/usb.c.orig Thu May 16 09:44:50 2002
-+++ backend/usb.c Sat Aug 17 17:48:21 2002
-@@ -431,34 +431,37 @@
- }
- #elif defined(__sgi)
- #elif defined(__sun)
--#elif defined(__hpux)
--#elif defined(__osf)
--#elif defined(__FreeBSD__)
- int i; /* Looping var */
- char device[255]; /* Device filename */
-
-
-- for (i = 0; i < 3; i ++)
-+ for (i = 0; i < 8; i ++)
- {
-- sprintf(device, "/dev/unlpt%d", i);
-+ sprintf(device, "/dev/usb/printer%d", i);
- if (!access(device, 0))
- printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
- }
--#elif defined(__NetBSD__) || defined(__OpenBSD__)
-+#elif defined(__hpux)
-+#elif defined(__osf)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- int i; /* Looping var */
- char device[255]; /* Device filename */
-
-
-- for (i = 0; i < 3; i ++)
-+ for (i = 0; i < 8; i ++)
- {
- sprintf(device, "/dev/ulpt%d", i);
- if (!access(device, 0))
- printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1);
-+
-+ sprintf(device, "/dev/unlpt%d", i);
-+ if (!access(device, 0))
-+ printf("direct usb:%s \"Unknown\" \"USB Printer #%d (no reset)\"\n", device, i + 1);
- }
- #endif
- }
-
-
- /*
-- * End of "$Id: usb.c,v 1.30 2002/05/16 13:44:50 mike Exp $".
-+ * End of "$Id: usb.c,v 1.32 2002/08/09 00:19:20 mike Exp $".
- */
diff --git a/print/cups-base/files/patch-cups.sh.in b/print/cups-base/files/patch-cups.sh.in
deleted file mode 100644
index 5789009bbe59..000000000000
--- a/print/cups-base/files/patch-cups.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- cups.sh.in.orig Fri Jun 7 20:15:29 2002
-+++ cups.sh.in Fri Jun 7 20:18:22 2002
-@@ -141,7 +141,8 @@
- exec_prefix=@exec_prefix@
- @sbindir@/cupsd
- fi
-- $ECHO "cups: scheduler ${1}ed."
-+# $ECHO "cups: scheduler ${1}ed."
-+ $ECHO " cupsd"
- else
- $ECHO "cups: scheduler stopped."
- fi
-@@ -150,7 +151,8 @@
- stop)
- if test "$pid" != ""; then
- kill $pid
-- $ECHO "cups: scheduler stopped."
-+# $ECHO "cups: scheduler stopped."
-+ $ECHO " cupsd"
- fi
- ;;
-
diff --git a/print/cups-base/files/patch-data-Makefile b/print/cups-base/files/patch-data-Makefile
deleted file mode 100644
index b5c974148dec..000000000000
--- a/print/cups-base/files/patch-data-Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/Makefile.orig Thu Jan 31 09:53:42 2002
-+++ data/Makefile Sat Feb 2 23:34:44 2002
-@@ -97,14 +97,14 @@
- for file in $(DATAFILES); do \
- $(INSTALL_DATA) $$file $(DATADIR)/data; \
- done
-- -if test x$(PAMDIR) != x$(BUILDROOT); 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$(BUILDROOT); 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/files/patch-filter-pstops.c b/print/cups-base/files/patch-filter-pstops.c
deleted file mode 100644
index 4ba546a13525..000000000000
--- a/print/cups-base/files/patch-filter-pstops.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- filter/pstops.c Tue May 28 15:04:50 2002
-+++ /home/alane/sw/src/cups/filter/pstops.c Thu Jun 27 12:31:45 2002
-@@ -60,8 +60,8 @@
- #define LAYOUT_RLBT 2 /* Right to left, bottom to top */
- #define LAYOUT_RLTB 3 /* Right to left, top to bottom */
- #define LAYOUT_BTLR 4 /* Bottom to top, left to right */
--#define LAYOUT_TBLR 5 /* Bottom to top, right to left */
--#define LAYOUT_BTRL 6 /* Top to bottom, left to right */
-+#define LAYOUT_TBLR 5 /* Top to bottom, right to left */
-+#define LAYOUT_BTRL 6 /* Bottom to top, left to right */
- #define LAYOUT_TBRL 7 /* Top to bottom, right to left */
-
- #define LAYOUT_NEGATEY 1
-@@ -418,23 +418,19 @@
- fputs(line, stdout);
- level --;
- }
-- else if (strncmp(line, "%%Orientation", 13) == 0 && level == 0)
-+ else if (strncmp(line, "%ESPRotation:", 13) == 0 && level == 0)
- {
- /*
- * Reset orientation of document?
- */
-
-- if (strstr(line, "Landscape") != NULL && !(Orientation & 1))
-- {
-- Orientation ++;
-- UpdatePageVars();
-- Orientation = 1;
-- }
-- else if (strstr(line, "Portrait") != NULL && (Orientation & 1))
-+ int orient = (atoi(line + 13) / 90) & 3;
-+
-+ if (orient != Orientation)
- {
-- Orientation = 4 - Orientation;
-+ Orientation = (4 - Orientation + orient) & 3;
- UpdatePageVars();
-- Orientation = 0;
-+ Orientation = orient;
- }
- }
- else if (strncmp(line, "%%BeginProlog", 13) == 0 && level == 0)
-@@ -1646,5 +1642,5 @@
-
-
- /*
-- * End of "$Id: pstops.c,v 1.83 2002/05/28 19:04:50 mike Exp $".
-+ * End of "$Id: pstops.c,v 1.85 2002/06/27 16:31:45 mike Exp $".
- */
diff --git a/print/cups-base/files/patch-man-Makefile.common b/print/cups-base/files/patch-man-Makefile.common
index d6a61af83b12..2c9028eaaeae 100644
--- a/print/cups-base/files/patch-man-Makefile.common
+++ b/print/cups-base/files/patch-man-Makefile.common
@@ -1,9 +1,9 @@
---- man/Makefile.common.orig Fri Jun 7 20:28:16 2002
-+++ man/Makefile.common Fri Jun 7 20:30:55 2002
-@@ -27,30 +27,30 @@
- #
+--- man/Makefile.common.orig Tue Dec 17 13:59:55 2002
++++ man/Makefile.common Wed Jan 22 07:25:31 2003
+@@ -28,58 +28,22 @@
MAN1 = backend.man \
+ cupstestppd.man \
- filter.man \
- lp.man \
- lpoptions.man \
@@ -13,13 +13,6 @@
- lpr.man \
- lpstat.man
+ filter.man
-+# 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 \
@@ -28,10 +21,8 @@
printers.conf.man
-MAN8 = accept.man \
- cupsaddsmb.man \
-- cups-lpd.man \
-+#MAN8 = accept.man \
-+# cupsaddsmb.man \
-+MAN8= cups-lpd.man \
++MAN8 = cupsaddsmb.man \
+ cups-lpd.man \
cups-polld.man \
- cupsd.man \
- enable.man \
@@ -39,12 +30,39 @@
- lpinfo.man \
- lpmove.man \
- lpc.man
+-
+-CAT1 = backend.$(CAT1EXT) \
+- cupstestppd.$(CAT1EXT) \
+- filter.$(CAT1EXT) \
+- lp.$(CAT1EXT) \
+- lpoptions.$(CAT1EXT) \
+- lppasswd.$(CAT1EXT) \
+- lpq.$(CAT1EXT) \
+- lprm.$(CAT1EXT) \
+- lpr.$(CAT1EXT) \
+- lpstat.$(CAT1EXT)
+-CAT3 = cups-config.$(CAT3EXT)
+-CAT5 = classes.conf.$(CAT5EXT) \
+- cupsd.conf.$(CAT5EXT) \
+- mime.convs.$(CAT5EXT) \
+- mime.types.$(CAT5EXT) \
+- printers.conf.$(CAT5EXT)
+-CAT8 = accept.$(CAT8EXT) \
+- cupsaddsmb.$(CAT8EXT) \
+- cups-lpd.$(CAT8EXT) \
+- cups-polld.$(CAT8EXT) \
+- cupsd.$(CAT8EXT) \
+- enable.$(CAT8EXT) \
+- lpadmin.$(CAT8EXT) \
+- lpinfo.$(CAT8EXT) \
+- lpmove.$(CAT8EXT) \
+- lpc.$(CAT8EXT)
+ cupsd.man
-+# enable.man \
-+# lpadmin.man \
-+# lpinfo.man \
-+# lpmove.man \
-+# lpc.man
- CAT1 = backend.$(CAT1EXT) \
- filter.$(CAT1EXT) \
++CAT1 =
++CAT3 =
++CAT5 =
++CAT8 =
+
+ #
+ # End of "$Id: Makefile.common,v 1.3 2002/12/17 18:59:55 swdev Exp $".
diff --git a/print/cups-base/files/patch-scheduler-mime.c-1.1.16 b/print/cups-base/files/patch-scheduler-mime.c-1.1.16
deleted file mode 100644
index b92b7e00ee1b..000000000000
--- a/print/cups-base/files/patch-scheduler-mime.c-1.1.16
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: scheduler/mime.c
-===================================================================
-RCS file: /home/anoncvs/cups/scheduler/mime.c,v
-retrieving revision 1.12
-retrieving revision 1.14
-diff -u -3 -r1.12 -r1.14
---- scheduler/mime.c 2002/05/16 13:45:02 1.12
-+++ scheduler/mime.c 2002/08/23 01:33:46 1.14
-@@ -502,17 +502,20 @@
- filter = lineptr;
-
- #ifndef WIN32
-- /*
-- * Verify that the filter exists and is executable...
-- */
-+ if (strcmp(filter, "-") != 0)
-+ {
-+ /*
-+ * Verify that the filter exists and is executable...
-+ */
-
-- if (filter[0] == '/')
-- strlcpy(filterprog, filter, sizeof(filterprog));
-- else
-- snprintf(filterprog, sizeof(filterprog), "%s/%s", filterpath, filter);
-+ if (filter[0] == '/')
-+ strlcpy(filterprog, filter, sizeof(filterprog));
-+ else
-+ snprintf(filterprog, sizeof(filterprog), "%s/%s", filterpath, filter);
-
-- if (access(filterprog, X_OK))
-- continue;
-+ if (access(filterprog, X_OK))
-+ continue;
-+ }
- #endif /* !WIN32 */
-
- /*
-@@ -593,5 +596,5 @@
-
-
- /*
-- * End of "$Id: mime.c,v 1.12 2002/05/16 13:45:02 mike Exp $".
-+ * End of "$Id: mime.c,v 1.14 2002/08/23 01:33:46 mike Exp $".
- */
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
deleted file mode 100644
index 214e82a10b24..000000000000
--- a/print/cups-base/pkg-message
+++ /dev/null
@@ -1,21 +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/
-
-To install the BSD and system V compatibility binaries look to the port
-print/cups-lpr. These are no longer installed as part of the base cups port
-because they have conflicting names with the native print binaries, and with
-other ports, such as lprNG.
-
-NOTE: IF YOU USE A NON-POSTSCRIPT PRINTER:
-
-You will need to install the cups-pstoraster port in order to print to
-your printer. If you installed via the "cups" port, it will be installed
-automatically. Otherwise, you will need to install the port or the package
-yourself.
-
-======================================================================
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 3d626e4828a3..f222b433d9d3 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -1,19 +1,12 @@
bin/cups-config
-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/certs/0
+etc/cups/classes.conf.N
+etc/cups/client.conf.N
+etc/cups/cupsd.conf.N
etc/cups/mime.convs
etc/cups/mime.types
-@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
+etc/cups/printers.conf.N
+etc/rc.d/cups.sh.sample
include/cups/cups.h
include/cups/http.h
include/cups/image.h
@@ -25,6 +18,7 @@ include/cups/raster.h
lib/libcups.a
lib/libcups.so
lib/libcups.so.2
+lib/libcupsimage.a
lib/libcupsimage.so
lib/libcupsimage.so.2
libexec/cups/backend/http
@@ -86,6 +80,7 @@ share/cups/charsets/windows-874
share/cups/data/HPGLprolog
share/cups/data/psglyphs
share/cups/data/testprint.ps
+share/cups/fonts/Courier
share/cups/fonts/Courier-Bold
share/cups/fonts/Courier-BoldOblique
share/cups/fonts/Courier-Oblique
@@ -120,6 +115,51 @@ share/cups/templates/classes.tmpl
share/cups/templates/config-printer.tmpl
share/cups/templates/config-printer2.tmpl
share/cups/templates/error.tmpl
+share/cups/templates/fr/add-class.tmpl
+share/cups/templates/fr/add-printer.tmpl
+share/cups/templates/fr/admin-op.tmpl
+share/cups/templates/fr/admin.tmpl
+share/cups/templates/fr/choose-device.tmpl
+share/cups/templates/fr/choose-make.tmpl
+share/cups/templates/fr/choose-members.tmpl
+share/cups/templates/fr/choose-model.tmpl
+share/cups/templates/fr/choose-serial.tmpl
+share/cups/templates/fr/choose-uri.tmpl
+share/cups/templates/fr/class-added.tmpl
+share/cups/templates/fr/class-confirm.tmpl
+share/cups/templates/fr/class-deleted.tmpl
+share/cups/templates/fr/class-modified.tmpl
+share/cups/templates/fr/classes.tmpl
+share/cups/templates/fr/config-printer.tmpl
+share/cups/templates/fr/config-printer2.tmpl
+share/cups/templates/fr/error.tmpl
+share/cups/templates/fr/header.tmpl
+share/cups/templates/fr/job-cancel.tmpl
+share/cups/templates/fr/job-hold.tmpl
+share/cups/templates/fr/job-op.tmpl
+share/cups/templates/fr/job-release.tmpl
+share/cups/templates/fr/job-restart.tmpl
+share/cups/templates/fr/jobs.tmpl
+share/cups/templates/fr/modify-class.tmpl
+share/cups/templates/fr/modify-printer.tmpl
+share/cups/templates/fr/option-boolean.tmpl
+share/cups/templates/fr/option-header.tmpl
+share/cups/templates/fr/option-pickmany.tmpl
+share/cups/templates/fr/option-pickone.tmpl
+share/cups/templates/fr/option-trailer.tmpl
+share/cups/templates/fr/printer-accept.tmpl
+share/cups/templates/fr/printer-added.tmpl
+share/cups/templates/fr/printer-configured.tmpl
+share/cups/templates/fr/printer-confirm.tmpl
+share/cups/templates/fr/printer-deleted.tmpl
+share/cups/templates/fr/printer-modified.tmpl
+share/cups/templates/fr/printer-purge.tmpl
+share/cups/templates/fr/printer-reject.tmpl
+share/cups/templates/fr/printer-start.tmpl
+share/cups/templates/fr/printer-stop.tmpl
+share/cups/templates/fr/printers.tmpl
+share/cups/templates/fr/test-page.tmpl
+share/cups/templates/fr/trailer.tmpl
share/cups/templates/header.tmpl
share/cups/templates/job-cancel.tmpl
share/cups/templates/job-hold.tmpl
@@ -130,6 +170,7 @@ share/cups/templates/jobs.tmpl
share/cups/templates/modify-class.tmpl
share/cups/templates/modify-printer.tmpl
share/cups/templates/option-boolean.tmpl
+share/cups/templates/option-conflict.tmpl
share/cups/templates/option-header.tmpl
share/cups/templates/option-pickmany.tmpl
share/cups/templates/option-pickone.tmpl
@@ -147,75 +188,112 @@ share/cups/templates/printer-stop.tmpl
share/cups/templates/printers.tmpl
share/cups/templates/test-page.tmpl
share/cups/templates/trailer.tmpl
-share/doc/cups/cmp.html
-share/doc/cups/cmp.pdf
-share/doc/cups/cups.css
-share/doc/cups/cupsdoc.css
-share/doc/cups/documentation.html
-share/doc/cups/idd.html
-share/doc/cups/idd.pdf
-share/doc/cups/images/accept-jobs.gif
-share/doc/cups/images/add-class.gif
-share/doc/cups/images/add-printer.gif
-share/doc/cups/images/cancel-job.gif
-share/doc/cups/images/cancel-jobs.gif
-share/doc/cups/images/cancel.gif
-share/doc/cups/images/classes.gif
-share/doc/cups/images/config-printer.gif
-share/doc/cups/images/continue.gif
-share/doc/cups/images/cups-block-diagram.gif
-share/doc/cups/images/cups-large.gif
-share/doc/cups/images/cups-medium.gif
-share/doc/cups/images/cups-small.gif
-share/doc/cups/images/delete-class.gif
-share/doc/cups/images/delete-printer.gif
-share/doc/cups/images/draft.gif
-share/doc/cups/images/hold-job.gif
-share/doc/cups/images/left.gif
-share/doc/cups/images/logo.gif
-share/doc/cups/images/manage-classes.gif
-share/doc/cups/images/manage-jobs.gif
-share/doc/cups/images/manage-printers.gif
-share/doc/cups/images/modify-class.gif
-share/doc/cups/images/modify-printer.gif
-share/doc/cups/images/navbar.gif
-share/doc/cups/images/print-test-page.gif
-share/doc/cups/images/printer-idle.gif
-share/doc/cups/images/printer-processing.gif
-share/doc/cups/images/printer-stopped.gif
-share/doc/cups/images/reject-jobs.gif
-share/doc/cups/images/release-job.gif
-share/doc/cups/images/restart-job.gif
-share/doc/cups/images/right.gif
-share/doc/cups/images/show-active.gif
-share/doc/cups/images/show-completed.gif
-share/doc/cups/images/start-class.gif
-share/doc/cups/images/start-printer.gif
-share/doc/cups/images/stop-class.gif
-share/doc/cups/images/stop-printer.gif
-share/doc/cups/index.html
-share/doc/cups/ipp.html
-share/doc/cups/ipp.pdf
-share/doc/cups/overview.html
-share/doc/cups/overview.pdf
-share/doc/cups/sam.html
-share/doc/cups/sam.pdf
-share/doc/cups/sdd.html
-share/doc/cups/sdd.pdf
-share/doc/cups/spm.html
-share/doc/cups/spm.pdf
-share/doc/cups/sps.html
-share/doc/cups/sps.pdf
-share/doc/cups/ssr.html
-share/doc/cups/ssr.pdf
-share/doc/cups/stp.html
-share/doc/cups/stp.pdf
-share/doc/cups/sum.html
-share/doc/cups/sum.pdf
-share/doc/cups/svd.html
-share/doc/cups/svd.pdf
-share/doc/cups/translation.html
-share/doc/cups/translation.pdf
+share/doc/cups-1.1.18.0/cmp.html
+share/doc/cups-1.1.18.0/cmp.pdf
+share/doc/cups-1.1.18.0/cups.css
+share/doc/cups-1.1.18.0/cupsdoc.css
+share/doc/cups-1.1.18.0/documentation.html
+share/doc/cups-1.1.18.0/fr/cups.css
+share/doc/cups-1.1.18.0/fr/cupsdoc.css
+share/doc/cups-1.1.18.0/fr/documentation.html
+share/doc/cups-1.1.18.0/fr/images/accept-jobs.gif
+share/doc/cups-1.1.18.0/fr/images/add-class.gif
+share/doc/cups-1.1.18.0/fr/images/add-printer.gif
+share/doc/cups-1.1.18.0/fr/images/cancel-job.gif
+share/doc/cups-1.1.18.0/fr/images/cancel-jobs.gif
+share/doc/cups-1.1.18.0/fr/images/cancel.gif
+share/doc/cups-1.1.18.0/fr/images/config-printer.gif
+share/doc/cups-1.1.18.0/fr/images/continue.gif
+share/doc/cups-1.1.18.0/fr/images/delete-class.gif
+share/doc/cups-1.1.18.0/fr/images/delete-printer.gif
+share/doc/cups-1.1.18.0/fr/images/hold-job.gif
+share/doc/cups-1.1.18.0/fr/images/manage-classes.gif
+share/doc/cups-1.1.18.0/fr/images/manage-jobs.gif
+share/doc/cups-1.1.18.0/fr/images/manage-printers.gif
+share/doc/cups-1.1.18.0/fr/images/modify-class.gif
+share/doc/cups-1.1.18.0/fr/images/modify-printer.gif
+share/doc/cups-1.1.18.0/fr/images/navbar.gif
+share/doc/cups-1.1.18.0/fr/images/print-test-page.gif
+share/doc/cups-1.1.18.0/fr/images/reject-jobs.gif
+share/doc/cups-1.1.18.0/fr/images/release-job.gif
+share/doc/cups-1.1.18.0/fr/images/restart-job.gif
+share/doc/cups-1.1.18.0/fr/images/show-active.gif
+share/doc/cups-1.1.18.0/fr/images/show-completed.gif
+share/doc/cups-1.1.18.0/fr/images/start-class.gif
+share/doc/cups-1.1.18.0/fr/images/start-printer.gif
+share/doc/cups-1.1.18.0/fr/images/stop-class.gif
+share/doc/cups-1.1.18.0/fr/images/stop-printer.gif
+share/doc/cups-1.1.18.0/fr/index.html
+share/doc/cups-1.1.18.0/fr/overview.html
+share/doc/cups-1.1.18.0/fr/overview.pdf
+share/doc/cups-1.1.18.0/fr/sam.html
+share/doc/cups-1.1.18.0/fr/sam.pdf
+share/doc/cups-1.1.18.0/fr/sum.html
+share/doc/cups-1.1.18.0/fr/sum.pdf
+share/doc/cups-1.1.18.0/idd.html
+share/doc/cups-1.1.18.0/idd.pdf
+share/doc/cups-1.1.18.0/images/accept-jobs.gif
+share/doc/cups-1.1.18.0/images/add-class.gif
+share/doc/cups-1.1.18.0/images/add-printer.gif
+share/doc/cups-1.1.18.0/images/cancel-job.gif
+share/doc/cups-1.1.18.0/images/cancel-jobs.gif
+share/doc/cups-1.1.18.0/images/cancel.gif
+share/doc/cups-1.1.18.0/images/classes.gif
+share/doc/cups-1.1.18.0/images/config-printer.gif
+share/doc/cups-1.1.18.0/images/continue.gif
+share/doc/cups-1.1.18.0/images/cups-block-diagram.gif
+share/doc/cups-1.1.18.0/images/cups-large.gif
+share/doc/cups-1.1.18.0/images/cups-medium.gif
+share/doc/cups-1.1.18.0/images/cups-small.gif
+share/doc/cups-1.1.18.0/images/delete-class.gif
+share/doc/cups-1.1.18.0/images/delete-printer.gif
+share/doc/cups-1.1.18.0/images/draft.gif
+share/doc/cups-1.1.18.0/images/hold-job.gif
+share/doc/cups-1.1.18.0/images/left.gif
+share/doc/cups-1.1.18.0/images/logo.gif
+share/doc/cups-1.1.18.0/images/manage-classes.gif
+share/doc/cups-1.1.18.0/images/manage-jobs.gif
+share/doc/cups-1.1.18.0/images/manage-printers.gif
+share/doc/cups-1.1.18.0/images/modify-class.gif
+share/doc/cups-1.1.18.0/images/modify-printer.gif
+share/doc/cups-1.1.18.0/images/navbar.gif
+share/doc/cups-1.1.18.0/images/print-test-page.gif
+share/doc/cups-1.1.18.0/images/printer-idle.gif
+share/doc/cups-1.1.18.0/images/printer-processing.gif
+share/doc/cups-1.1.18.0/images/printer-stopped.gif
+share/doc/cups-1.1.18.0/images/reject-jobs.gif
+share/doc/cups-1.1.18.0/images/release-job.gif
+share/doc/cups-1.1.18.0/images/restart-job.gif
+share/doc/cups-1.1.18.0/images/right.gif
+share/doc/cups-1.1.18.0/images/show-active.gif
+share/doc/cups-1.1.18.0/images/show-completed.gif
+share/doc/cups-1.1.18.0/images/start-class.gif
+share/doc/cups-1.1.18.0/images/start-printer.gif
+share/doc/cups-1.1.18.0/images/stop-class.gif
+share/doc/cups-1.1.18.0/images/stop-printer.gif
+share/doc/cups-1.1.18.0/index.html
+share/doc/cups-1.1.18.0/ipp.html
+share/doc/cups-1.1.18.0/ipp.pdf
+share/doc/cups-1.1.18.0/overview.html
+share/doc/cups-1.1.18.0/overview.pdf
+share/doc/cups-1.1.18.0/sam.html
+share/doc/cups-1.1.18.0/sam.pdf
+share/doc/cups-1.1.18.0/sdd.html
+share/doc/cups-1.1.18.0/sdd.pdf
+share/doc/cups-1.1.18.0/spm.html
+share/doc/cups-1.1.18.0/spm.pdf
+share/doc/cups-1.1.18.0/sps.html
+share/doc/cups-1.1.18.0/sps.pdf
+share/doc/cups-1.1.18.0/ssr.html
+share/doc/cups-1.1.18.0/ssr.pdf
+share/doc/cups-1.1.18.0/stp.html
+share/doc/cups-1.1.18.0/stp.pdf
+share/doc/cups-1.1.18.0/sum.html
+share/doc/cups-1.1.18.0/sum.pdf
+share/doc/cups-1.1.18.0/svd.html
+share/doc/cups-1.1.18.0/svd.pdf
+share/doc/cups-1.1.18.0/translation.html
+share/doc/cups-1.1.18.0/translation.pdf
share/locale/C/cups_C
share/locale/be/cups_be
share/locale/cs/cups_cs
@@ -231,33 +309,40 @@ share/locale/sv/cups_sv
share/locale/uk/cups_uk
share/locale/uk_UA.cp1251/cups_uk_UA.cp1251
share/locale/zh_CN/cups_zh_CN
-@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
-@exec mkdir -p %D/etc/cups/interfaces
-@exec mkdir -p %D/etc/cups/ppd
-@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
-@dirrm libexec/cups/daemon
-@dirrm libexec/cups/filter
-@dirrm libexec/cups
-@dirrm share/cups/banners
-@dirrm share/cups/charsets
-@dirrm share/cups/data
-@dirrm share/cups/fonts
-@dirrm share/cups/model
+@dirrm share/locale/zh_CN
+@dirrm share/locale/uk_UA.cp1251
+@dirrm share/locale/uk
+@dirrm share/locale/sv
+@dirrm share/locale/ru_RU.koi8r
+@dirrm share/locale/ru_RU.cp1251
+@dirrm share/locale/it
+@dirrm share/locale/he
+@dirrm share/locale/fr
+@dirrm share/locale/es
+@dirrm share/locale/en
+@dirrm share/locale/de
+@dirrm share/locale/cs
+@dirrm share/locale/be
+@dirrm share/locale/C
+@dirrm share/doc/cups-1.1.18.0/images
+@dirrm share/doc/cups-1.1.18.0/fr/images
+@dirrm share/doc/cups-1.1.18.0/fr
+@dirrm share/doc/cups-1.1.18.0
+@dirrm share/doc
+@dirrm share/cups/templates/fr
@dirrm share/cups/templates
+@dirrm share/cups/model
+@dirrm share/cups/fonts
+@dirrm share/cups/data
+@dirrm share/cups/charsets
+@dirrm share/cups/banners
@dirrm share/cups
-@dirrm share/doc/cups/images
-@dirrm share/doc/cups
+@dirrm libexec/cups/filter
+@dirrm libexec/cups/daemon
+@dirrm libexec/cups/cgi-bin
+@dirrm libexec/cups/backend
+@dirrm libexec/cups
+@dirrm include/cups
+@dirrm etc/cups/interfaces
+@dirrm etc/cups/certs
+@dirrm etc/cups
diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index 877270ee4fea..7440f33a4f6f 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -1,32 +1,28 @@
-# New ports collection makefile for: cups-lpr
-# Date created: 29 November 2001
-# Whom: James Halstead <jah4007@cs.rit.edu>
+# ex:ts=8 -*-mode: makefile-*-
+#
+# New ports collection makefile for: cups
+# Date created: 2003-01-22
+# Whom: Alan Eldridge <alane@geeksrus.net>
#
# $FreeBSD$
#
PORTNAME= cups-lpr
PORTVERSION= ${CUPS_PORTVER}
-PORTREVISION= 1
-CATEGORIES?= print
+PORTREVISION= 0
+PORTEPOCH= ${CUPS_PORTEPOCH}
+CATEGORIES= print
+MASTER_SITES= ${CUPS_MASTER_SITES}
MAINTAINER= alane@FreeBSD.org
-LIB_DEPENDS= cups.2:${.CURDIR}/../../print/cups-base
-
-MAN1= lp.1 lpoptions.1 lpq.1 lpr.1 lprm.1 lpstat.1 \
- lppasswd.1
-MAN8= accept.8 enable.8 lpadmin.8 lpc.8 lpinfo.8 \
- lpmove.8 cupsaddsmb.8
-
-USE_SUBMAKE= yes # required for MLINKS support
-
-MLINKS= accept.8 reject.8
-MLINKS+= enable.8 disable.8
-MLINKS+= lp.1 cancel.1
-
post-install:
- @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
+ ${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
+ ${FIND} ${PREFIX}/man/fr/cat* -type l -name '*.0' -delete
+
+.include "${.CURDIR}/../../print/cups/Makefile.common"
+.include <bsd.port.pre.mk>
+.include "${FILESDIR}/manpages.mk"
+.include <bsd.port.post.mk>
-.include "${.CURDIR}/../../print/cups/Makefile.inc"
-.include <bsd.port.mk>
+#EOF
diff --git a/print/cups-lpr/distinfo b/print/cups-lpr/distinfo
index 0edc8c761640..7c4c9f612542 100644
--- a/print/cups-lpr/distinfo
+++ b/print/cups-lpr/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.15-1-source.tar.bz2) = 971a14d35f61ea19871616f437e199a2
+MD5 (cups-1.1.18-source.tar.bz2) = 4a8a423a8268d088bffa19f6515883a7
diff --git a/print/cups-lpr/files/manpages.mk b/print/cups-lpr/files/manpages.mk
new file mode 100644
index 000000000000..fa6f89285ff8
--- /dev/null
+++ b/print/cups-lpr/files/manpages.mk
@@ -0,0 +1,18 @@
+MAN1+= cupsaddsmb.1
+MAN1+= cupstestppd.1
+MAN1+= lp.1
+MAN1+= lpoptions.1
+MAN1+= lppasswd.1
+MAN1+= lpq.1
+MAN1+= lpr.1
+MAN1+= lprm.1
+MAN1+= lpstat.1
+MAN8+= accept.8
+MAN8+= enable.8
+MAN8+= lpadmin.8
+MAN8+= lpc.8
+MAN8+= lpinfo.8
+MAN8+= lpmove.8
+MLINKS+= lp.1 cancel.1
+MLINKS+= enable.8 disable.8
+MLINKS+= accept.8 reject.8
diff --git a/print/cups-lpr/files/patch-Makefile b/print/cups-lpr/files/patch-Makefile
index 1e8bd03e34cb..133708751f6d 100644
--- a/print/cups-lpr/files/patch-Makefile
+++ b/print/cups-lpr/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Tue Apr 23 13:49:34 2002
-+++ Makefile Sat Jun 8 01:20:35 2002
+--- Makefile.orig Tue Dec 17 13:56:25 2002
++++ Makefile Wed Jan 22 08:02:38 2003
@@ -28,8 +28,7 @@
# Directories to make...
#
@@ -19,25 +19,7 @@
echo Making all in $$dir... ;\
(cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\
done
-@@ -47,7 +46,7 @@
- #
-
- clean:
-- for dir in $(DIRS); do\
-+ for dir in cups $(DIRS); do\
- echo Cleaning in $$dir... ;\
- (cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
- done
-@@ -57,7 +56,7 @@
- #
-
- depend:
-- for dir in $(DIRS); do\
-+ for dir in cups $(DIRS); do\
- echo Making dependencies in $$dir... ;\
- (cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
- done
-@@ -67,52 +66,52 @@
+@@ -67,104 +66,11 @@
# Install object and target files...
#
@@ -88,47 +70,58 @@
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
- fi \
- fi
-+# echo Installing in conf...
-+# (cd conf; $(MAKE) $(MFLAGS) install)
-+# echo Installing in data...
-+# (cd data; $(MAKE) $(MFLAGS) install)
-+# echo Installing in doc...
-+# (cd doc; $(MAKE) $(MFLAGS) install)
-+# echo Installing in fonts...
-+# (cd fonts; $(MAKE) $(MFLAGS) install)
-+# echo Installing in locale...
-+# (cd locale; $(MAKE) $(MFLAGS) install)
-+# echo Installing in ppd...
-+# (cd ppd; $(MAKE) $(MFLAGS) install)
-+# echo Installing in templates...
-+# (cd templates; $(MAKE) $(MFLAGS) install)
-+# echo Installing cups-config script...
-+# $(INSTALL_DIR) $(BINDIR)
-+# $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
-+# echo Installing startup script...
-+# if test "x$(INITDIR)" != "x"; then \
-+# $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \
-+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-+# $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \
-+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
-+# $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \
-+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
-+# $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \
-+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
-+# $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \
-+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
-+# fi
-+# if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
-+# $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
-+# if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
-+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
-+# $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
-+# $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
-+# $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
-+# else \
-+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
-+# fi \
-+# fi
-
+-
+-#
+-# Install source and header files...
+-#
+-
+-installsrc:
+- gnutar --dereference --exclude=CVS -cf - . | gnutar -C $(SRCROOT) -xf -
+-
+-installhdrs:
+- (cd cups ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;\
+- (cd filter ; $(MAKE) $(MFLAGS) installhdrs) || exit 1;
+-
+-
+-#
+-# Run the test suite...
+-#
+-
+-check test: all
+- echo Running CUPS test suite...
+- cd test; ./run-stp-tests.sh
+-
+-
+-#
+-# Make software distributions using EPM (http://www.easysw.com/epm)...
+-#
+-
+-EPMFLAGS = -v
+-
+-aix:
+- epm $(EPMFLAGS) -f aix cups
+-
+-bsd:
+- epm $(EPMFLAGS) -f bsd cups
+-
+-epm:
+- epm $(EPMFLAGS) cups
+-
+-rpm:
+- epm $(EPMFLAGS) -f rpm cups
+-
+-deb:
+- epm $(EPMFLAGS) -f deb cups
+-
+-depot:
+- epm $(EPMFLAGS) -f depot cups
+-
+-pkg:
+- epm $(EPMFLAGS) -f pkg cups
+-
+-tardist:
+- epm $(EPMFLAGS) -f tardist cups
+-
+ #
+ # End of "$Id: Makefile,v 1.47 2002/12/17 18:56:25 swdev Exp $".
#
- # Install source and header files...
diff --git a/print/cups-lpr/files/patch-man-Makefile.common b/print/cups-lpr/files/patch-man-Makefile.common
index e3b450f5d23a..b160843f0ed0 100644
--- a/print/cups-lpr/files/patch-man-Makefile.common
+++ b/print/cups-lpr/files/patch-man-Makefile.common
@@ -1,16 +1,18 @@
---- man/Makefile.common.orig Sat Jun 8 01:05:48 2002
-+++ man/Makefile.common Sat Jun 8 01:08:44 2002
-@@ -26,26 +26,17 @@
+--- man/Makefile.common.orig Tue Dec 17 13:59:55 2002
++++ man/Makefile.common Wed Jan 22 07:38:08 2003
+@@ -26,9 +26,8 @@
# Man pages...
#
-MAN1 = backend.man \
+- cupstestppd.man \
- filter.man \
-- lp.man \
-+MAN1 = lp.man \
++MAN1 = cupsaddsmb.man\
++ cupstestppd.man\
+ lp.man \
lpoptions.man \
lppasswd.man \
- lpq.man \
+@@ -36,50 +35,17 @@
lprm.man \
lpr.man \
lpstat.man
@@ -20,13 +22,48 @@
- mime.convs.man \
- mime.types.man \
- printers.conf.man
-+MAN3 =
-+MAN5 =
MAN8 = accept.man \
- cupsaddsmb.man \
+- cupsaddsmb.man \
- cups-lpd.man \
- cups-polld.man \
- cupsd.man \
enable.man \
lpadmin.man \
lpinfo.man \
+ lpmove.man \
+ lpc.man
+
+-CAT1 = backend.$(CAT1EXT) \
+- cupstestppd.$(CAT1EXT) \
+- filter.$(CAT1EXT) \
+- lp.$(CAT1EXT) \
+- lpoptions.$(CAT1EXT) \
+- lppasswd.$(CAT1EXT) \
+- lpq.$(CAT1EXT) \
+- lprm.$(CAT1EXT) \
+- lpr.$(CAT1EXT) \
+- lpstat.$(CAT1EXT)
+-CAT3 = cups-config.$(CAT3EXT)
+-CAT5 = classes.conf.$(CAT5EXT) \
+- cupsd.conf.$(CAT5EXT) \
+- mime.convs.$(CAT5EXT) \
+- mime.types.$(CAT5EXT) \
+- printers.conf.$(CAT5EXT)
+-CAT8 = accept.$(CAT8EXT) \
+- cupsaddsmb.$(CAT8EXT) \
+- cups-lpd.$(CAT8EXT) \
+- cups-polld.$(CAT8EXT) \
+- cupsd.$(CAT8EXT) \
+- enable.$(CAT8EXT) \
+- lpadmin.$(CAT8EXT) \
+- lpinfo.$(CAT8EXT) \
+- lpmove.$(CAT8EXT) \
+- lpc.$(CAT8EXT)
+-
++CAT1 =
++CAT3 =
++CAT5 =
++CAT8 =
+
+ #
+ # End of "$Id: Makefile.common,v 1.3 2002/12/17 18:59:55 swdev Exp $".
diff --git a/print/cups-lpr/pkg-message b/print/cups-lpr/pkg-message
deleted file mode 100644
index e75d8c7b65f3..000000000000
--- a/print/cups-lpr/pkg-message
+++ /dev/null
@@ -1,20 +0,0 @@
-======================================================================
-
-CUPS BSD and system V print compatibility system is installed.
-
-This port installs binaries (lpr, lpc, etc) which have the same names as
-binaries in /usr/bin and /usr/sbin. Assuming you installed this port to use
-cups fully, the minimum you need to do is make sure all users PATH variable
-has %%PREFIX%%/bin before /usr/bin. As this is not always easy to do,
-you may consider removing the FreeBSD printing system completely. To do this,
-remove the binaries and man pages listed below, and set NO_LPR=true in your
-/etc/make.conf. This will prevent future buildworlds from re-installing the
-binaries, but will not prevent them from getting re-installed during a binary
-upgrade.
-
-The relevant files for the FreeBSD printing system are:
-(with wildcards to make it easier)
-/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 d11fea616efa..310bf8bd6315 100644
--- a/print/cups-lpr/pkg-plist
+++ b/print/cups-lpr/pkg-plist
@@ -9,9 +9,10 @@ bin/lpr
bin/lprm
bin/lpstat
sbin/accept
+sbin/reject
sbin/cupsaddsmb
+sbin/cupstestppd
sbin/lpadmin
sbin/lpc
sbin/lpinfo
sbin/lpmove
-sbin/reject
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index 9db3d17944eb..f228e0ed2f63 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cups-pstoraster
PORTVERSION= 7.05.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.easysw.com/pub/ghostscript/
@@ -16,8 +16,8 @@ DISTNAME= espgs-${PORTVERSION}-source
MAINTAINER= alane@FreeBSD.org
-LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base
-RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/fonts.scale:${PORTSDIR}/print/ghostscript-gnu
+LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
+RUN_DEPENDS+= ${LOCALBASE}/share/ghostscript/fonts/fonts.scale:${PORTSDIR}/print/ghostscript-gnu
WRKSRC= ${WRKDIR}/espgs-${PORTVERSION}
@@ -48,5 +48,9 @@ do-install:
${PREFIX}/etc/cups
${INSTALL_SCRIPT} ${WRKSRC}/pstoraster/pstoraster \
${PREFIX}/libexec/cups/filter
+ ${CHOWN} -R ${CUPSOWN}:${CUPSGRP} \
+ ${PREFIX}/etc/cups ${PREFIX}/libexec/cups/filter
-.include <bsd.port.mk>
+.include "${.CURDIR}/../../print/cups/Makefile.common"
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
diff --git a/print/cups/Makefile b/print/cups/Makefile
index b17bc4d6582b..00ae5b9070ec 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,31 +1,42 @@
-# New ports collection makefile for: cups
-# Date created: 05 January 2001
-# Whom: George Reid <greid@ukug.uk.freebsd.org>
+# ex:ts=8 -*-mode: makefile-*-
+#
+# New ports collection makefile for: cups
+# Date created: 2003-01-22
+# Whom: Alan Eldridge <alane@geeksrus.net>
#
# $FreeBSD$
#
PORTNAME= cups
PORTVERSION= ${CUPS_PORTVER}
-CATEGORIES?= print
+PORTREVISION= 0
+PORTEPOCH= ${CUPS_PORTEPOCH}
+CATEGORIES= print
MASTER_SITES= # empty
-DISTFILES= # none
+DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= alane@FreeBSD.org
-LIB_DEPENDS?= cups.2:${.CURDIR}/../../print/cups-base
-RUN_DEPENDS?= espgs:${.CURDIR}/../../print/cups-pstoraster \
+LIB_DEPENDS+= cups.2:${.CURDIR}/../../print/cups-base
+RUN_DEPENDS+= espgs:${.CURDIR}/../../print/cups-pstoraster \
${LOCALBASE}/sbin/cupsaddsmb:${.CURDIR}/../../print/cups-lpr
.if make(package)
DEPENDS_TARGET="package"
-.endif
+.endif # make(package)
USE_PERL5= yes
NO_BUILD= true
-do-install: # empty
-do-patch: # empty
-.include "${.CURDIR}/../../print/cups/Makefile.inc"
-.include <bsd.port.mk>
+do-patch:
+ ${DO_NADA}
+
+do-install:
+ ${DO_NADA}
+
+.include "${.CURDIR}/../../print/cups/Makefile.common"
+.include <bsd.port.pre.mk>
+.include <bsd.port.post.mk>
+
+#EOF
diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common
index 012ea502c478..cb1fbf3d958f 100644
--- a/print/cups/Makefile.common
+++ b/print/cups/Makefile.common
@@ -1,72 +1,69 @@
+# ex:ts=8 -*-mode: makefile-*-
# Common file for CUPS ports
# $FreeBSD$
-MASTER_SITES= \
- ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
- ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \
- ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
- ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
- ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
+CUPS_MASTER_SITES=\
+ ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
+ ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \
+ ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
+ ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
+ ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
-CUPS_VERSION= 1.1.16
+CUPS_VERSION= 1.1.18
CUPS_REVISION= 0
+CUPS_PORTVER= ${CUPS_VERSION}.${CUPS_REVISION}
+CUPS_PORTEPOCH= 0
+CUPS_FILESDIR= ${.CURDIR}/../../print/cups/files
+CUPS_DOCSDIR= ${PREFIX}/share/doc/cups-${CUPS_PORTVER}
+CUPS_SPOOLDIR= /var/spool/cups
-CUPS_USER= daemon
-CUPS_GROUP= daemon
-LOCALSTATEDIR= /var
-SPOOLDIR= ${LOCALSTATEDIR}/spool/cups
-OPTFLAGS?= ""
+# file, dir ownership
+CUPSGRP= wheel
+CUPSOWN= daemon
-.ifdef CUPS_FR
-MANLANG= "" fr
-.else
-#EXTRA_PATCHES=${.CURDIR}/../../print/cups/files/fr-patch-man-Makefile
-.endif
+######################################################################
+# The rest of the file is for components (cups-base, cups-lpr) only.
+######################################################################
-#EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-Makefile
-#EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-fr-Makefile
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-config-scripts-cups-common.m4
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-Makedefs.in
+.if ${PORTNAME} == "cups-base" || ${PORTNAME} == "cups-lpr"
+
+MANLANG= "" fr
-#protect the base port
-.if ${PORTNAME} != "cups"
-.if ${CUPS_REVISION} == 0
-CUPS_PORTVER= ${CUPS_VERSION}
+.if ${CUPS_REVISION} < 1
DISTNAME= cups-${CUPS_VERSION}-source
-.else # ${CUPS_REVISION} != 0
-CUPS_PORTVER= ${CUPS_VERSION}.${CUPS_REVISION}
+.else
DISTNAME= cups-${CUPS_VERSION}-${CUPS_REVISION}-source
-.endif # ${CUPS_REVISION} != 0
+.endif # ${CUPS_REVISION} < 1
+
DISTFILES= ${DISTNAME}.tar.bz2
WRKSRC= ${WRKDIR}/cups-${CUPS_VERSION}
-USE_BZIP2= yes
-#Breaks build.. USE_GMAKE= yes
-GNU_CONFIGURE= yes
-
-AUTOCONF= autoconf
-BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
-
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
-CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include -I${X11BASE}/include"
-CONFIGURE_ENV+= DSOFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib"
-CONFIGURE_ENV+= LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib"
+WANT_AUTOCONF_VER= 253
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_PERL5_RUN= yes
+GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= \
- --localstatedir=${LOCALSTATEDIR} \
- --with-cups-user=${CUPS_USER} --with-cups-group=${CUPS_GROUP} \
- --with-rcdir=${PREFIX}/etc/rc.d --without-pam
+CONFIGURE_ARGS+= --localstatedir=/var \
+ --disable-pam \
+ --with-cups-user=${CUPSOWN} \
+ --with-cups-group=${CUPSGRP} \
+ --with-docdir=${CUPS_DOCSDIR} \
+ --with-rcdir=${PREFIX}/etc/rc.d
-post-patch::
- ${RM} -f ${WRKSRC}/man/Makefile ${WRKSRC}/man/Makefile.common
- ${TOUCH} ${WRKSRC}/man/Makefile.common
- ${CP} -f ${.CURDIR}/../../print/cups/Makefile.man \
- ${WRKSRC}/man/Makefile
- cd ${WRKSRC}; ${AUTOCONF} --force
+CONFIGURE_ARGS+= CPPFLAGS="-I${PREFIX}/include"
+CONFIGURE_ARGS+= CFLAGS="${CFLAGS} -I${PREFIX}/include"
+CONFIGURE_ARGS+= CXXFLAGS="${CFLAGS} -I${PREFIX}/include"
+CONFIGURE_ARGS+= DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib"
+CONFIGURE_ARGS+= LDFLAGS="-L${PREFIX}/lib"
-.endif # ${PORTNAME} != "cups"
+pre-configure::
+ @${ECHO_CMD} Configuring CUPS with options:
+ @${ECHO_CMD} ${CONFIGURE_ARGS} | fmt
+.endif # ${PORTNAME} != "cups"
diff --git a/print/cups/Makefile.inc b/print/cups/Makefile.inc
deleted file mode 100644
index 7707177704e8..000000000000
--- a/print/cups/Makefile.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-# Common file for CUPS ports
-# $FreeBSD$
-
-MASTER_SITES= \
- ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
- ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \
- ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
- ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
- ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
-
-CUPS_VERSION= 1.1.15
-CUPS_REVISION= 1
-CUPS_PORTVER= ${CUPS_VERSION}.${CUPS_REVISION}
-
-.ifdef CUPS_FR
-MANLANG= "" fr
-.else
-EXTRA_PATCHES=${.CURDIR}/../../print/cups/files/fr-patch-man-Makefile
-.endif
-
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-Makefile
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-fr-Makefile
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-config-scripts-cups-common.m4
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-Makedefs.in
-
-#protect the base port
-.if ${PORTNAME} != "cups"
-DISTNAME= cups-${CUPS_VERSION}-${CUPS_REVISION}-source
-#DISTNAME= cups-${CUPS_VERSION}-source
-DISTFILES= ${DISTNAME}.tar.bz2
-WRKSRC= ${WRKDIR}/cups-${CUPS_VERSION}
-
-USE_PERL5= yes
-USE_BZIP2= yes
-#Breaks build.. USE_GMAKE= yes
-GNU_CONFIGURE= yes
-
-CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
-CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include"
-CONFIGURE_ENV+= DSOFLAGS="-L${PREFIX}/lib"
-CONFIGURE_ENV+= LDFLAGS="-L${PREFIX}/lib"
-
-CONFIGURE_ARGS+= --localstatedir=/var
-
-AUTOCONF= autoconf
-BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
-
-LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.5:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff
-
-post-patch::
- cd ${WRKSRC}; ${AUTOCONF} --force
-.endif
-
diff --git a/print/cups/distinfo b/print/cups/distinfo
new file mode 100644
index 000000000000..cd633b7b6417
--- /dev/null
+++ b/print/cups/distinfo
@@ -0,0 +1 @@
+This is a metaport; it has no source of its own.
diff --git a/print/cups/files/fr-patch-man-Makefile b/print/cups/files/fr-patch-man-Makefile
deleted file mode 100644
index 8984c09cc949..000000000000
--- a/print/cups/files/fr-patch-man-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/Makefile.fr Fri Jun 7 21:02:51 2002
-+++ man/Makefile Fri Jun 7 21:03:00 2002
-@@ -30,7 +30,7 @@
- # Other languages...
- #
-
--LANGDIRS = fr
-+LANGDIRS =
-
-
- #
diff --git a/print/cups/files/patch-Makedefs.in b/print/cups/files/patch-Makedefs.in
deleted file mode 100644
index d62032fdda40..000000000000
--- a/print/cups/files/patch-Makedefs.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makedefs.in.orig Tue Jun 4 16:32:02 2002
-+++ Makedefs.in Tue Jul 2 03:13:20 2002
-@@ -83,8 +83,8 @@
- #
-
- ARFLAGS = @ARFLAGS@
--CFLAGS = $(RC_CFLAGS) @CFLAGS@ -I.. $(OPTIONS)
--CXXFLAGS = $(RC_CFLAGS) @CXXFLAGS@ -I.. $(OPTIONS)
-+CFLAGS = $(RC_CFLAGS) @CFLAGS@ -I.. @CPPFLAGS@ $(OPTIONS)
-+CXXFLAGS = $(RC_CFLAGS) @CXXFLAGS@ -I.. @CPPFLAGS@ $(OPTIONS)
- CXXLIBS = @CXXLIBS@
- DSOFLAGS = @DSOFLAGS@
- DSOLIBS = @DSOLIBS@
diff --git a/print/cups/files/patch-config-scripts-cups-common.m4 b/print/cups/files/patch-config-scripts-cups-common.m4
deleted file mode 100644
index eca3c6914b31..000000000000
--- a/print/cups/files/patch-config-scripts-cups-common.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- config-scripts/cups-common.m4.orig Tue Jun 4 16:58:55 2002
-+++ config-scripts/cups-common.m4 Tue Jul 2 02:18:13 2002
-@@ -88,7 +88,7 @@
- AC_HEADER_STDC
- AC_HEADER_DIRENT
- AC_CHECK_HEADER(crypt.h,AC_DEFINE(HAVE_CRYPT_H))
--AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
-+dnl AC_CHECK_HEADER(malloc.h,AC_DEFINE(HAVE_MALLOC_H))
- AC_CHECK_HEADER(shadow.h,AC_DEFINE(HAVE_SHADOW_H))
- AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
- AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
diff --git a/print/cups/files/patch-man-Makefile b/print/cups/files/patch-man-Makefile
deleted file mode 100644
index ed4e9201574a..000000000000
--- a/print/cups/files/patch-man-Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
---- man/Makefile.orig Fri Jun 7 20:23:59 2002
-+++ man/Makefile Fri Jun 7 20:59:42 2002
-@@ -37,7 +37,7 @@
- # Make everything...
- #
-
--all: $(CAT1) $(CAT3) $(CAT5) $(CAT8)
-+all: #$(CAT1) $(CAT3) $(CAT5) $(CAT8)
- for dir in $(LANGDIRS); do \
- echo "Making all in man/$$dir..."; \
- (cd $$dir; make all); \
-@@ -72,8 +72,6 @@
- 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
- $(INSTALL_DIR) $(PMANDIR)/man3
- for file in $(MAN3); do \
- $(INSTALL_MAN) $$file $(PMANDIR)/man3/`basename $$file man`3; \
-@@ -86,32 +84,6 @@
- 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; \
-- 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; \
-- 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)
- for dir in $(LANGDIRS); do \
- echo "Installing all in man/$$dir..."; \
- (cd $$dir; make install); \
diff --git a/print/cups/files/patch-man-fr-Makefile b/print/cups/files/patch-man-fr-Makefile
deleted file mode 100644
index c70225f501d1..000000000000
--- a/print/cups/files/patch-man-fr-Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
---- man/fr/Makefile.orig Fri Jun 7 20:47:55 2002
-+++ man/fr/Makefile Fri Jun 7 20:51:46 2002
-@@ -37,7 +37,7 @@
- # Make everything...
- #
-
--all: $(CAT1) $(CAT3) $(CAT5) $(CAT8)
-+all: #$(CAT1) $(CAT3) $(CAT5) $(CAT8)
-
-
- #
-@@ -64,8 +64,6 @@
- for file in $(MAN1); do \
- $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/man1/`basename $$file man`1; \
- done
-- $(RM) $(MANDIR)/$(LANGUAGE)/man1/cancel.1
-- $(LN) lp.1 $(MANDIR)/$(LANGUAGE)/man1/cancel.1
- $(INSTALL_DIR) $(PMANDIR)/fr/man3
- for file in $(MAN3); do \
- $(INSTALL_MAN) $$file $(PMANDIR)/fr/man3/`basename $$file man`3; \
-@@ -78,32 +76,6 @@
- for file in $(MAN8); do \
- $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/`basename $$file man`$(MAN8EXT); \
- done
-- $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
-- $(LN) accept.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/reject.$(MAN8EXT)
-- $(RM) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
-- $(LN) enable.$(MAN8EXT) $(AMANDIR)/$(LANGUAGE)/man$(MAN8EXT)/disable.$(MAN8EXT)
-- $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat1
-- for file in $(CAT1); do \
-- $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat1; \
-- done
-- $(RM) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
-- $(LN) lp.$(CAT1EXT) $(MANDIR)/$(LANGUAGE)/cat1/cancel.$(CAT1EXT)
-- $(INSTALL_DIR) $(PMANDIR)/fr/cat3
-- for file in $(CAT3); do \
-- $(INSTALL_MAN) $$file $(PMANDIR)/fr/cat3; \
-- done
-- $(INSTALL_DIR) $(MANDIR)/$(LANGUAGE)/cat5
-- for file in $(CAT5); do \
-- $(INSTALL_MAN) $$file $(MANDIR)/$(LANGUAGE)/cat5; \
-- done
-- $(INSTALL_DIR) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)
-- for file in $(CAT8); do \
-- $(INSTALL_MAN) $$file $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT); \
-- done
-- $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
-- $(LN) accept.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/reject.$(CAT8EXT)
-- $(RM) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
-- $(LN) enable.$(CAT8EXT) $(AMANDIR)/$(LANGUAGE)/cat$(MAN8EXT)/disable.$(CAT8EXT)
-
-
- #
diff --git a/print/cups/pkg-plist b/print/cups/pkg-plist
index b483d9ce545d..8e71fad2a84e 100644
--- a/print/cups/pkg-plist
+++ b/print/cups/pkg-plist
@@ -1 +1 @@
-@comment This is the meta-port for CUPS.
+@comment This package is a meta port; it has no files.