Hi,
this needs some testing. For now, pdfwrite seems to be broken at
least on powerpc and arm (but it works on amd64). If you need some
test files for it, see http://openbsd.dead-parrot.de/testgs (run
the testgs.sh script on the .ps files). However, I'll debug this
soon, so other tests and bug reports are more appreciated.
Ciao,
Ki "giving you beer" li
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile 15 Sep 2007 23:36:43 -0000 1.51
+++ Makefile 27 Oct 2007 16:49:00 -0000
@@ -2,115 +2,86 @@
COMMENT= GNU PostScript interpreter
-VERSION= 8.54
-DISTNAME= ghostscript-${VERSION}-gpl
-PKGNAME= ${DISTNAME:S,-gpl,,}p1
+VERSION= 8.60
+DISTNAME= ghostscript-${VERSION}
CATEGORIES= print lang
-SHARED_LIBS= gs 9.0
+SHARED_LIBS= gs 10.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/}
HOMEPAGE= http://www.cs.wisc.edu/~ghost/
+MAINTAINER= Matthias Kilian <[EMAIL PROTECTED]>
+
+FLAVORS= a4 gtk no_x11 cups
+FLAVOR?=
+
FLAVOR_STRING= ${FLAVOR_EXT:S/-/,/g}
SUBST_VARS= VERSION FLAVOR_STRING
-# GPL
+# GPLv2, except the included CMap files from Adobe, which may only
+# redistributed without modifications.
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
-WANTLIB= m c z jpeg png
+WANTLIB= m c z
+
+MODULES= converters/libiconv
RUN_DEPENDS= :ghostscript-fonts-*:print/ghostscript/gnu-fonts
-LIB_DEPENDS= ::graphics/png ::graphics/jpeg
+LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
+ png.>=6::graphics/png \
+ ijs::print/ijs
-BASE_FLAGS= INSTALL_PROGRAM='${INSTALL_SCRIPT}' \
- INSTALL_DATA='${INSTALL_DATA}' \
- SHARE_LIBPNG=1 \
- SHARE_ZLIB=1 \
- CFLAGS_STANDARD='${CFLAGS}' \
- XLDFLAGS=-L${LOCALBASE}/lib \
- BINDIR=./obj \
- GLSRCDIR=./src \
- GLGENDIR=./obj \
- GLOBJDIR=./obj \
- PSSRCDIR=./src \
- PSLIBDIR=./lib \
- PSGENDIR=./obj \
- PSOBJDIR=./obj \
- JBIG2SRCDIR=./jbig2dec \
- ICCSRCDIR=./icclib \
- IJSSRCDIR=./ijs \
- SOOBJRELDIR=../obj \
- SOBINRELDIR=../obj \
- STDLIBS='-lm' \
- LIBgs_VERSION=${LIBgs_VERSION}
-
-PDFDIR=share/ghostscript/${VERSION}/lib
-
-X11_DEVICE_DEVS1= $$(DD)x11.dev $$(DD)x11alpha.dev $$(DD)x11cmyk.dev \
-$$(DD)x11cmyk2.dev $$(DD)x11cmyk4.dev $$(DD)x11cmyk8.dev \
-$$(DD)x11gray2.dev $$(DD)x11gray4.dev $$(DD)x11mono.dev
-
-BASE_DEVICE_DEVS1= $$(DD)ap3250.dev $$(DD)appledmp.dev $$(DD)bbox.dev \
-$$(DD)bit.dev $$(DD)bitcmyk.dev $$(DD)bitrgb.dev $$(DD)bj10e.dev \
-$$(DD)bj200.dev $$(DD)bjc600.dev $$(DD)bjc800.dev $$(DD)bmp16.dev \
-$$(DD)bmp16m.dev $$(DD)bmp256.dev $$(DD)bmp32b.dev $$(DD)bmpgray.dev \
-$$(DD)bmpmono.dev $$(DD)bmpsep1.dev $$(DD)bmpsep8.dev $$(DD)ccr.dev \
-$$(DD)cdeskjet.dev $$(DD)cdj500.dev $$(DD)cdj550.dev $$(DD)cdjcolor.dev \
-$$(DD)cdjmono.dev $$(DD)cgm24.dev $$(DD)cgm8.dev $$(DD)cgmmono.dev \
-$$(DD)cif.dev $$(DD)cljet5.dev $$(DD)cljet5c.dev $$(DD)cp50.dev \
-$$(DD)declj250.dev $$(DD)deskjet.dev $$(DD)devicen.dev $$(DD)dfaxhigh.dev \
-$$(DD)dfaxlow.dev $$(DD)djet500.dev $$(DD)djet500c.dev $$(DD)dnj650c.dev \
-$$(DD)eps9high.dev $$(DD)eps9mid.dev $$(DD)epson.dev $$(DD)epsonc.dev \
-$$(DD)epswrite.dev $$(DD)faxg3.dev $$(DD)faxg32d.dev $$(DD)faxg4.dev \
-$$(DD)hl7x0.dev $$(DD)ibmpro.dev $$(DD)ijs.dev $$(DD)imagen.dev \
-$$(DD)inferno.dev $$(DD)iwhi.dev $$(DD)iwlo.dev $$(DD)iwlq.dev \
-$$(DD)jetp3852.dev $$(DD)jpeg.dev $$(DD)jpeggray.dev $$(DD)laserjet.dev \
-$$(DD)lbp8.dev $$(DD)lips3.dev $$(DD)lj250.dev $$(DD)lj4dith.dev \
-$$(DD)lj5gray.dev $$(DD)lj5mono.dev $$(DD)ljet2p.dev $$(DD)ljet3.dev \
-$$(DD)ljet3d.dev $$(DD)ljet4.dev $$(DD)ljet4d.dev $$(DD)ljetplus.dev \
-$$(DD)lp2563.dev $$(DD)lp8000.dev $$(DD)lq850.dev $$(DD)m8510.dev \
-$$(DD)mgr4.dev $$(DD)mgr8.dev $$(DD)mgrgray2.dev $$(DD)mgrgray4.dev \
-$$(DD)mgrgray8.dev $$(DD)mgrmono.dev $$(DD)miff24.dev $$(DD)necp6.dev \
-$$(DD)oce9050.dev $$(DD)oki182.dev $$(DD)okiibm.dev $$(DD)paintjet.dev \
-$$(DD)pbm.dev $$(DD)pbmraw.dev $$(DD)pcx16.dev $$(DD)pcx24b.dev \
-$$(DD)pcx256.dev $$(DD)pcxcmyk.dev $$(DD)pcxgray.dev $$(DD)pcxmono.dev \
-$$(DD)pdfwrite.dev $$(DD)pgm.dev $$(DD)pgmraw.dev $$(DD)pgnm.dev \
-$$(DD)pgnmraw.dev $$(DD)pj.dev $$(DD)pjetxl.dev $$(DD)pjxl.dev \
-$$(DD)pjxl300.dev $$(DD)pkm.dev $$(DD)pkmraw.dev $$(DD)pksm.dev \
-$$(DD)pksmraw.dev $$(DD)plan9bm.dev $$(DD)png16.dev $$(DD)png16m.dev \
-$$(DD)png256.dev $$(DD)png48.dev $$(DD)pngalpha.dev $$(DD)pnggray.dev \
-$$(DD)pngmono.dev $$(DD)pnm.dev $$(DD)pnmraw.dev $$(DD)ppm.dev \
-$$(DD)ppmraw.dev $$(DD)ps2write.dev $$(DD)psdcmyk.dev $$(DD)psdrgb.dev \
-$$(DD)psgray.dev $$(DD)psmono.dev $$(DD)psrgb.dev $$(DD)pswrite.dev \
-$$(DD)pxlcolor.dev $$(DD)pxlmono.dev $$(DD)r4081.dev $$(DD)sgirgb.dev \
-$$(DD)sj48.dev $$(DD)spotcmyk.dev $$(DD)st800.dev $$(DD)stcolor.dev \
-$$(DD)t4693d2.dev $$(DD)t4693d4.dev $$(DD)t4693d8.dev $$(DD)tek4696.dev \
-$$(DD)tiff12nc.dev $$(DD)tiff24nc.dev $$(DD)tiff32nc.dev \
-$$(DD)tiffcrle.dev $$(DD)tiffg3.dev $$(DD)tiffg32d.dev $$(DD)tiffg4.dev \
-$$(DD)tiffgray.dev $$(DD)tifflzw.dev $$(DD)tiffpack.dev $$(DD)tiffsep.dev \
-$$(DD)uniprint.dev $$(DD)xcf.dev
+CFLAGS+= -DSYS_TYPES_HAS_STDINT_TYPES \
+ -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/libpng
-MAKE_FLAGS= ${BASE_FLAGS}
-CFLAGS+= -DSYS_TYPES_HAS_STDINT_TYPES
+# Note: all the device definitions are at the very end of this makefile.
-INCPATHS= -I${LOCALBASE}/include \
- -I${LOCALBASE}/include/libpng
+MAKE_FLAGS= BINDIR=./obj \
+ CFLAGS_STANDARD='${CFLAGS} -fPIC' \
+ DEVICE_DEVS='${DEVICES:=$(DD)%.dev}' \
+ EXTRALIBS="${EXTRALIBS}" \
+ GLGENDIR=./obj \
+ GLOBJDIR=./obj \
+ GLSRCDIR=./src \
+ ICCSRCDIR=./icclib \
+ INSTALL='${INSTALL}' \
+ INSTALL_DATA='${INSTALL_DATA}' \
+ INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
+ JBIG2SRCDIR=./jbig2dec \
+ JPX_LIB=jasper \
+ LIBgs_VERSION=${LIBgs_VERSION} \
+ PSGENDIR=./obj \
+ PSLIBDIR=./lib \
+ PSOBJDIR=./obj \
+ PSSRCDIR=./src \
+ SHARE_IJS=1 \
+ SHARE_JPEG=1 \
+ SHARE_LIBPNG=1 \
+ SHARE_ZLIB=1 \
+ SOBINRELDIR=../obj \
+ SOOBJRELDIR=../obj \
+ STDLIBS='-lm -liconv' \
+ TRUE_PREFIX='${LOCALBASE}' \
+ XLDFLAGS=-L${LOCALBASE}/lib \
+ prefix='${PREFIX}'
USE_GMAKE= Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= CFLAGS="${CFLAGS} ${INCPATHS}" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
- LIBS=-ljpeg
-
-FLAVORS= a4 gtk no_x11
-FLAVOR?=
+# Jasper needs this. Everything else seems to work better without auto*.
+WRKCONF= ${WRKSRC}/jasper
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV= AWK=/usr/bin/awk \
+ CFLAGS='${CFLAGS}' \
+ GREP=/usr/bin/grep \
+ LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' \
+ LIBS=-ljpeg
.if ${FLAVOR:L:Ma4}
CFLAGS+= -DA4
@@ -119,40 +90,41 @@ CFLAGS+= -DA4
.if ${FLAVOR:L:Mgtk} && ${FLAVOR:L:Mno_x11}
ERRORS+= "Fatal: Conflicting flavors: ${FLAVOR}"
.elif ${FLAVOR:L:Mgtk}
-MODULES= devel/gettext
-LIB_DEPENDS+= gtk.>=1,gdk::x11/gtk+
-WANTLIB+= Xi glib gmodule
+LIB_DEPENDS+=
gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2
+MODULES+= devel/gettext
+WANTLIB+= Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr Xrender \
+ atk-1.0 cairo expat fontconfig freetype glib-2.0 glitz \
+ gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
+MAKE_FLAGS+= SOC_CFLAGS="$$(pkg-config gtk+-2.0 --cflags)" \
+ SOC_LIBS="$$(pkg-config gtk+-2.0 --libs)"
ALL_TARGET= so
-INSTALL_TARGET= soinstall
-NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
-X11_DEVICE_DEVS1+= $$(DD)display.dev
-.else
-ALL_TARGET= all
-INSTALL_TARGET= install
+INSTALL_TARGET= install install-so
+NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
+DEVICES+= ${GTK_DEVICES}
.endif
-.if ${FLAVOR:L:Mno_x11}
-CONFIGURE_ARGS+=--without-x
-BASE_FLAGS+= DEVICE_DEVS1='${BASE_DEVICE_DEVS1}'
-.else
+.if !${FLAVOR:L:Mno_x11}
USE_X11= Yes
-CONFIGURE_ARGS+=--with-x
-WANTLIB+= X11 Xt SM Xext ICE
-BASE_FLAGS+= DEVICE_DEVS1='${X11_DEVICE_DEVS1} ${BASE_DEVICE_DEVS1}'
+WANTLIB+= X11 Xt Xext
+DEVICES+= ${X11_DEVICES}
.endif
-NO_REGRESS= Yes
+.if ${FLAVOR:L:Mcups}
+LIB_DEPENDS+= cups.>=3,cupsimage.>=2::print/cups
+EXTRALIBS+= $$(cups-config --image --libs)
+DEVICES+= ${CUPS_DEVICES}
+WANTLIB+= crypto pthread ssl tiff
+.endif
-FAKE_FLAGS=${BASE_FLAGS} prefix=${WRKINST}${PREFIX} \
- mandir=${WRKINST}${PREFIX}/man
+NO_REGRESS= Yes
+FAKE_FLAGS+= ${MAKE_FLAGS} DESTDIR=${WRKINST}
# Avoid surprises in update-patches.
+# Use the old-style (non-autoconf) build.
post-extract:
find ${WRKDIST} -name '*.orig' -type f | xargs -r rm
-
-pre-configure:
- rm -rf ${WRKDIST}/{jpeg,libpng,zlib}
+ ln -s src/unix-gcc.mak ${WRKDIST}/Makefile
pre-build:
mkdir -p ${WRKDIST}/obj
@@ -162,13 +134,17 @@ pre-install:
@${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
@${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+.ifdef(DEBUG)
+STRIP= :
+.endif
+
post-install:
.if ${FLAVOR:L:Mgtk}
- strip ${PREFIX}/bin/gsc
- strip ${PREFIX}/bin/gsx
- ln -s gsc ${PREFIX}/bin/gs
+ ${STRIP} ${PREFIX}/bin/gsc
+ ${STRIP} ${PREFIX}/bin/gsx
+ ln -sf gsc ${PREFIX}/bin/gs
.else
- strip ${PREFIX}/bin/gs
+ ${STRIP} ${PREFIX}/bin/gs
.endif
cd ${PREFIX}/man/man1 && \
ln -sf ps2ps.1 eps2eps.1 && \
@@ -184,5 +160,126 @@ post-install:
ln -sf ps2pdf.1 ps2pdf13.1 && \
ln -sf ps2pdf.1 ps2pdf14.1 && \
ln -sf ps2ps.1 eps2eps.1
+.if ${FLAVOR:L:Mcups}
+ mv ${DESTDIR}/etc/cups/* ${PREFIX}/share/ghostscript/${VERSION}/examples
+.else
+ rm -rf ${PREFIX}/libexec/cups
+.endif
+ rm -rf ${DESTDIR}/etc/cups
+
+# Device list based on configure.ac:
+# X_DEVS (skipping x11_ and x11alt_, since those are dependencies of
+# other devices).
+X11_DEVICES= x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 \
+ x11gray2 x11gray4 x11mono x11rg16x x11rg32x
+
+# HP_DEVS
+DEVICES+= cdeskjet cdj1600 cdj500 cdj550 cdj670 cdj850 cdj880 \
+ cdj890 cdj970 cdjcolor cdjmono chp2200 cljet5 cljet5c \
+ cljet5pr deskjet djet500 djet500c dnj650c hpdj1120c \
+ hpdj310 hpdj320 hpdj340 hpdj400 hpdj500 hpdj500c \
+ hpdj510 hpdj520 hpdj540 hpdj550c hpdj560c hpdj600 \
+ hpdj660c hpdj670c hpdj680c hpdj690c hpdj850c hpdj855c \
+ hpdj870c hpdj890c hpdjplus hpdjportable laserjet \
+ lj3100sw lj4dith lj5gray lj5mono ljet2p ljet3 ljet3d \
+ ljet4 ljet4d ljetplus lp2563 paintjet pcl3 pj pjetxl \
+ pjxl pjxl300 pxlcolor pxlmono
+
+# PCLXL_DEVS
+DEVICES+= pxlmono pxlcolor
+
+# EPSON_DEVS
+DEVICES+= alc1900 alc2000 alc4000 alc4100 alc8500 alc8600 \
+ alc9100 epl2050 epl2050p epl2120 epl2500 epl2750 \
+ epl5800 epl5900 epl6100 epl6200 eps9high eps9mid \
+ epson epsonc escp lp1800 lp1900 lp2200 lp2400 lp2500 \
+ lp3000c lp7500 lp7700 lp7900 lp8000 lp8000c lp8100 \
+ lp8200c lp8300c lp8300f lp8400f lp8500c lp8600 \
+ lp8600f lp8700 lp8800c lp8900 lp9000b lp9000c lp9100 \
+ lp9200b lp9200c lp9300 lp9400 lp9500c lp9600 lp9600s \
+ lp9800c lps4500 lps6500 lq850 photoex st800 stcolor
+
+# CANON_DEVS
+DEVICES+= bj10e bj200 bjc600 bjc800 bjccmyk bjccolor bjcgray \
+ bjcmono lbp8 lips3
+
+# LEXMARK_DEVS
+DEVICES+= lex2050 lex3200 lex5700 lex7000 lx5000 lxm3200 lxm5700m
+
+# BROTHER_DEVS
+DEVICES+= hl1240 hl1250 hl7x0
+
+# APPLE_DEVS
+DEVICES+= appledmp iwhi iwlo iwlq
+
+# IBM_DEVS
+DEVICES+= ibmpro jetp3852
+
+# OKI_DEVS
+DEVICES+= oki182 oki4w okiibm
+
+# JAPAN_DEVS
+DEVICES+= bj10v bj10vh bjc880j dj505j escpage fmlbp fmpr jj100 \
+ lbp310 lbp320 lips2p lips4 lips4v lj4dithp ljet4pjl \
+ lp2000 md1xMono md50Eco md50Mono mj500c mj6000c \
+ mj700v2c mj8000c ml600 npdl picty180 pr1000 pr1000_4 \
+ pr150 pr201 rpdl
+
+# MISC_PDEVS
+DEVICES+= ap3250 atx23 atx24 atx38 coslw2p coslwxl cp50 \
+ declj250 dl2100 fs600 gdi imagen la50 la70 la75 \
+ la75plus lj250 ln03 m8510 md2k md5k necp6 oce9050 \
+ r4081 samsunggdi sj48 t4693d2 t4693d4 t4693d8 tek4696 \
+ uniprint xes
+
+# OPVP_DEVS
+DEVICES+= oprp opvp
+
+# BMP_DEVS
+DEVICES+= bmp16 bmp16m bmp256 bmp32b bmpgray bmpmono bmpsep1 \
+ bmpsep8
+
+# FAX_DEVS
+DEVICES+= cfax dfaxhigh dfaxlow fax faxg3 faxg32d faxg4 tfax \
+ tiffg3 tiffg32d tiffg4
+
+# JPEG_DEVS
+DEVICES+= jpeg jpegcmyk jpeggray jpx
+
+# PNG_DEVS (note: png48 not mentioned in configure.ac)
+DEVICES+= png16 png16m png256 png48 pngalpha pnggray pngmono
+
+# TIFF_DEVS
+DEVICES+= tiff12nc tiff24nc tiff32nc tiffcrle tiffgray tifflzw \
+ tiffpack tiffs tiffsep
+
+# PCX_DEVS
+DEVICES+= pcx16 pcx24b pcx256 pcx2up pcxcmyk pcxgray pcxmono
+
+# PBM_DEVS
+DEVICES+= pam pbm pbmraw pgm pgmraw pgnm pgnmraw pkm pkmraw \
+ pksm pksmraw pnm pnmraw ppm ppmraw
+
+# PS_DEVS
+DEVICES+= bbox epswrite pdfwrite ps2write psdcmyk psdf psdrgb \
+ psgray psmono psrgb pswrite
+
+# WTS_HALFTONING_DEVS
+DEVICES+= imdi simdi wtscmyk wtsimdi
+
+# MISC_FDEVS
+DEVICES+= bit bitcmyk bitrgb bitrgbtags ccr cgm24 cgm8 cgmmono \
+ cif devicen inferno mag16 mag256 mgr4 mgr8 mgrgray2 \
+ mgrgray4 mgrgray8 mgrmono miff24 plan9bm sgirgb \
+ spotcmyk sunhmono xcf
+
+# Aditional devices not mentioned in configure.ac:
+DEVICES+= ijs
+
+# Cups
+CUPS_DEVICES= cups
+
+# gtk (display driver)
+GTK_DEVICES= display
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 26 May 2007 12:25:10 -0000 1.8
+++ distinfo 27 Oct 2007 16:49:00 -0000
@@ -1,5 +1,5 @@
-MD5 (ghostscript-8.54-gpl.tar.gz) = 1qt/a1zna+ML4D7pCTiM1Q==
-RMD160 (ghostscript-8.54-gpl.tar.gz) = SiqkPPhGksqnoLnjACNRRoU0GRM=
-SHA1 (ghostscript-8.54-gpl.tar.gz) = T02ivaRgnKpAILG7sQFBm4Ou9ws=
-SHA256 (ghostscript-8.54-gpl.tar.gz) =
g3nPRKN+Uvkg3BriHIE1UMFH9XCQ0sZ24KbgBYS3kuo=
-SIZE (ghostscript-8.54-gpl.tar.gz) = 14932756
+MD5 (ghostscript-8.60.tar.gz) = znwnaJFBHghl4AbwMQ6h7A==
+RMD160 (ghostscript-8.60.tar.gz) = iVLZpf09Ei7WtIstijAfRs1gULk=
+SHA1 (ghostscript-8.60.tar.gz) = pWsxtzaIPSx3Pl8Y5Ajryl8HfKA=
+SHA256 (ghostscript-8.60.tar.gz) = lmjqJeRyBGjYjivASUYGCruW43y8QtqF3fQdtw4nWS0=
+SIZE (ghostscript-8.60.tar.gz) = 15612652
Index: patches/patch-lib_ps2epsi
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-lib_ps2epsi,v
retrieving revision 1.5
diff -u -p -r1.5 patch-lib_ps2epsi
--- patches/patch-lib_ps2epsi 19 Oct 2006 13:12:37 -0000 1.5
+++ patches/patch-lib_ps2epsi 27 Oct 2007 16:49:00 -0000
@@ -1,26 +1,25 @@
$OpenBSD: patch-lib_ps2epsi,v 1.5 2006/10/19 13:12:37 kili Exp $
---- lib/ps2epsi.orig Fri Jan 27 22:58:27 2006
-+++ lib/ps2epsi Sat Sep 30 22:49:46 2006
-@@ -6,13 +6,7 @@
- GS_EXECUTABLE=gs
+--- lib/ps2epsi.orig Thu Jul 5 21:04:29 2007
++++ lib/ps2epsi Mon Sep 3 15:27:31 2007
+@@ -11,20 +11,7 @@ fi
+ GS_EXECUTABLE="$gs"
# try to create a temporary file securely
--tmpdir=/tmp/ps2epsi.$$
--(umask 077 && mkdir $tmpdir)
--if ! test -d $tmpdir; then
-- echo "failed: could not create temporary file"
-- exit 1
+-if test -z "$TMPDIR"; then
+- TMPDIR=/tmp
+-fi
+-if which mktemp >/dev/null 2>/dev/null; then
+- tmpfile="`mktemp $TMPDIR/ps2epsi.XXXXXX`"
+-else
+- tmpdir=$TMPDIR/ps2epsi.$$
+- (umask 077 && mkdir "$tmpdir")
+- if test ! -d "$tmpdir"; then
+- echo "failed: could not create temporary file"
+- exit 1
+- fi
+- tmpfile="$tmpdir"/ps2epsi$$
-fi
--tmpfile=$tmpdir/ps2epsi$$
+tmpfile=`mktemp -t ps2epsiXXXXXXXXXX` || exit 1
+ trap "rm -rf \"$tmpfile\"" 0 1 2 3 7 13 15
export outfile
-
-@@ -64,7 +58,6 @@ awk 'F==1 {
-
- $GS_EXECUTABLE -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit
-sOutputFile=/dev/null $tmpfile ps2epsi.ps $tmpfile <"${infile}" 1>&2
- rm -f $tmpfile
--rm -rf $tmpdir
-
- (
- cat << BEGINEPS
Index: patches/patch-lib_pv_sh
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-lib_pv_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_pv_sh
--- patches/patch-lib_pv_sh 19 Oct 2006 13:12:37 -0000 1.2
+++ patches/patch-lib_pv_sh 27 Oct 2007 16:49:00 -0000
@@ -1,17 +1,24 @@
$OpenBSD: patch-lib_pv_sh,v 1.2 2006/10/19 13:12:37 kili Exp $
---- lib/pv.sh.orig Wed Dec 28 20:56:24 2005
-+++ lib/pv.sh Sat Sep 30 22:25:32 2006
-@@ -34,9 +34,10 @@ TEMPDIR=.
+--- lib/pv.sh.orig Thu Jul 5 12:41:52 2007
++++ lib/pv.sh Mon Sep 3 15:27:31 2007
+@@ -30,19 +30,11 @@ fi
+ # executable name set in the makefile
+ GS_EXECUTABLE=gs
+
+-TEMPDIR=.
PAGE=$1
shift
- FILE=$1
-+TEMPFILE=`mktemp -t ${FILE}XXXXXXXXXX` || exit 1
+ FILE="$1"
shift
--trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
-+trap "rm -rf $TEMPFILE" 0 1 2 15
- #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--$GS_EXECUTABLE $FILE.$$.pv
-+dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
-+$GS_EXECUTABLE $TEMPFILE
- exit 0
+-if test -z "$TEMPDIR"; then
+- TEMPDIR=/tmp
+-fi
+-if which mktemp >/dev/null 2>/dev/null; then
+- tmpfile="`mktemp $TEMPDIR/\"$FILE\".pv.XXXXXX`"
+-else
+- tmpfile="$TEMPDIR/$FILE.$$.pv"
+-fi
++tmpfile=`mktemp -t ${FILE}XXXXXXXXXX` || exit 1
+ trap "rm -rf $tmpfile" 0 1 2 15
+ #dvips -D$RESOLUTION -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
+ dvips -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
Index: patches/patch-src_devs_mak
===================================================================
RCS file: patches/patch-src_devs_mak
diff -N patches/patch-src_devs_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_devs_mak 27 Oct 2007 16:49:00 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- src/devs.mak.orig Thu Jun 7 00:03:27 2007
++++ src/devs.mak Thu Oct 25 14:25:34 2007
+@@ -659,14 +659,13 @@ $(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj56.c $(PDEVH)
+
+ ### -------------------- The ijs client ----------------- ###
+
+-ijs_=$(GLOBJ)gdevijs.$(OBJ) $(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
+- $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
++ijs_=$(GLOBJ)gdevijs.$(OBJ)
+
+-$(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev
++$(DD)ijs.dev : $(ijs_) $(GLD)page.dev
+ $(SETPDEV) $(DD)ijs $(ijs_)
++ $(ADDMOD) $(DD)ijs -lib ijs
+
+-$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
+- $(ijs_h) $(ijs_client_h)
++$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)
+ $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(GLF_) $(GLO_)gdevijs.$(OBJ)
$(C_) $(GLSRC)gdevijs.c
+
+ # Please see ijs.mak for the Makefile fragment which builds the IJS
Index: patches/patch-src_gxfcopy_c
===================================================================
RCS file: patches/patch-src_gxfcopy_c
diff -N patches/patch-src_gxfcopy_c
--- patches/patch-src_gxfcopy_c 19 Oct 2006 13:12:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gxfcopy_c,v 1.1 2006/10/19 13:12:37 kili Exp $
---- src/gxfcopy.c.orig Thu Mar 23 13:39:23 2006
-+++ src/gxfcopy.c Thu Oct 19 01:05:43 2006
-@@ -2391,7 +2391,7 @@ order_font_data(gs_copied_font_data_t *c
- a[j++] = &cfdata->names[i];
- }
- }
-- qsort(a, cfdata->num_glyphs, sizeof(int), compare_glyph_names);
-+ qsort(a, cfdata->num_glyphs, sizeof(*a), compare_glyph_names);
- for (; j >= 0; j--)
- cfdata->glyphs[j].order_index = a[j] - cfdata->names;
- gs_free_object(memory, a, "order_font_data");
Index: patches/patch-src_ijs_mak
===================================================================
RCS file: patches/patch-src_ijs_mak
diff -N patches/patch-src_ijs_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ijs_mak 27 Oct 2007 16:49:00 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- src/ijs.mak.orig Wed Jun 6 00:23:38 2007
++++ src/ijs.mak Fri Sep 14 21:11:40 2007
+@@ -18,6 +18,8 @@
+ # in spawning the server. currently
+ # 'unix' and 'win' are supported.
+ # BINDIR - where to put the executible examples
++# SHARE_IJS - 0 to compile the library, 1 to share
++# IJS_NAME - if SHARE_IJS = 1, the name of the shared library
+
+ # This partial makefile compiles the IJS client library for use in
+ # Ghostscript.
+@@ -51,9 +53,19 @@ ijs.config-clean :
+
+ IJSDEP=$(AK)
+
++# Define the version of ijslib.dev that we are actually using.
++$(IJSGEN)ijslib.dev : $(TOP_MAKEFILES) $(IJSGEN)ijslib_$(SHARE_IJS).dev
++ $(CP_) $(IJSGEN)ijslib_$(SHARE_IJS).dev $(IJSGEN)ijslib.dev
++
++# Define the shared version of libpng.
++# Note that it requires libz, which must be searched *after* libpng.
++$(IJSGEN)ijslib_1.dev : $(TOP_MAKEFILES) $(IJS_MAK) $(ECHOGS_XE)
++ $(SETMOD) $(IJSGEN)ijslib_1 -lib $(IJS_NAME)
++
++# Define the non-shared version of ijslib.
+ ijslib_=$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_server.$(OBJ) \
+ $(IJSOBJ)ijs_client.$(OBJ) $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
+-$(IJSGEN)ijslib.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
++$(IJSGEN)ijslib_0.dev : $(IJS_MAK) $(ECHOGS_XE) $(ijslib_)
+ $(SETMOD) $(IJSGEN)ijslib $(ijslib_)
+
+ ijs_h=$(IJSSRC)ijs.h
Index: patches/patch-src_jasper_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_jasper_mak,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_jasper_mak
--- patches/patch-src_jasper_mak 26 May 2007 12:25:10 -0000 1.1
+++ patches/patch-src_jasper_mak 27 Oct 2007 16:49:00 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_jasper_mak,v 1.1 2007/05/26 12:25:10 kili Exp $
---- src/jasper.mak.orig Mon Mar 13 17:18:19 2006
-+++ src/jasper.mak Sun Apr 22 20:39:01 2007
+--- src/jasper.mak.orig Wed Jun 6 00:23:38 2007
++++ src/jasper.mak Mon Sep 3 15:27:31 2007
@@ -159,7 +159,7 @@ JAS_EXCF_=\
$(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D)
# define our specific compiler
--JAS_CC=$(CC_) $(CFLAGS) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_)
$(JAS_EXCF_)
+-JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
$(CFLAGS)
+JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
$(CFLAGS)
JASO_=$(O_)$(JASOBJ)
Index: patches/patch-src_lib_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_lib_mak,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_lib_mak
--- patches/patch-src_lib_mak 26 May 2007 12:25:10 -0000 1.1
+++ patches/patch-src_lib_mak 27 Oct 2007 16:49:00 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_lib_mak,v 1.1 2007/05/26 12:25:10 kili Exp $
---- src/lib.mak.orig Mon May 15 21:00:31 2006
-+++ src/lib.mak Sun Apr 22 20:45:37 2007
-@@ -25,7 +25,7 @@ GLO_=$(O_)$(GLOBJ)
+--- src/lib.mak.orig Tue Jul 17 11:55:56 2007
++++ src/lib.mak Mon Sep 3 15:27:31 2007
+@@ -25,12 +25,12 @@ GLO_=$(O_)$(GLOBJ)
GLI_=$(GLGENDIR) $(II)$(GLSRCDIR)
GLF_=
GLCCFLAGS=$(I_)$(GLI_)$(_I) $(GLF_)
@@ -10,3 +10,9 @@ $OpenBSD: patch-src_lib_mak,v 1.1 2007/0
GLICCCC=$(CC_) $(I_)$(GLI_) $(II)$(ICCI_)$(_I) $(ICCCF_) $(GLF_)
GLJCC=$(CC_) $(I_)$(GLI_) $(II)$(JI_)$(_I) $(JCF_) $(GLF_)
GLZCC=$(CC_) $(I_)$(GLI_) $(II)$(ZI_)$(_I) $(ZCF_) $(GLF_)
+ GLJBIG2CC=$(CC_) $(I_)$(GLI_) $(II)$(JB2I_)$(_I) $(JB2CF_) $(GLF_)
+-GLJASCC=$(CC_) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_)
++GLJASCC=$(CC) $(I_)$(JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_) ${CCFLAGS}
+ GLLDFJB2CC=$(CC_) $(I_)$(LDF_JB2I_) $(II)$(GLI_)$(_I) $(JB2CF_) $(GLF_)
+ GLLWFJPXCC=$(CC_) $(I_)$(LWF_JPXI_) $(II)$(GLI_)$(_I) $(JPXCF_) $(GLF_)
+ GLCCSHARED=$(CC_SHARED) $(GLCCFLAGS)
Index: patches/patch-src_libpng_mak
===================================================================
RCS file: patches/patch-src_libpng_mak
diff -N patches/patch-src_libpng_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libpng_mak 27 Oct 2007 16:49:00 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- src/libpng.mak.orig Wed Jun 6 00:23:38 2007
++++ src/libpng.mak Mon Sep 3 15:27:31 2007
+@@ -137,17 +137,16 @@ $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng
+
+ # Define the shared version of libpng.
+ # Note that it requires libz, which must be searched *after* libpng.
+-$(PNGGEN)libpng_1.dev : $(TOP_MAKEFILES) $(LIBPNG_MAK) $(ECHOGS_XE)
$(PZGEN)zlibe.dev
++$(PNGGEN)libpng_1.dev : $(TOP_MAKEFILES) $(LIBPNG_MAK) $(ECHOGS_XE)
+ $(SETMOD) $(PNGGEN)libpng_1 -lib $(LIBPNG_NAME)
+- $(ADDMOD) $(PNGGEN)libpng_1 -include $(PZGEN)zlibe.dev
+
+ # Define the non-shared version of libpng.
+ $(PNGGEN)libpng_0.dev : $(LIBPNG_MAK) $(ECHOGS_XE) $(png_1) $(png_2) $(png_3)\
+- $(PZGEN)zlibe.dev $(PNGGEN)lpg$(PNGVERSION).dev
++ $(PNGGEN)lpg$(PNGVERSION).dev
+ $(SETMOD) $(PNGGEN)libpng_0 $(png_1)
+ $(ADDMOD) $(PNGGEN)libpng_0 $(png_2)
+ $(ADDMOD) $(PNGGEN)libpng_0 $(png_3)
+- $(ADDMOD) $(PNGGEN)libpng_0 -include $(PZGEN)zlibe.dev
$(PNGGEN)lpg$(PNGVERSION).dev
++ $(ADDMOD) $(PNGGEN)libpng_0 $(PNGGEN)lpg$(PNGVERSION).dev
+
+ $(PNGGEN)lpg$(PNGVERSION).dev : $(LIBPNG_MAK) $(ECHOGS_XE)
$(PNGOBJ)pngwio.$(OBJ) $(PZGEN)crc32.dev
+ $(SETMOD) $(PNGGEN)lpg$(PNGVERSION) $(PNGOBJ)pngwio.$(OBJ) -include
$(PZGEN)crc32.dev
Index: patches/patch-src_unix-aux_mak
===================================================================
RCS file: patches/patch-src_unix-aux_mak
diff -N patches/patch-src_unix-aux_mak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_unix-aux_mak 27 Oct 2007 16:49:00 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/unix-aux.mak.orig Fri Jun 29 00:08:46 2007
++++ src/unix-aux.mak Mon Sep 3 15:27:31 2007
+@@ -77,7 +77,7 @@ $(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS)
+ $(GENINIT_XE): $(GLSRC)geninit.c $(AK) $(GENINIT_DEPS)
+ $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENINIT_XE) $(GLSRC)geninit.c
+
+-MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ)
$(GLOBJ)gsmisc.$(OBJ) \
++MKROMFS_OBJS=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
+ $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
+ $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
+ $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
Index: patches/patch-src_unix-dll_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_unix-dll_mak,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_unix-dll_mak
--- patches/patch-src_unix-dll_mak 19 Oct 2006 13:12:37 -0000 1.4
+++ patches/patch-src_unix-dll_mak 27 Oct 2007 16:49:00 -0000
@@ -1,33 +1,53 @@
$OpenBSD: patch-src_unix-dll_mak,v 1.4 2006/10/19 13:12:37 kili Exp $
---- src/unix-dll.mak.orig Mon Mar 13 17:18:19 2006
-+++ src/unix-dll.mak Sat Sep 30 22:25:32 2006
-@@ -43,11 +43,11 @@ GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_X
-
- # shared library
- GS_SONAME=lib$(GS).so
+--- src/unix-dll.mak.orig Wed Jul 11 01:30:47 2007
++++ src/unix-dll.mak Wed Oct 24 15:43:09 2007
+@@ -47,9 +47,9 @@ GS_SONAME_BASE=lib$(GS)
+ # GNU/Linux
+ GS_SOEXT=so
+ GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
-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).$(LIBgs_VERSION:R)
-+GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(LIBgs_VERSION)
- 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).$(LIBgs_VERSION:R)
-+GS_SO_MAJOR_MINOR=$(GS_SO).$(LIBgs_VERSION)
-
- # Shared object is built by redefining GS_XE in a recursive make.
+-GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
+-LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR)
++GS_SONAME_MAJOR=$(GS_SONAME).$(basename $(LIBgs_VERSION))
++GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(LIBgs_VERSION)
++LDFLAGS_SO=-shared
+
+ # MacOS X
+ #GS_SOEXT=dylib
+@@ -77,11 +77,12 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
-@@ -67,11 +67,11 @@ $(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`
+ # Build the small Ghostscript loaders, with Gtk+ and without
- $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
+-$(GSSOC_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER)
- $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
-+ $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
$(XLDFLAGS) $(XLIBDIRS) -lXt -lSM -lICE -lXext -lX11 -lpng
++$(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
++ $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) \
++ $(SOC_LIBS)
+
+-$(GSSOX_XE): $(GS_SO) $(GLSRC)$(SOC_LOADER)
+- $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(GLSRC)$(SOC_LOADER) \
++$(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
++ $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(GLSRC)dxmain.c \
+ -L$(BINDIR) -l$(GS) $(SOC_LIBS)
# ------------------------- Recursive make targets ------------------------- #
+@@ -99,7 +100,7 @@ SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\
+
+ # Normal shared object
+ so: SODIRS
+- $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(CFLAGS_SO) $(GCFLAGS)
$(XCFLAGS)' prefix=$(prefix) $(GSSOC) $(GSSOX)
++ $(MAKE) $(SODEFS) CFLAGS='$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)'
prefix=$(prefix) $(GSSOC) $(GSSOX)
+
+ # Debug shared object
+ # Note that this is in the same directory as the normal shared
+@@ -117,10 +118,6 @@ install-so: so
+ $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
+ $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
+ $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)
$(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
+- $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
+- ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
+- $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+- ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+
+ soinstall: install-so install-scripts install-data
--SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared
-Wl,-soname=$(GS_SONAME_MAJOR)'\
-+SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared'\
- GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
- STDIO_IMPLEMENTATION=c\
- DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
Index: patches/patch-src_unix-gcc_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_unix-gcc_mak,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_unix-gcc_mak
--- patches/patch-src_unix-gcc_mak 19 Oct 2006 13:12:37 -0000 1.4
+++ patches/patch-src_unix-gcc_mak 27 Oct 2007 16:49:00 -0000
@@ -1,7 +1,15 @@
$OpenBSD: patch-src_unix-gcc_mak,v 1.4 2006/10/19 13:12:37 kili Exp $
---- src/unix-gcc.mak.orig Wed May 10 23:54:27 2006
-+++ src/unix-gcc.mak Sat Sep 30 22:25:32 2006
-@@ -64,12 +64,12 @@ gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+--- src/unix-gcc.mak.orig Mon Jul 30 22:13:56 2007
++++ src/unix-gcc.mak Thu Oct 25 17:37:55 2007
+@@ -30,6 +30,7 @@ PSLIBDIR=./lib
+ PSRESDIR=./Resource
+ PSGENDIR=./obj
+ PSOBJDIR=./obj
++CONTRIBDIR=./contrib
+
+ # Do not edit the next group of lines.
+
+@@ -65,12 +66,12 @@ gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
docdir=$(gsdatadir)/doc
exdir=$(gsdatadir)/examples
@@ -16,7 +24,29 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.4 2
# Define whether or not searching for initialization files should always
# look in the current directory first. This leads to well-known security
-@@ -201,7 +201,7 @@ RANLIB=ranlib
+@@ -191,6 +192,9 @@ ICCSRCDIR=icclib
+ IJSSRCDIR=ijs
+ IJSEXECTYPE=unix
+
++SHARED_IJS=0
++IJS_NAME=ijs
++
+ # Define how to build the library archives. (These are not used in any
+ # standard configuration.)
+
+@@ -199,6 +203,11 @@ IJSEXECTYPE=unix
+
+ IMDISRCDIR=imdi
+
++JPX_LIB=jasper
++JPXSRCDIR=jasper
++SHARE_JPX=0
++JPX_CFLAGS=-DJAS_CONFIGURE
++
+ AR=ar
+ ARFLAGS=qc
+ RANLIB=ranlib
+@@ -207,7 +216,7 @@ RANLIB=ranlib
# Define the name of the C compiler.
@@ -25,3 +55,62 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.4 2
# Define the name of the linker for the final link step.
# Normally this is the same as the C compiler.
+@@ -371,8 +380,6 @@ EXTEND_NAMES=0
+ # Choose the device(s) to include. See devs.mak for details,
+ # devs.mak and contrib.mak for the list of available devices.
+
+-DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev
$(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev
+-
+ #DEVICE_DEVS1=
+ #DEVICE_DEVS2=
+ #DEVICE_DEVS3=
+@@ -394,31 +401,8 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.
+ #DEVICE_DEVS19=
+ #DEVICE_DEVS20=
+
+-DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev
$(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
$(DD)stcolor.dev
+-DEVICE_DEVS2=$(DD)epson.dev $(DD)eps9high.dev $(DD)eps9mid.dev
$(DD)epsonc.dev $(DD)ibmpro.dev
+-DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev
$(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev
$(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev
+-DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev
$(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev
+-DEVICE_DEVS5=$(DD)uniprint.dev $(DD)ijs.dev
+-DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev
+-DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev
+-DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev
$(DD)pcx24b.dev $(DD)pcxcmyk.dev
+-DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev
$(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev
$(DD)ppmraw.dev $(DD)pkm.dev $(DD)pkmraw.dev $(DD)pksm.dev $(DD)pksmraw.dev
+-DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev
$(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev
+-DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev $(DD)tiffgray.dev
$(DD)tiff32nc.dev $(DD)tiffsep.dev
+-DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev
$(DD)bitrgb.dev $(DD)bitcmyk.dev
+-DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev
$(DD)png256.dev $(DD)png16m.dev $(DD)pngalpha.dev
+-DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev $(DD)jpegcmyk.dev
+-DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)ps2write.dev
$(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
+-DEVICE_DEVS16=$(DD)bbox.dev
+-
+-DEVICE_DEVS17=
+-DEVICE_DEVS18=
+-DEVICE_DEVS19=
+-DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
+-DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev
$(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev
$(DD)psdcmyk.dev $(DD)psdrgb.dev
+-
+ # Shared library target to build.
+-GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so
++#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so
$(GLOBJDIR)/vgalib.so
+ #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
+
+ # ---------------------------- End of options --------------------------- #
+@@ -457,6 +441,7 @@ include $(GLSRCDIR)/jpeg.mak
+ include $(GLSRCDIR)/zlib.mak
+ include $(GLSRCDIR)/libpng.mak
+ include $(GLSRCDIR)/jbig2.mak
++include $(GLSRCDIR)/jasper.mak
+ include $(GLSRCDIR)/icclib.mak
+ include $(GLSRCDIR)/ijs.mak
+ include $(GLSRCDIR)/devs.mak
+@@ -466,6 +451,8 @@ include $(GLSRCDIR)/unixlink.mak
+ include $(GLSRCDIR)/unix-dll.mak
+ include $(GLSRCDIR)/unix-end.mak
+ include $(GLSRCDIR)/unixinst.mak
++include contrib/contrib.mak
++include cups/cups.mak
+
+ # This has to come last so it won't be taken as the default target.
+ $(AK):
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/DESCR,v
retrieving revision 1.6
diff -u -p -r1.6 DESCR
--- pkg/DESCR 10 Jul 2004 17:21:58 -0000 1.6
+++ pkg/DESCR 27 Oct 2007 16:49:00 -0000
@@ -1,27 +1,9 @@
-This is GNU Ghostscript, the GPL'ed version.
-
-Ghostscript is the well-known PostScript interpreter which is available for
-all common and most esoteric platforms and supports many different printers
-and some displays.
-
-Official ghostscript homepage, see:
- http://www.cs.wisc.edu/~ghost/index.html
-
-This port includes useful add-ons:
- o Support for HP DeskJet 670, 690, 850, 855, 870, 890, 1100 and 1600,
- see announcement on
- http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
- o A Separate package with support for pdf encryption,
- see description on
- http://www.ozemail.com.au/~geoffk/pdfencrypt/
-
-Thomas Merz has written a Ghostscript manual in PDF format:
- http://www.cs.wisc.edu/~ghost/merz.html
-
-The manual is also available in German language, see:
- http://www.muc.de/~tm/free/free.html
+Ghostscript is the well-known PostScript interpreter which is
+available for all common and most esoteric platforms and supports
+many different printers, file formats and some displays.
Flavors:
a4 - Build with support for A4 page size
+ cups - Build with the cups device and ps2raster
gtk - Build with Gtk+ support
no_x11 - Build without X support
Index: pkg/PFRAG.cups
===================================================================
RCS file: pkg/PFRAG.cups
diff -N pkg/PFRAG.cups
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.cups 27 Oct 2007 16:49:00 -0000
@@ -0,0 +1,11 @@
[EMAIL PROTECTED] $OpenBSD$
+libexec/cups/
+libexec/cups/filter/
+libexec/cups/filter/pstopxl
+libexec/cups/filter/pstoraster
+share/cups/
+share/cups/model/
+share/cups/model/pxlcolor.ppd
+share/cups/model/pxlmono.ppd
+share/ghostscript/${VERSION}/examples/pstoraster.convs
[EMAIL PROTECTED] ${SYSCONFDIR}/cups/pstroaster.convs
Index: pkg/PFRAG.gtk
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PFRAG.gtk,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.gtk
--- pkg/PFRAG.gtk 19 Oct 2006 13:12:37 -0000 1.4
+++ pkg/PFRAG.gtk 27 Oct 2007 16:49:00 -0000
@@ -1,6 +1,4 @@
@comment $OpenBSD: PFRAG.gtk,v 1.4 2006/10/19 13:12:37 kili Exp $
bin/gsc
bin/gsx
[EMAIL PROTECTED] lib/libgs.so
[EMAIL PROTECTED] lib/libgs.so.
@lib lib/libgs.so.${LIBgs_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 20 Oct 2006 16:45:58 -0000 1.10
+++ pkg/PLIST 27 Oct 2007 16:49:01 -0000
@@ -28,6 +28,7 @@ bin/ps2pdf13
bin/ps2pdf14
bin/ps2pdfwr
bin/ps2ps
+bin/ps2ps2
bin/pv.sh
bin/unix-lpr.sh
bin/wftopfa
@@ -225,6 +226,8 @@ share/ghostscript/${VERSION}/Resource/CM
share/ghostscript/${VERSION}/Resource/CMap/Hojo-RKSJ-H
share/ghostscript/${VERSION}/Resource/CMap/Hojo-V
share/ghostscript/${VERSION}/Resource/CMap/Identity-H
+share/ghostscript/${VERSION}/Resource/CMap/Identity-UTF16-H
+share/ghostscript/${VERSION}/Resource/CMap/Identity-UTF16-V
share/ghostscript/${VERSION}/Resource/CMap/Identity-V
share/ghostscript/${VERSION}/Resource/CMap/KSC-EUC-H
share/ghostscript/${VERSION}/Resource/CMap/KSC-EUC-V
@@ -313,15 +316,20 @@ share/ghostscript/${VERSION}/Resource/Co
share/ghostscript/${VERSION}/Resource/ColorSpace/DefaultRGB
share/ghostscript/${VERSION}/Resource/ColorSpace/TrivialCMYK
share/ghostscript/${VERSION}/Resource/Decoding/
+share/ghostscript/${VERSION}/Resource/Decoding/FCO_Dingbats
+share/ghostscript/${VERSION}/Resource/Decoding/FCO_Symbol
+share/ghostscript/${VERSION}/Resource/Decoding/FCO_Unicode
+share/ghostscript/${VERSION}/Resource/Decoding/FCO_Wingdings
share/ghostscript/${VERSION}/Resource/Decoding/Latin1
share/ghostscript/${VERSION}/Resource/Decoding/StandardEncoding
share/ghostscript/${VERSION}/Resource/Decoding/Unicode
+share/ghostscript/${VERSION}/Resource/Encoding/
+share/ghostscript/${VERSION}/Resource/Encoding/Wingdings
share/ghostscript/${VERSION}/doc/
share/ghostscript/${VERSION}/doc/API.htm
share/ghostscript/${VERSION}/doc/C-style.htm
share/ghostscript/${VERSION}/doc/Changes.htm
share/ghostscript/${VERSION}/doc/Commprod.htm
-share/ghostscript/${VERSION}/doc/Copying.htm
share/ghostscript/${VERSION}/doc/DLL.htm
share/ghostscript/${VERSION}/doc/Deprecated.htm
share/ghostscript/${VERSION}/doc/Details.htm
@@ -346,7 +354,6 @@ share/ghostscript/${VERSION}/doc/Install
share/ghostscript/${VERSION}/doc/Issues.htm
share/ghostscript/${VERSION}/doc/Language.htm
share/ghostscript/${VERSION}/doc/Lib.htm
-share/ghostscript/${VERSION}/doc/Maintain.htm
share/ghostscript/${VERSION}/doc/Make.htm
share/ghostscript/${VERSION}/doc/News.htm
share/ghostscript/${VERSION}/doc/Projects.htm
@@ -354,7 +361,6 @@ share/ghostscript/${VERSION}/doc/Ps-styl
share/ghostscript/${VERSION}/doc/Ps2epsi.htm
share/ghostscript/${VERSION}/doc/Ps2pdf.htm
share/ghostscript/${VERSION}/doc/Psfiles.htm
-share/ghostscript/${VERSION}/doc/Public.htm
share/ghostscript/${VERSION}/doc/README
share/ghostscript/${VERSION}/doc/Readme.htm
share/ghostscript/${VERSION}/doc/Release.htm
@@ -380,11 +386,11 @@ share/ghostscript/${VERSION}/examples/ti
share/ghostscript/${VERSION}/examples/vasarely.ps
share/ghostscript/${VERSION}/examples/waterfal.ps
share/ghostscript/${VERSION}/lib/
-share/ghostscript/${VERSION}/lib/FAPIcidfmap
-share/ghostscript/${VERSION}/lib/FAPIconfig
-share/ghostscript/${VERSION}/lib/FAPIfontmap
+share/ghostscript/${VERSION}/lib/FCOfontmap-PCLPS2
share/ghostscript/${VERSION}/lib/Fontmap
share/ghostscript/${VERSION}/lib/Fontmap.GS
+share/ghostscript/${VERSION}/lib/PDFA_def.ps
+share/ghostscript/${VERSION}/lib/PDFX_def.ps
share/ghostscript/${VERSION}/lib/acctest.ps
share/ghostscript/${VERSION}/lib/addxchar.ps
share/ghostscript/${VERSION}/lib/align.ps
@@ -432,6 +438,7 @@ share/ghostscript/${VERSION}/lib/gs_agl.
share/ghostscript/${VERSION}/lib/gs_btokn.ps
share/ghostscript/${VERSION}/lib/gs_ccfnt.ps
share/ghostscript/${VERSION}/lib/gs_ce_e.ps
+share/ghostscript/${VERSION}/lib/gs_cet.ps
share/ghostscript/${VERSION}/lib/gs_cff.ps
share/ghostscript/${VERSION}/lib/gs_cidcm.ps
share/ghostscript/${VERSION}/lib/gs_ciddc.ps
@@ -522,8 +529,10 @@ share/ghostscript/${VERSION}/lib/level1.
share/ghostscript/${VERSION}/lib/lines.ps
share/ghostscript/${VERSION}/lib/markhint.ps
share/ghostscript/${VERSION}/lib/markpath.ps
+share/ghostscript/${VERSION}/lib/mkcidfm.ps
share/ghostscript/${VERSION}/lib/necp2x.upp
share/ghostscript/${VERSION}/lib/necp2x6.upp
+share/ghostscript/${VERSION}/lib/opdfread.ps
share/ghostscript/${VERSION}/lib/packfile.ps
share/ghostscript/${VERSION}/lib/pcharstr.ps
share/ghostscript/${VERSION}/lib/pdf2dsc.ps
@@ -539,6 +548,8 @@ share/ghostscript/${VERSION}/lib/pdfwrit
share/ghostscript/${VERSION}/lib/pf2afm.ps
share/ghostscript/${VERSION}/lib/pfbtopfa.ps
share/ghostscript/${VERSION}/lib/ppath.ps
+share/ghostscript/${VERSION}/lib/pphs
+share/ghostscript/${VERSION}/lib/pphs.ps
share/ghostscript/${VERSION}/lib/prfont.ps
share/ghostscript/${VERSION}/lib/printafm.ps
share/ghostscript/${VERSION}/lib/ps2ai.ps
@@ -603,4 +614,5 @@ share/ghostscript/${VERSION}/lib/winmaps
share/ghostscript/${VERSION}/lib/wrfont.ps
share/ghostscript/${VERSION}/lib/xlatmap
share/ghostscript/${VERSION}/lib/zeroline.ps
+%%cups%%
%%gtk%%
