From owner-freebsd-ports Tue Dec 4 15: 1: 9 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0487F37B405 for ; Tue, 4 Dec 2001 15:00:03 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fB4N03F59996; Tue, 4 Dec 2001 15:00:03 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 46AB237B41D for ; Tue, 4 Dec 2001 14:55:08 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fB4Mt8u59461; Tue, 4 Dec 2001 14:55:08 -0800 (PST) (envelope-from nobody) Message-Id: <200112042255.fB4Mt8u59461@freefall.freebsd.org> Date: Tue, 4 Dec 2001 14:55:08 -0800 (PST) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/32523: Update port: print/ghostscript-gnu (fix ports/32409) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 32523 >Category: ports >Synopsis: Update port: print/ghostscript-gnu (fix ports/32409) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Dec 04 15:00:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update Gimp-Print driver to version 4.2.0 New file: files/stp.cotrib.mak Remove file: files/escputil.contrib.mak This PR supersedes ports/32049. >How-To-Repeat: >Fix: diff -urN /usr/ports/print/ghostscript-gnu/Makefile print/ghostscript-gnu/Makefile --- /usr/ports/print/ghostscript-gnu/Makefile Mon Nov 5 22:49:11 2001 +++ print/ghostscript-gnu/Makefile Sat Dec 1 01:53:24 2001 @@ -7,6 +7,7 @@ PORTNAME= ghostscript PORTVERSION= 6.52 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU} \ ${MASTER_SITE_SOURCEFORGE} \ @@ -32,11 +33,12 @@ USE_BZIP2= yes USE_GMAKE= yes CFLAGS+= -DUPD_SIGNAL=0 +MAKE_ENV= CXX="${CXX}" MAKEFILE= src/unix-gcc.mak -ALL_TARGET= all pcl3opts escputil +ALL_TARGET= all pcl3opts PLIST_SUB= GS_VERSION=${PORTVERSION} -MAN1= dvipdf.1 eps2eps.1 escputil.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \ +MAN1= dvipdf.1 eps2eps.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \ gs.1 gslp.1 gsnd.1 pcl3opts.1 pdf2dsc.1 pdf2ps.1 pdfopt.1 \ pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 \ ps2pdfwr.1 ps2ps.1 wftopfa.1 @@ -95,14 +97,12 @@ # http://www.harsch.net/Ghostscript/ghostscript.html HP970_DRV= gdevdj9.c.gz -# gimp-print - very high quality driver for Epson, HPs,... +# Gimp-Print - very high quality driver for Epson, HPs,... # http://gimp-print.sourceforge.net/ -GPRINT= print -GPRINT_DESC= gimp-${GPRINT} -GPRINT_VERS= 4.0.5 +GPRINT= gimp-print +GPRINT_VERS= 4.2.0 GPRINT_NAME= ${GPRINT}-${GPRINT_VERS} GPRINT_SRC= ${GPRINT_NAME}.tar.gz -GPRINT_MAN1= escputil.1 # HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series # http://hpinkjet.sourceforge.net/ @@ -131,7 +131,6 @@ ${ECHO_MSG} ">>> in post-extract ..." ${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \ ${WRKSRC}/jpeg - ${RM} -f ${WRKSRC}/man/de/*.1 # ** 3rd party driver ** # Note: don't forget to add those devices in scripts/configure and # configure.batch, which update unix-gcc.mak to build gs with these @@ -154,7 +153,7 @@ ${ECHO_MSG} ">>> extracting ${HP970_DRV} ..." ${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src ${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV} -# for gimp-print +# for Gimp-Print driver ${ECHO_MSG} ">>> extracting ${GPRINT_SRC} ..." ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC} # for HPinkjet driver @@ -182,20 +181,11 @@ ${ECHO_MSG} ">>> adding ${PCL3} driver to contrib.mak ..." ${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.51.add \ >> ${WRKSRC}/src/contrib.mak -# for gimp-print - ${ECHO_MSG} ">>> creating symlinks for ${GPRINT_DESC} ..." - ${LN} -sf ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \ - ${WRKSRC}/src - ${ECHO_MSG} ">>> adding ${GPRINT_DESC} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \ - >> ${WRKSRC}/src/contrib.mak - ${ECHO_MSG} ">>> adding make rules for escputil to contrib.mak ..." - ${CAT} ${FILESDIR}/escputil.contrib.mak \ +# for Gimp-Print driver + ${ECHO_MSG} ">>> adding ${GPRINT} driver to contrib.mak ..." + ${CAT} ${FILESDIR}/stp.contrib.mak \ >> ${WRKSRC}/src/contrib.mak # for HPinkjet driver - ${ECHO_MSG} ">>> creating symlinks for ${HPIJS} ..." - ${LN} -sf ${WRKSRC}/${HPIJS_NAME}/gdevhpij.[ch] \ - ${WRKSRC}/src ${ECHO_MSG} ">>> adding ${HPIJS} driver to contrib.mak ..." ${CAT} ${FILESDIR}/hpijs.contrib.mak \ >> ${WRKSRC}/src/contrib.mak @@ -208,16 +198,41 @@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure .endif +post-configure: + ${ECHO_MSG} ">>> in post-configure ..." +# for Gimp-Print driver + ${ECHO_MSG} ">>> running configure script for ${GPRINT} driver ..." + cd ${WRKSRC}/${GPRINT_NAME} ; \ + ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" ${SH} ./configure \ + --without-cups --without-translated-ppds \ + --with-ghost --without-foomatic \ + --without-gimp --without-samples \ + --without-user-guide --disable-escputil \ + --disable-nls --disable-shared + pre-build: ${ECHO_MSG} ">>> in pre-build ..." ${ECHO_MSG} ">>> creating directories for compilation ..." ${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/bin - -post-build: +# for Gimp-Print driver + ${ECHO_MSG} ">>> building ${GPRINT} library ..." + cd ${WRKSRC}/${GPRINT_NAME} ; \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile + ${ECHO_MSG} ">>> creating symlinks for ${GPRINT} ..." + ${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \ + ${WRKSRC}/src + ${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/ghost/*.[ch] \ + ${WRKSRC}/src + ${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \ + ${WRKSRC}/obj # for HPinkjet driver + ${ECHO_MSG} ">>> building ${HPIJS} server ..." cd ${WRKSRC}/${HPIJS_NAME} ; \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} makefile + ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} makefile + ${ECHO_MSG} ">>> creating symlinks for ${HPIJS} ..." + ${LN} -sf ${WRKSRC}/${HPIJS_NAME}/gdevhpij.[ch] \ + ${WRKSRC}/src pre-install: ${ECHO_MSG} ">>> in pre-install ..." @@ -261,19 +276,12 @@ ${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \ ${DATADIR}/${PORTVERSION}/pcl3 .endfor -# for gimp-print driver - ${ECHO_MSG} ">>> installing ${GPRINT_DESC} escputil in bindir ..." - ${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin - ${ECHO_MSG} ">>> installing ${GPRINT_DESC} manpages ..." -.for i in ${GPRINT_MAN1} - ${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \ - ${PREFIX}/man/man1 -.endfor - ${ECHO_MSG} ">>> creating ${GPRINT_DESC} destdir ..." +# for Gimp-Print driver + ${ECHO_MSG} ">>> creating ${GPRINT} destdir ..." ${MKDIR} ${DATADIR}/${PORTVERSION}/gimp-print - ${ECHO_MSG} ">>> installing files in gimp-print destdir ..." + ${ECHO_MSG} ">>> installing files in ${GPRINT} destdir ..." .for i in README - ${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \ + ${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \ ${DATADIR}/${PORTVERSION}/gimp-print .endfor # for HPinkjet driver diff -urN /usr/ports/print/ghostscript-gnu/distinfo print/ghostscript-gnu/distinfo --- /usr/ports/print/ghostscript-gnu/distinfo Mon Nov 5 22:49:11 2001 +++ print/ghostscript-gnu/distinfo Mon Nov 26 19:13:14 2001 @@ -6,5 +6,5 @@ MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6 MD5 (ghostscript/gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375 -MD5 (ghostscript/print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2 +MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6 MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8 diff -urN /usr/ports/print/ghostscript-gnu/files/escputil.contrib.mak print/ghostscript-gnu/files/escputil.contrib.mak --- /usr/ports/print/ghostscript-gnu/files/escputil.contrib.mak Wed Sep 12 04:12:18 2001 +++ print/ghostscript-gnu/files/escputil.contrib.mak Thu Jan 1 09:00:00 1970 @@ -1,6 +0,0 @@ - -# build escputil command from gimp-print sources - -escputil: $(GLSRC)escputil.c - $(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c - diff -urN /usr/ports/print/ghostscript-gnu/files/stp.contrib.mak print/ghostscript-gnu/files/stp.contrib.mak --- /usr/ports/print/ghostscript-gnu/files/stp.contrib.mak Thu Jan 1 09:00:00 1970 +++ print/ghostscript-gnu/files/stp.contrib.mak Tue Nov 27 03:05:35 2001 @@ -0,0 +1,17 @@ +### --------------- Gimp-Print/stp Driver ---------------------------- ### +### Be careful to add the exact contents of this file; cut and paste ### +### may corrupt the file and cause mysterious make errors ### + +stp_=$(GLOBJ)gdevstp.$(OBJ) + +STPINCDIR=-I$(GLSRC) +STPLIBDIR=-L$(GLOBJ) +STPLIB=gimpprint + +$(DD)stp.dev: $(stp_) $(DD)page.dev + $(SETPDEV) $(DD)stp $(stp_) + $(ADDMOD) $(DD)stp -link $(STPLIBDIR) + $(ADDMOD) $(DD)stp -lib $(STPLIB) + +$(GLOBJ)gdevstp.$(OBJ) : $(GLSRC)gdevstp.c $(PDEVH) + $(GLCC) $(GLO_)gdevstp.$(OBJ) $(C_) $(STPINCDIR) $(GLSRC)gdevstp.c diff -urN /usr/ports/print/ghostscript-gnu/pkg-plist print/ghostscript-gnu/pkg-plist --- /usr/ports/print/ghostscript-gnu/pkg-plist Mon Nov 5 22:49:13 2001 +++ print/ghostscript-gnu/pkg-plist Mon Nov 26 21:51:04 2001 @@ -1,7 +1,6 @@ bin/bdftops bin/dvipdf bin/eps2eps -bin/escputil bin/fixmswrd.pl bin/font2c bin/gs >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message