Update to ghostscript-8.61 (mostly bug fix release). This also fixes
some linking problem for the gtk-cups flavor.
Please comment and test.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile 19 Nov 2007 20:06:56 -0000 1.52
+++ Makefile 26 Dec 2007 13:42:50 -0000
@@ -2,7 +2,7 @@
COMMENT= GNU PostScript interpreter
-VERSION= 8.60
+VERSION= 8.61
DISTNAME= ghostscript-${VERSION}
CATEGORIES= print lang
SHARED_LIBS= gs 10.0
@@ -97,8 +97,11 @@ WANTLIB+= Xcomposite Xcursor Xdamage Xau
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)"
+MAKE_FLAGS+= SOC_CFLAGS="$$(pkg-config gtk+-2.0 --cflags)"
+# This one is used in the addition of SOC_LIBS to MAKE_FLAGS later.
+# We need this stunt to get gsc and gsx linked correctly when the cups
+# flavor is enabled.
+SOC_LIBS= $$(pkg-config gtk+-2.0 --libs)
ALL_TARGET= so
INSTALL_TARGET= install install-so
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
@@ -113,10 +116,19 @@ DEVICES+= ${X11_DEVICES}
.if ${FLAVOR:L:Mcups}
LIB_DEPENDS+= cups.>=3,cupsimage.>=2::print/cups
-EXTRALIBS+= $$(cups-config --image --libs)
+CUPSLIBS= $$(cups-config --image --libs)
+EXTRALIBS+= ${CUPSLIBS}
+SOC_LIBS+= ${CUPSLIBS}
DEVICES+= ${CUPS_DEVICES}
WANTLIB+= crypto pthread ssl tiff
+MAKE_FLAGS+= CUPSCFLAGS="$$(cups-config --cflags)" \
+ CUPSSERVERBIN="$$(cups-config --serverbin)" \
+ CUPSSERVERROOT="$$(cups-config --serverroot)" \
+ CUPSDATA="$$(cups-config --datadir)"
.endif
+
+SOC_LIBS?=
+MAKE_FLAGS+= SOC_LIBS="${SOC_LIBS}"
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 19 Nov 2007 20:06:56 -0000 1.9
+++ distinfo 26 Dec 2007 13:42:50 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (ghostscript-8.61.tar.gz) = qlXKkLiRwbO3QCoJohRqhw==
+RMD160 (ghostscript-8.61.tar.gz) = 9QYEAL0qZ24eF38Jt8pDUHl/jCg=
+SHA1 (ghostscript-8.61.tar.gz) = H0PsSKsTzsD/fEmet8o+b1wK9aM=
+SHA256 (ghostscript-8.61.tar.gz) = asXUwcJu51B/ODR4pIdpR7vl3Lbaf/oOXJxu/Fuqdek=
+SIZE (ghostscript-8.61.tar.gz) = 15764823
Index: patches/patch-src_devs_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_devs_mak,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_devs_mak
--- patches/patch-src_devs_mak 19 Nov 2007 20:06:56 -0000 1.1
+++ patches/patch-src_devs_mak 26 Dec 2007 13:42:50 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_devs_mak,v 1.1 2007/11/19 20:06:56 kili Exp $
---- 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)
+--- src/devs.mak.orig Wed Nov 7 05:19:13 2007
++++ src/devs.mak Fri Dec 21 21:27:15 2007
+@@ -661,14 +661,13 @@ $(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj56.c $(PDEVH)
### -------------------- The ijs client ----------------- ###
Index: patches/patch-src_jasper_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_jasper_mak,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_jasper_mak
--- patches/patch-src_jasper_mak 19 Nov 2007 20:06:56 -0000 1.2
+++ patches/patch-src_jasper_mak 26 Dec 2007 13:42:50 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-src_jasper_mak,v 1.2 2007/11/19 20:06:56 kili Exp $
---- src/jasper.mak.orig Wed Jun 6 00:23:38 2007
-+++ src/jasper.mak Mon Sep 3 15:27:31 2007
+--- src/jasper.mak.orig Thu Oct 18 02:36:37 2007
++++ src/jasper.mak Fri Dec 21 21:28:53 2007
@@ -159,7 +159,7 @@ JAS_EXCF_=\
$(D_)EXCLUDE_PNG_SUPPORT$(_D_)1$(_D)
# define our specific compiler
--JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
$(CFLAGS)
-+JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
$(CFLAGS)
+-JAS_CC=$(CC_) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
++JAS_CC=$(CC) $(I_)$(JASGEN) $(II)$(JPXI_)$(_I) $(JPXCF_) $(JAS_EXCF_)
JASO_=$(O_)$(JASOBJ)
# switch in the selected .dev
Index: patches/patch-src_unix-dll_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_unix-dll_mak,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_unix-dll_mak
--- patches/patch-src_unix-dll_mak 19 Nov 2007 20:06:56 -0000 1.5
+++ patches/patch-src_unix-dll_mak 26 Dec 2007 13:42:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_unix-dll_mak,v 1.5 2007/11/19 20:06:56 kili Exp $
---- src/unix-dll.mak.orig Wed Jul 11 01:30:47 2007
-+++ src/unix-dll.mak Wed Oct 24 15:43:09 2007
+--- src/unix-dll.mak.orig Thu Oct 18 20:58:54 2007
++++ src/unix-dll.mak Fri Dec 21 21:30:19 2007
@@ -47,9 +47,9 @@ GS_SONAME_BASE=lib$(GS)
# GNU/Linux
GS_SOEXT=so
@@ -14,7 +14,7 @@ $OpenBSD: patch-src_unix-dll_mak,v 1.5 2
# MacOS X
#GS_SOEXT=dylib
-@@ -77,11 +77,12 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
+@@ -78,11 +78,12 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
# Build the small Ghostscript loaders, with Gtk+ and without
@@ -31,7 +31,7 @@ $OpenBSD: patch-src_unix-dll_mak,v 1.5 2
-L$(BINDIR) -l$(GS) $(SOC_LIBS)
# ------------------------- Recursive make targets ------------------------- #
-@@ -99,7 +100,7 @@ SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\
+@@ -100,7 +101,7 @@ SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\
# Normal shared object
so: SODIRS
@@ -40,7 +40,7 @@ $OpenBSD: patch-src_unix-dll_mak,v 1.5 2
# Debug shared object
# Note that this is in the same directory as the normal shared
-@@ -117,10 +118,6 @@ install-so: so
+@@ -119,10 +120,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)
@@ -48,6 +48,6 @@ $OpenBSD: patch-src_unix-dll_mak,v 1.5 2
- 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
+ $(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)/iapi.h
+ $(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)/ierrors.h
Index: patches/patch-src_unix-gcc_mak
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/patches/patch-src_unix-gcc_mak,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_unix-gcc_mak
--- patches/patch-src_unix-gcc_mak 19 Nov 2007 20:06:56 -0000 1.5
+++ patches/patch-src_unix-gcc_mak 26 Dec 2007 13:42:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_unix-gcc_mak,v 1.5 2007/11/19 20:06:56 kili Exp $
---- src/unix-gcc.mak.orig Mon Jul 30 22:13:56 2007
-+++ src/unix-gcc.mak Thu Oct 25 17:37:55 2007
+--- src/unix-gcc.mak.orig Fri Nov 9 22:18:04 2007
++++ src/unix-gcc.mak Fri Dec 21 21:31:51 2007
@@ -30,6 +30,7 @@ PSLIBDIR=./lib
PSRESDIR=./Resource
PSGENDIR=./obj
@@ -9,7 +9,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
# Do not edit the next group of lines.
-@@ -65,12 +66,12 @@ gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
+@@ -68,12 +69,12 @@ gsincludedir = $(includedir)/ghostscript/
docdir=$(gsdatadir)/doc
exdir=$(gsdatadir)/examples
@@ -24,7 +24,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
# Define whether or not searching for initialization files should always
# look in the current directory first. This leads to well-known security
-@@ -191,6 +192,9 @@ ICCSRCDIR=icclib
+@@ -188,6 +189,9 @@ ICCSRCDIR=icclib
IJSSRCDIR=ijs
IJSEXECTYPE=unix
@@ -34,7 +34,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
# Define how to build the library archives. (These are not used in any
# standard configuration.)
-@@ -199,6 +203,11 @@ IJSEXECTYPE=unix
+@@ -196,6 +200,11 @@ IJSEXECTYPE=unix
IMDISRCDIR=imdi
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
AR=ar
ARFLAGS=qc
RANLIB=ranlib
-@@ -207,7 +216,7 @@ RANLIB=ranlib
+@@ -204,7 +213,7 @@ RANLIB=ranlib
# Define the name of the C compiler.
@@ -55,7 +55,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 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
+@@ -368,8 +377,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.
@@ -64,7 +64,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
#DEVICE_DEVS1=
#DEVICE_DEVS2=
#DEVICE_DEVS3=
-@@ -394,31 +401,8 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.
+@@ -391,31 +398,8 @@ DEVICE_DEVS=$(DISPLAY_DEV) $(DD)x11.dev $(DD)x11alpha.
#DEVICE_DEVS19=
#DEVICE_DEVS20=
@@ -82,7 +82,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
-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_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)ps2write.dev
$(DD)epswrite.dev $(DD)txtwrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev
-DEVICE_DEVS16=$(DD)bbox.dev
-
-DEVICE_DEVS17=
@@ -97,7 +97,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
# ---------------------------- End of options --------------------------- #
-@@ -457,6 +441,7 @@ include $(GLSRCDIR)/jpeg.mak
+@@ -454,6 +438,7 @@ include $(GLSRCDIR)/jpeg.mak
include $(GLSRCDIR)/zlib.mak
include $(GLSRCDIR)/libpng.mak
include $(GLSRCDIR)/jbig2.mak
@@ -105,7 +105,7 @@ $OpenBSD: patch-src_unix-gcc_mak,v 1.5 2
include $(GLSRCDIR)/icclib.mak
include $(GLSRCDIR)/ijs.mak
include $(GLSRCDIR)/devs.mak
-@@ -466,6 +451,8 @@ include $(GLSRCDIR)/unixlink.mak
+@@ -463,6 +448,8 @@ include $(GLSRCDIR)/unixlink.mak
include $(GLSRCDIR)/unix-dll.mak
include $(GLSRCDIR)/unix-end.mak
include $(GLSRCDIR)/unixinst.mak
Index: pkg/PFRAG.gtk
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PFRAG.gtk,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.gtk
--- pkg/PFRAG.gtk 19 Nov 2007 20:06:56 -0000 1.5
+++ pkg/PFRAG.gtk 26 Dec 2007 13:42:50 -0000
@@ -1,4 +1,7 @@
@comment $OpenBSD: PFRAG.gtk,v 1.5 2007/11/19 20:06:56 kili Exp $
bin/gsc
bin/gsx
+include/ghostscript/
+include/ghostscript/iapi.h
+include/ghostscript/ierrors.h
@lib lib/libgs.so.${LIBgs_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/ghostscript/gnu/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 19 Nov 2007 20:06:56 -0000 1.11
+++ pkg/PLIST 26 Dec 2007 13:42:50 -0000
@@ -295,11 +295,19 @@ share/ghostscript/${VERSION}/Resource/CM
share/ghostscript/${VERSION}/Resource/CMap/UniJIS-UTF32-V
share/ghostscript/${VERSION}/Resource/CMap/UniJIS-UTF8-H
share/ghostscript/${VERSION}/Resource/CMap/UniJIS-UTF8-V
+share/ghostscript/${VERSION}/Resource/CMap/UniJIS2004-UTF16-H
+share/ghostscript/${VERSION}/Resource/CMap/UniJIS2004-UTF16-V
+share/ghostscript/${VERSION}/Resource/CMap/UniJIS2004-UTF32-H
+share/ghostscript/${VERSION}/Resource/CMap/UniJIS2004-UTF32-V
+share/ghostscript/${VERSION}/Resource/CMap/UniJIS2004-UTF8-H
+share/ghostscript/${VERSION}/Resource/CMap/UniJIS2004-UTF8-V
share/ghostscript/${VERSION}/Resource/CMap/UniJISPro-UCS2-HW-V
share/ghostscript/${VERSION}/Resource/CMap/UniJISPro-UCS2-V
share/ghostscript/${VERSION}/Resource/CMap/UniJISPro-UTF8-V
share/ghostscript/${VERSION}/Resource/CMap/UniJISX0213-UTF32-H
share/ghostscript/${VERSION}/Resource/CMap/UniJISX0213-UTF32-V
+share/ghostscript/${VERSION}/Resource/CMap/UniJISX02132004-UTF32-H
+share/ghostscript/${VERSION}/Resource/CMap/UniJISX02132004-UTF32-V
share/ghostscript/${VERSION}/Resource/CMap/UniKS-UCS2-H
share/ghostscript/${VERSION}/Resource/CMap/UniKS-UCS2-V
share/ghostscript/${VERSION}/Resource/CMap/UniKS-UTF16-H
@@ -537,6 +545,7 @@ share/ghostscript/${VERSION}/lib/packfil
share/ghostscript/${VERSION}/lib/pcharstr.ps
share/ghostscript/${VERSION}/lib/pdf2dsc.ps
share/ghostscript/${VERSION}/lib/pdf_base.ps
+share/ghostscript/${VERSION}/lib/pdf_cslayer.ps
share/ghostscript/${VERSION}/lib/pdf_draw.ps
share/ghostscript/${VERSION}/lib/pdf_font.ps
share/ghostscript/${VERSION}/lib/pdf_main.ps
