From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 13 08:50:18 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6B2B37B404 for ; Fri, 13 Jun 2003 08:50:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10AAD43FE5 for ; Fri, 13 Jun 2003 08:50:14 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5DFoEUp069223 for ; Fri, 13 Jun 2003 08:50:14 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5DFoEg7069222; Fri, 13 Jun 2003 08:50:14 -0700 (PDT) Resent-Date: Fri, 13 Jun 2003 08:50:14 -0700 (PDT) Resent-Message-Id: <200306131550.h5DFoEg7069222@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7ACD937B40F for ; Fri, 13 Jun 2003 08:47:08 -0700 (PDT) Received: from hfep03.dion.ne.jp (hfep03.dion.ne.jp [203.181.105.69]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B88A43FB1 for ; Fri, 13 Jun 2003 08:47:07 -0700 (PDT) (envelope-from tkato@prontomail.com) Received: from localhost ([61.198.222.53]) by hfep03.dion.ne.jp with SMTP id <20030613154649795.ZWUI@hfep03.dion.ne.jp> for ; Sat, 14 Jun 2003 00:46:49 +0900 Message-Id: <20030614004545.19a867c6.tkato@prontomail.com> Date: Sat, 14 Jun 2003 00:45:45 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53286: Update port: print/cups to 1.1.19 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2003 15:50:19 -0000 >Number: 53286 >Category: ports >Synopsis: Update port: print/cups to 1.1.19 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 13 08:50:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE i386 >Organization: >Environment: >Description: - Update to verison 1.1.19 [print/cups-base] Remove file: distinfo files/patch-cgi-bin-ipp-var.c-1.1.19 [print/cups-lpr] Remove file: distinfo Following PRs should be superseded by this one: [2003/05/20] ports/52509 ports-bugs Update port: print/cups-base (dangling symlinks) >How-To-Repeat: >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # print_cups-base.diff # print_cups-lpr.diff # print_cups.diff # echo x - print_cups-base.diff sed 's/^X//' >print_cups-base.diff << 'END-of-print_cups-base.diff' Xdiff -urN /usr/ports/print/cups-base/Makefile print/cups-base/Makefile X--- /usr/ports/print/cups-base/Makefile Mon Jun 9 07:15:33 2003 X+++ print/cups-base/Makefile Wed Jun 11 01:15:07 2003 X@@ -17,26 +17,37 @@ X MAINTAINER= ports@FreeBSD.org X COMMENT= The Common UNIX Printing System: headers, libs, & daemons X X+USE_REINPLACE= yes X INSTALLS_SHLIB= yes X X+MANLANG= "" fr X+ X+post-patch: X+ @${REINPLACE_CMD} -e '/SILENT/d' \ X+ ${WRKSRC}/Makedefs.in X+ @${REINPLACE_CMD} -e '/LN/d' \ X+ ${WRKSRC}/man/Makefile ${WRKSRC}/man/fr/Makefile X+ X pre-install: X- -@${ECHO_CMD} "===>" Stopping cupsd ... X- -killall cupsd || true X- -rm -fr ${PREFIX}/etc/cups/certs/* || true X+ @${ECHO_MSG} "===>" Stopping cupsd ... X+ -killall cupsd || ${TRUE} X+ ${RM} -fr ${PREFIX}/etc/cups/certs/* || ${TRUE} X X post-install: X+ ${MKDIR} ${CUPS_ETCDIR} X+.for f in classes.conf client.conf cupsd.conf printers.conf X+ ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N X+ cd ${CUPS_ETCDIR}; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi X+.endfor # classes.conf client.conf cupsd.conf printers.conf X+.for f in mime.convs mime.types X+ ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f} X+.endfor # mime.convs mime.types X cd ${CUPS_RCDIR}; ${MV} cups cups.sh.sample X ${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete X ${FIND} ${PREFIX}/man/fr/cat* -type l -name '*.0' -delete X ${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp X ${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR} X ${CHMOD} -R g+w ${CUPS_SPOOLDIR} X-.for f in classes.conf client.conf cupsd.conf printers.conf X- cd ${CUPS_ETCDIR};\ X- if test ! -f ${f}.N; then cp -p ${f} ${f}.N; else true; fi X-.endfor # classes.conf client.conf cupsd.conf printers.conf X- X-MANLANG= "" fr X X .include "${.CURDIR}/../../print/cups/Makefile.common" X .include Xdiff -urN /usr/ports/print/cups-base/distinfo print/cups-base/distinfo X--- /usr/ports/print/cups-base/distinfo Thu Jan 23 21:18:44 2003 X+++ print/cups-base/distinfo Thu Jan 1 09:00:00 1970 X@@ -1 +0,0 @@ X-MD5 (cups-1.1.18-source.tar.bz2) = 4a8a423a8268d088bffa19f6515883a7 Xdiff -urN /usr/ports/print/cups-base/files/patch-Makefile print/cups-base/files/patch-Makefile X--- /usr/ports/print/cups-base/files/patch-Makefile Thu Jan 23 21:18:44 2003 X+++ print/cups-base/files/patch-Makefile Wed Jun 11 01:04:55 2003 X@@ -1,5 +1,5 @@ X---- Makefile.orig Tue Dec 17 13:56:25 2002 X-+++ Makefile Wed Jan 22 06:18:57 2003 X+--- Makefile.orig Fri Mar 7 01:36:00 2003 X++++ Makefile Wed Jun 11 01:03:08 2003 X @@ -28,8 +28,8 @@ X # Directories to make... X # X@@ -11,3 +11,12 @@ X X # X # Make all targets... X+@@ -72,8 +72,6 @@ X+ echo Installing in $$dir... ;\ X+ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ X+ done X+- echo Installing in conf... X+- (cd conf; $(MAKE) $(MFLAGS) install) X+ echo Installing in data... X+ (cd data; $(MAKE) $(MFLAGS) install) X+ echo Installing in doc... Xdiff -urN /usr/ports/print/cups-base/files/patch-cgi-bin-ipp-var.c-1.1.19 print/cups-base/files/patch-cgi-bin-ipp-var.c-1.1.19 X--- /usr/ports/print/cups-base/files/patch-cgi-bin-ipp-var.c-1.1.19 Fri Jan 31 21:46:49 2003 X+++ print/cups-base/files/patch-cgi-bin-ipp-var.c-1.1.19 Thu Jan 1 09:00:00 1970 X@@ -1,53 +0,0 @@ X---- cgi-bin/ipp-var.c.orig Sat Jan 25 10:07:30 2003 X-+++ cgi-bin/ipp-var.c Sat Jan 25 10:08:15 2003 X-@@ -103,14 +103,35 @@ X- int port; /* URI data */ X- int ishttps; /* Using encryption? */ X- const char *server; /* Name of server */ X-+ char servername[1024];/* Locale server name */ X- struct tm *date; /* Date information */ X- X- X-+ /* X-+ * Set common CGI template variables... X-+ */ X-+ X- ippSetServerVersion(); X- X-- server = getenv("SERVER_NAME"); X-+ /* X-+ * Get the server name associated with the client interface as well as X-+ * the locally configured hostname. We'll check *both* of these to X-+ * see if the printer URL is local... X-+ */ X-+ X-+ server = getenv("SERVER_NAME"); X-+ gethostname(servername, sizeof(servername)); X-+ X-+ /* X-+ * Flag whether we are using SSL on this connection... X-+ */ X-+ X- ishttps = getenv("HTTPS") != NULL; X- X-+ /* X-+ * Loop through the attributes and set them for the template... X-+ */ X-+ X- for (attr = response->attrs; X- attr && attr->group_tag == IPP_TAG_OPERATION; X- attr = attr->next); X-@@ -239,10 +260,11 @@ X- strcmp(method, "http") == 0) X- { X- /* X-- * Map localhost access to localhost and local port... X-+ * Map local access to a local URI... X- */ X- X-- if (strcasecmp(hostname, server) == 0) X-+ if (strcasecmp(hostname, server) == 0 || X-+ strcasecmp(hostname, servername) == 0) X- { X- /* X- * Make URI relative to the current server... Xdiff -urN /usr/ports/print/cups-base/pkg-plist print/cups-base/pkg-plist X--- /usr/ports/print/cups-base/pkg-plist Sat May 17 06:15:08 2003 X+++ print/cups-base/pkg-plist Wed Jun 11 00:45:49 2003 X@@ -2,16 +2,20 @@ X @exec /usr/bin/killall cupsd || true X @exec /bin/rm -fr %D/etc/cups/certs/* 2>/dev/null || true X bin/cups-config X+@unexec if cmp -s %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; then rm -f %D/etc/cups/classes.conf; fi X etc/cups/classes.conf.N X-@exec if ! /bin/test -f %D/etc/cups/classes.conf; then /bin/cp -p %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; else true; fi X+@exec if test ! -f %D/etc/cups/classes.conf; then cp -p %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; fi X+@unexec if cmp -s %D/etc/cups/client.conf.N %D/etc/cups/client.conf; then rm -f %D/etc/cups/client.conf; fi X etc/cups/client.conf.N X-@exec if ! /bin/test -f %D/etc/cups/client.conf; then /bin/cp -p %D/etc/cups/client.conf.N %D/etc/cups/client.conf; else true; fi X+@exec if test ! -f %D/etc/cups/client.conf; then cp -p %D/etc/cups/client.conf.N %D/etc/cups/client.conf; fi X+@unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi X etc/cups/cupsd.conf.N X-@exec if ! /bin/test -f %D/etc/cups/cupsd.conf; then /bin/cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; else true; fi X+@exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi X etc/cups/mime.convs X etc/cups/mime.types X+@unexec if cmp -s %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; then rm -f %D/etc/cups/printers.conf; fi X etc/cups/printers.conf.N X-@exec if ! /bin/test -f %D/etc/cups/printers.conf; then /bin/cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; else true; fi X+@exec if test ! -f %D/etc/cups/printers.conf; then cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; fi X etc/rc.d/cups.sh.sample X include/cups/cups.h X include/cups/http.h X@@ -41,9 +45,11 @@ X libexec/cups/cgi-bin/printers.cgi X libexec/cups/daemon/cups-lpd X libexec/cups/daemon/cups-polld X+libexec/cups/filter/gziptoany X libexec/cups/filter/hpgltops X libexec/cups/filter/imagetops X libexec/cups/filter/imagetoraster X+libexec/cups/filter/libcupsimage.a X libexec/cups/filter/pdftops X libexec/cups/filter/pstops X libexec/cups/filter/rastertodymo X@@ -120,6 +126,51 @@ X share/cups/templates/classes.tmpl X share/cups/templates/config-printer.tmpl X share/cups/templates/config-printer2.tmpl X+share/cups/templates/de/add-class.tmpl X+share/cups/templates/de/add-printer.tmpl X+share/cups/templates/de/admin-op.tmpl X+share/cups/templates/de/admin.tmpl X+share/cups/templates/de/choose-device.tmpl X+share/cups/templates/de/choose-make.tmpl X+share/cups/templates/de/choose-members.tmpl X+share/cups/templates/de/choose-model.tmpl X+share/cups/templates/de/choose-serial.tmpl X+share/cups/templates/de/choose-uri.tmpl X+share/cups/templates/de/class-added.tmpl X+share/cups/templates/de/class-confirm.tmpl X+share/cups/templates/de/class-deleted.tmpl X+share/cups/templates/de/class-modified.tmpl X+share/cups/templates/de/classes.tmpl X+share/cups/templates/de/config-printer.tmpl X+share/cups/templates/de/config-printer2.tmpl X+share/cups/templates/de/error.tmpl X+share/cups/templates/de/header.tmpl X+share/cups/templates/de/job-cancel.tmpl X+share/cups/templates/de/job-hold.tmpl X+share/cups/templates/de/job-op.tmpl X+share/cups/templates/de/job-release.tmpl X+share/cups/templates/de/job-restart.tmpl X+share/cups/templates/de/jobs.tmpl X+share/cups/templates/de/modify-class.tmpl X+share/cups/templates/de/modify-printer.tmpl X+share/cups/templates/de/option-boolean.tmpl X+share/cups/templates/de/option-header.tmpl X+share/cups/templates/de/option-pickmany.tmpl X+share/cups/templates/de/option-pickone.tmpl X+share/cups/templates/de/option-trailer.tmpl X+share/cups/templates/de/printer-accept.tmpl X+share/cups/templates/de/printer-added.tmpl X+share/cups/templates/de/printer-configured.tmpl X+share/cups/templates/de/printer-confirm.tmpl X+share/cups/templates/de/printer-deleted.tmpl X+share/cups/templates/de/printer-modified.tmpl X+share/cups/templates/de/printer-purge.tmpl X+share/cups/templates/de/printer-reject.tmpl X+share/cups/templates/de/printer-start.tmpl X+share/cups/templates/de/printer-stop.tmpl X+share/cups/templates/de/printers.tmpl X+share/cups/templates/de/test-page.tmpl X+share/cups/templates/de/trailer.tmpl X share/cups/templates/error.tmpl X share/cups/templates/fr/add-class.tmpl X share/cups/templates/fr/add-printer.tmpl X@@ -198,6 +249,33 @@ X share/doc/cups/cmp.pdf X share/doc/cups/cups.css X share/doc/cups/cupsdoc.css X+share/doc/cups/de/documentation.html X+share/doc/cups/de/images/accept-jobs.gif X+share/doc/cups/de/images/add-class.gif X+share/doc/cups/de/images/add-printer.gif X+share/doc/cups/de/images/cancel-job.gif X+share/doc/cups/de/images/config-printer.gif X+share/doc/cups/de/images/continue.gif X+share/doc/cups/de/images/delete-class.gif X+share/doc/cups/de/images/delete-printer.gif X+share/doc/cups/de/images/hold-job.gif X+share/doc/cups/de/images/manage-classes.gif X+share/doc/cups/de/images/manage-jobs.gif X+share/doc/cups/de/images/manage-printers.gif X+share/doc/cups/de/images/modify-class.gif X+share/doc/cups/de/images/modify-printer.gif X+share/doc/cups/de/images/navbar.gif X+share/doc/cups/de/images/print-test-page.gif X+share/doc/cups/de/images/reject-jobs.gif X+share/doc/cups/de/images/release-job.gif X+share/doc/cups/de/images/restart-job.gif X+share/doc/cups/de/images/show-active.gif X+share/doc/cups/de/images/show-completed.gif X+share/doc/cups/de/images/start-class.gif X+share/doc/cups/de/images/start-printer.gif X+share/doc/cups/de/images/stop-class.gif X+share/doc/cups/de/images/stop-printer.gif X+share/doc/cups/de/index.html X share/doc/cups/documentation.html X share/doc/cups/fr/cups.css X share/doc/cups/fr/cupsdoc.css X@@ -206,8 +284,6 @@ X share/doc/cups/fr/images/add-class.gif X share/doc/cups/fr/images/add-printer.gif X share/doc/cups/fr/images/cancel-job.gif X-share/doc/cups/fr/images/cancel-jobs.gif X-share/doc/cups/fr/images/cancel.gif X share/doc/cups/fr/images/config-printer.gif X share/doc/cups/fr/images/continue.gif X share/doc/cups/fr/images/delete-class.gif X@@ -242,8 +318,6 @@ X share/doc/cups/images/add-class.gif X share/doc/cups/images/add-printer.gif X share/doc/cups/images/cancel-job.gif X-share/doc/cups/images/cancel-jobs.gif X-share/doc/cups/images/cancel.gif X share/doc/cups/images/classes.gif X share/doc/cups/images/config-printer.gif X share/doc/cups/images/continue.gif X@@ -253,7 +327,6 @@ X share/doc/cups/images/cups-small.gif X share/doc/cups/images/delete-class.gif X share/doc/cups/images/delete-printer.gif X-share/doc/cups/images/draft.gif X share/doc/cups/images/hold-job.gif X share/doc/cups/images/left.gif X share/doc/cups/images/logo.gif X@@ -282,6 +355,7 @@ X share/doc/cups/ipp.pdf X share/doc/cups/overview.html X share/doc/cups/overview.pdf X+share/doc/cups/robots.txt X share/doc/cups/sam.html X share/doc/cups/sam.pdf X share/doc/cups/sdd.html X@@ -305,37 +379,39 @@ X share/locale/cs/cups_cs X share/locale/de/cups_de X share/locale/en/cups_en X+share/locale/en_US/cups_en_US X share/locale/es/cups_es X share/locale/fr/cups_fr X share/locale/he/cups_he X share/locale/it/cups_it X-share/locale/ru_RU.cp1251/cups_ru_RU.cp1251 X-share/locale/ru_RU.koi8r/cups_ru_RU.koi8r X+share/locale/ru_RU/cups_ru_RU X share/locale/sv/cups_sv X share/locale/uk/cups_uk X-share/locale/uk_UA.cp1251/cups_uk_UA.cp1251 X+share/locale/uk_UA/cups_uk_UA X share/locale/zh_CN/cups_zh_CN X-@dirrm share/locale/zh_CN X-@dirrm share/locale/uk_UA.cp1251 X-@dirrm share/locale/uk X-@dirrm share/locale/sv X-@dirrm share/locale/ru_RU.koi8r X-@dirrm share/locale/ru_RU.cp1251 X-@dirrm share/locale/it X-@dirrm share/locale/he X-@dirrm share/locale/fr X-@dirrm share/locale/es X-@dirrm share/locale/en X-@dirrm share/locale/de X-@dirrm share/locale/cs X-@dirrm share/locale/be X-@dirrm share/locale/C X+@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true X+@unexec rmdir %D/share/locale/uk_UA 2>/dev/null || true X+@unexec rmdir %D/share/locale/uk 2>/dev/null || true X+@unexec rmdir %D/share/locale/sv 2>/dev/null || true X+@unexec rmdir %D/share/locale/ru_RU 2>/dev/null || true X+@unexec rmdir %D/share/locale/it 2>/dev/null || true X+@unexec rmdir %D/share/locale/he 2>/dev/null || true X+@unexec rmdir %D/share/locale/fr 2>/dev/null || true X+@unexec rmdir %D/share/locale/es 2>/dev/null || true X+@unexec rmdir %D/share/locale/en 2>/dev/null || true X+@unexec rmdir %D/share/locale/de 2>/dev/null || true X+@unexec rmdir %D/share/locale/cs 2>/dev/null || true X+@unexec rmdir %D/share/locale/be 2>/dev/null || true X+@unexec rmdir %D/share/locale/C 2>/dev/null || true X+@unexec rmdir %D/share/locale 2>/dev/null || true X @dirrm share/doc/cups/images X @dirrm share/doc/cups/fr/images X @dirrm share/doc/cups/fr X+@dirrm share/doc/cups/de/images X+@dirrm share/doc/cups/de X @dirrm share/doc/cups X-@dirrm share/doc X @dirrm share/cups/templates/fr X+@dirrm share/cups/templates/de X @dirrm share/cups/templates X @dirrm share/cups/model X @dirrm share/cups/fonts X@@ -349,6 +425,7 @@ X @dirrm libexec/cups/backend X @dirrm libexec/cups X @dirrm include/cups X+@dirrm etc/cups/ppd X @dirrm etc/cups/interfaces X @dirrm etc/cups/certs X-@dirrm etc/cups X+@unexec rmdir %D/etc/cups 2>/dev/null || true END-of-print_cups-base.diff echo x - print_cups-lpr.diff sed 's/^X//' >print_cups-lpr.diff << 'END-of-print_cups-lpr.diff' Xdiff -urN /usr/ports/print/cups-lpr/Makefile print/cups-lpr/Makefile X--- /usr/ports/print/cups-lpr/Makefile Mon Jun 9 07:15:33 2003 X+++ print/cups-lpr/Makefile Tue Jun 10 22:34:13 2003 X@@ -17,11 +17,20 @@ X MAINTAINER= ports@FreeBSD.org X COMMENT= The CUPS BSD and system V compatibility binaries (lp* commands) X X+USE_REINPLACE= yes X+ X+MANLANG= "" fr X+ X+post-patch: X+ @${REINPLACE_CMD} -e '/SILENT/d' \ X+ ${WRKSRC}/Makedefs.in X+ @${REINPLACE_CMD} -e '/LN/d' \ X+ ${WRKSRC}/man/Makefile ${WRKSRC}/man/fr/Makefile X+ X post-install: X ${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete X ${FIND} ${PREFIX}/man/fr/cat* -type l -name '*.0' -delete X X-MANLANG= "" fr X X .include "${.CURDIR}/../../print/cups/Makefile.common" X .include Xdiff -urN /usr/ports/print/cups-lpr/distinfo print/cups-lpr/distinfo X--- /usr/ports/print/cups-lpr/distinfo Thu Jan 23 21:18:44 2003 X+++ print/cups-lpr/distinfo Thu Jan 1 09:00:00 1970 X@@ -1 +0,0 @@ X-MD5 (cups-1.1.18-source.tar.bz2) = 4a8a423a8268d088bffa19f6515883a7 Xdiff -urN /usr/ports/print/cups-lpr/files/patch-Makefile print/cups-lpr/files/patch-Makefile X--- /usr/ports/print/cups-lpr/files/patch-Makefile Thu Jan 23 21:18:44 2003 X+++ print/cups-lpr/files/patch-Makefile Tue Jun 10 22:24:15 2003 X@@ -1,5 +1,5 @@ X---- Makefile.orig Tue Dec 17 13:56:25 2002 X-+++ Makefile Wed Jan 22 08:02:38 2003 X+--- Makefile.orig Fri Mar 7 01:36:00 2003 X++++ Makefile Tue Jun 10 22:24:03 2003 X @@ -28,8 +28,7 @@ X # Directories to make... X # X@@ -19,7 +19,7 @@ X echo Making all in $$dir... ;\ X (cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\ X done X-@@ -67,104 +66,11 @@ X+@@ -67,103 +66,11 @@ X # Install object and target files... X # X X@@ -62,7 +62,7 @@ X - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ X - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ X - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ X-- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \ X+- $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \ X - $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ X - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ X - $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ X@@ -121,7 +121,6 @@ X - X -tardist: X - epm $(EPMFLAGS) -f tardist cups X-- X- # X- # End of "$Id: Makefile,v 1.47 2002/12/17 18:56:25 swdev Exp $". X+ X # X+ # End of "$Id: Makefile,v 1.48 2003/03/06 16:36:00 mike Exp $". Xdiff -urN /usr/ports/print/cups-lpr/files/patch-man-Makefile.common print/cups-lpr/files/patch-man-Makefile.common X--- /usr/ports/print/cups-lpr/files/patch-man-Makefile.common Thu Jan 23 21:18:44 2003 X+++ print/cups-lpr/files/patch-man-Makefile.common Tue Jun 10 22:32:55 2003 X@@ -1,14 +1,13 @@ X---- man/Makefile.common.orig Tue Dec 17 13:59:55 2002 X-+++ man/Makefile.common Wed Jan 22 07:38:08 2003 X+--- man/Makefile.common.orig Wed Dec 18 03:59:55 2002 X++++ man/Makefile.common Tue Jun 10 22:32:41 2003 X @@ -26,9 +26,8 @@ X # Man pages... X # X X -MAN1 = backend.man \ X-- cupstestppd.man \ X++MAN1 = cupsaddsmb.man \ X+ cupstestppd.man \ X - filter.man \ X-+MAN1 = cupsaddsmb.man\ X-+ cupstestppd.man\ X lp.man \ X lpoptions.man \ X lppasswd.man \ Xdiff -urN /usr/ports/print/cups-lpr/pkg-plist print/cups-lpr/pkg-plist X--- /usr/ports/print/cups-lpr/pkg-plist Thu Jan 23 21:18:44 2003 X+++ print/cups-lpr/pkg-plist Tue Jun 10 22:33:50 2003 X@@ -1,4 +1,5 @@ X bin/cancel X+bin/cupstestppd X bin/disable X bin/enable X bin/lp X@@ -9,10 +10,9 @@ X bin/lprm X bin/lpstat X sbin/accept X-sbin/reject X sbin/cupsaddsmb X-sbin/cupstestppd X sbin/lpadmin X sbin/lpc X sbin/lpinfo X sbin/lpmove X+sbin/reject END-of-print_cups-lpr.diff echo x - print_cups.diff sed 's/^X//' >print_cups.diff << 'END-of-print_cups.diff' Xdiff -urN /usr/ports/print/cups/Makefile.common print/cups/Makefile.common X--- /usr/ports/print/cups/Makefile.common Sat May 17 06:15:08 2003 X+++ print/cups/Makefile.common Sat Jun 14 00:12:34 2003 X@@ -9,10 +9,10 @@ X ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \ X ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/ X X-CUPS_VERSION= 1.1.18 X+CUPS_VERSION= 1.1.19 X CUPS_REVISION= 0 X CUPS_PORTVER= ${CUPS_VERSION}.${CUPS_REVISION} X-CUPS_PORTREV= 5 X+CUPS_PORTREV= 0 X CUPS_PORTEPOCH= 0 X CUPS_FILESDIR= ${.CURDIR}/../../print/cups/files X CUPS_ETCDIR= ${PREFIX}/etc/cups X@@ -39,6 +39,8 @@ X .endif # ${CUPS_REVISION} < 1 X X DISTFILES= ${DISTNAME}.tar.bz2 X+ X+MD5_FILE= ${.CURDIR}/../../print/cups/distinfo X WRKSRC= ${WRKDIR}/cups-${CUPS_VERSION} X X LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ X@@ -52,6 +54,8 @@ X USE_PERL5_RUN= yes X GNU_CONFIGURE= yes X X+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} X+ X CONFIGURE_ARGS+= --localstatedir=/var \ X --disable-pam \ X --disable-slp \ X@@ -60,14 +64,12 @@ X --with-docdir=${CUPS_DOCSDIR} \ X --with-rcdir=${CUPS_RCDIR} X X-CONFIGURE_ARGS+= CPPFLAGS="-I${PREFIX}/include" X-CONFIGURE_ARGS+= CFLAGS="${CFLAGS} -I.. -I${PREFIX}/include" X-CONFIGURE_ARGS+= CXXFLAGS="${CFLAGS} -I.. -I${PREFIX}/include" X+CONFIGURE_ARGS+= CPPFLAGS="-I.. -I${LOCALBASE}/include" X CONFIGURE_ARGS+= DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib" X-CONFIGURE_ARGS+= LDFLAGS="-L${PREFIX}/lib" X+CONFIGURE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib" X X pre-configure:: X- @${ECHO_CMD} Configuring CUPS with options: X- @${ECHO_CMD} ${CONFIGURE_ARGS} | fmt X+ @${ECHO_MSG} Configuring CUPS with options: X+ @${ECHO_MSG} ${CONFIGURE_ARGS} | fmt X X .endif # ${PORTNAME} != "cups" Xdiff -urN /usr/ports/print/cups/distinfo print/cups/distinfo X--- /usr/ports/print/cups/distinfo Wed Jan 22 22:54:54 2003 X+++ print/cups/distinfo Tue Jun 10 20:20:08 2003 X@@ -1 +1 @@ X-This is a metaport; it has no source of its own. X+MD5 (cups-1.1.19-source.tar.bz2) = 04cbeed9a8acfe23624f1cb6be9c3eac END-of-print_cups.diff exit >Release-Note: >Audit-Trail: >Unformatted: