From b015871462112260ed7a0f285cd0c986345db00f Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Thu, 27 Dec 2001 16:47:06 +0000 Subject: - Update Gimp-Print driver to version 4.2.0 - Update HPinkjet driver to version 1.0 - Better support for jpeg WRKDIR location PR: 33061 Submitted by: KATO Tsuguru --- print/ghostscript-gnu/Makefile | 109 ++++++++++++--------- print/ghostscript-gnu/distinfo | 4 +- print/ghostscript-gnu/files/escputil.contrib.mak | 6 -- print/ghostscript-gnu/files/hpijs.contrib.mak | 36 +++---- print/ghostscript-gnu/files/patch-hpijs:makefile | 32 ------ print/ghostscript-gnu/files/patch-hpijs:platform.h | 13 --- print/ghostscript-gnu/files/patch-src:unix-gcc.mak | 16 ++- print/ghostscript-gnu/files/stp.contrib.mak | 17 ++++ print/ghostscript-gnu/pkg-plist | 6 +- print/ghostscript-gnu/scripts/configure | 2 +- print/ghostscript7/Makefile | 109 ++++++++++++--------- print/ghostscript7/distinfo | 4 +- print/ghostscript7/files/escputil.contrib.mak | 6 -- print/ghostscript7/files/hpijs.contrib.mak | 36 +++---- print/ghostscript7/files/patch-hpijs:makefile | 32 ------ print/ghostscript7/files/patch-hpijs:platform.h | 13 --- print/ghostscript7/files/patch-src:unix-gcc.mak | 16 ++- print/ghostscript7/files/stp.contrib.mak | 17 ++++ print/ghostscript7/pkg-plist | 6 +- print/ghostscript7/scripts/configure | 2 +- 20 files changed, 212 insertions(+), 270 deletions(-) delete mode 100644 print/ghostscript-gnu/files/escputil.contrib.mak delete mode 100644 print/ghostscript-gnu/files/patch-hpijs:makefile delete mode 100644 print/ghostscript-gnu/files/patch-hpijs:platform.h create mode 100644 print/ghostscript-gnu/files/stp.contrib.mak delete mode 100644 print/ghostscript7/files/escputil.contrib.mak delete mode 100644 print/ghostscript7/files/patch-hpijs:makefile delete mode 100644 print/ghostscript7/files/patch-hpijs:platform.h create mode 100644 print/ghostscript7/files/stp.contrib.mak (limited to 'print') diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile index 66bfd05c4521..eb0952e2cd99 100644 --- a/print/ghostscript-gnu/Makefile +++ b/print/ghostscript-gnu/Makefile @@ -7,6 +7,7 @@ PORTNAME= ghostscript PORTVERSION= 6.52 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU} \ ${MASTER_SITE_SOURCEFORGE} \ @@ -31,12 +32,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GMAKE= yes -CFLAGS+= -DUPD_SIGNAL=0 +MAKE_ENV= CC="${CC}" CXX="${CXX}" XCFLAGS="${XCFLAGS}" 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 @@ -47,8 +48,10 @@ MLINKS= gslp.1 gsbj.1 \ ps2pdf.1 ps2pdf12.1 \ ps2pdf.1 ps2pdf13.1 +XCFLAGS= -DUPD_SIGNAL=0 + .if defined(A4) -MAKE_ENV+= A4="${A4}" +XCFLAGS+= -DA4 .endif .if !defined(WITHOUT_X11) @@ -97,18 +100,16 @@ HP970_DRV= gdevdj9.c.gz # 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/ HPIJS= hpijs -HPIJS_VERS= 0.97 -HPIJS_NAME= ${HPIJS}${HPIJS_VERS} +HPIJS_VERS= 1.0 +HPIJS_NAME= ${HPIJS}-${HPIJS_VERS} HPIJS_SRC= ${HPIJS_NAME}.tar.gz # contributed uniprint profiles @@ -129,9 +130,8 @@ pre-everything:: post-extract: ${ECHO_MSG} ">>> in post-extract ..." - ${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \ + ${LN} -sf ${WRKDIRPREFIX}/${PORTSDIR}/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,21 +154,21 @@ post-extract: ${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 ${ECHO_MSG} ">>> extracting ${HPIJS_SRC} ..." ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC} - ${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs post-patch: ${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \ ${WRKSRC}/src/unix-gcc.mak # for HPinkjet driver + ${PERL} -pi -e 's|CFLAGS="-O2 -Wall"||g ; \ + s|CXXFLAGS="-O2 -Wall"||g' ${WRKSRC}/${HPIJS_NAME}/configure find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \ - 's|#include ||g; \ - s|SRVPATH \"hpijs\"|SRVPATH \"${PREFIX}/libexec/hpijs\"|g' + 's|#include ||g' # here we apply the modifications necessary to build the 3rd party drivers # advantage: you see unmodified makefiles after a pure make extract @@ -182,20 +182,11 @@ pre-configure: ${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 +199,49 @@ do-configure: ${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} ${MAKE_ENV} ${SH} ./configure \ + --without-cups --without-translated-ppds \ + --with-ghost --without-foomatic \ + --without-gimp --without-samples \ + --without-user-guide --disable-escputil \ + --disable-nls --disable-shared \ + --prefix=${PREFIX} +# for HPinkjet driver + ${ECHO_MSG} ">>> running configure script for ${HPIJS} driver ..." + cd ${WRKSRC}/${HPIJS_NAME} ; \ + ${SETENV} ${MAKE_ENV} ${SH} ./configure \ + --prefix=${PREFIX} + 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} ..." +.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 ..." @@ -261,29 +285,22 @@ post-install: ${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 - ${ECHO_MSG} ">>> installing ${HPIJS} server in libexecdir ..." - ${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/libexec + ${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 - ${INSTALL_DATA} ${WRKSRC}/${HPIJS}/${i} \ +.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 diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo index 86ae657a92bd..670d6c2eb68e 100644 --- a/print/ghostscript-gnu/distinfo +++ b/print/ghostscript-gnu/distinfo @@ -6,5 +6,5 @@ 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/print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2 -MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8 +MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6 +MD5 (ghostscript/hpijs-1.0.tar.gz) = 9ec7d86d2cc2dd613f8829891b02104b diff --git a/print/ghostscript-gnu/files/escputil.contrib.mak b/print/ghostscript-gnu/files/escputil.contrib.mak deleted file mode 100644 index b0cea6064968..000000000000 --- a/print/ghostscript-gnu/files/escputil.contrib.mak +++ /dev/null @@ -1,6 +0,0 @@ - -# build escputil command from gimp-print sources - -escputil: $(GLSRC)escputil.c - $(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c - diff --git a/print/ghostscript-gnu/files/hpijs.contrib.mak b/print/ghostscript-gnu/files/hpijs.contrib.mak index 35eb9e6b06b1..6e94367c778c 100644 --- a/print/ghostscript-gnu/files/hpijs.contrib.mak +++ b/print/ghostscript-gnu/files/hpijs.contrib.mak @@ -1,31 +1,19 @@ -### ------------- Hewlett-Packard Co. Inkjet Driver -------------- ### +### ------------- IJS Interface -------------- ### -hpijs_=$(GLOBJ)gdevhpij.$(OBJ) +ijs_=$(GLOBJ)gdevijs.$(OBJ) $(GLOBJ)ijs_client.$(OBJ) $(GLOBJ)ijs_exec_unix.$(OBJ) $(GLOBJ)ijs.$(OBJ) -$(DD)gdevhpij.$(OBJ): $(GLSRC)gdevhpij.c $(PDEVH) - $(GLCC) $(GLO_)gdevhpij.$(OBJ) $(C_) $(GLSRC)gdevhpij.c +$(GLOBJ)ijs_client.$(OBJ) : $(GLSRC)ijs_client.c $(PDEVH) + $(GLCC) $(GLO_)ijs_client.$(OBJ) $(C_) $(GLSRC)ijs_client.c -$(DD)hpijs.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) $(DD)hpijs $(hpijs_) +$(GLOBJ)ijs_exec_unix.$(OBJ) : $(GLSRC)ijs_exec_unix.c $(PDEVH) + $(GLCC) $(GLO_)ijs_exec_unix.$(OBJ) $(C_) $(GLSRC)ijs_exec_unix.c -$(DD)DJ630.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ630 $(hpijs_) +$(GLOBJ)ijs.$(OBJ) : $(GLSRC)ijs.c $(PDEVH) + $(GLCC) $(GLO_)ijs.$(OBJ) $(C_) $(GLSRC)ijs.c -$(DD)DJ6xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ6xx $(hpijs_) +$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) + $(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c -$(DD)DJ6xxP.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ6xxP $(hpijs_) - -$(DD)DJ8xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ8xx $(hpijs_) - -$(DD)DJ9xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ9xx $(hpijs_) - -$(DD)DJ9xxVIP.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ9xxVIP $(hpijs_) - -$(DD)AP21xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) AP21xx $(hpijs_) +$(DD)ijs.dev : $(ijs_) $(DD)page.dev + $(SETPDEV) $(DD)ijs $(ijs_) diff --git a/print/ghostscript-gnu/files/patch-hpijs:makefile b/print/ghostscript-gnu/files/patch-hpijs:makefile deleted file mode 100644 index 8f53a8202f59..000000000000 --- a/print/ghostscript-gnu/files/patch-hpijs:makefile +++ /dev/null @@ -1,32 +0,0 @@ ---- hpijs/makefile.orig Fri Jun 8 06:10:57 2001 -+++ hpijs/makefile Tue Jul 10 03:09:21 2001 -@@ -1,17 +1,17 @@ --FLAGS = -D_LITTLE_ENDIAN -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \ -+FLAGS = -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \ - -D_DJ9xxVIP -D_DJ630 -D_APOLLO2100 -D_DJ600 -D_DJ350 - - VERSION=0.97 - INSTALLDIR=/usr/bin - - --CC = g++ -c -Wall -DVERSION=\"$(VERSION)\" $(FLAGS) -+CXXFLAGS += -DVERSION=\"$(VERSION)\" $(FLAGS) - #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" -DCAPTURE $(FLAGS) - #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" $(FLAGS) - - .cpp.o: - echo "compiling $( - #include - #include -+ -+#ifdef __FreeBSD__ -+#include -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define _LITTLE_ENDIAN -+#endif -+#endif diff --git a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak index ac8c89578df3..2143001118ad 100644 --- a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak +++ b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak @@ -1,5 +1,5 @@ --- src/unix-gcc.mak.orig Tue Jul 10 12:01:06 2001 -+++ src/unix-gcc.mak Sat Nov 3 05:10:14 2001 ++++ src/unix-gcc.mak Sat Dec 15 04:22:49 2001 @@ -27,14 +27,15 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -106,21 +106,19 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -216,9 +226,11 @@ +@@ -216,9 +226,9 @@ # 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= -+ifdef A4 -+XCFLAGS=-DA4 -+endif ++#XCFLAGS= -CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) +CFLAGS+=$(XCFLAGS) # Define platform flags for ld. # SunOS 4.n may need -Bstatic. -@@ -227,7 +239,7 @@ +@@ -227,7 +237,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. @@ -129,7 +127,7 @@ LDFLAGS=$(XLDFLAGS) -fno-common -@@ -260,7 +272,7 @@ +@@ -260,7 +270,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -138,7 +136,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 -@@ -272,12 +284,12 @@ +@@ -272,12 +282,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 @@ -154,7 +152,7 @@ # Define whether this platform has floating point hardware: # FPU_TYPE=2 means floating point is faster than fixed point. -@@ -406,7 +418,7 @@ +@@ -406,7 +416,7 @@ # Define the compilation rules and flags. diff --git a/print/ghostscript-gnu/files/stp.contrib.mak b/print/ghostscript-gnu/files/stp.contrib.mak new file mode 100644 index 000000000000..613116007dd3 --- /dev/null +++ b/print/ghostscript-gnu/files/stp.contrib.mak @@ -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 --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist index 79f796bd4cee..343b40802fd9 100644 --- a/print/ghostscript-gnu/pkg-plist +++ b/print/ghostscript-gnu/pkg-plist @@ -1,7 +1,6 @@ bin/bdftops bin/dvipdf bin/eps2eps -bin/escputil bin/fixmswrd.pl bin/font2c bin/gs @@ -11,6 +10,7 @@ bin/gsdj500 bin/gslj bin/gslp bin/gsnd +bin/hpijs bin/lprsetup.sh bin/pdf2dsc bin/pdf2ps @@ -30,7 +30,6 @@ bin/pv.sh bin/sysvlp.sh bin/unix-lpr.sh bin/wftopfa -libexec/hpijs %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/NEWS @@ -98,7 +97,10 @@ 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 diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure index 47eef6b4e3cf..eda4ce45fceb 100644 --- a/print/ghostscript-gnu/scripts/configure +++ b/print/ghostscript-gnu/scripts/configure @@ -81,7 +81,7 @@ Have fun with this new configuration style ! -andreas \n\n\ "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 \ - "hpijs" "HP PhotoSmart/DeskJet series (HP developed driver)" ON \ + "ijs" "HP PhotoSmart/DeskJet series (HP developed driver)" ON \ "ibmpro" "IBM 9-pin Proprinter" OFF \ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \ "imagen" "Imagen ImPress printers" OFF \ diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index 66bfd05c4521..eb0952e2cd99 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -7,6 +7,7 @@ PORTNAME= ghostscript PORTVERSION= 6.52 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU} \ ${MASTER_SITE_SOURCEFORGE} \ @@ -31,12 +32,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes USE_GMAKE= yes -CFLAGS+= -DUPD_SIGNAL=0 +MAKE_ENV= CC="${CC}" CXX="${CXX}" XCFLAGS="${XCFLAGS}" 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 @@ -47,8 +48,10 @@ MLINKS= gslp.1 gsbj.1 \ ps2pdf.1 ps2pdf12.1 \ ps2pdf.1 ps2pdf13.1 +XCFLAGS= -DUPD_SIGNAL=0 + .if defined(A4) -MAKE_ENV+= A4="${A4}" +XCFLAGS+= -DA4 .endif .if !defined(WITHOUT_X11) @@ -97,18 +100,16 @@ HP970_DRV= gdevdj9.c.gz # 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/ HPIJS= hpijs -HPIJS_VERS= 0.97 -HPIJS_NAME= ${HPIJS}${HPIJS_VERS} +HPIJS_VERS= 1.0 +HPIJS_NAME= ${HPIJS}-${HPIJS_VERS} HPIJS_SRC= ${HPIJS_NAME}.tar.gz # contributed uniprint profiles @@ -129,9 +130,8 @@ pre-everything:: post-extract: ${ECHO_MSG} ">>> in post-extract ..." - ${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \ + ${LN} -sf ${WRKDIRPREFIX}/${PORTSDIR}/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,21 +154,21 @@ post-extract: ${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 ${ECHO_MSG} ">>> extracting ${HPIJS_SRC} ..." ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC} - ${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs post-patch: ${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \ ${WRKSRC}/src/unix-gcc.mak # for HPinkjet driver + ${PERL} -pi -e 's|CFLAGS="-O2 -Wall"||g ; \ + s|CXXFLAGS="-O2 -Wall"||g' ${WRKSRC}/${HPIJS_NAME}/configure find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \ - 's|#include ||g; \ - s|SRVPATH \"hpijs\"|SRVPATH \"${PREFIX}/libexec/hpijs\"|g' + 's|#include ||g' # here we apply the modifications necessary to build the 3rd party drivers # advantage: you see unmodified makefiles after a pure make extract @@ -182,20 +182,11 @@ pre-configure: ${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 +199,49 @@ do-configure: ${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} ${MAKE_ENV} ${SH} ./configure \ + --without-cups --without-translated-ppds \ + --with-ghost --without-foomatic \ + --without-gimp --without-samples \ + --without-user-guide --disable-escputil \ + --disable-nls --disable-shared \ + --prefix=${PREFIX} +# for HPinkjet driver + ${ECHO_MSG} ">>> running configure script for ${HPIJS} driver ..." + cd ${WRKSRC}/${HPIJS_NAME} ; \ + ${SETENV} ${MAKE_ENV} ${SH} ./configure \ + --prefix=${PREFIX} + 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} ..." +.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 ..." @@ -261,29 +285,22 @@ post-install: ${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 - ${ECHO_MSG} ">>> installing ${HPIJS} server in libexecdir ..." - ${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/libexec + ${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 - ${INSTALL_DATA} ${WRKSRC}/${HPIJS}/${i} \ +.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 diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo index 86ae657a92bd..670d6c2eb68e 100644 --- a/print/ghostscript7/distinfo +++ b/print/ghostscript7/distinfo @@ -6,5 +6,5 @@ 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/print-4.0.5.tar.gz) = 2eae88b9285d47036d31974fd2b0abc2 -MD5 (ghostscript/hpijs0.97.tar.gz) = d02f8c4c2d730e72038f6f4d4350fbe8 +MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6 +MD5 (ghostscript/hpijs-1.0.tar.gz) = 9ec7d86d2cc2dd613f8829891b02104b diff --git a/print/ghostscript7/files/escputil.contrib.mak b/print/ghostscript7/files/escputil.contrib.mak deleted file mode 100644 index b0cea6064968..000000000000 --- a/print/ghostscript7/files/escputil.contrib.mak +++ /dev/null @@ -1,6 +0,0 @@ - -# build escputil command from gimp-print sources - -escputil: $(GLSRC)escputil.c - $(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c - diff --git a/print/ghostscript7/files/hpijs.contrib.mak b/print/ghostscript7/files/hpijs.contrib.mak index 35eb9e6b06b1..6e94367c778c 100644 --- a/print/ghostscript7/files/hpijs.contrib.mak +++ b/print/ghostscript7/files/hpijs.contrib.mak @@ -1,31 +1,19 @@ -### ------------- Hewlett-Packard Co. Inkjet Driver -------------- ### +### ------------- IJS Interface -------------- ### -hpijs_=$(GLOBJ)gdevhpij.$(OBJ) +ijs_=$(GLOBJ)gdevijs.$(OBJ) $(GLOBJ)ijs_client.$(OBJ) $(GLOBJ)ijs_exec_unix.$(OBJ) $(GLOBJ)ijs.$(OBJ) -$(DD)gdevhpij.$(OBJ): $(GLSRC)gdevhpij.c $(PDEVH) - $(GLCC) $(GLO_)gdevhpij.$(OBJ) $(C_) $(GLSRC)gdevhpij.c +$(GLOBJ)ijs_client.$(OBJ) : $(GLSRC)ijs_client.c $(PDEVH) + $(GLCC) $(GLO_)ijs_client.$(OBJ) $(C_) $(GLSRC)ijs_client.c -$(DD)hpijs.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) $(DD)hpijs $(hpijs_) +$(GLOBJ)ijs_exec_unix.$(OBJ) : $(GLSRC)ijs_exec_unix.c $(PDEVH) + $(GLCC) $(GLO_)ijs_exec_unix.$(OBJ) $(C_) $(GLSRC)ijs_exec_unix.c -$(DD)DJ630.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ630 $(hpijs_) +$(GLOBJ)ijs.$(OBJ) : $(GLSRC)ijs.c $(PDEVH) + $(GLCC) $(GLO_)ijs.$(OBJ) $(C_) $(GLSRC)ijs.c -$(DD)DJ6xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ6xx $(hpijs_) +$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) + $(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c -$(DD)DJ6xxP.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ6xxP $(hpijs_) - -$(DD)DJ8xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ8xx $(hpijs_) - -$(DD)DJ9xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ9xx $(hpijs_) - -$(DD)DJ9xxVIP.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) DJ9xxVIP $(hpijs_) - -$(DD)AP21xx.dev : $(hpijs_) $(DD)page.dev - $(SETPDEV) AP21xx $(hpijs_) +$(DD)ijs.dev : $(ijs_) $(DD)page.dev + $(SETPDEV) $(DD)ijs $(ijs_) diff --git a/print/ghostscript7/files/patch-hpijs:makefile b/print/ghostscript7/files/patch-hpijs:makefile deleted file mode 100644 index 8f53a8202f59..000000000000 --- a/print/ghostscript7/files/patch-hpijs:makefile +++ /dev/null @@ -1,32 +0,0 @@ ---- hpijs/makefile.orig Fri Jun 8 06:10:57 2001 -+++ hpijs/makefile Tue Jul 10 03:09:21 2001 -@@ -1,17 +1,17 @@ --FLAGS = -D_LITTLE_ENDIAN -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \ -+FLAGS = -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \ - -D_DJ9xxVIP -D_DJ630 -D_APOLLO2100 -D_DJ600 -D_DJ350 - - VERSION=0.97 - INSTALLDIR=/usr/bin - - --CC = g++ -c -Wall -DVERSION=\"$(VERSION)\" $(FLAGS) -+CXXFLAGS += -DVERSION=\"$(VERSION)\" $(FLAGS) - #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" -DCAPTURE $(FLAGS) - #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" $(FLAGS) - - .cpp.o: - echo "compiling $( - #include - #include -+ -+#ifdef __FreeBSD__ -+#include -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define _LITTLE_ENDIAN -+#endif -+#endif diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak index ac8c89578df3..2143001118ad 100644 --- a/print/ghostscript7/files/patch-src:unix-gcc.mak +++ b/print/ghostscript7/files/patch-src:unix-gcc.mak @@ -1,5 +1,5 @@ --- src/unix-gcc.mak.orig Tue Jul 10 12:01:06 2001 -+++ src/unix-gcc.mak Sat Nov 3 05:10:14 2001 ++++ src/unix-gcc.mak Sat Dec 15 04:22:49 2001 @@ -27,14 +27,15 @@ # source, generated intermediate file, and object directories # for the graphics library (GL) and the PostScript/PDF interpreter (PS). @@ -106,21 +106,19 @@ # Define the name of the linker for the final link step. # Normally this is the same as the C compiler. -@@ -216,9 +226,11 @@ +@@ -216,9 +226,9 @@ # 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= -+ifdef A4 -+XCFLAGS=-DA4 -+endif ++#XCFLAGS= -CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) +CFLAGS+=$(XCFLAGS) # Define platform flags for ld. # SunOS 4.n may need -Bstatic. -@@ -227,7 +239,7 @@ +@@ -227,7 +237,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. @@ -129,7 +127,7 @@ LDFLAGS=$(XLDFLAGS) -fno-common -@@ -260,7 +272,7 @@ +@@ -260,7 +270,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). @@ -138,7 +136,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 -@@ -272,12 +284,12 @@ +@@ -272,12 +282,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 @@ -154,7 +152,7 @@ # Define whether this platform has floating point hardware: # FPU_TYPE=2 means floating point is faster than fixed point. -@@ -406,7 +418,7 @@ +@@ -406,7 +416,7 @@ # Define the compilation rules and flags. diff --git a/print/ghostscript7/files/stp.contrib.mak b/print/ghostscript7/files/stp.contrib.mak new file mode 100644 index 000000000000..613116007dd3 --- /dev/null +++ b/print/ghostscript7/files/stp.contrib.mak @@ -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 --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist index 79f796bd4cee..343b40802fd9 100644 --- a/print/ghostscript7/pkg-plist +++ b/print/ghostscript7/pkg-plist @@ -1,7 +1,6 @@ bin/bdftops bin/dvipdf bin/eps2eps -bin/escputil bin/fixmswrd.pl bin/font2c bin/gs @@ -11,6 +10,7 @@ bin/gsdj500 bin/gslj bin/gslp bin/gsnd +bin/hpijs bin/lprsetup.sh bin/pdf2dsc bin/pdf2ps @@ -30,7 +30,6 @@ bin/pv.sh bin/sysvlp.sh bin/unix-lpr.sh bin/wftopfa -libexec/hpijs %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/NEWS @@ -98,7 +97,10 @@ 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 diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure index 47eef6b4e3cf..eda4ce45fceb 100644 --- a/print/ghostscript7/scripts/configure +++ b/print/ghostscript7/scripts/configure @@ -81,7 +81,7 @@ Have fun with this new configuration style ! -andreas \n\n\ "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 \ - "hpijs" "HP PhotoSmart/DeskJet series (HP developed driver)" ON \ + "ijs" "HP PhotoSmart/DeskJet series (HP developed driver)" ON \ "ibmpro" "IBM 9-pin Proprinter" OFF \ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \ "imagen" "Imagen ImPress printers" OFF \ -- cgit v1.2.3