From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 4 05:00:22 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A1D8416A403 for ; Mon, 4 Dec 2006 05:00:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E50543C9D for ; Mon, 4 Dec 2006 04:59:51 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB450LKx098975 for ; Mon, 4 Dec 2006 05:00:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB450LEq098974; Mon, 4 Dec 2006 05:00:21 GMT (envelope-from gnats) Resent-Date: Mon, 4 Dec 2006 05:00:21 GMT Resent-Message-Id: <200612040500.kB450LEq098974@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, "Frank Mayhar" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 77A2B16A40F for ; Mon, 4 Dec 2006 04:58:25 +0000 (UTC) (envelope-from frank@exit.com) Received: from tinker.exit.com (tinker.exit.com [206.223.0.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B83B43C9D for ; Mon, 4 Dec 2006 04:57:54 +0000 (GMT) (envelope-from frank@exit.com) Received: from jill.exit.com (jill.exit.com [206.223.0.4]) by tinker.exit.com (8.13.8/8.13.8) with ESMTP id kB44wOUV024603 for ; Sun, 3 Dec 2006 20:58:24 -0800 (PST) (envelope-from frank@exit.com) Message-Id: <1165208304.80735@jill.exit.com> Date: Sun, 3 Dec 2006 20:58:24 -0800 From: "Frank Mayhar" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/106292: [patch] Update print/cup-pstoraster to latest version, take maintainership. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Dec 2006 05:00:22 -0000 >Number: 106292 >Category: ports >Synopsis: [patch] Update print/cup-pstoraster to latest version, take maintainership. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Dec 04 05:00:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Frank Mayhar >Release: FreeBSD 6.1-STABLE amd64 >Organization: Exit Consulting >Environment: System: FreeBSD 6.1-STABLE #1: Wed Jul 12 10:17:42 PDT 2006 root@jill.exit.com:/usr/obj/usr/src/sys/JILL >Description: Bring cups-pstoraster up-to-date with espgs 8.15.3. Take maintainership away from ports@. >How-To-Repeat: >Fix: --- cups-pstoraster.diff begins here --- Index: cups-pstoraster/Makefile =================================================================== RCS file: /cvs/repos/ports/print/cups-pstoraster/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- cups-pstoraster/Makefile 6 Aug 2006 08:54:01 -0000 1.23 +++ cups-pstoraster/Makefile 2 Dec 2006 06:23:57 -0000 @@ -6,7 +6,7 @@ # PORTNAME= cups-pstoraster -PORTVERSION= 8.15 +PORTVERSION= 8.15.3 CATEGORIES= print MASTER_SITES= \ ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ \ @@ -14,35 +14,32 @@ ftp://ftp3.easysw.com/pub/%SUBDIR%/ \ http://ftp.easysw.com/pub/%SUBDIR%/ \ http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ -MASTER_SITE_SUBDIR= ghostscript/test +MASTER_SITE_SUBDIR= ghostscript/${PORTVERSION} DIST_SUBDIR= ghostscript -MAINTAINER= ports@FreeBSD.org +MAINTAINER= frank@exit.com COMMENT= Postscript interpreter for CUPS printing to non-PS printers -PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${GHOSTSCRIPT_PORT}:patch LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base -ESPGS_VER= ${PORTVERSION}rc3 +ESPGS_VER= ${PORTVERSION} +GS_VERSION= 8.15 DISTNAME= espgs-${ESPGS_VER}-source -EXTRACT_AFTER_ARGS= | ${TAR} -xf - espgs-${ESPGS_VER}/pstoraster -ESPGS_WRKSRC= ${WRKDIR}/espgs-${ESPGS_VER}/pstoraster -WRKSRC= ${WRKDIRPREFIX}$$(${REALPATH} ${PORTSDIR})/${GHOSTSCRIPT_PORT}/work/ghostscript -PATCH_WRKSRC= ${ESPGS_WRKSRC} +WRKSRC= ${WRKDIR}/espgs-${PORTVERSION} + +DATADIR= ${TARGETDIR}/share/ghostscript USE_BZIP2= yes -USE_GHOSTSCRIPT_RUN= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --without-x --without-ijs --without-gimp-print \ - --with-gs=espgs +CONFIGURE_ARGS= --without-x --with-gs=espgs MAKE_ARGS= CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \ DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev" - +PLIST_SUB= GS_VERSION="${GS_VERSION}" PLIST_FILES= bin/espgs etc/cups/pstoraster.convs \ libexec/cups/filter/pstopxl libexec/cups/filter/pstoraster \ share/cups/model/pxlcolor.ppd share/cups/model/pxlmono.ppd @@ -51,15 +48,19 @@ IGNORE= doesn't build with AFPL version of Ghostscript; please use gnu ghostscript instead .endif +pre-configure: + ${RM} -f ${WRKSRC}/ijs/config.guess ${WRKSRC}/ijs/missing ${WRKSRC}/ijs/config.sub ${WRKSRC}/ijs/install-sh ${WRKSRC}/ijs/ltmain.sh + ${RM} -f ${WRKSRC}/trunk/ijs/config.guess ${WRKSRC}/trunk/ijs/missing ${WRKSRC}/trunk/ijs/config.sub ${WRKSRC}/trunk/ijs/install-sh ${WRKSRC}/trunk/ijs/ltmain.sh + post-patch: - ${LN} -sf ${ESPGS_WRKSRC}/gdevcups.c ${WRKSRC}/src + ${LN} -sf ${WRKSRC}/pstoraster/gdevcups.c ${WRKSRC}/src ${CAT} ${FILESDIR}/cups.contrib.mak >> ${WRKSRC}/src/contrib.mak .for file in pstopxl pstoraster ${SED} -e 's:@prefix@:${PREFIX}:g ; \ s:@exec_prefix@:${PREFIX}:g ; \ s:@bindir@:${PREFIX}/bin:g ; \ s:@GS@:espgs:g' \ - ${ESPGS_WRKSRC}/${file}.in > ${ESPGS_WRKSRC}/${file} + ${WRKSRC}/pstoraster/${file}.in > ${WRKSRC}/pstoraster/${file} .endfor ${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS=@CPPFLAGS@ |g ; \ s|^LDFLAGS=|LDFLAGS=@LDFLAGS@ |g ; \ @@ -69,14 +70,4 @@ ${MKDIR} ${WRKSRC}/bin ${MKDIR} ${WRKSRC}/obj -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/espgs ${PREFIX}/bin - ${INSTALL_DATA} ${ESPGS_WRKSRC}/pstoraster.convs ${PREFIX}/etc/cups -.for _file in pstopxl pstoraster - ${INSTALL_SCRIPT} ${ESPGS_WRKSRC}/${_file} ${PREFIX}/libexec/cups/filter -.endfor -.for _file in pxlcolor.ppd pxlmono.ppd - ${INSTALL_DATA} ${ESPGS_WRKSRC}/${_file} ${PREFIX}/share/cups/model -.endfor - .include Index: cups-pstoraster/distinfo =================================================================== RCS file: /cvs/repos/ports/print/cups-pstoraster/distinfo,v retrieving revision 1.8 diff -u -r1.8 distinfo --- cups-pstoraster/distinfo 25 Nov 2005 17:42:46 -0000 1.8 +++ cups-pstoraster/distinfo 2 Dec 2006 05:03:35 -0000 @@ -1,3 +1,5 @@ -MD5 (ghostscript/espgs-8.15rc3-source.tar.bz2) = e6fb2e581bd2b85368f7664be8d38186 -SHA256 (ghostscript/espgs-8.15rc3-source.tar.bz2) = 90f2f2382e63be37e5bb7d873ef2b67c883595e79417bd01393b914f3e7eb875 -SIZE (ghostscript/espgs-8.15rc3-source.tar.bz2) = 7820124 +MD5 (ghostscript/espgs-8.15.3-source.tar.bz2) = 4ec87a3da20c1b433ffbe0ffe3675fcd +SHA256 (ghostscript/espgs-8.15.3-source.tar.bz2) = c1f5eefc058b08113f90bc583436399d71644b61872fa39ab4982a58a80baa62 +SIZE (ghostscript/espgs-8.15.3-source.tar.bz2) = 8785418 + + Index: cups-pstoraster/files/patch-pstopxl.in =================================================================== RCS file: /cvs/repos/ports/print/cups-pstoraster/files/patch-pstopxl.in,v retrieving revision 1.1 diff -u -r1.1 patch-pstopxl.in --- cups-pstoraster/files/patch-pstopxl.in 23 Jun 2005 09:54:31 -0000 1.1 +++ cups-pstoraster/files/patch-pstopxl.in 2 Dec 2006 05:06:37 -0000 @@ -1,5 +1,5 @@ ---- pstopxl.in.orig Mon Feb 21 18:13:47 2005 -+++ pstopxl.in Wed Jun 8 09:11:00 2005 +--- pstoraster/pstopxl.in.orig Mon Feb 21 18:13:47 2005 ++++ pstoraster/pstopxl.in Wed Jun 8 09:11:00 2005 @@ -27,7 +27,7 @@ bindir=@bindir@ Index: cups-pstoraster/files/patch-pstoraster.in =================================================================== RCS file: /cvs/repos/ports/print/cups-pstoraster/files/patch-pstoraster.in,v retrieving revision 1.1 diff -u -r1.1 patch-pstoraster.in --- cups-pstoraster/files/patch-pstoraster.in 23 Jun 2005 09:54:31 -0000 1.1 +++ cups-pstoraster/files/patch-pstoraster.in 2 Dec 2006 05:05:44 -0000 @@ -1,5 +1,5 @@ ---- pstoraster.in.orig Wed Jun 8 09:11:26 2005 -+++ pstoraster.in Wed Jun 8 09:13:19 2005 +--- pstoraster/pstoraster.in.orig Wed Jun 8 09:11:26 2005 ++++ pstoraster/pstoraster.in Wed Jun 8 09:13:19 2005 @@ -27,7 +27,7 @@ bindir=@bindir@ Index: cups-pstoraster/files/patch-src:gxobj.h =================================================================== RCS file: /cvs/repos/ports/print/cups-pstoraster/files/Attic/patch-src:gxobj.h,v retrieving revision 1.2 diff -u -r1.2 patch-src:gxobj.h --- cups-pstoraster/files/patch-src:gxobj.h 26 Nov 2004 21:05:46 -0000 1.2 +++ cups-pstoraster/files/patch-src:gxobj.h 4 Dec 2006 04:52:47 -0000 @@ -1,17 +0,0 @@ ---- src/gxobj.h.orig Fri Feb 22 19:45:59 2002 -+++ src/gxobj.h Thu Dec 19 00:16:57 2002 -@@ -99,10 +99,14 @@ - * The final | is because back pointer values are divided by obj_back_scale, - * so objects must be aligned at least 0 mod obj_back_scale. - */ -+#if !defined(__ia64__) && !defined(__amd64__) - #define obj_align_mod\ - (((arch_align_long_mod - 1) | (arch_align_ptr_mod - 1) |\ - (arch_align_double_mod - 1) | (align_bitmap_mod - 1) |\ - (obj_back_scale - 1)) + 1) -+#else -+#define obj_align_mod 16 -+#endif - /* The only possible values for obj_align_mod are 4, 8, or 16.... */ - #if obj_align_mod == 4 - # define log2_obj_align_mod 2 --- cups-pstoraster.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: