diff options
| author | jlam <jlam@pkgsrc.org> | 2000-07-12 20:09:33 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-07-12 20:09:33 +0000 |
| commit | 84fe60f2c43488c2ece7f223776fe62357040b42 (patch) | |
| tree | 1c82829fbbbba8b76560df9f70350ab9fa0599bf /print/cups | |
| parent | 32e83de61f6633cef2ae28bfc68cddfd0dfb9d01 (diff) | |
| download | pkgsrc-84fe60f2c43488c2ece7f223776fe62357040b42.tar.gz | |
Update CUPS to 1.1. Remove most of the patches; I worked closely with
the author to make this package compile more seamlessly on BSD systems,
and in particular with the NetBSD pkgsrc software collection.
CUPS 1.1 is the newest production (stable) release of CUPS. It
provides many new features from the 1.0.x releases, including a
new Level 3 PostScript RIP, a new PDF filter, EPSON printer
drivers, IPP/1.1 support, banner page support, and LPD client
support. Binaries for several platforms are also available.
Major changes in v1.1 include:
- The text filter now embeds missing fonts.
- Integrated Xpdf's pdftops filter into CUPS, which is a
lightweight and reliable replacement for Ghostscript's
PDF support.
- The web administration interface now allows you to set
the default banner pages.
- Images can now be positioned on the page using the new
"position" option.
- Updated the serial, parallel, and usb backends to do
multiple writes and ignore ioctl() errors as needed;
this should fix problems with serial printing on old
serial drivers and with the UltraSPARC parallel port
driver under Solaris 2.7.
- Now propagate LD_LIBRARY_PATH to child processes from
cupsd.
- Queued remote jobs recreate remote printers as needed
when the scheduler is started.
- Deleting a printer also purges all jobs on that
printer.
- Old job and control files that don't belong to a
printer are automatically deleted.
- cups-lpd now supports options set with lpoptions.
- The IPP backend now switches to IPP/1.0 if a 1.1
request fails.
Diffstat (limited to 'print/cups')
37 files changed, 443 insertions, 1191 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index 240db4f186d..3b8be45a21f 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,39 +1,42 @@ -# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:40 rh Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/12 20:09:33 jlam Exp $ # -DISTNAME= cups-1.0.2-source -PKGNAME= ${DISTNAME:S/-source//} -VERS= ${PKGNAME:S/cups-//} -WRKSRC= ${WRKDIR}/${PKGNAME} -CATEGORIES= print -MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERS}/ \ - ftp://ftp2.easysw.com/pub/cups/${VERS}/ \ - ftp://ftp.northamerica.net/pub/ESP/cups/${VERS}/ \ - ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/cups/${VERS}/ \ - ftp://ftp.fisek.com.tr/pub/cups/${VERS}/ -EXTRACT_SUFX= .tar.bz2 +DISTNAME= cups-1.1-source +PKGNAME= ${DISTNAME:S/-source//} +VERS= ${PKGNAME:S/cups-//} +WRKSRC= ${WRKDIR}/${PKGNAME} +CATEGORIES= print +MASTER_SITES= ftp://ftp2.easysw.com/pub/cups/${VERS}/ \ + ftp://ftp.easysw.com/pub/cups/${VERS}/ \ + ftp://ftp.northamerica.net/pub/ESP/cups/${VERS}/ \ + ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/cups/${VERS}/ \ + ftp://ftp.fisek.com.tr/pub/cups/${VERS}/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= jlam@netbsd.org -HOMEPAGE= http://www.cups.org/ +MAINTAINER= jlam@netbsd.org +HOMEPAGE= http://www.cups.org/ -DEPENDS+= jpeg-6b:../../graphics/jpeg -DEPENDS+= png>=1.0.6:../../graphics/png -DEPENDS+= tiff-*:../../graphics/tiff +BUILD_DEPENDS+= autoconf:../../devel/autoconf +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= png>=1.0.6:../../graphics/png +DEPENDS+= tiff-*:../../graphics/tiff -USE_PKGLIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +USE_GMAKE= # defined +USE_LIBTOOL= # defined +GNU_CONFIGURE= # defined +CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL}" +CONFIGURE_ARGS+= --disable-pam +CONFIGURE_ARGS+= --enable-rootconfig -CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include + +pre-configure: + cd ${WRKSRC} && autoconf post-install: -.for DIR in interfaces logs ppd requests - ${TOUCH} /var/cups/${DIR}/.directory -.endfor ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups - cd ${WRKSRC}/conf; ${INSTALL_DATA} classes.conf cupsd.conf \ - cupsd.conf-personal cupsd.conf-professional mime.convs \ - mime.types printcap printers.conf \ + cd ${WRKSRC}/conf; ${INSTALL_DATA} *.conf mime.* \ ${PREFIX}/share/examples/cups + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/files/md5 b/print/cups/files/md5 index 5cb8895b67a..9e3743e13ce 100644 --- a/print/cups/files/md5 +++ b/print/cups/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/11/29 02:18:53 jlam Exp $ +$NetBSD: md5,v 1.2 2000/07/12 20:09:35 jlam Exp $ -MD5 (cups-1.0.2-source.tar.bz2) = f716151838e62f457d2a0199b45788dd +MD5 (cups-1.1-source.tar.bz2) = 8dd8db34a30e2b4457b9d08bf248cef9 diff --git a/print/cups/files/patch-sum b/print/cups/files/patch-sum index 257d34408aa..f679cf5f3dd 100644 --- a/print/cups/files/patch-sum +++ b/print/cups/files/patch-sum @@ -1,29 +1,7 @@ -$NetBSD: patch-sum,v 1.3 1999/12/07 21:01:46 rh Exp $ +$NetBSD: patch-sum,v 1.4 2000/07/12 20:09:35 jlam Exp $ -MD5 (patch-aa) = f1a7eea498b1a9fd94653d1e3c80401a -MD5 (patch-ab) = 21699090b79c25a4179c2a679cc3aedc -MD5 (patch-ac) = 13bb5438face1e4350929f371c2d651a -MD5 (patch-ad) = 925104038b1134ca37cac35c641a4c23 -MD5 (patch-ae) = ba8ec3eb8323cb2aa93672a82325743c -MD5 (patch-af) = e10aa43281866e885c9a5c06caae96bf -MD5 (patch-ag) = bee5cced53708e0e146513b524a8a5c8 -MD5 (patch-ah) = 30b4684a041c92b8fca89b832ee9ab2d -MD5 (patch-ai) = 7e7224d6e9b5229c674019a4f6d35f68 -MD5 (patch-aj) = af901aa380060baeedf83847bd483459 -MD5 (patch-ak) = 4bc7b6f1c969068d9aab036f3e92fdd3 -MD5 (patch-al) = 47ac4189d12e4d2244b44404e5b22196 -MD5 (patch-am) = 7a7318ca4c6cff09fbb5e005cd9cdd09 -MD5 (patch-an) = 6c861a883738e196cb97e2726e467cf1 -MD5 (patch-ao) = 34c35df565a5ba4827a6ee52e484d694 -MD5 (patch-ap) = 867e8fa6f8003fa012fabb8fc0872e5b -MD5 (patch-aq) = 0a1d0b9eff567d9670640cff9f97e99c -MD5 (patch-ar) = 272446ec38b264d9798b0a6e26d485f3 -MD5 (patch-as) = c85b1bd90cf0fea838d71265d10e7cf1 -MD5 (patch-at) = cdb846d02054320bce4df80eee030747 -MD5 (patch-au) = 26a4aa95db65c4edf07a504b38ffba7a -MD5 (patch-av) = 88110ca7dadb8947f88d715aacf9fba0 -MD5 (patch-aw) = 442ad5d5048e025cae862404892285db -MD5 (patch-ax) = ad8fc1d57bf160bbd742c96490416e1b -MD5 (patch-ay) = 4c780b9c3bf45864efc9b838a732113a -MD5 (patch-az) = aa9a0821e5bbed1e6ba7da74b9c744d1 -MD5 (patch-ba) = b1738236a0b2c80ae0cc596a90ed206f +MD5 (patch-aa) = aa04d679c1a6ee4e1c4269c97201d4be +MD5 (patch-ab) = 60e0f0b91b4d403e77f7cdf5cae10938 +MD5 (patch-bb) = d6e760e450e715ba284f61ce320be2f2 +MD5 (patch-bc) = f0836fd83ce767b78e482c0fa11aaeb4 +MD5 (patch-bd) = c3eb7faea327283839ea836590421c89 diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa index e1b98e8f16c..2c23a7c8857 100644 --- a/print/cups/patches/patch-aa +++ b/print/cups/patches/patch-aa @@ -1,43 +1,21 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2000/07/12 20:09:35 jlam Exp $ ---- Makedefs.in.orig Fri Oct 22 13:37:34 1999 -+++ Makedefs.in Sun Nov 28 21:09:21 1999 -@@ -65,11 +65,11 @@ +--- Makedefs.in.orig Fri Jul 7 15:13:52 2000 ++++ Makedefs.in Wed Jul 12 00:46:06 2000 +@@ -48,11 +48,11 @@ + # Installation programs... # - ARFLAGS = crvs --CFLAGS = @CFLAGS@ $(OPTIM) -I.. $(OPTIONS) -+CFLAGS = @CPPFLAGS@ @CFLAGS@ $(OPTIM) -I.. $(OPTIONS) - DSOLIBS = @DSOLIBS@ - IMGLIBS = @IMGLIBS@ -lm - LDFLAGS = @LDFLAGS@ $(OPTIM) --LIBS = -L../cups -lcups $(NETLIBS) @LIBS@ -+LIBS = ../cups/libcups.la $(NETLIBS) @LIBS@ - NETLIBS = @NETLIBS@ - OPTIM = @OPTIM@ - OPTIONS = -@@ -111,6 +111,9 @@ +-INSTALL_BIN = $(LIBTOOL) $(CP) +-INSTALL_DATA = $(CP) +-INSTALL_LIB = $(LIBTOOL) $(CP) +-INSTALL_MAN = $(CP) +-INSTALL_SCRIPT = $(CP) ++INSTALL_BIN = $(LIBTOOL) $(BSD_INSTALL_PROGRAM) ++INSTALL_DATA = $(BSD_INSTALL_DATA) ++INSTALL_LIB = $(LIBTOOL) $(BSD_INSTALL_DATA) ++INSTALL_MAN = $(BSD_INSTALL_MAN) ++INSTALL_SCRIPT = $(BSD_INSTALL_SCRIPT) + INSTALL_SYSV = @INSTALL_SYSV@ - BINDIR = @bindir@ - DATADIR = @CUPS_DATADIR@ -+DOCDIR = @CUPS_DOCDIR@ -+CONFDIR = @CUPS_CONFDIR@ -+EXECDIR = @CUPS_EXECDIR@ - INCLUDEDIR = $(includedir) - LIBDIR = $(libdir) - LOCALEDIR = @CUPS_LOCALEDIR@ -@@ -123,10 +126,13 @@ # - - .SILENT: --.SUFFIXES: .a .c .gz .h .o .z .1 .5 .8 -+.SUFFIXES: .a .c .gz .h .lo .o .z .1 .5 .8 - .c.o: - echo Compiling $<... - $(CC) $(CFLAGS) -c $< -+.c.lo: -+ echo Compiling $<... -+ $(LIBTOOL) $(CC) $(CFLAGS) -c $< - .1.z .5.z .8.z .1.gz .5.gz .8.gz: - echo Formatting $<... - $(NROFF) -man $< >t diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab index c674dd5738e..ead5025b6cc 100644 --- a/print/cups/patches/patch-ab +++ b/print/cups/patches/patch-ab @@ -1,13 +1,39 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2000/07/12 20:09:35 jlam Exp $ ---- Makefile.orig Mon Jun 21 14:59:04 1999 -+++ Makefile Sun Nov 28 21:06:28 1999 -@@ -28,7 +28,7 @@ - # Directories to make... - # - --DIRS = cups backend berkeley cgi-bin filter man pstoraster \ -+DIRS = cups backend berkeley cgi-bin filter locale man pstoraster \ - scheduler systemv +--- Makefile.orig Fri Jul 7 14:19:23 2000 ++++ Makefile Wed Jul 12 00:49:00 2000 +@@ -60,8 +60,6 @@ + echo Installing in $$dir... ;\ + (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ + done +- echo Installing in conf... +- (cd conf; $(MAKE) $(MFLAGS) install) + echo Installing in data... + (cd data; $(MAKE) $(MFLAGS) install) + echo Installing in fonts... +@@ -72,25 +70,6 @@ + (cd ppd; $(MAKE) $(MFLAGS) install) + echo Installing in templates... + (cd templates; $(MAKE) $(MFLAGS) install) +- echo Installing startup script... +- if test -d $(prefix)/sbin/init.d; then \ +- $(INSTALL_SCRIPT) cups.sh $(prefix)/sbin/init.d/cups; \ +- $(CHMOD) ugo+rx $(prefix)/sbin/init.d/cups; \ +- ln -s ../init.d/cups $(prefix)/sbin/rc0.d/K000cups; \ +- ln -s ../init.d/cups $(prefix)/sbin/rc2.d/S999cups; \ +- fi +- if test -d $(prefix)/etc/rc.d/init.d; then \ +- $(INSTALL_SCRIPT) cups.sh $(prefix)/etc/rc.d/init.d/cups; \ +- $(CHMOD) ugo+rx $(prefix)/etc/rc.d/cups; \ +- ln -s ../init.d/cups $(prefix)/etc/rc.d/rc0.d/K00cups; \ +- ln -s ../init.d/cups $(prefix)/etc/rc.d/rc2.d/S99cups; \ +- fi +- if test -d $(prefix)/etc/init.d; then \ +- $(INSTALL_SCRIPT) cups.sh $(prefix)/etc/init.d/cups; \ +- $(CHMOD) ugo+rx $(prefix)/etc/init.d/cups; \ +- ln -s ../init.d/cups $(prefix)/etc/rc0.d/K00cups; \ +- ln -s ../init.d/cups $(prefix)/etc/rc2.d/S99cups; \ +- fi # + # Make software distributions using EPM (http://www.easysw.com/epm)... diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac deleted file mode 100644 index f4821961361..00000000000 --- a/print/cups/patches/patch-ac +++ /dev/null @@ -1,73 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- backend/Makefile.orig Tue Oct 12 14:19:29 1999 -+++ backend/Makefile Sun Nov 28 21:06:28 1999 -@@ -45,10 +45,10 @@ - # - - install: -- -$(MKDIR) $(SERVERROOT)/backend -- $(CP) $(TARGETS) $(SERVERROOT)/backend -- -$(LN) ipp $(SERVERROOT)/backend/http -- $(CHMOD) u+s $(SERVERROOT)/backend/lpd -+ -$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/backend -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGETS) $(EXECDIR)/backend -+ -$(LN) ipp $(EXECDIR)/backend/http -+ $(CHMOD) u+s $(EXECDIR)/backend/lpd - - # - # betest -@@ -56,7 +56,7 @@ - - betest: betest.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o betest betest.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o betest betest.o $(LIBS) - - betest.o: ../cups/string.h ../Makedefs - -@@ -66,7 +66,7 @@ - - ipp: ipp.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS) - -$(LN) ipp http - - ipp.o: ../cups/cups.h ../Makedefs -@@ -77,7 +77,7 @@ - - lpd: lpd.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS) - - lpd.o: ../cups/cups.h ../Makedefs - -@@ -87,7 +87,7 @@ - - parallel: parallel.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS) - - parallel.o: ../cups/cups.h ../Makedefs - -@@ -97,7 +97,7 @@ - - serial: serial.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o serial serial.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o serial serial.o $(LIBS) - - serial.o: ../cups/cups.h ../Makedefs - -@@ -107,7 +107,7 @@ - - socket: socket.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o socket socket.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o socket socket.o $(LIBS) - - socket.o: ../cups/cups.h ../Makedefs - diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad deleted file mode 100644 index a749a370a33..00000000000 --- a/print/cups/patches/patch-ad +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- berkeley/Makefile.orig Tue Jul 13 08:39:37 1999 -+++ berkeley/Makefile Sun Nov 28 21:06:28 1999 -@@ -45,10 +45,10 @@ - # - - install: -- -$(MKDIR) $(BINDIR) -- -$(MKDIR) $(SBINDIR) -- $(CP) lpq lpr lprm $(BINDIR) -- $(CP) lpc $(SBINDIR) -+ -$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR) -+ -$(BSD_INSTALL_PROGRAM_DIR) $(SBINDIR) -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) lpq lpr lprm $(BINDIR) -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) lpc $(SBINDIR) - - # - # lpc -@@ -56,7 +56,7 @@ - - lpc: lpc.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS) - - lpc.o: ../cups/cups.h ../Makedefs - -@@ -66,7 +66,7 @@ - - lpq: lpq.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS) - - lpq.o: ../cups/cups.h ../Makedefs - -@@ -76,7 +76,7 @@ - - lpr: lpr.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS) - - lpr.o: ../cups/cups.h ../Makedefs - -@@ -86,7 +86,7 @@ - - lprm: lprm.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS) - - lprm.o: ../cups/cups.h ../Makedefs - diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae deleted file mode 100644 index 9e0c4d29538..00000000000 --- a/print/cups/patches/patch-ae +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- cgi-bin/Makefile.orig Thu Jul 8 10:20:38 1999 -+++ cgi-bin/Makefile Sun Nov 28 21:06:28 1999 -@@ -45,8 +45,8 @@ - # - - install: -- -$(MKDIR) $(SERVERROOT)/cgi-bin -- $(CP) $(TARGETS) $(SERVERROOT)/cgi-bin -+ -$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/cgi-bin -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGETS) $(EXECDIR)/cgi-bin - - # - # classes.cgi -@@ -54,7 +54,7 @@ - - classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ classes.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ classes.o $(LIBS) - - $(OBJS): ../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h - -@@ -64,7 +64,7 @@ - - jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ jobs.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ jobs.o $(LIBS) - - $(OBJS): ../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h - -@@ -74,7 +74,7 @@ - - printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ printers.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ printers.o $(LIBS) - - $(OBJS): ../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h - diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af deleted file mode 100644 index 19412cf4d8a..00000000000 --- a/print/cups/patches/patch-af +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- conf/Makefile.orig Fri Jul 30 10:18:35 1999 -+++ conf/Makefile Sun Nov 28 21:06:28 1999 -@@ -48,19 +48,19 @@ - # - - install: -- -$(MKDIR) $(SERVERROOT)/conf -+ -$(MKDIR) $(CONFDIR) - for file in $(KEEP); do \ -- if test -e $(SERVERROOT)/conf/$$file ; then \ -- $(CP) $$file $(SERVERROOT)/conf/$$file.N ; \ -+ if test -e $(CONFDIR)/$$file ; then \ -+ $(CP) $$file $(CONFDIR)/$$file.N ; \ - else \ -- $(CP) $$file $(SERVERROOT)/conf ; \ -+ $(CP) $$file $(CONFDIR) ; \ - fi ; \ - done - for file in $(REPLACE); do \ -- if test -e $(SERVERROOT)/conf/$$file ; then \ -- $(MV) $(SERVERROOT)/conf/$$file $(SERVERROOT)/conf/$$file.O ; \ -+ if test -e $(CONFDIR)/$$file ; then \ -+ $(MV) $(CONFDIR)/$$file $(CONFDIR)/$$file.O ; \ - fi ; \ -- $(CP) $$file $(SERVERROOT)/conf ; \ -+ $(CP) $$file $(CONFDIR) ; \ - done - - # diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag deleted file mode 100644 index fc9624020a8..00000000000 --- a/print/cups/patches/patch-ag +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- conf/cupsd.conf.orig Mon Aug 23 11:24:48 1999 -+++ conf/cupsd.conf Sun Nov 28 21:06:28 1999 -@@ -107,6 +107,20 @@ - #ServerRoot /var/cups - - # -+# ConfRoot: the root directory for the configuration files. -+# By default the compiled-in value -+# -+ -+#ConfRoot /etc/cups -+ -+# -+# ExecRoot: the root directory for the CUPS executables. -+# By default the compiled-in value -+# -+ -+#ExecRoot /usr/pkg/libexec/cups -+ -+# - # AccessLog: the access log file; if this does not start with a leading / - # then it is assumed to be relative to ServerRoot. By default set to - # "logs/access_log" diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah deleted file mode 100644 index d4c21ba1f66..00000000000 --- a/print/cups/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- config.h.in.orig Thu Nov 4 08:35:00 1999 -+++ config.h.in Sun Nov 28 21:06:28 1999 -@@ -34,9 +34,12 @@ - * Where are files stored? - */ - --#define CUPS_LOCALEDIR "/usr/lib/locale" -+#define CUPS_LOCALEDIR "/usr/share/cups/locale" - #define CUPS_SERVERROOT "/var/cups" - #define CUPS_DATADIR "/usr/share/cups" -+#define CUPS_DOCDIR "/usr/share/doc/cups" -+#define CUPS_CONFDIR "/etc/cups" -+#define CUPS_EXECDIR "/usr/libexec/cups" - - /* - * Do we have various image libraries? diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai deleted file mode 100644 index f6c9129d546..00000000000 --- a/print/cups/patches/patch-ai +++ /dev/null @@ -1,136 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- configure.orig Thu Nov 4 10:34:48 1999 -+++ configure Sun Nov 28 21:06:28 1999 -@@ -556,6 +556,9 @@ - : - fi - -+# Use libtool to build shared libraries. -+# -+if false; then - if test "$enable_shared" != "no"; then - case "$uname" in - SunOS* | UNIX_S*) -@@ -597,6 +600,11 @@ - LIBCUPSIMAGE="libcupsimage.a" - DSO=":" - fi -+else -+ LIBCUPS="libcups.la" -+ LIBCUPSIMAGE="libcupsimage.la" -+ DSO=":" -+fi - - for ac_prog in mawk gawk nawk awk - do -@@ -1820,7 +1828,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lpng $LIBS" -+LIBS="-lpng -lz -lm $LIBS" - cat > conftest.$ac_ext <<EOF - #line 1826 "configure" - #include "confdefs.h" -@@ -1865,7 +1873,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ltiff $LIBS" -+LIBS="-ltiff -ljpeg -lz -lm $LIBS" - cat > conftest.$ac_ext <<EOF - #line 1871 "configure" - #include "confdefs.h" -@@ -1903,9 +1911,9 @@ - fi - - --echo $ac_n "checking for deflateInit in -lz""... $ac_c" 1>&6 --echo "configure:1908: checking for deflateInit in -lz" >&5 --ac_lib_var=`echo z'_'deflateInit | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -+echo "configure:1908: checking for deflate in -lz" >&5 -+ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1917,10 +1925,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char deflateInit(); -+char deflate(); - - int main() { --deflateInit() -+deflate() - ; return 0; } - EOF - if { (eval echo configure:1927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -2795,11 +2803,16 @@ - libdir="/usr/lib32" - fi - -+if false; then - if test "$prefix" = "/usr"; then - CUPS_SERVERROOT="/var/cups" - else - CUPS_SERVERROOT="$prefix/var/cups" - fi -+else -+ # NetBSD's CUPS runtime files go into /var/cups -+ CUPS_SERVERROOT="/var/cups" -+fi - cat >> confdefs.h <<EOF - #define CUPS_SERVERROOT "$CUPS_SERVERROOT" - EOF -@@ -2811,6 +2824,10 @@ - CUPS_LOCALEDIR="$prefix/share/locale" - ;; - -+ FreeBSD* | NetBSD* | OpenBSD*) -+ CUPS_LOCALEDIR="$prefix/share/cups/locale" -+ ;; -+ - OSF1) - CUPS_LOCALEDIR="$prefix/lib/nls/msg" - ;; -@@ -2834,6 +2851,27 @@ - - - -+CUPS_DOCDIR="$prefix/share/doc/cups" -+cat >> confdefs.h <<EOF -+#define CUPS_DOCDIR "$CUPS_DOCDIR" -+EOF -+ -+ -+ -+CUPS_CONFDIR="/etc/cups" -+cat >> confdefs.h <<EOF -+#define CUPS_CONFDIR "$CUPS_CONFDIR" -+EOF -+ -+ -+ -+CUPS_EXECDIR="$prefix/libexec/cups" -+cat >> confdefs.h <<EOF -+#define CUPS_EXECDIR "$CUPS_EXECDIR" -+EOF -+ -+ -+ - trap '' 1 2 15 - cat > confcache <<\EOF - # This file is a shell script that caches the results of configure -@@ -2996,6 +3034,9 @@ - s%@CUPS_SERVERROOT@%$CUPS_SERVERROOT%g - s%@CUPS_LOCALEDIR@%$CUPS_LOCALEDIR%g - s%@CUPS_DATADIR@%$CUPS_DATADIR%g -+s%@CUPS_DOCDIR@%$CUPS_DOCDIR%g -+s%@CUPS_CONFDIR@%$CUPS_CONFDIR%g -+s%@CUPS_EXECDIR@%$CUPS_EXECDIR%g - - CEOF - EOF diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj deleted file mode 100644 index 95c9503f292..00000000000 --- a/print/cups/patches/patch-aj +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- cups/Makefile.orig Fri Oct 22 11:53:09 1999 -+++ cups/Makefile Sun Nov 28 21:06:28 1999 -@@ -63,13 +63,20 @@ - # - - install: all -- -$(MKDIR) $(INCLUDEDIR)/cups -- $(CP) $(HEADERS) $(INCLUDEDIR)/cups -- -$(MKDIR) $(LIBDIR) -- $(CP) $(LIBCUPS) $(LIBDIR) -- if test $(LIBCUPS) != "libcups.a"; then \ -- $(LN) $(LIBCUPS) `basename $(LIBCUPS) .1`; \ -- fi -+ -$(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/cups -+ $(BSD_INSTALL_DATA) $(HEADERS) $(INCLUDEDIR)/cups -+ -$(BSD_INSTALL_DATA_DIR) $(LIBDIR) -+ $(LIBTOOL) $(BSD_INSTALL_DATA) $(LIBCUPS) $(LIBDIR) -+ -+# -+# libcups.la -+# -+ -+libcups.la: $(LIBOBJS:.o=.lo) -+ echo Linking $@... -+ $(RM) $@ -+ $(LIBTOOL) $(CC) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ -+ -version-info 1:0 - - # - # libcups.so.1, libcups.sl.1 -@@ -120,9 +127,9 @@ - # testhttp (dependency on static CUPS library is intentional) - # - --testhttp: testhttp.o libcups.a -+testhttp: testhttp.o $(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS) -+ $(CC) $(LDFLAGS) -o $@ testhttp.o .libs/libcups.a $(NETLIBS) - - testhttp.o: http.h ../Makedefs - -@@ -130,9 +137,9 @@ - # testmime (dependency on static CUPS library is intentional) - # - --testmime: testmime.o libcups.a -+testmime: testmime.o $(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ testmime.o libcups.a -+ $(CC) $(LDFLAGS) -o $@ testmime.o .libs/libcups.a - - testmime.o: mime.h ../Makedefs - -@@ -140,9 +147,9 @@ - # testppd (dependency on static CUPS library is intentional) - # - --testppd: testppd.o libcups.a -+testppd: testppd.o $(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ testppd.o libcups.a $(NETLIBS) -+ $(CC) $(LDFLAGS) -o $@ testppd.o .libs/libcups.a $(NETLIBS) - - testppd.o: ppd.h ../Makedefs - diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak deleted file mode 100644 index efdb5f364f9..00000000000 --- a/print/cups/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- cups/usersys.c.orig Mon Jul 12 12:09:42 1999 -+++ cups/usersys.c Sun Nov 28 21:06:28 1999 -@@ -136,7 +136,7 @@ - * Next check to see if we have a cupsd.conf file... - */ - -- if ((fp = fopen(CUPS_SERVERROOT "/conf/cupsd.conf", "r")) == NULL) -+ if ((fp = fopen(CUPS_CONFDIR "/cupsd.conf", "r")) == NULL) - return ("localhost"); - - /* diff --git a/print/cups/patches/patch-al b/print/cups/patches/patch-al deleted file mode 100644 index c80c78fd7a2..00000000000 --- a/print/cups/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.2 1999/12/07 21:01:47 rh Exp $ - ---- data/Makefile.orig Fri Jul 30 16:22:10 1999 -+++ data/Makefile Tue Dec 7 21:59:45 1999 -@@ -49,6 +49,6 @@ - - install: -- -$(MKDIR) $(DATADIR)/data -- $(CP) $(FILES) $(DATADIR)/data -+ -$(BSD_INSTALL_DATA_DIR) $(DATADIR)/data -+ $(BSD_INSTALL_DATA) $(FILES) $(DATADIR)/data - - # diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am deleted file mode 100644 index e5fff5b2745..00000000000 --- a/print/cups/patches/patch-am +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- doc/Makefile.orig Wed Sep 22 16:06:17 1999 -+++ doc/Makefile Sun Nov 28 21:06:28 1999 -@@ -71,14 +71,14 @@ - # - - install: -- -$(MKDIR) $(DATADIR)/doc -- $(CP) $(WEBPAGES) $(DATADIR)/doc -- $(CP) overview.html overview.pdf $(DATADIR)/doc -- $(CP) $(DOCUMENTS:.shtml=.html) $(DATADIR)/doc -- $(CP) $(DOCUMENTS:.shtml=.pdf) $(DATADIR)/doc -- -$(MKDIR) $(DATADIR)/doc/images -- $(CP) $(WEBIMAGES) $(DATADIR)/doc/images -- $(CP) $(DOCIMAGES) $(DATADIR)/doc/images -+ -$(BSD_INSTALL_DATA_DIR) $(DOCDIR) -+ $(BSD_INSTALL_DATA) $(WEBPAGES) $(DOCDIR) -+ $(BSD_INSTALL_DATA) overview.html overview.pdf $(DOCDIR) -+ $(BSD_INSTALL_DATA) $(DOCUMENTS:.shtml=.html) $(DOCDIR) -+ $(BSD_INSTALL_DATA) $(DOCUMENTS:.shtml=.pdf) $(DOCDIR) -+ -$(BSD_INSTALL_DATA_DIR) $(DOCDIR)/images -+ $(BSD_INSTALL_DATA) $(WEBIMAGES) $(DOCDIR)/images -+ $(BSD_INSTALL_DATA) $(DOCIMAGES) $(DOCDIR)/images - - # - # The overview, admin guide, and user's guide get special attention... diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an deleted file mode 100644 index 8ba1753d7c4..00000000000 --- a/print/cups/patches/patch-an +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- filter/Makefile.orig Fri Jul 30 10:57:20 1999 -+++ filter/Makefile Sun Nov 28 21:06:28 1999 -@@ -53,13 +53,10 @@ - # - - install: -- -$(MKDIR) $(SERVERROOT)/filter -- $(CP) $(TARGETS) $(SERVERROOT)/filter -- -$(MKDIR) $(LIBDIR) -- $(CP) $(LIBCUPSIMAGE) $(LIBDIR) -- -if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \ -- $(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .1`; \ -- fi -+ -$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/filter -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGETS) $(EXECDIR)/filter -+ -$(BSD_INSTALL_DATA_DIR) $(LIBDIR) -+ $(LIBTOOL) $(BSD_INSTALL_DATA) $(LIBCUPSIMAGE) $(LIBDIR) - - # - # hpgltops -@@ -67,10 +64,19 @@ - - hpgltops: $(HPGLOBJS) common.o ../Makedefs ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm - $(HPGLOBJS): hpgltops.h - - # -+# libcupsimage.la -+# -+libcupsimage.la: $(IMAGEOBJS:.o=.lo) -+ echo Linking $@... -+ $(RM) $@ -+ $(LIBTOOL) $(CC) -o $@ $(IMAGEOBJS:.o=.lo) -rpath $(LIBDIR) \ -+ -version-info 1:0 -+ -+# - # libcupsimage.so.1, libcupsimage.sl.1 - # - -@@ -98,8 +104,8 @@ - imagetops: imagetops.o common.o $(LIBCUPSIMAGE) ../Makedefs \ - ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ imagetops.o common.o -L. -lcupsimage \ -- $(IMGLIBS) $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ imagetops.o common.o \ -+ $(LIBCUPSIMAGE) $(IMGLIBS) $(LIBS) - imagetops: common.h image.h - - # -@@ -109,8 +115,8 @@ - imagetoraster: imagetoraster.o common.o $(LIBCUPSIMAGE) ../Makedefs \ - ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ imagetoraster.o common.o -L. -lcupsimage \ -- $(IMGLIBS) $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ imagetoraster.o common.o \ -+ $(LIBCUPSIMAGE) $(IMGLIBS) $(LIBS) - imagetoraster: common.h image.h - - # -@@ -119,7 +125,7 @@ - - pstops: pstops.o common.o ../Makedefs ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) - pstops.o: common.h - - # -@@ -128,7 +134,7 @@ - - rastertohp: rastertohp.o ../Makedefs ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ rastertohp.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ rastertohp.o $(LIBS) - rastertohp.o: ../cups/raster.h - - # -@@ -138,7 +144,8 @@ - texttops: texttops.o textcommon.o common.o ../Makedefs \ - ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o $@ texttops.o textcommon.o common.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o $@ texttops.o textcommon.o common.o \ -+ $(LIBS) - texttops.o: common.h textcommon.h - - common.o: common.h diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-ao deleted file mode 100644 index 4d34d519fb5..00000000000 --- a/print/cups/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.2 1999/12/07 21:01:47 rh Exp $ - ---- fonts/Makefile.orig Mon May 10 23:33:34 1999 -+++ fonts/Makefile Tue Dec 7 21:59:46 1999 -@@ -61,6 +61,6 @@ - - install: -- -$(MKDIR) $(DATADIR)/fonts -- $(CP) $(FONTS) $(DATADIR)/fonts -+ -$(BSD_INSTALL_DATA_DIR) $(DATADIR)/fonts -+ $(BSD_INSTALL_DATA) $(FONTS) $(DATADIR)/fonts - - # diff --git a/print/cups/patches/patch-ap b/print/cups/patches/patch-ap deleted file mode 100644 index 99eacb0d26a..00000000000 --- a/print/cups/patches/patch-ap +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- locale/Makefile.orig Mon Jun 21 14:47:44 1999 -+++ locale/Makefile Sun Nov 28 21:06:28 1999 -@@ -47,12 +47,12 @@ - # - - install: -- -$(MKDIR) $(LIBDIR)/locale -+ -$(BSD_INSTALL_DATA_DIR) $(LOCALEDIR) - for dir in $(LOCALES) ; do \ -- if test ! -d $(LIBDIR)/locale/$$dir ; then \ -- $(MKDIR) $(LIBDIR)/locale/$$dir ; \ -+ if test ! -d $(LOCALEDIR)/$$dir ; then \ -+ $(BSD_INSTALL_DATA_DIR) $(LOCALEDIR)/$$dir ; \ - fi ; \ -- $(CP) cups_$$dir $(LIBDIR)/locale/$$dir ; \ -+ $(BSD_INSTALL_DATA) $$dir/cups_$$dir $(LOCALEDIR)/$$dir ; \ - done - - # -@@ -64,7 +64,7 @@ - - translate: translate.o ../cups/libcups.a - echo Linking $<... -- $(CC) $(LDFLAGS) -o translate translate.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o translate translate.o $(LIBS) - - translate.o: ../cups/http.h - diff --git a/print/cups/patches/patch-aq b/print/cups/patches/patch-aq deleted file mode 100644 index 031bd0b644c..00000000000 --- a/print/cups/patches/patch-aq +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-aq,v 1.2 1999/12/07 21:01:47 rh Exp $ - ---- man/Makefile.orig Mon Jun 21 17:27:44 1999 -+++ man/Makefile Tue Dec 7 21:59:46 1999 -@@ -42,5 +42,5 @@ - # - --all: $(CAT1) $(CAT5) $(CAT8) -+all: # $(CAT1) $(CAT5) $(CAT8) - - # -@@ -55,22 +55,13 @@ - - install: -- -$(MKDIR) $(MANDIR)/man1 -- $(CP) $(MAN1) $(MANDIR)/man1 -+ -$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man1 -+ $(BSD_INSTALL_DATA) $(MAN1) $(MANDIR)/man1 - $(LN) lp.1 $(MANDIR)/man1/cancel.1 -- -$(MKDIR) $(MANDIR)/man5 -- $(CP) $(MAN5) $(MANDIR)/man5 -- -$(MKDIR) $(MANDIR)/man8 -- $(CP) $(MAN8) $(MANDIR)/man8 -+ -$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man5 -+ $(BSD_INSTALL_DATA) $(MAN5) $(MANDIR)/man5 -+ -$(BSD_INSTALL_DATA_DIR) $(MANDIR)/man8 -+ $(BSD_INSTALL_DATA) $(MAN8) $(MANDIR)/man8 - $(LN) accept.8 $(MANDIR)/man8/reject.8 - $(LN) enable.8 $(MANDIR)/man8/disable.8 -- -$(MKDIR) $(MANDIR)/cat1 -- $(CP) $(CAT1) $(MANDIR)/cat1 -- $(LN) lp.$(CAT) $(MANDIR)/cat1/cancel.$(CAT) -- -$(MKDIR) $(MANDIR)/cat5 -- $(CP) $(CAT5) $(MANDIR)/cat5 -- -$(MKDIR) $(MANDIR)/cat8 -- $(CP) $(CAT8) $(MANDIR)/cat8 -- $(LN) accept.$(CAT) $(MANDIR)/cat8/reject.$(CAT) -- $(LN) enable.$(CAT) $(MANDIR)/cat8/disable.$(CAT) - - # diff --git a/print/cups/patches/patch-ar b/print/cups/patches/patch-ar deleted file mode 100644 index 598407b01ca..00000000000 --- a/print/cups/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.2 1999/12/07 21:01:47 rh Exp $ - ---- ppd/Makefile.orig Wed May 19 20:00:57 1999 -+++ ppd/Makefile Tue Dec 7 21:58:21 1999 -@@ -48,6 +48,6 @@ - - install: -- -$(MKDIR) $(DATADIR)/model -- $(CP) $(FILES) $(DATADIR)/model -+ -$(BSD_INSTALL_DATA_DIR) $(DATADIR)/model -+ $(BSD_INSTALL_DATA) $(FILES) $(DATADIR)/model - - # diff --git a/print/cups/patches/patch-as b/print/cups/patches/patch-as deleted file mode 100644 index 8f196d45923..00000000000 --- a/print/cups/patches/patch-as +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-as,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- pstoraster/Makefile.orig Thu Jul 29 16:33:30 1999 -+++ pstoraster/Makefile Sun Nov 28 21:06:28 1999 -@@ -120,11 +120,11 @@ - # - - install: $(TARGETS) -- -$(MKDIR) $(SERVERROOT)/filter -- $(CP) pstoraster $(SERVERROOT)/filter -- -$(LN) pstoraster $(SERVERROOT)/filter/pdftops -- -$(MKDIR) $(DATADIR)/pstoraster -- $(CP) $(DFILES) $(DATADIR)/pstoraster -+ -$(BSD_INSTALL_PROGRAM_DIR) $(EXECDIR)/filter -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) pstoraster $(EXECDIR)/filter -+ -$(LN) pstoraster $(EXECDIR)/filter/pdftops -+ -$(BSD_INSTALL_DATA_DIR) $(DATADIR)/pstoraster -+ $(BSD_INSTALL_DATA) $(DFILES) $(DATADIR)/pstoraster - - # - # genarch - generate the architecture configuration file. -@@ -158,7 +158,7 @@ - - pstoraster: pstoraster.o libgs.a ../Makedefs ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o pstoraster pstoraster.o libgs.a \ -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o pstoraster pstoraster.o libgs.a \ - $(LIBJPEG) $(LIBZ) $(LIBS) -lm - pstoraster.o: arch.h ../config.h ../Makedefs - diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at deleted file mode 100644 index 82d6e410678..00000000000 --- a/print/cups/patches/patch-at +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- scheduler/Makefile.orig Mon Sep 27 14:21:21 1999 -+++ scheduler/Makefile Sun Nov 28 21:06:28 1999 -@@ -46,8 +46,8 @@ - # - - install: -- -$(MKDIR) $(SBINDIR) -- $(CP) cupsd $(SBINDIR) -+ -$(BSD_INSTALL_PROGRAM_DIR) $(SBINDIR) -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) cupsd $(SBINDIR) - -$(MKDIR) $(SERVERROOT)/interfaces - -$(MKDIR) $(SERVERROOT)/logs - -$(MKDIR) $(SERVERROOT)/ppd -@@ -59,7 +59,7 @@ - - cupsd: $(CUPSDOBJS) ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) $(LIBS) - - $(CUPSDOBJS): auth.h classes.h client.h conf.h cupsd.h dirsvc.h job.h \ - printers.h ../cups/cups.h ../cups/http.h ../cups/ipp.h \ -@@ -71,7 +71,7 @@ - - testspeed: testspeed.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o testspeed testspeed.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o testspeed testspeed.o $(LIBS) - - testspeed.o: ../cups/cups.h ../cups/http.h ../cups/ipp.h ../cups/language.h - diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au deleted file mode 100644 index 35c1ca5798a..00000000000 --- a/print/cups/patches/patch-au +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-au,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- scheduler/classes.c.orig Wed Sep 22 14:08:40 1999 -+++ scheduler/classes.c Sun Nov 28 21:06:29 1999 -@@ -300,7 +300,7 @@ - * Open the classes.conf file... - */ - -- sprintf(line, "%s/conf/classes.conf", ServerRoot); -+ sprintf(line, "%s/classes.conf", ConfRoot); - if ((fp = fopen(line, "r")) == NULL) - return; - -@@ -470,7 +470,7 @@ - * Create the classes.conf file... - */ - -- sprintf(temp, "%s/conf/classes.conf", ServerRoot); -+ sprintf(temp, "%s/classes.conf", ConfRoot); - if ((fp = fopen(temp, "w")) == NULL) - { - LogMessage(LOG_ERROR, "Unable to save classes.conf - %s", strerror(errno)); diff --git a/print/cups/patches/patch-av b/print/cups/patches/patch-av deleted file mode 100644 index 68ac7c96cde..00000000000 --- a/print/cups/patches/patch-av +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-av,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- scheduler/client.c.orig Thu Nov 4 09:56:33 1999 -+++ scheduler/client.c Sun Nov 28 21:06:29 1999 -@@ -474,17 +474,17 @@ - - if (strncmp(con->uri, "/printers", 9) == 0) - { -- snprintf(command, sizeof(command), "%s/cgi-bin/printers.cgi", ServerRoot); -+ snprintf(command, sizeof(command), "%s/cgi-bin/printers.cgi", ExecRoot); - options = con->uri + 9; - } - else if (strncmp(con->uri, "/classes", 8) == 0) - { -- snprintf(command, sizeof(command), "%s/cgi-bin/classes.cgi", ServerRoot); -+ snprintf(command, sizeof(command), "%s/cgi-bin/classes.cgi", ExecRoot); - options = con->uri + 8; - } - else - { -- snprintf(command, sizeof(command), "%s/cgi-bin/jobs.cgi", ServerRoot); -+ snprintf(command, sizeof(command), "%s/cgi-bin/jobs.cgi", ExecRoot); - options = con->uri + 5; - } - -@@ -585,17 +585,17 @@ - - if (strncmp(con->uri, "/printers", 9) == 0) - { -- snprintf(command, sizeof(command), "%s/cgi-bin/printers", ServerRoot); -+ snprintf(command, sizeof(command), "%s/cgi-bin/printers", ExecRoot); - options = con->uri + 9; - } - else if (strncmp(con->uri, "/classes", 8) == 0) - { -- snprintf(command, sizeof(command), "%s/cgi-bin/classes", ServerRoot); -+ snprintf(command, sizeof(command), "%s/cgi-bin/classes", ExecRoot); - options = con->uri + 8; - } - else - { -- snprintf(command, sizeof(command), "%s/cgi-bin/jobs", ServerRoot); -+ snprintf(command, sizeof(command), "%s/cgi-bin/jobs", ExecRoot); - options = con->uri + 5; - } - diff --git a/print/cups/patches/patch-aw b/print/cups/patches/patch-aw deleted file mode 100644 index ca0adf5b72c..00000000000 --- a/print/cups/patches/patch-aw +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- scheduler/conf.c.orig Sun Oct 10 11:41:09 1999 -+++ scheduler/conf.c Sun Nov 28 21:06:29 1999 -@@ -76,6 +76,8 @@ - { "ServerAdmin", ServerAdmin, VAR_STRING, sizeof(ServerAdmin) }, - { "ServerRoot", ServerRoot, VAR_STRING, sizeof(ServerRoot) }, - { "DocumentRoot", DocumentRoot, VAR_STRING, sizeof(DocumentRoot) }, -+ { "ConfRoot", ConfRoot, VAR_STRING, sizeof(ConfRoot) }, -+ { "ExecRoot", ExecRoot, VAR_STRING, sizeof(ExecRoot) }, - { "SystemGroup", SystemGroup, VAR_STRING, sizeof(SystemGroup) }, - { "AccessLog", AccessLog, VAR_STRING, sizeof(AccessLog) }, - { "ErrorLog", ErrorLog, VAR_STRING, sizeof(ErrorLog) }, -@@ -168,7 +170,9 @@ - gethostname(ServerName, sizeof(ServerName)); - sprintf(ServerAdmin, "root@%s", ServerName); - strcpy(ServerRoot, CUPS_SERVERROOT); -- strcpy(DocumentRoot, CUPS_DATADIR "/doc"); -+ strcpy(DocumentRoot, CUPS_DOCDIR); -+ strcpy(ConfRoot, CUPS_CONFDIR); -+ strcpy(ExecRoot, CUPS_EXECDIR); - strcpy(AccessLog, "logs/access_log"); - strcpy(ErrorLog, "logs/error_log"); - -@@ -272,7 +276,7 @@ - * Read the MIME type and conversion database... - */ - -- sprintf(directory, "%s/conf", ServerRoot); -+ sprintf(directory, "%s", ConfRoot); - - MimeDatabase = mimeNew(); - mimeMerge(MimeDatabase, directory); diff --git a/print/cups/patches/patch-ax b/print/cups/patches/patch-ax deleted file mode 100644 index 364d679aa13..00000000000 --- a/print/cups/patches/patch-ax +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- scheduler/conf.h.orig Sat Aug 28 12:17:51 1999 -+++ scheduler/conf.h Sun Nov 28 21:06:29 1999 -@@ -39,7 +39,7 @@ - * Globals... - */ - --VAR char ConfigurationFile[256] VALUE(CUPS_SERVERROOT "/conf/cupsd.conf"), -+VAR char ConfigurationFile[256] VALUE(CUPS_CONFDIR "/cupsd.conf"), - /* Configuration file to use */ - ServerName[256] VALUE(""), - /* FQDN for server */ -@@ -47,8 +47,12 @@ - /* Administrator's email */ - ServerRoot[1024] VALUE(CUPS_SERVERROOT), - /* Root directory for scheduler */ -- DocumentRoot[1024] VALUE(CUPS_DATADIR "/doc"), -+ DocumentRoot[1024] VALUE(CUPS_DOCDIR), - /* Root directory for documents */ -+ ConfRoot[1024] VALUE(CUPS_CONFDIR), -+ /* Root dir for configuration files */ -+ ExecRoot[1024] VALUE(CUPS_EXECDIR), -+ /* Root dir for CUPS executables */ - SystemGroup[32], - /* System group name */ - AccessLog[1024] VALUE("logs/access_log"), diff --git a/print/cups/patches/patch-ay b/print/cups/patches/patch-ay deleted file mode 100644 index 638953ed678..00000000000 --- a/print/cups/patches/patch-ay +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ay,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- scheduler/job.c.orig Tue Oct 12 14:29:30 1999 -+++ scheduler/job.c Sun Nov 28 21:06:29 1999 -@@ -604,7 +604,7 @@ - argv[6] = NULL; - - if (filters[i].filter[0] != '/') -- sprintf(command, "%s/filter/%s", ServerRoot, filters[i].filter); -+ sprintf(command, "%s/filter/%s", ExecRoot, filters[i].filter); - else - strcpy(command, filters[i].filter); - -@@ -662,7 +662,7 @@ - if (strncmp(printer->device_uri, "file:", 5) != 0) - { - sscanf(printer->device_uri, "%254[^:]", method); -- sprintf(command, "%s/backend/%s", ServerRoot, method); -+ sprintf(command, "%s/backend/%s", ExecRoot, method); - - argv[0] = printer->device_uri; - if (num_filters) diff --git a/print/cups/patches/patch-az b/print/cups/patches/patch-az deleted file mode 100644 index 273687c5e4e..00000000000 --- a/print/cups/patches/patch-az +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-az,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- scheduler/printers.c.orig Wed Oct 13 12:50:13 1999 -+++ scheduler/printers.c Sun Nov 28 21:06:29 1999 -@@ -376,7 +376,7 @@ - * Open the printer.conf file... - */ - -- sprintf(line, "%s/conf/printers.conf", ServerRoot); -+ sprintf(line, "%s/printers.conf", ConfRoot); - if ((fp = fopen(line, "r")) == NULL) - return; - -@@ -549,7 +549,7 @@ - * Create the printers.conf file... - */ - -- sprintf(temp, "%s/conf/printers.conf", ServerRoot); -+ sprintf(temp, "%s/printers.conf", ConfRoot); - if ((fp = fopen(temp, "w")) == NULL) - { - LogMessage(LOG_ERROR, "Unable to save printers.conf - %s", strerror(errno)); diff --git a/print/cups/patches/patch-ba b/print/cups/patches/patch-ba deleted file mode 100644 index 079dfddb30c..00000000000 --- a/print/cups/patches/patch-ba +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ - ---- systemv/Makefile.orig Thu Aug 12 09:11:02 1999 -+++ systemv/Makefile Sun Nov 28 21:06:29 1999 -@@ -45,16 +45,13 @@ - # - - install: -- -$(MKDIR) $(BINDIR) -- -$(MKDIR) $(LIBDIR) -- $(CP) accept lpadmin $(SBINDIR) -+ -$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR) -+ -$(BSD_INSTALL_DATA_DIR) $(LIBDIR) -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) accept lpadmin $(SBINDIR) - -$(LN) accept $(SBINDIR)/reject -- -$(LN) $(SBINDIR)/lpadmin $(LIBDIR) -- -$(LN) $(SBINDIR)/accept $(LIBDIR) -- -$(LN) $(SBINDIR)/accept $(LIBDIR)/reject - -$(LN) $(SBINDIR)/accept $(BINDIR)/disable - -$(LN) $(SBINDIR)/accept $(BINDIR)/enable -- $(CP) cancel lp lpstat $(BINDIR) -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) cancel lp lpstat $(BINDIR) - - # - # accept -@@ -62,7 +59,7 @@ - - accept: accept.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o accept accept.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o accept accept.o $(LIBS) - -$(LN) accept disable - -$(LN) accept enable - -$(LN) accept reject -@@ -75,7 +72,7 @@ - - cancel: cancel.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o cancel cancel.o $(LIBS) - - cancel.o: ../cups/cups.h ../Makedefs - -@@ -85,7 +82,7 @@ - - lp: lp.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lp lp.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lp lp.o $(LIBS) - - lp.o: ../cups/cups.h ../Makedefs - -@@ -95,7 +92,7 @@ - - lpadmin: lpadmin.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS) - - lpadmin.o: ../cups/cups.h ../Makedefs - -@@ -105,7 +102,7 @@ - - lpstat: lpstat.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS) -+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS) - - lpstat.o: ../cups/cups.h ../Makedefs - diff --git a/print/cups/patches/patch-bb b/print/cups/patches/patch-bb new file mode 100644 index 00000000000..4fad15a680d --- /dev/null +++ b/print/cups/patches/patch-bb @@ -0,0 +1,56 @@ +$NetBSD: patch-bb,v 1.1 2000/07/12 20:09:39 jlam Exp $ + +--- configure.in.orig Mon Jul 10 16:58:19 2000 ++++ configure.in Wed Jul 12 01:04:23 2000 +@@ -43,6 +43,9 @@ + CFLAGS="${CFLAGS:=}" + CXXFLAGS="${CXXFLAGS:=}" + ++AC_ARG_ENABLE(rootconfig, [ --enable-rootconfig ++ set root of CUPS configuration to root directory ++ [default=no]]) + AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then + OPTIM="-g " + fi]) +@@ -403,13 +406,23 @@ + AC_SUBST(CAT8EXT) + + dnl Setup default locations... +-CUPS_SERVERROOT='${prefix}/etc/cups' +-CUPS_LOGDIR='${prefix}/var/log/cups' +-CUPS_REQUESTS='${prefix}/var/spool/cups' +- +-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups") +-AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups") +-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups") ++if test "$enable_rootconfig" = "yes"; then ++ CUPS_SERVERROOT='/etc/cups' ++ CUPS_LOGDIR='/var/log/cups' ++ CUPS_REQUESTS='/var/spool/cups' ++ ++ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "/etc/cups") ++ AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "/var/log/cups") ++ AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "/var/spool/cups") ++else ++ CUPS_SERVERROOT='${prefix}/etc/cups' ++ CUPS_LOGDIR='${prefix}/var/log/cups' ++ CUPS_REQUESTS='${prefix}/var/spool/cups' ++ ++ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups") ++ AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups") ++ AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups") ++fi + + dnl See what directory to put server executables... + case "$uname" in +@@ -460,8 +473,8 @@ + AC_SUBST(CUPS_DATADIR) + + dnl Set the CUPS_DOCROOT directory... +-CUPS_DOCROOT='${exec_prefix}/share/doc/cups' +-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups") ++CUPS_DOCROOT='${exec_prefix}/share/doc/html/cups' ++AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/html/cups") + AC_SUBST(CUPS_DOCROOT) + + AC_OUTPUT(Makedefs cups.sh) diff --git a/print/cups/patches/patch-bc b/print/cups/patches/patch-bc new file mode 100644 index 00000000000..75985bd33b9 --- /dev/null +++ b/print/cups/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1 2000/07/12 20:09:40 jlam Exp $ + +--- filter/Makefile.orig Fri Jul 7 13:02:42 2000 ++++ filter/Makefile Wed Jul 12 01:53:04 2000 +@@ -69,7 +69,7 @@ + $(INSTALL_DATA) raster.h $(INCLUDEDIR)/cups + -$(MKDIR) $(LIBDIR) + $(CHMOD) ugo+rx $(LIBDIR) +- $(INSTALL_DATA) $(LIBCUPSIMAGE) $(LIBDIR) ++ $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR) + -if test $(LIBCUPSIMAGE) != "libcupsimage.a" -a $(LIBCUPSIMAGE) != "libcupsimage.la"; then \ + $(RM) `basename $(LIBCUPSIMAGE) .2`; \ + $(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .2`; \ diff --git a/print/cups/patches/patch-bd b/print/cups/patches/patch-bd new file mode 100644 index 00000000000..e43ba8520be --- /dev/null +++ b/print/cups/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1 2000/07/12 20:09:40 jlam Exp $ + +--- pstoraster/Makefile.orig Fri Jul 7 13:02:47 2000 ++++ pstoraster/Makefile Wed Jul 12 01:49:12 2000 +@@ -344,7 +344,7 @@ + gs_fform.ps gs_fonts.ps gs_init.ps gs_iso_e.ps \ + gs_kanji.ps gs_ksb_e.ps gs_lev2.ps \ + gs_ll3.ps gs_mex_e.ps gs_mro_e.ps \ +- gs_pdf_e.ps gs_pfile.ps gs_res.ps gs_setpd.ps \ ++ gs_pfile.ps gs_res.ps gs_setpd.ps \ + gs_statd.ps gs_std_e.ps gs_sym_e.ps gs_ttf.ps \ + gs_typ32.ps gs_typ42.ps gs_type1.ps gs_wan_e.ps \ + gs_wl1_e.ps gs_wl2_e.ps gs_wl5_e.ps diff --git a/print/cups/pkg/DEINSTALL b/print/cups/pkg/DEINSTALL index 860c7e5d7ac..d43c78af690 100644 --- a/print/cups/pkg/DEINSTALL +++ b/print/cups/pkg/DEINSTALL @@ -1,21 +1,26 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ -# +# $NetBSD: DEINSTALL,v 1.2 2000/07/12 20:09:40 jlam Exp $ PKGNAME=$1 +STAGE=$2 -case $2 in +case ${STAGE} in DEINSTALL) ;; POST-DEINSTALL) - /bin/cat << EOF + SERVERROOT=/etc/cups + LOGDIR=/var/log/cups + REQUESTDIR=/var/spool/cups + + cat << EOF =========================================================================== If you won't be using ${PKGNAME} any longer, you may want to remove the following directories: - /etc/cups - /var/cups + ${SERVERROOT} + ${LOGDIR} + ${REQUESTDIR} =========================================================================== EOF ;; diff --git a/print/cups/pkg/INSTALL b/print/cups/pkg/INSTALL new file mode 100644 index 00000000000..563d13565ce --- /dev/null +++ b/print/cups/pkg/INSTALL @@ -0,0 +1,47 @@ +#!/bin/sh +# +# $NetBSD: INSTALL,v 1.1 2000/07/12 20:09:40 jlam Exp $ + +PKGNAME=$1 +STAGE=$2 + +case ${STAGE} in +PRE-INSTALL) + ;; +POST-INSTALL) + SERVERROOT=/etc/cups + LOGDIR=/var/log/cups + REQUESTDIR=/var/spool/cups + + mkdir -p ${SERVERROOT} + mkdir -p ${SERVERROOT}/certs + mkdir -p ${SERVERROOT}/interfaces + mkdir -p ${SERVERROOT}/ppd + mkdir -p ${LOGDIR} + mkdir -p ${REQUESTDIR} + + echo "Installing configuration files:" + for file in \ + classes.conf \ + client.conf \ + cupsd.conf \ + mime.convs \ + mime.types \ + printers.conf + do + if [ ! -f ${SERVERROOT}/${file} ] + then + echo " ${file}" + cp ${PKG_PREFIX}/share/examples/cups/${file} \ + ${SERVERROOT}/${file} + chmod 644 ${SERVERROOT}/${file} + fi + done + echo "done." + ;; +*) + echo "Unexpected argument: $2" + exit 1 + ;; +esac +exit 0 diff --git a/print/cups/pkg/MESSAGE b/print/cups/pkg/MESSAGE new file mode 100644 index 00000000000..d30fc27d859 --- /dev/null +++ b/print/cups/pkg/MESSAGE @@ -0,0 +1,8 @@ +========================================================================== +$NetBSD: MESSAGE,v 1.1 2000/07/12 20:09:40 jlam Exp $ + +You may want to backup /etc/printcap before starting cupsd for the first +time, as cupsd may overwrite this file with automatically generated +content. + +========================================================================== diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST index 4b71d85e5c0..44a7581cfbf 100644 --- a/print/cups/pkg/PLIST +++ b/print/cups/pkg/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/29 02:18:54 jlam Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/07/12 20:09:40 jlam Exp $ bin/cancel bin/disable bin/enable bin/lp +bin/lpoptions +bin/lppasswd bin/lpq bin/lpr bin/lprm @@ -11,35 +13,69 @@ include/cups/cups.h include/cups/http.h include/cups/ipp.h include/cups/language.h -include/cups/mime.h +include/cups/md5.h include/cups/ppd.h include/cups/raster.h lib/libcups.a -lib/libcups.so.1.0 +lib/libcups.la +lib/libcups.so.2.0 lib/libcupsimage.a -lib/libcupsimage.so.1.0 -libexec/cups/backend/betest +lib/libcupsimage.la +lib/libcupsimage.so.2.0 libexec/cups/backend/http libexec/cups/backend/ipp libexec/cups/backend/lpd libexec/cups/backend/parallel libexec/cups/backend/serial libexec/cups/backend/socket +libexec/cups/backend/usb +libexec/cups/cgi-bin/admin.cgi libexec/cups/cgi-bin/classes.cgi libexec/cups/cgi-bin/jobs.cgi libexec/cups/cgi-bin/printers.cgi +libexec/cups/daemon/cups-lpd +libexec/cups/daemon/cups-polld libexec/cups/filter/hpgltops libexec/cups/filter/imagetops libexec/cups/filter/imagetoraster libexec/cups/filter/pdftops libexec/cups/filter/pstops libexec/cups/filter/pstoraster +libexec/cups/filter/rastertoepson libexec/cups/filter/rastertohp libexec/cups/filter/texttops +man/cat1/backend.0 +man/cat1/cancel.0 +man/cat1/filter.0 +man/cat1/lp.0 +man/cat1/lpoptions.0 +man/cat1/lpq.0 +man/cat1/lpr.0 +man/cat1/lprm.0 +man/cat1/lpstat.0 +man/cat5/classes.conf.0 +man/cat5/cupsd.conf.0 +man/cat5/mime.convs.0 +man/cat5/mime.types.0 +man/cat5/printers.conf.0 +man/cat8/accept.0 +man/cat8/cups-lpd.0 +man/cat8/cups-polld.0 +man/cat8/cupsd.0 +man/cat8/disable.0 +man/cat8/enable.0 +man/cat8/lpadmin.0 +man/cat8/lpc.0 +man/cat8/lpinfo.0 +man/cat8/lpmove.0 +man/cat8/reject.0 man/man1/backend.1 man/man1/cancel.1 man/man1/filter.1 man/man1/lp.1 +man/man1/lpoptions.1 +man/man1/lpq.1 +man/man1/lpr.1 man/man1/lprm.1 man/man1/lpstat.1 man/man5/classes.conf.5 @@ -48,29 +84,56 @@ man/man5/mime.convs.5 man/man5/mime.types.5 man/man5/printers.conf.5 man/man8/accept.8 +man/man8/cups-lpd.8 +man/man8/cups-polld.8 man/man8/cupsd.8 man/man8/disable.8 man/man8/enable.8 man/man8/lpadmin.8 man/man8/lpc.8 +man/man8/lpinfo.8 +man/man8/lpmove.8 man/man8/reject.8 sbin/accept sbin/cupsd sbin/lpadmin sbin/lpc +sbin/lpinfo +sbin/lpmove sbin/reject -share/cups/data/8859-1 -share/cups/data/8859-14 -share/cups/data/8859-15 -share/cups/data/8859-2 -share/cups/data/8859-3 -share/cups/data/8859-4 -share/cups/data/8859-5 -share/cups/data/8859-6 -share/cups/data/8859-7 -share/cups/data/8859-8 -share/cups/data/8859-9 +share/cups/banners/classified +share/cups/banners/confidential +share/cups/banners/secret +share/cups/banners/standard +share/cups/banners/topsecret +share/cups/banners/unclassified +share/cups/charsets/iso-8859-1 +share/cups/charsets/iso-8859-10 +share/cups/charsets/iso-8859-13 +share/cups/charsets/iso-8859-14 +share/cups/charsets/iso-8859-15 +share/cups/charsets/iso-8859-2 +share/cups/charsets/iso-8859-3 +share/cups/charsets/iso-8859-4 +share/cups/charsets/iso-8859-5 +share/cups/charsets/iso-8859-6 +share/cups/charsets/iso-8859-7 +share/cups/charsets/iso-8859-8 +share/cups/charsets/iso-8859-9 +share/cups/charsets/utf-8 +share/cups/charsets/windows-1250 +share/cups/charsets/windows-1251 +share/cups/charsets/windows-1252 +share/cups/charsets/windows-1253 +share/cups/charsets/windows-1254 +share/cups/charsets/windows-1255 +share/cups/charsets/windows-1256 +share/cups/charsets/windows-1257 +share/cups/charsets/windows-1258 +share/cups/charsets/windows-874 share/cups/data/HPGLprolog +share/cups/data/psglyphs +share/cups/data/testprint.ps share/cups/fonts/AvantGarde-Book share/cups/fonts/AvantGarde-BookOblique share/cups/fonts/AvantGarde-Demi @@ -79,6 +142,10 @@ share/cups/fonts/Bookman-Demi share/cups/fonts/Bookman-DemiItalic share/cups/fonts/Bookman-Light share/cups/fonts/Bookman-LightItalic +share/cups/fonts/Charter-Bold +share/cups/fonts/Charter-BoldItalic +share/cups/fonts/Charter-Italic +share/cups/fonts/Charter-Roman share/cups/fonts/Courier share/cups/fonts/Courier-Bold share/cups/fonts/Courier-BoldOblique @@ -110,36 +177,34 @@ share/cups/fonts/Utopia-Italic share/cups/fonts/Utopia-Regular share/cups/fonts/ZapfChancery-MediumItalic share/cups/fonts/ZapfDingbats -share/cups/locale/C/cups_C -share/cups/locale/de/cups_de -share/cups/locale/en/cups_en -share/cups/locale/es/cups_es -share/cups/locale/fr/cups_fr -share/cups/locale/it/cups_it share/cups/model/deskjet.ppd share/cups/model/laserjet.ppd +share/cups/model/stcolor.ppd +share/cups/model/stphoto.ppd share/cups/pstoraster/Fontmap share/cups/pstoraster/gs_btokn.ps share/cups/pstoraster/gs_ccfnt.ps +share/cups/pstoraster/gs_cff.ps share/cups/pstoraster/gs_cidfn.ps share/cups/pstoraster/gs_cmap.ps share/cups/pstoraster/gs_cmdl.ps share/cups/pstoraster/gs_dbt_e.ps share/cups/pstoraster/gs_diskf.ps +share/cups/pstoraster/gs_dpnxt.ps +share/cups/pstoraster/gs_dps.ps share/cups/pstoraster/gs_dps1.ps +share/cups/pstoraster/gs_dps2.ps +share/cups/pstoraster/gs_epsf.ps share/cups/pstoraster/gs_fform.ps share/cups/pstoraster/gs_fonts.ps share/cups/pstoraster/gs_init.ps share/cups/pstoraster/gs_iso_e.ps share/cups/pstoraster/gs_kanji.ps share/cups/pstoraster/gs_ksb_e.ps -share/cups/pstoraster/gs_l2img.ps share/cups/pstoraster/gs_lev2.ps +share/cups/pstoraster/gs_ll3.ps share/cups/pstoraster/gs_mex_e.ps share/cups/pstoraster/gs_mro_e.ps -share/cups/pstoraster/gs_pdf.ps -share/cups/pstoraster/gs_pdf_e.ps -share/cups/pstoraster/gs_pdfwr.ps share/cups/pstoraster/gs_pfile.ps share/cups/pstoraster/gs_res.ps share/cups/pstoraster/gs_setpd.ps @@ -147,84 +212,139 @@ share/cups/pstoraster/gs_statd.ps share/cups/pstoraster/gs_std_e.ps share/cups/pstoraster/gs_sym_e.ps share/cups/pstoraster/gs_ttf.ps +share/cups/pstoraster/gs_typ32.ps share/cups/pstoraster/gs_typ42.ps share/cups/pstoraster/gs_type1.ps share/cups/pstoraster/gs_wan_e.ps share/cups/pstoraster/gs_wl1_e.ps share/cups/pstoraster/gs_wl2_e.ps share/cups/pstoraster/gs_wl5_e.ps -share/cups/pstoraster/pdf_2ps.ps -share/cups/pstoraster/pdf_base.ps -share/cups/pstoraster/pdf_draw.ps -share/cups/pstoraster/pdf_font.ps -share/cups/pstoraster/pdf_main.ps -share/cups/pstoraster/pdf_sec.ps -share/cups/pstoraster/pfbtogs.ps -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/classes.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/logo.gif -share/doc/cups/images/navbar.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/index.html -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/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/cups/templates/add-class.tmpl +share/cups/templates/add-printer.tmpl +share/cups/templates/admin-op.tmpl +share/cups/templates/admin.tmpl +share/cups/templates/choose-device.tmpl +share/cups/templates/choose-make.tmpl +share/cups/templates/choose-members.tmpl +share/cups/templates/choose-model.tmpl +share/cups/templates/choose-serial.tmpl +share/cups/templates/choose-uri.tmpl +share/cups/templates/class-added.tmpl +share/cups/templates/class-confirm.tmpl +share/cups/templates/class-deleted.tmpl +share/cups/templates/class-modified.tmpl +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/header.tmpl +share/cups/templates/job-cancel.tmpl +share/cups/templates/job-hold.tmpl +share/cups/templates/job-release.tmpl +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-header.tmpl +share/cups/templates/option-pickmany.tmpl +share/cups/templates/option-pickone.tmpl +share/cups/templates/option-trailer.tmpl +share/cups/templates/printer-accept.tmpl +share/cups/templates/printer-added.tmpl +share/cups/templates/printer-configured.tmpl +share/cups/templates/printer-confirm.tmpl +share/cups/templates/printer-deleted.tmpl +share/cups/templates/printer-modified.tmpl +share/cups/templates/printer-reject.tmpl +share/cups/templates/printer-start.tmpl +share/cups/templates/printer-stop.tmpl +share/cups/templates/printers.tmpl +share/cups/templates/test-page.tmpl +share/cups/templates/trailer.tmpl +share/doc/html/cups/cmp.html +share/doc/html/cups/cmp.pdf +share/doc/html/cups/cups.css +share/doc/html/cups/cupsdoc.css +share/doc/html/cups/documentation.html +share/doc/html/cups/idd.html +share/doc/html/cups/idd.pdf +share/doc/html/cups/images/accept-jobs.gif +share/doc/html/cups/images/add-class.gif +share/doc/html/cups/images/add-printer.gif +share/doc/html/cups/images/cancel-job.gif +share/doc/html/cups/images/cancel-jobs.gif +share/doc/html/cups/images/cancel.gif +share/doc/html/cups/images/classes.gif +share/doc/html/cups/images/config-printer.gif +share/doc/html/cups/images/continue.gif +share/doc/html/cups/images/cups-block-diagram.gif +share/doc/html/cups/images/cups-large.gif +share/doc/html/cups/images/cups-medium.gif +share/doc/html/cups/images/cups-small.gif +share/doc/html/cups/images/delete-class.gif +share/doc/html/cups/images/delete-printer.gif +share/doc/html/cups/images/draft.gif +share/doc/html/cups/images/hold-job.gif +share/doc/html/cups/images/left.gif +share/doc/html/cups/images/logo.gif +share/doc/html/cups/images/manage-classes.gif +share/doc/html/cups/images/manage-jobs.gif +share/doc/html/cups/images/manage-printers.gif +share/doc/html/cups/images/modify-class.gif +share/doc/html/cups/images/modify-printer.gif +share/doc/html/cups/images/navbar.gif +share/doc/html/cups/images/print-test-page.gif +share/doc/html/cups/images/printer-idle.gif +share/doc/html/cups/images/printer-processing.gif +share/doc/html/cups/images/printer-stopped.gif +share/doc/html/cups/images/reject-jobs.gif +share/doc/html/cups/images/release-job.gif +share/doc/html/cups/images/right.gif +share/doc/html/cups/images/show-active.gif +share/doc/html/cups/images/show-completed.gif +share/doc/html/cups/images/start-class.gif +share/doc/html/cups/images/start-printer.gif +share/doc/html/cups/images/stop-class.gif +share/doc/html/cups/images/stop-printer.gif +share/doc/html/cups/index.html +share/doc/html/cups/ipp.html +share/doc/html/cups/ipp.pdf +share/doc/html/cups/overview.html +share/doc/html/cups/overview.pdf +share/doc/html/cups/sam.html +share/doc/html/cups/sam.pdf +share/doc/html/cups/sdd.html +share/doc/html/cups/sdd.pdf +share/doc/html/cups/spm.html +share/doc/html/cups/spm.pdf +share/doc/html/cups/ssr.html +share/doc/html/cups/ssr.pdf +share/doc/html/cups/stp.html +share/doc/html/cups/stp.pdf +share/doc/html/cups/sum.html +share/doc/html/cups/sum.pdf +share/doc/html/cups/svd.html +share/doc/html/cups/svd.pdf share/examples/cups/classes.conf +share/examples/cups/client.conf share/examples/cups/cupsd.conf -share/examples/cups/cupsd.conf-personal -share/examples/cups/cupsd.conf-professional share/examples/cups/mime.convs share/examples/cups/mime.types -share/examples/cups/printcap share/examples/cups/printers.conf -@exec mkdir -p /etc/cups -@exec if [ ! -f /etc/cups/classes.conf ]; then cp %D/share/examples/cups/classes.conf /etc/cups; fi -@exec if [ ! -f /etc/cups/cupsd.conf ]; then cp %D/share/examples/cups/cupsd.conf /etc/cups; fi -@exec if [ ! -f /etc/cups/mime.convs ]; then cp %D/share/examples/cups/mime.convs /etc/cups; fi -@exec if [ ! -f /etc/cups/mime.types ]; then cp %D/share/examples/cups/mime.types /etc/cups; fi -@exec if [ ! -f /etc/cups/printers.conf ]; then cp %D/share/examples/cups/printers.conf /etc/cups; fi @dirrm share/examples/cups -@dirrm share/doc/cups/images -@dirrm share/doc/cups +@dirrm share/doc/html/cups/images +@dirrm share/doc/html/cups +@dirrm share/cups/templates @dirrm share/cups/pstoraster @dirrm share/cups/model -@dirrm share/cups/locale/it -@dirrm share/cups/locale/fr -@dirrm share/cups/locale/es -@dirrm share/cups/locale/en -@dirrm share/cups/locale/de -@dirrm share/cups/locale/C -@dirrm share/cups/locale @dirrm share/cups/fonts @dirrm share/cups/data +@dirrm share/cups/charsets +@dirrm share/cups/banners @dirrm share/cups @dirrm libexec/cups/filter +@dirrm libexec/cups/daemon @dirrm libexec/cups/cgi-bin @dirrm libexec/cups/backend @dirrm libexec/cups @dirrm include/cups -@exec mkdir -p /var/cups/interfaces -@exec mkdir -p /var/cups/logs -@exec mkdir -p /var/cups/ppd -@exec mkdir -p /var/cups/requests |