diff options
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/Makefile | 28 | ||||
| -rw-r--r-- | print/cups/distinfo | 16 | ||||
| -rw-r--r-- | print/cups/patches/patch-aa | 6 | ||||
| -rw-r--r-- | print/cups/patches/patch-ac | 6 | ||||
| -rw-r--r-- | print/cups/patches/patch-ad | 26 | ||||
| -rw-r--r-- | print/cups/patches/patch-ag | 19 | ||||
| -rw-r--r-- | print/cups/patches/patch-ah | 65 | ||||
| -rw-r--r-- | print/cups/patches/patch-ai | 13 | ||||
| -rw-r--r-- | print/cups/patches/patch-aj | 21 | ||||
| -rw-r--r-- | print/cups/patches/patch-ak | 21 | ||||
| -rw-r--r-- | print/cups/pkg/MESSAGE | 3 | ||||
| -rw-r--r-- | print/cups/pkg/PLIST | 5 |
12 files changed, 30 insertions, 199 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index c30beac5085..566f3f30bee 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.26 2001/03/27 03:20:13 hubertf Exp $ -# +# $NetBSD: Makefile,v 1.27 2001/05/15 17:43:20 jlam Exp $ -DISTNAME= cups-${VERS}-3-source -PKGNAME= cups-${VERS}.3nb2 -VERS= 1.1.6 +DISTNAME= cups-${VERS}-source +PKGNAME= cups-${VERS} +VERS= 1.1.7 WRKSRC= ${WRKDIR}/cups-${VERS} 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}/ \ +MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERS}/ \ + ftp://ftp2.easysw.com/pub/cups/${VERS}/ \ ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/cups/${VERS}/ \ + ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERS}/ \ + ftp://ftp.ntua.gr/pub/gnu/cups/${VERS}/ \ ftp://ftp.fisek.com.tr/pub/cups/${VERS}/ EXTRACT_SUFX= .tar.bz2 @@ -19,7 +19,6 @@ COMMENT= Common UNIX Printing System CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* -BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png>1.0.9:../../graphics/png DEPENDS+= tiff-*:../../graphics/tiff @@ -29,15 +28,21 @@ USE_LIBTOOL= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --sysconfdir=/etc CONFIGURE_ARGS+= --localstatedir=/var +CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/cups CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL}" USE_SSL= # defined CONFIGURE_ARGS+= --enable-ssl CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.prefs.mk" +.if (${OPSYS} == "SunOS") +DEPENDS+= zlib>=1.1.3:../../devel/zlib +.endif + .if defined(USE_PAM) DEPENDS+= PAM-*:../../security/PAM CONFIGURE_ARGS+= --enable-pam @@ -77,10 +82,7 @@ DOCDIR= ${PREFIX}/share/doc/cups EGDIR= ${PREFIX}/share/examples/cups post-extract: - cd ${WRKSRC}/conf; ${MV} cupsd.conf cupsd.conf.in - -pre-configure: - cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf + cd ${WRKSRC}/conf; ${MV} -f cupsd.conf cupsd.conf.in post-build: ${SED} -e "s|@CUPS_USER@|${CUPS_USER}|g" \ diff --git a/print/cups/distinfo b/print/cups/distinfo index 7c0ad1eaebf..dfdda301ea7 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,13 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:41:49 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/15 17:43:20 jlam Exp $ -SHA1 (cups-1.1.6-3-source.tar.bz2) = 6c7170974fd31309a7f50c35973cde9bc35dd648 -Size (cups-1.1.6-3-source.tar.bz2) = 4398801 bytes -SHA1 (patch-aa) = b24523500b38d56530d7a379aa7cd889f21160c9 +SHA1 (cups-1.1.7-source.tar.bz2) = 5b8f6938838e70eaa8fe03c59c45af6aae3824e2 +Size (cups-1.1.7-source.tar.bz2) = 5377455 bytes +SHA1 (patch-aa) = 19ff305dc89ad4ffce750af36b68a11e06247912 SHA1 (patch-ab) = b1d7878e470af8f84a42162275562d28773d94bf -SHA1 (patch-ac) = 3069f84c48e29f8696586e7ed1b25c8e3ff297ea -SHA1 (patch-ad) = 281a98d6cc70ed979a15508fce43b9ba819956da -SHA1 (patch-ag) = 47c11b2b9ef3f28dae80977253af916c57d37705 -SHA1 (patch-ah) = cbd5f024e48b490e6e89491d424ee5f7dacecdcc -SHA1 (patch-ai) = 0ab6a01b99aae1f592b90ad129f072f527923e9b -SHA1 (patch-aj) = c1339ea43d83f74af9d9fa67b263fa0577fc00e6 -SHA1 (patch-ak) = 53a0ba572a079584f8d348b08e12a176997915fe +SHA1 (patch-ac) = 087cffe07d650df4632fc3700ef0f7afb8016c57 diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa index 141a6426033..779bacaf65a 100644 --- a/print/cups/patches/patch-aa +++ b/print/cups/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2001/02/08 19:05:01 jlam Exp $ +$NetBSD: patch-aa,v 1.9 2001/05/15 17:43:21 jlam Exp $ ---- Makedefs.in.orig Fri Feb 2 11:37:43 2001 +--- Makedefs.in.orig Mon Apr 30 13:53:01 2001 +++ Makedefs.in @@ -48,11 +48,11 @@ # Installation programs... @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.8 2001/02/08 19:05:01 jlam Exp $ -INSTALL_SCRIPT = $(CP) +INSTALL_BIN = $(LIBTOOL) $(BSD_INSTALL_PROGRAM) +INSTALL_DATA = $(BSD_INSTALL_DATA) -+INSTALL_LIB = $(LIBTOOL) $(BSD_INSTALL_PROGRAM) ++INSTALL_LIB = $(LIBTOOL) $(BSD_INSTALL_DATA) +INSTALL_MAN = $(BSD_INSTALL_MAN) +INSTALL_SCRIPT = $(BSD_INSTALL_SCRIPT) INSTALL_SYSV = @INSTALL_SYSV@ diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac index 1e4ca8bdb7e..b441d18da09 100644 --- a/print/cups/patches/patch-ac +++ b/print/cups/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.8 2001/02/08 19:05:01 jlam Exp $ +$NetBSD: patch-ac,v 1.9 2001/05/15 17:43:21 jlam Exp $ ---- conf/cupsd.conf.in.orig Wed Dec 20 08:41:12 2000 +--- conf/cupsd.conf.in.orig Wed Mar 14 08:45:30 2001 +++ conf/cupsd.conf.in -@@ -247,8 +247,8 @@ +@@ -258,8 +258,8 @@ # program is run... # diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad deleted file mode 100644 index c8f2d150246..00000000000 --- a/print/cups/patches/patch-ad +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2001/02/27 17:37:53 jlam Exp $ - ---- configure.in.orig Tue Feb 20 12:32:59 2001 -+++ configure.in -@@ -494,4 +494,5 @@ - - dnl Fix "mandir" variable... -+AMANDIR="\${mandir}" - if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then - case "$uname" in -@@ -664,6 +665,6 @@ - - dnl Set the CUPS_DOCROOT directory... --CUPS_DOCROOT='${datadir}/doc/cups' --AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups") -+CUPS_DOCROOT='${datadir}/doc/html/cups' -+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/html/cups") - AC_SUBST(CUPS_DOCROOT) - -@@ -671,5 +672,5 @@ - AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath") - --AC_OUTPUT(Makedefs cups.sh) -+AC_OUTPUT(Makedefs cups.sh conf/cupsd.conf) - - dnl diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag deleted file mode 100644 index a5436f61620..00000000000 --- a/print/cups/patches/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ag,v 1.6 2001/02/27 17:37:54 jlam Exp $ - ---- cgi-bin/Makefile.orig Thu Feb 15 08:34:14 2001 -+++ cgi-bin/Makefile -@@ -50,10 +50,10 @@ - # - - install: -- -$(MKDIR) $(SERVERROOT)/cgi-bin -- $(CHMOD) ugo+rx $(SERVERROOT) -- $(CHMOD) ugo+rx $(SERVERROOT)/cgi-bin -- $(INSTALL_BIN) $(CGIS) $(SERVERROOT)/cgi-bin -+ -$(MKDIR) $(SERVERBIN)/cgi-bin -+ $(CHMOD) ugo+rx $(SERVERBIN) -+ $(CHMOD) ugo+rx $(SERVERBIN)/cgi-bin -+ $(INSTALL_BIN) $(CGIS) $(SERVERBIN)/cgi-bin - - - # diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah deleted file mode 100644 index b8a3eb5729c..00000000000 --- a/print/cups/patches/patch-ah +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2001/02/27 17:37:54 jlam Exp $ - ---- scheduler/job.c.orig Tue Feb 27 00:20:56 2001 -+++ scheduler/job.c -@@ -189,6 +189,8 @@ - free(current->filetypes); - - free(current); -+ -+ NumJobs --; - } - - return; -@@ -563,6 +565,8 @@ - prev->next = job; - else - Jobs = job; -+ -+ NumJobs ++; - } - - /* -@@ -619,6 +623,12 @@ - closedir(dir); - - /* -+ * Clean out old jobs as needed... -+ */ -+ -+ CleanJobs(); -+ -+ /* - * Check to see if we need to start any jobs... - */ - -@@ -1714,6 +1724,7 @@ - - StopJob(job->id); - job->state->values[0].integer = IPP_JOB_PENDING; -+ SaveJob(job->id); - } - else if (job->status > 0) - { -@@ -1728,7 +1739,10 @@ - CancelJob(job->id, 0); - - if (JobHistory) -+ { - job->state->values[0].integer = IPP_JOB_ABORTED; -+ SaveJob(job->id); -+ } - - CheckJobs(); - } -@@ -1749,7 +1763,10 @@ - CancelJob(job->id, 0); - - if (JobHistory) -+ { - job->state->values[0].integer = IPP_JOB_COMPLETED; -+ SaveJob(job->id); -+ } - - CheckJobs(); - } diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai deleted file mode 100644 index b97a4d3ffb2..00000000000 --- a/print/cups/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.7 2001/03/07 04:09:59 jlam Exp $ - ---- scheduler/cert.c.orig Mon Jan 22 10:03:58 2001 -+++ scheduler/cert.c -@@ -235,7 +235,7 @@ - * the current time, as available... - */ - -- if ((fp = fopen("/dev/random", "rb")) == NULL) -+ if ((fp = fopen("/dev/urandom", "rb")) == NULL) - { - /* - * Get the time in usecs and use it as the initial seed... diff --git a/print/cups/patches/patch-aj b/print/cups/patches/patch-aj deleted file mode 100644 index 61f4ac2cca8..00000000000 --- a/print/cups/patches/patch-aj +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aj,v 1.7 2001/03/07 04:09:59 jlam Exp $ - ---- scheduler/main.c.orig Mon Jan 22 10:04:00 2001 -+++ scheduler/main.c -@@ -234,14 +234,14 @@ - * Read configuration... - */ - -- InitCerts(); -- - if (!ReadConfiguration()) - { - syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!", - ConfigurationFile); - return (1); - } -+ -+ InitCerts(); - - LoadAllJobs(); - diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak deleted file mode 100644 index b83bba4201b..00000000000 --- a/print/cups/patches/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ak,v 1.7 2001/03/30 17:36:43 jlam Exp $ - ---- scheduler/ipp.c.orig Wed Feb 7 14:41:37 2001 -+++ scheduler/ipp.c -@@ -4657,11 +4657,11 @@ - - if (strcmp(attr->name, "job-originating-host-name") == 0 || - strcmp(attr->name, "job-originating-user-name") == 0 || -- strcpy(attr->name, "job-media-sheets-completed") == 0 || -- strcpy(attr->name, "job-k-octets") == 0 || -- strcpy(attr->name, "job-id") == 0 || -- strcpy(attr->name, "job-sheets") == 0 || -- strncpy(attr->name, "time-at-", 8) == 0) -+ strcmp(attr->name, "job-media-sheets-completed") == 0 || -+ strcmp(attr->name, "job-k-octets") == 0 || -+ strcmp(attr->name, "job-id") == 0 || -+ strcmp(attr->name, "job-sheets") == 0 || -+ strncmp(attr->name, "time-at-", 8) == 0) - continue; /* Read-only attrs */ - - if (strcmp(attr->name, "job-priority") == 0 && diff --git a/print/cups/pkg/MESSAGE b/print/cups/pkg/MESSAGE index d1254767830..4ba927c447e 100644 --- a/print/cups/pkg/MESSAGE +++ b/print/cups/pkg/MESSAGE @@ -1,8 +1,7 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.2 2001/01/28 02:05:38 jlam Exp $ +$NetBSD: MESSAGE,v 1.3 2001/05/15 17:43:22 jlam Exp $ You may want to backup /etc/printcap before starting CUPS for the first time, as the CUPS scheduler may overwrite this file with automatically generated content. - ========================================================================== diff --git a/print/cups/pkg/PLIST b/print/cups/pkg/PLIST index 112ac52b6bb..cb37d6ad7f4 100644 --- a/print/cups/pkg/PLIST +++ b/print/cups/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2001/02/08 19:05:02 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2001/05/15 17:43:23 jlam Exp $ bin/cancel bin/disable bin/enable @@ -21,7 +21,7 @@ lib/libcups.a lib/libcups.la lib/libcups.so lib/libcups.so.2 -lib/libcups.so.2.1 +lib/libcups.so.2.3 lib/libcupsimage.a lib/libcupsimage.la lib/libcupsimage.so @@ -183,6 +183,7 @@ share/cups/fonts/Utopia-Regular share/cups/fonts/ZapfChancery-MediumItalic share/cups/fonts/ZapfDingbats share/cups/model/deskjet.ppd +share/cups/model/deskjet2.ppd share/cups/model/epson24.ppd share/cups/model/epson9.ppd share/cups/model/laserjet.ppd |