From owner-freebsd-ports Sun Feb 24 12:31:23 2002 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 29A3437B404 for ; Sun, 24 Feb 2002 12:30:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g1OKU1O85520; Sun, 24 Feb 2002 12:30:01 -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 7736D37B404 for ; Sun, 24 Feb 2002 12:21:52 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g1OKLqb84577; Sun, 24 Feb 2002 12:21:52 -0800 (PST) (envelope-from nobody) Message-Id: <200202242021.g1OKLqb84577@freefall.freebsd.org> Date: Sun, 24 Feb 2002 12:21:52 -0800 (PST) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/35283: Update port: print/ghostscript-afpl to 7.04 (fix ports/35228) 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: 35283 >Category: ports >Synopsis: Update port: print/ghostscript-afpl to 7.04 (fix ports/35228) >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: Sun Feb 24 12:30:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 7.04 New file: files/patch-src:unix-dll.mak Remove file: files/hpijs.contrib.mak This PR supersedes ports/35228. >How-To-Repeat: >Fix: diff -urN /usr/ports/print/ghostscript-afpl/Makefile print/ghostscript-afpl/Makefile --- /usr/ports/print/ghostscript-afpl/Makefile Tue Jan 22 19:09:36 2002 +++ print/ghostscript-afpl/Makefile Mon Feb 25 04:31:12 2002 @@ -6,23 +6,29 @@ # PORTNAME= ghostscript -PORTVERSION= 7.03 -PORTREVISION= 4 +PORTVERSION= 7.04 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://members.ozemail.com.au/~geoffk/pdfencrypt/ \ http://www.gelhaus.net/hp880c/1.4beta/ \ http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \ http://www.harsch.net/Download/ \ - ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs703/ \ - ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/ -MASTER_SITE_SUBDIR= ${PORTNAME} gimp-print hpinkjet + ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,gimp-print,} \ + ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,hpinkjet,} \ + ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/ \ + ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/ +MASTER_SITE_SUBDIR= ${PORTNAME} PKGNAMESUFFIX= -afpl -DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \ - ${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${PCL3_SRC} \ - ${HP970_DRV} ${GPRINT_SRC} ${HPIJS_SRC} +DISTFILES= ${GS_SRCS} \ + ${GS_FONTS_STD} \ + ${GS_FONTS_OTHER} \ + ${HP8XX_SRCS} \ + ${HPDJ_SRCS} \ + ${PCL3_SRCS} \ + ${DJ970_SRCS} \ + ${GPRINT_SRCS} \ + ${HPIJS_SRCS} DIST_SUBDIR= ghostscript -EXTRACT_ONLY= ${GS_SOURCES} +EXTRACT_ONLY= ${GS_SRCS} MAINTAINER= ports@FreeBSD.org @@ -33,10 +39,10 @@ WRKSRC= ${WRKDIR}/gs${PORTVERSION} +USE_BZIP2= yes USE_GMAKE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" XCFLAGS="${XCFLAGS}" -MAKEFILE= src/unix-gcc.mak -ALL_TARGET= all pcl3opts +MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ + XCFLAGS="${XCFLAGS}" PLIST_SUB= GS_VERSION=${PORTVERSION} MAN1= ansi2knr.1 dvipdf.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \ @@ -64,7 +70,21 @@ MAKE_ENV+= WITHOUT_X11="${WITHOUT_X11}" .endif -GS_SOURCES= ${DISTNAME}${EXTRACT_SUFX} +.if defined(WITH_SHLIB) +.undef WITHOUT_X11 +USE_GTK= yes +MAKE_ENV+= GS_SHLIB_VER="${SHLIB_VER}" +ALL_TARGET= so pcl3opts +INSTALL_TARGET= soinstall +INSTALLS_SHLIB= yes +SHLIB_VER= 1 +PLIST_SUB+= SHLIB="" SHLIB_VER="${SHLIB_VER}" +.else +ALL_TARGET= all pcl3opts +PLIST_SUB+= SHLIB="@comment " +.endif + +GS_SRCS= ${DISTNAME}${EXTRACT_SUFX} # Note: the following two are real files that have symlinks with # later version numbers pointing to them. To avoid unnecessarily # downloading distfiles, do not change these when upgrading the port @@ -74,54 +94,52 @@ # Additional Drivers: -# Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C +# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C # http://www.gelhaus.net/hp880c/ HP8XX= cdj880 -HP8XX_DRV= gdevcd8.tar.gz +HP8XX_SRCS= gdevcd8.tar.gz -# HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser +# HPDJ - additional driver for HP PCL3 printers, by Martin Lottermoser # still present, just for the case pcl3 is missing some hpdj feature # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html HPDJ= hpdj HPDJ_VERS= 2.6 HPDJ_NAME= ${HPDJ}-${HPDJ_VERS} -HPDJ_SRC= ${HPDJ_NAME}.tar.gz +HPDJ_SRCS= ${HPDJ_NAME}.tar.gz HPDJ_MAN1= gs-hpdj.1 # PCL3 (hpdj successor now in RELEASE quality) -# additional driver for HP PCL3 Printers, by Martin Lottermoser +# additional driver for HP PCL3 printers, by Martin Lottermoser # http://home.t-online.de/home/Martin.Lottermoser/pcl3.html PCL3= pcl3 PCL3_VERS= 3.3 PCL3_NAME= ${PCL3}-${PCL3_VERS} -PCL3_SRC= ${PCL3_NAME}.tar.gz +PCL3_SRCS= ${PCL3_NAME}.tar.gz PCL3_MAN1= gs-pcl3.1 pcl3opts.1 -# additional driver for HP DeskJet 970, supports duplex printing +# DJ970 - additional driver for HP DeskJet 970, supports duplex printing # http://www.harsch.net/Ghostscript/ghostscript.html -HP970_DRV= gdevdj9.c.gz +DJ970= gdevdj9 +DJ970_SRCS= ${DJ970}.c.gz # Gimp-Print - very high quality driver for Epson, HPs,... # http://gimp-print.sourceforge.net/ GPRINT= gimp-print GPRINT_VERS= 4.2.0 GPRINT_NAME= ${GPRINT}-${GPRINT_VERS} -GPRINT_SRC= ${GPRINT_NAME}.tar.gz +GPRINT_SRCS= ${GPRINT_NAME}.tar.gz -# HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series +# HPinkjet - additional driver for PhotoSmart/DeskJet series (HP developed) # http://hpinkjet.sourceforge.net/ HPIJS= hpijs -HPIJS_VERS= 1.0.2 +HPIJS_VERS= 1.0.3 HPIJS_NAME= ${HPIJS}-${HPIJS_VERS} -HPIJS_SRC= ${HPIJS_NAME}.tar.gz +HPIJS_SRCS= ${HPIJS_NAME}.tar.gz # contributed uniprint profiles CONTRIB_UPP= lqx70ch.upp lqx70cl.upp lqx70cm.upp \ stc740ih.upp stc740p.upp stc740pl.upp -# replacement for pdf_sec.ps, that allows you to read encrypted PDF files -DECRYPT_PDF= pdf_sec.ps - .SILENT: pre-everything:: @@ -141,28 +159,28 @@ # new devices ! # # for HP8XX driver - ${ECHO_MSG} ">>> extracting ${HP8XX_DRV} ..." - ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_DRV} + ${ECHO_MSG} ">>> extracting ${HP8XX_SRCS} ..." + ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS} # for HPDJ driver - ${ECHO_MSG} ">>> extracting ${HPDJ_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRC} + ${ECHO_MSG} ">>> extracting ${HPDJ_SRCS} ..." + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPDJ_SRCS} ${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar # for PCL3 driver - ${ECHO_MSG} ">>> extracting ${PCL3_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRC} - ${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3 + ${ECHO_MSG} ">>> extracting ${PCL3_SRCS} ..." + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS} + ${LN} -sf ${PCL3_NAME} ${WRKSRC}/${PCL3} ${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \ ${WRKSRC}/${PCL3_NAME}/${PCL3}.tar -# for HP DeskJet 970 driver - ${ECHO_MSG} ">>> extracting ${HP970_DRV} ..." - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${HP970_DRV} ${WRKSRC}/src - ${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV} +# for DJ970 driver + ${ECHO_MSG} ">>> extracting ${DJ970_SRCS} ..." + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src + ${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS} # for Gimp-Print driver - ${ECHO_MSG} ">>> extracting ${GPRINT_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRC} + ${ECHO_MSG} ">>> extracting ${GPRINT_SRCS} ..." + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS} # for HPinkjet driver - ${ECHO_MSG} ">>> extracting ${HPIJS_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC} + ${ECHO_MSG} ">>> extracting ${HPIJS_SRCS} ..." + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRCS} post-patch: ${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \ @@ -192,18 +210,14 @@ ${ECHO_MSG} ">>> adding ${PCL3} driver to contrib.mak ..." ${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \ >> ${WRKSRC}/src/contrib.mak -# for HP DeskJet 970 driver - ${ECHO_MSG} ">>> adding DJ970 driver to contrib.mak ..." +# for DJ970 driver + ${ECHO_MSG} ">>> adding ${DJ970} driver to contrib.mak ..." ${CAT} ${FILESDIR}/dj970.contrib.mak \ >> ${WRKSRC}/src/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} ">>> adding ${HPIJS} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/hpijs.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak do-configure: ${ECHO_MSG} ">>> in do-configure ..." @@ -216,7 +230,7 @@ post-configure: ${ECHO_MSG} ">>> in post-configure ..." # for Gimp-Print driver - ${ECHO_MSG} ">>> running configure script for ${GPRINT} driver ..." + ${ECHO_MSG} ">>> running configure script for ${GPRINT} library ..." cd ${WRKSRC}/${GPRINT_NAME} ; \ ${SETENV} ${MAKE_ENV} ${SH} ./configure \ --without-cups --without-translated-ppds \ @@ -226,7 +240,7 @@ --disable-nls --disable-shared \ --prefix=${PREFIX} # for HPinkjet driver - ${ECHO_MSG} ">>> running configure script for ${HPIJS} driver ..." + ${ECHO_MSG} ">>> running configure script for ${HPIJS} server ..." cd ${WRKSRC}/${HPIJS_NAME} ; \ ${SETENV} ${MAKE_ENV} ${SH} ./configure \ --prefix=${PREFIX} @@ -236,60 +250,64 @@ ${ECHO_MSG} ">>> creating directories for compilation ..." ${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/bin + ${LN} -sf ${WRKSRC}/src/unix-gcc.mak ${WRKSRC}/Makefile # 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 + ${MKDIR} ${WRKSRC}/${GPRINT} + ${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \ + ${WRKSRC}/${GPRINT}/gimp-print ${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \ - ${WRKSRC}/obj + ${WRKSRC}/${GPRINT}/libgimpprint.a # for HPinkjet driver ${ECHO_MSG} ">>> building ${HPIJS} server ..." cd ${WRKSRC}/${HPIJS_NAME} ; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile - ${ECHO_MSG} ">>> creating symlinks for ${HPIJS} ..." -.for file in gdevijs.[ch] ijs.[ch] ijs_client.[ch] ijs_exec_unix.c unistd_.h - ${LN} -sf ${WRKSRC}/${HPIJS_NAME}/${file} \ - ${WRKSRC}/src -.endfor pre-install: ${ECHO_MSG} ">>> in pre-install ..." ${ECHO_MSG} ">>> creating ghostscript destdir ..." ${MKDIR} ${DATADIR} - ${ECHO_MSG} ">>> extracting ghostscript fonts..." + ${ECHO_MSG} ">>> extracting ghostscript fonts ..." ${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD} ${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER} post-install: ${ECHO_MSG} ">>> in post-install ..." ${ECHO_MSG} ">>> stripping gs ..." - strip ${PREFIX}/bin/gs +.if defined(WITH_SHLIB) + ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx + ${LN} -sf gsc ${PREFIX}/bin/gs +.else + ${STRIP_CMD} ${PREFIX}/bin/gs +.endif # for HPDJ driver ${ECHO_MSG} ">>> installing ${HPDJ} manpages ..." .for i in ${HPDJ_MAN1} - ${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/src/${i} ${MANPREFIX}/man/man1 .endfor ${ECHO_MSG} ">>> creating ${HPDJ} destdir ..." - ${MKDIR} ${DATADIR}/${PORTVERSION}/hpdj + ${MKDIR} ${DATADIR}/${PORTVERSION}/${HPDJ} ${ECHO_MSG} ">>> installing files in ${HPDJ} destdir ..." .for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \ margins-Letter.ps margins-LetterRotated.ps ${INSTALL_DATA} ${WRKSRC}/src/${i} \ - ${DATADIR}/${PORTVERSION}/hpdj + ${DATADIR}/${PORTVERSION}/${HPDJ} .endfor # for PCL3 driver + ${ECHO_MSG} ">>> installing ${PCL3} utility in bindir ..." + ${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin ${ECHO_MSG} ">>> installing ${PCL3} manpages ..." .for i in ${PCL3_MAN1} - ${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${MANPREFIX}/man/man1 .endfor # other pcl3 stuff, which might be interesting for runtime ${ECHO_MSG} ">>> creating ${PCL3} destdir ..." - ${MKDIR} ${DATADIR}/${PORTVERSION}/pcl3 + ${MKDIR} ${DATADIR}/${PORTVERSION}/${PCL3} ${ECHO_MSG} ">>> installing files in ${PCL3} destdir ..." .for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \ ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \ @@ -297,58 +315,50 @@ ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \ ps/margins-LetterRotated.ps ${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \ - ${DATADIR}/${PORTVERSION}/pcl3 -.endfor -# for Gimp-Print driver - ${ECHO_MSG} ">>> creating ${GPRINT} destdir ..." - ${MKDIR} ${DATADIR}/${PORTVERSION}/gimp-print - ${ECHO_MSG} ">>> installing files in ${GPRINT} destdir ..." -.for i in README - ${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \ - ${DATADIR}/${PORTVERSION}/gimp-print + ${DATADIR}/${PORTVERSION}/${PCL3} .endfor # for HPinkjet driver ${ECHO_MSG} ">>> installing ${HPIJS} server in bindir ..." ${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/bin - ${ECHO_MSG} ">>> creating ${HPIJS} destdir ..." - ${MKDIR} ${DATADIR}/${PORTVERSION}/hpijs - ${ECHO_MSG} ">>> installing files in ${HPIJS} destdir ..." -.for i in hpijs_readme.html gs_hpijs.png printerdb_append append_db.sh - ${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \ - ${DATADIR}/${PORTVERSION}/hpijs -.endfor # contributed UPP driver ${ECHO_MSG} ">>> installing contributed UPP profiles ..." .for i in ${CONTRIB_UPP} ${INSTALL_DATA} ${FILESDIR}/${i} \ ${DATADIR}/${PORTVERSION}/lib .endfor -# for reading encrypted PDFs - ${ECHO_MSG} ">>> installing support for encrypted PDF files ..." - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DECRYPT_PDF} \ - ${DATADIR}/${PORTVERSION}/lib # # now NOPORTDOCS dependend stuff # .if !defined(NOPORTDOCS) ${ECHO_MSG} ">>> installing PORTDOC stuff ..." -# install hpdj docu, not necessary for runtime -# note: old hpdj driver has its files in ${WRKSRC}/src - ${ECHO_MSG} ">>> creating ${HPDJ} docu destdir ..." - ${MKDIR} ${DOCSDIR}/${PORTVERSION}/hpdj - ${ECHO_MSG} ">>> installing files in ${HPDJ} docu destdir ..." + ${MKDIR} ${DOCSDIR}/${PORTVERSION} +# for HPDJ driver + ${ECHO_MSG} ">>> installing ${HPDJ} docs ..." + ${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPDJ} .for i in NEWS hpdj.html ${INSTALL_DATA} ${WRKSRC}/src/${i} \ - ${DOCSDIR}/${PORTVERSION}/hpdj + ${DOCSDIR}/${PORTVERSION}/${HPDJ} .endfor -# install pcl3 docu, not necessary for runtime -# note: new pcl3 driver has a subdir of its own - ${ECHO_MSG} ">>> creating ${PCL3} docu destdir ..." - ${MKDIR} ${DOCSDIR}/${PORTVERSION}/pcl3 - ${ECHO_MSG} ">>> installing files in ${PCL3} docu destdir ..." +# for PCL3 driver + ${ECHO_MSG} ">>> installing ${PCL3} docs ..." + ${MKDIR} ${DOCSDIR}/${PORTVERSION}/${PCL3} .for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html ${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \ - ${DOCSDIR}/${PORTVERSION}/pcl3 + ${DOCSDIR}/${PORTVERSION}/${PCL3} +.endfor +# for Gimp-Print driver + ${ECHO_MSG} ">>> installing ${GPRINT} docs ..." + ${MKDIR} ${DOCSDIR}/${PORTVERSION}/${GPRINT} +.for i in README + ${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/src/ghost/${i} \ + ${DOCSDIR}/${PORTVERSION}/${GPRINT} +.endfor +# for HPinkjet driver + ${ECHO_MSG} ">>> installing ${HPIJS} docs ..." + ${MKDIR} ${DOCSDIR}/${PORTVERSION}/${HPIJS} +.for i in hpijs_readme.html gs_hpijs.png printerdb_append append_db.sh + ${INSTALL_DATA} ${WRKSRC}/${HPIJS_NAME}/${i} \ + ${DOCSDIR}/${PORTVERSION}/${HPIJS} .endfor .endif ${ECHO_MSG} "> post-installation tasks completed." diff -urN /usr/ports/print/ghostscript-afpl/distinfo print/ghostscript-afpl/distinfo --- /usr/ports/print/ghostscript-afpl/distinfo Thu Jan 24 20:19:06 2002 +++ print/ghostscript-afpl/distinfo Mon Feb 25 04:49:06 2002 @@ -1,11 +1,9 @@ -MD5 (ghostscript/ghostscript-7.03.tar.gz) = d9b5c31e0df09db9c439eec01c077532 +MD5 (ghostscript/ghostscript-7.04.tar.bz2) = 4fffc7520a510dac7b1cfb98fca8e724 MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272 -MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0 MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6 -MD5 (ghostscript/gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27 MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6 -MD5 (ghostscript/hpijs-1.0.2.tar.gz) = 750923f29a5b70551ddea1d91b819cfa +MD5 (ghostscript/hpijs-1.0.3.tar.gz) = e19d7ac4386e13ac5f41ba776bb6f751 diff -urN /usr/ports/print/ghostscript-afpl/files/hpijs.contrib.mak print/ghostscript-afpl/files/hpijs.contrib.mak --- /usr/ports/print/ghostscript-afpl/files/hpijs.contrib.mak Fri Dec 28 16:38:11 2001 +++ print/ghostscript-afpl/files/hpijs.contrib.mak Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ -### ------------- IJS Interface -------------- ### - -ijs_=$(GLOBJ)gdevijs.$(OBJ) $(GLOBJ)ijs_client.$(OBJ) $(GLOBJ)ijs_exec_unix.$(OBJ) $(GLOBJ)ijs.$(OBJ) - -$(GLOBJ)ijs_client.$(OBJ) : $(GLSRC)ijs_client.c $(PDEVH) - $(GLCC) $(GLO_)ijs_client.$(OBJ) $(C_) $(GLSRC)ijs_client.c - -$(GLOBJ)ijs_exec_unix.$(OBJ) : $(GLSRC)ijs_exec_unix.c $(PDEVH) - $(GLCC) $(GLO_)ijs_exec_unix.$(OBJ) $(C_) $(GLSRC)ijs_exec_unix.c - -$(GLOBJ)ijs.$(OBJ) : $(GLSRC)ijs.c $(PDEVH) - $(GLCC) $(GLO_)ijs.$(OBJ) $(C_) $(GLSRC)ijs.c - -$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) - $(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c - -$(DD)ijs.dev : $(ijs_) $(DD)page.dev - $(SETPDEV) $(DD)ijs $(ijs_) - diff -urN /usr/ports/print/ghostscript-afpl/files/patch-lib:gs_init.ps print/ghostscript-afpl/files/patch-lib:gs_init.ps --- /usr/ports/print/ghostscript-afpl/files/patch-lib:gs_init.ps Wed Sep 12 04:24:31 2001 +++ print/ghostscript-afpl/files/patch-lib:gs_init.ps Thu Feb 14 08:00:00 2002 @@ -1,6 +1,6 @@ ---- lib/gs_init.ps.orig Mon Apr 9 15:20:03 2001 -+++ lib/gs_init.ps Wed Jun 20 04:05:12 2001 -@@ -1263,7 +1263,7 @@ +--- lib/gs_init.ps.orig Fri Feb 1 12:25:45 2002 ++++ lib/gs_init.ps Sat Feb 9 01:42:10 2002 +@@ -1274,7 +1274,7 @@ % Set the default screen and BG/UCR. /.setdefaultbgucr { systemdict /setblackgeneration known { @@ -9,8 +9,8 @@ } if } bind def /.useloresscreen { % - .useloresscreen -@@ -1815,3 +1815,7 @@ - (END GC) VMDEBUG +@@ -1874,3 +1874,7 @@ + userdict /AGM_preserve_spots false put % The interpreter will run the initial procedure (start). + diff -urN /usr/ports/print/ghostscript-afpl/files/patch-src:unix-dll.mak print/ghostscript-afpl/files/patch-src:unix-dll.mak --- /usr/ports/print/ghostscript-afpl/files/patch-src:unix-dll.mak Thu Jan 1 09:00:00 1970 +++ print/ghostscript-afpl/files/patch-src:unix-dll.mak Thu Feb 14 08:00:00 2002 @@ -0,0 +1,59 @@ +--- src/unix-dll.mak.orig Wed Oct 17 19:11:23 2001 ++++ src/unix-dll.mak Sat Feb 9 04:53:18 2002 +@@ -48,11 +48,9 @@ + + # shared library + GS_SONAME=lib$(GS).so +-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) +-GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) ++GS_SONAME_MAJOR=$(GS_SONAME).$(GS_SHLIB_VER) + GS_SO=$(BINDIR)/$(GS_SONAME) +-GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR) +-GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR) ++GS_SO_MAJOR=$(GS_SO).$(GS_SHLIB_VER) + + # Shared object is built by redefining GS_XE in a recursive make. + +@@ -60,24 +58,20 @@ + + $(GS_SO): $(GS_SO_MAJOR) + $(RM_) $(GS_SO) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO) +- +-$(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) +- $(RM_) $(GS_SO_MAJOR) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO_MAJOR) ++ ln -s $(GS_SONAME_MAJOR) $(GS_SO) + + # Build the small Ghostscript loaders, with Gtk+ and without + + $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c +- $(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs` ++ $(GLCC) `$(GTK_CONFIG) --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `$(GTK_CONFIG) --libs` + + $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c +- $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) ++ $(GLCC) -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) + + # ------------------------- Recursive make targets ------------------------- # + + SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\ +- GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ ++ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)\ + STDIO_IMPLEMENTATION=c\ + DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\ + BINDIR=$(BINDIR)/$(SOBINRELDIR)\ +@@ -106,11 +100,9 @@ + -mkdir $(libdir) + $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME) + $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME) +- $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR) ++ $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME_MAJOR) + $(RM_) $(libdir)/$(GS_SONAME) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME) +- $(RM_) $(libdir)/$(GS_SONAME_MAJOR) +- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR) ++ ln -s $(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME) + + soinstall: install-so install-scripts install-data + diff -urN /usr/ports/print/ghostscript-afpl/files/patch-src:unix-gcc.mak print/ghostscript-afpl/files/patch-src:unix-gcc.mak --- /usr/ports/print/ghostscript-afpl/files/patch-src:unix-gcc.mak Fri Dec 28 16:38:12 2001 +++ print/ghostscript-afpl/files/patch-src:unix-gcc.mak Thu Feb 14 08:00:00 2002 @@ -1,5 +1,5 @@ ---- src/unix-gcc.mak.orig Sat Sep 15 17:55:32 2001 -+++ src/unix-gcc.mak Sat Dec 15 04:19:08 2001 +--- src/unix-gcc.mak.orig Fri Feb 1 15:27:58 2002 ++++ src/unix-gcc.mak Sat Feb 9 04:34:53 2002 @@ -26,14 +26,15 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -54,7 +54,7 @@ -PSRCDIR=libpng +PSRCDIR=${LOCALBASE}/include - PVERSION=10012 + PVERSION=10201 # Choose whether to use a shared version of the PNG library, and if so, # what its name is. @@ -74,7 +74,7 @@ #ZLIB_NAME=gz ZLIB_NAME=z -@@ -196,7 +196,7 @@ +@@ -203,7 +203,7 @@ # Define the name of the C compiler. @@ -83,28 +83,38 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -229,9 +229,9 @@ +@@ -220,9 +220,9 @@ + # Define the added flags for standard, debugging, profiling + # and shared object builds. + +-CFLAGS_STANDARD=-O2 +-CFLAGS_DEBUG=-g -O +-CFLAGS_PROFILE=-pg -O2 ++CFLAGS_STANDARD?=-O2 ++CFLAGS_DEBUG=-g ++CFLAGS_PROFILE=-pg + CFLAGS_SO=-fPIC + + # Define the other compilation flags. Add at most one of the following: +@@ -236,7 +236,7 @@ # We don't include -ansi, because this gets in the way of the platform- # specific stuff that typically needs; nevertheless, we expect # gcc to accept ANSI-style function prototypes and function definitions. -XCFLAGS= -+#XCFLAGS= ++XCFLAGS+=-I${.CURDIR}/gimp-print --CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) -+CFLAGS+=$(XCFLAGS) + CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) - # Define platform flags for ld. - # SunOS 4.n may need -Bstatic. -@@ -240,7 +240,7 @@ +@@ -247,7 +247,7 @@ # -R /usr/local/xxx/lib:/usr/local/lib # giving the full path names of the shared library directories. # XLDFLAGS can be set from the command line. -XLDFLAGS= -+XLDFLAGS=-L${LOCALBASE}/lib ++XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib LDFLAGS=$(XLDFLAGS) -fno-common -@@ -273,7 +273,7 @@ +@@ -280,7 +280,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -113,7 +123,7 @@ # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH -@@ -285,12 +285,12 @@ +@@ -292,12 +292,12 @@ # Solaris and other SVR4 systems with dynamic linking probably want #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib # X11R6 (on any platform) may need diff -urN /usr/ports/print/ghostscript-afpl/files/stp.contrib.mak print/ghostscript-afpl/files/stp.contrib.mak --- /usr/ports/print/ghostscript-afpl/files/stp.contrib.mak Fri Dec 28 01:45:47 2001 +++ print/ghostscript-afpl/files/stp.contrib.mak Thu Feb 14 08:00:00 2002 @@ -4,14 +4,11 @@ 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 + $(GLCC) $(GLO_)gdevstp.$(OBJ) $(C_) $(GLSRC)gdevstp.c diff -urN /usr/ports/print/ghostscript-afpl/pkg-descr print/ghostscript-afpl/pkg-descr --- /usr/ports/print/ghostscript-afpl/pkg-descr Tue Jan 22 19:09:37 2002 +++ print/ghostscript-afpl/pkg-descr Thu Feb 14 08:00:00 2002 @@ -11,7 +11,7 @@ - http://members.ozemail.com.au/~geoffk/pdfencrypt/ o HP8XX driver for HP DeskJet 880C/882C/895C - http://www.gelhaus.net/hp880c/ - o HP970 driver for HP DeskJet 970CXi + o DJ970 driver for HP DeskJet 970CXi - http://www.harsch.net/Ghostscript/ghostscript.html o PCL3 and HPDJ driver for HP DeskJet series - http://home.t-online.de/home/Martin.Lottermoser/pcl3.html diff -urN /usr/ports/print/ghostscript-afpl/pkg-plist print/ghostscript-afpl/pkg-plist --- /usr/ports/print/ghostscript-afpl/pkg-plist Fri Dec 28 16:38:13 2001 +++ print/ghostscript-afpl/pkg-plist Thu Feb 14 08:00:00 2002 @@ -5,13 +5,16 @@ bin/font2c bin/gs bin/gsbj +%%SHLIB%%bin/gsc bin/gsdj bin/gsdj500 bin/gslj bin/gslp bin/gsnd +%%SHLIB%%bin/gsx bin/hpijs bin/lprsetup.sh +bin/pcl3opts bin/pdf2dsc bin/pdf2ps bin/pdfopt @@ -30,8 +33,15 @@ bin/sysvlp.sh bin/unix-lpr.sh bin/wftopfa +%%SHLIB%%lib/libgs.so +%%SHLIB%%lib/libgs.so.%%SHLIB_VER%% +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gimp-print/README %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/append_db.sh +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpijs/printerdb_append %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/NEWS %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt @@ -57,9 +67,11 @@ share/ghostscript/%%GS_VERSION%%/doc/History4.htm share/ghostscript/%%GS_VERSION%%/doc/History5.htm share/ghostscript/%%GS_VERSION%%/doc/History6.htm +share/ghostscript/%%GS_VERSION%%/doc/History7.htm share/ghostscript/%%GS_VERSION%%/doc/Htmstyle.htm share/ghostscript/%%GS_VERSION%%/doc/Humor.htm share/ghostscript/%%GS_VERSION%%/doc/Install.htm +share/ghostscript/%%GS_VERSION%%/doc/Issues.htm share/ghostscript/%%GS_VERSION%%/doc/Language.htm share/ghostscript/%%GS_VERSION%%/doc/Lib.htm share/ghostscript/%%GS_VERSION%%/doc/Maintain.htm @@ -95,17 +107,12 @@ share/ghostscript/%%GS_VERSION%%/examples/tiger.ps share/ghostscript/%%GS_VERSION%%/examples/vasarely.ps share/ghostscript/%%GS_VERSION%%/examples/waterfal.ps -share/ghostscript/%%GS_VERSION%%/gimp-print/README share/ghostscript/%%GS_VERSION%%/hpdj/README.hpdj share/ghostscript/%%GS_VERSION%%/hpdj/example.mdf share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4.ps share/ghostscript/%%GS_VERSION%%/hpdj/margins-A4Rotated.ps share/ghostscript/%%GS_VERSION%%/hpdj/margins-Letter.ps share/ghostscript/%%GS_VERSION%%/hpdj/margins-LetterRotated.ps -share/ghostscript/%%GS_VERSION%%/hpijs/append_db.sh -share/ghostscript/%%GS_VERSION%%/hpijs/gs_hpijs.png -share/ghostscript/%%GS_VERSION%%/hpijs/hpijs_readme.html -share/ghostscript/%%GS_VERSION%%/hpijs/printerdb_append share/ghostscript/%%GS_VERSION%%/lib/Fontmap share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS share/ghostscript/%%GS_VERSION%%/lib/acctest.ps @@ -495,14 +502,14 @@ @dirrm share/ghostscript/fonts @dirrm share/ghostscript/%%GS_VERSION%%/pcl3 @dirrm share/ghostscript/%%GS_VERSION%%/lib -@dirrm share/ghostscript/%%GS_VERSION%%/hpijs @dirrm share/ghostscript/%%GS_VERSION%%/hpdj -@dirrm share/ghostscript/%%GS_VERSION%%/gimp-print @dirrm share/ghostscript/%%GS_VERSION%%/examples @dirrm share/ghostscript/%%GS_VERSION%%/doc @dirrm share/ghostscript/%%GS_VERSION%% @dirrm share/ghostscript %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3 +%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpijs %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj +%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gimp-print %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%% %%PORTDOCS%%@dirrm share/doc/ghostscript diff -urN /usr/ports/print/ghostscript-afpl/scripts/configure print/ghostscript-afpl/scripts/configure --- /usr/ports/print/ghostscript-afpl/scripts/configure Fri Dec 28 16:38:14 2001 +++ print/ghostscript-afpl/scripts/configure Thu Feb 14 08:00:00 2002 @@ -14,13 +14,24 @@ file format drivers. The gs5 default drivers are preselected. \n\ Have fun with this new configuration style ! -andreas \n\n\ Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\ + "x11" "X Window System version 11, release >=4" ON \ + "x11alpha" "X Window System masquer. as device with alpha capability" ON \ + "x11cmyk" "X Window System masquer. as 1-bit-per-plane CMYK device" ON \ + "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" OFF \ + "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" OFF \ + "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" OFF \ + "x11gray2" "X Window System as a 2-bit gray-scale device" ON \ + "x11gray4" "X Window System as a 4-bit gray-scale device" ON \ + "x11mono" "X Window System masquer. as black-and-white device" ON \ + "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" ON \ + "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" ON \ "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \ "iwhi" "Apple Imagewriter, high-resolution mode" OFF \ "iwlo" "Apple Imagewriter, low-resolution mode" OFF \ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \ "hl7x0" "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" OFF \ - "bj10e" "Canon BubbleJet BJ10e" ON \ - "bj200" "Canon BubbleJet BJ200 and BJC-240(b&w)" ON \ + "bj10e" "Canon BubbleJet BJ-10e" ON \ + "bj200" "Canon BubbleJet BJ-200 and BJC-240(b&w)" ON \ "bjc600" "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" ON \ "bjc800" "Canon Color BubbleJet BJC-240/800" ON \ "lbp8" "Canon LBP-8II laser printer" OFF \ @@ -28,7 +39,7 @@ "m8510" "C.Itoh M8510 printer" OFF \ "coslw2p" "CoStar LabelWriter II II/Plus" OFF \ "coslwxl" "CoStar LabelWriter XL" OFF \ - "stp" "Configurable Canon/Epson/Lexmark/HP driver (Gimp-Print)" ON \ + "stp" "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" ON \ "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \ "lj250" "DEC LJ250 Companion color printer" OFF \ "declj250" "DEC LJ250 driver (alternate)" OFF \ @@ -52,12 +63,12 @@ "cdjmono" "HP DeskJet 500/510/520/540C b/w printing" ON \ "cdj500" "HP DeskJet 500/540C (same as cdjcolor)" OFF \ "cdj550" "HP DeskJet 550C/560C/660C/660Cse" ON \ - "cdj670" "HP DeskJet 670/690 (HP8XX driver)" ON \ - "cdj850" "HP DeskJet 850/855/870/1100 (HP8XX driver)" ON \ - "cdj880" "HP DeskJet 880 (HP8XX driver)" ON \ - "cdj890" "HP DeskJet 890 (HP8XX driver)" ON \ - "cdj1600" "HP DeskJet 1600 (HP8XX driver)" ON \ - "cdj970" "HP DeskJet 970CXi (HP970 driver)" ON \ + "cdj670" "HP DeskJet 670/690 [HP8XX]" ON \ + "cdj850" "HP DeskJet 850/855/870/1100 [HP8XX]" ON \ + "cdj880" "HP DeskJet 880 [HP8XX]" ON \ + "cdj890" "HP DeskJet 890 [HP8XX]" ON \ + "cdj1600" "HP DeskJet 1600 [HP8XX]" ON \ + "cdj970" "HP DeskJet 970CXi [DJ970]" ON \ "laserjet" "HP LaserJet" ON \ "ljetplus" "HP LaserJet Plus" ON \ "ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" ON \ @@ -78,9 +89,9 @@ "pjxl300" "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \ "pxlmono" "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \ "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \ - "pcl3" "HP PCL 3+ (DeskJet 500/500C/510/520/540/550C/560C/850C/855C)" ON \ - "hpdj" "HP PCL 3+ (old drv.)" ON \ - "ijs" "HP PhotoSmart/DeskJet series (HP developed driver)" ON \ + "pcl3" "HP PCL 3+ (generic) [PCL3]" ON \ + "hpdj" "HP PCL 3+ (old drv.) [HPDJ]" ON \ + "ijs" "HP PhotoSmart/DeskJet series [HPinkjet]" ON \ "ibmpro" "IBM 9-pin Proprinter" OFF \ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \ "imagen" "Imagen ImPress printers" OFF \ @@ -173,17 +184,6 @@ "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format" ON \ "tifflzw" "TIFF LZW, tag = 5, mono" ON \ "tiffpack" "TIFF PackBits, tag = 32773, mono" ON \ - "x11" "X Window System version 11, release >=4" ON \ - "x11alpha" "X Window System masquer. as device with alpha capability" ON \ - "x11cmyk" "X Window System masquer. as 1-bit-per-plane CMYK device" ON \ - "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" OFF \ - "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" OFF \ - "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" OFF \ - "x11gray2" "X Window System as a 2-bit gray-scale device" ON \ - "x11gray4" "X Window System as a 4-bit gray-scale device" ON \ - "x11mono" "X Window System masquer. as black-and-white device" ON \ - "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" ON \ - "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" ON \ 2> /tmp/checklist.tmp.$$ retval=$? @@ -211,7 +211,7 @@ # > ${WRKSRC}/src/unix-gcc.mak.new # XXX new: echo "DEVICE_DEVS=$choice" \ - | perl -pe 's|"([a-z0-9]+)"|\$(DD)\1.dev|g' \ + | perl -pe 's|"([A-Za-z0-9]+)"|\$(DD)\1.dev|g' \ > ${WRKSRC}/src/unix-gcc.mak.new # create one new Makefile, where DEVICE_DEVS contains all wanted devices >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message