diff options
| -rw-r--r-- | print/ghostscript/Makefile | 9 | ||||
| -rw-r--r-- | print/ghostscript/PLIST | 5 | ||||
| -rw-r--r-- | print/ghostscript/distinfo | 15 | ||||
| -rw-r--r-- | print/ghostscript/patches/patch-ae | 13 | ||||
| -rw-r--r-- | print/ghostscript/patches/patch-af | 27 | ||||
| -rw-r--r-- | print/ghostscript/patches/patch-ah | 15 | ||||
| -rw-r--r-- | print/ghostscript/patches/patch-ak | 31 | ||||
| -rw-r--r-- | print/ghostscript/patches/patch-al | 13 |
8 files changed, 57 insertions, 71 deletions
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile index 48dbe79310c..1ba8f68a937 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.74 2010/01/20 08:50:16 tnn Exp $ +# $NetBSD: Makefile,v 1.75 2010/02/23 20:31:26 drochner Exp $ -DISTNAME= ghostscript-8.70 -PKGREVISION= 3 +DISTNAME= ghostscript-8.71 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES+= http://ghostscript.com/releases/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ghostscript.sourceforge.net/ @@ -76,6 +75,7 @@ post-extract: ${MKDIR} ${WRKSRC}/obj # ${MV} ${WRKSRC}/jasper ${WRKSRC}/jasper.dontuse ${MV} ${WRKSRC}/libpng ${WRKSRC}/libpng.dontuse + ${MV} ${WRKSRC}/tiff ${WRKSRC}/tiff.dontuse # ${MV} ${WRKSRC}/zlib ${WRKSRC}/zlib.dontuse post-install: @@ -85,6 +85,7 @@ post-install: .include "../../print/libpaper/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" # pkgsrc jasper is too new #.include "../../graphics/jasper/buildlink3.mk" diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST index 208068aefb5..7e076b6e0bd 100644 --- a/print/ghostscript/PLIST +++ b/print/ghostscript/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2009/06/14 21:16:21 joerg Exp $ +@comment $NetBSD: PLIST,v 1.16 2010/02/23 20:31:26 drochner Exp $ bin/bdftops bin/dumphint bin/dvipdf @@ -112,6 +112,7 @@ share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-2 share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-3 share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-4 share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-5 +share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-6 share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-B5pc share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-ETenms-B5 share/ghostscript/${PKGVERSION}/Resource/CMap/Adobe-CNS1-H-CID @@ -329,6 +330,8 @@ share/ghostscript/${PKGVERSION}/Resource/ColorSpace/DefaultCMYK share/ghostscript/${PKGVERSION}/Resource/ColorSpace/DefaultGray share/ghostscript/${PKGVERSION}/Resource/ColorSpace/DefaultRGB share/ghostscript/${PKGVERSION}/Resource/ColorSpace/TrivialCMYK +share/ghostscript/${PKGVERSION}/Resource/ColorSpace/sGray +share/ghostscript/${PKGVERSION}/Resource/ColorSpace/sRGB share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Dingbats share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Symbol share/ghostscript/${PKGVERSION}/Resource/Decoding/FCO_Unicode diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo index 69bfbe01f7f..2dbc9ff2038 100644 --- a/print/ghostscript/distinfo +++ b/print/ghostscript/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.28 2009/12/23 13:27:59 drochner Exp $ +$NetBSD: distinfo,v 1.29 2010/02/23 20:31:26 drochner Exp $ -SHA1 (ghostscript-8.70.tar.bz2) = 4e4132713258c680a4fbec577e6dfc82b980ec01 -RMD160 (ghostscript-8.70.tar.bz2) = 88f7d380d1075c57829aa7f34334542fd2bbd6ce -Size (ghostscript-8.70.tar.bz2) = 17019673 bytes +SHA1 (ghostscript-8.71.tar.gz) = 629299140f612fac32f6289be0904107dfd1b555 +RMD160 (ghostscript-8.71.tar.gz) = efce74cf22cf99b2b1a145df466e79a86e3dfefb +Size (ghostscript-8.71.tar.gz) = 25240801 bytes SHA1 (patch-ab) = 7a98cad37f94394f172bdac23f5dd73fb1f08006 SHA1 (patch-ad) = 8b3b743b2d6405ea35bfb16970942ecd55702401 -SHA1 (patch-ae) = 50335e72adebe95ab0cb5873d1c6dd00e971579a -SHA1 (patch-af) = e4d56f13f5eb595a3929aac6c257012961f59c2b +SHA1 (patch-af) = 13aa7b5159cbd5413353b48380d5665ed879fe64 SHA1 (patch-ag) = bdfbe40c849537d84ac2b3def4a0a3a87ecc152f -SHA1 (patch-ah) = efc85dead838505ee462714167f196db2deeb0aa +SHA1 (patch-ah) = 8cdf9cc1a62e3eb34ca8edf7bbaf9d542b612519 SHA1 (patch-ai) = ad69ddd4a4bd50cf2263ac6c6d17a59798ef3124 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c -SHA1 (patch-ak) = ff4603b188dad8ba8144e96f677ee4bda53df009 +SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc diff --git a/print/ghostscript/patches/patch-ae b/print/ghostscript/patches/patch-ae deleted file mode 100644 index b3d4594d22f..00000000000 --- a/print/ghostscript/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2009/02/12 19:51:08 drochner Exp $ - ---- base/gscencs.c.orig 2007-06-06 00:23:38.000000000 +0200 -+++ base/gscencs.c -@@ -117,7 +117,7 @@ bool - gs_is_c_glyph_name(const byte *str, uint len) - { - return (str >= (const byte *)gs_c_known_encoding_chars && -- (str - (const byte *)gs_c_known_encoding_chars) < -+ (unsigned long)(str - (const byte *)gs_c_known_encoding_chars) < - gs_c_known_encoding_total_chars); - } - diff --git a/print/ghostscript/patches/patch-af b/print/ghostscript/patches/patch-af index 55e06af3835..62a0e1dfb3b 100644 --- a/print/ghostscript/patches/patch-af +++ b/print/ghostscript/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.5 2009/02/12 19:51:08 drochner Exp $ +$NetBSD: patch-af,v 1.6 2010/02/23 20:31:26 drochner Exp $ ---- base/unix-dll.mak.orig 2008-09-13 22:22:25.000000000 +0200 +--- base/unix-dll.mak.orig 2009-10-19 20:24:53.000000000 +0000 +++ base/unix-dll.mak @@ -52,12 +52,12 @@ GS_SONAME_MAJOR_MINOR=$(GS_SONAME).$(GS_ LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR) @@ -14,23 +14,28 @@ $NetBSD: patch-af,v 1.5 2009/02/12 19:51:08 drochner Exp $ +#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) +#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) +#Darwin#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) - #LDFLAGS_SO=-dynamiclib -flat-namespace --#LDFLAGS_SO=-dynamiclib -install-name $(GS_SONAME_MAJOR_MINOR) + #LDFLAGS_SO=-dynamiclib -flat_namespace +-#LDFLAGS_SO=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR) +#Darwin#LDFLAGS_SO=-dynamiclib -install_name $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR) - #LDFLAGS_SO=-dynamiclib + #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME) GS_SO=$(BINDIR)/$(GS_SONAME) -@@ -79,11 +79,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) - # Build the small Ghostscript loaders, with Gtk+ and without +@@ -80,15 +80,15 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) -- $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c -L$(BINDIR) -l$(GS) -+ $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) + $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ +- $(LDFLAGS) -L$(BINDIR) -l$(GS) ++ $(LDFLAGS) -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ -- -L$(BINDIR) -l$(GS) $(SOC_LIBS) -+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) +- $(LDFLAGS) -L$(BINDIR) -l$(GS) $(SOC_LIBS) ++ $(LDFLAGS) -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) # ------------------------- Recursive make targets ------------------------- # +-SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\ ++SODEFS=LDFLAGS='$(LDFLAGS)' LDFLAGS_SO='$(LDFLAGS_SO)'\ + GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ + STDIO_IMPLEMENTATION=c\ + DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\ diff --git a/print/ghostscript/patches/patch-ah b/print/ghostscript/patches/patch-ah index fdead1aa81b..0479e726f4a 100644 --- a/print/ghostscript/patches/patch-ah +++ b/print/ghostscript/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2009/02/13 15:31:35 drochner Exp $ +$NetBSD: patch-ah,v 1.4 2010/02/23 20:31:26 drochner Exp $ ---- configure.orig 2009-02-13 12:06:58.000000000 +0100 +--- configure.orig 2010-02-10 20:31:30.000000000 +0000 +++ configure -@@ -7749,7 +7749,7 @@ fi +@@ -8126,7 +8126,7 @@ fi fi if test x$with_libpaper != xno; then @@ -11,3 +11,12 @@ $NetBSD: patch-ah,v 1.3 2009/02/13 15:31:35 drochner Exp $ cat >>confdefs.h <<\_ACEOF #define USE_LIBPAPER 1 +@@ -9203,7 +9203,7 @@ done + + fi + +- if test -z $LOCAL_LIBTIFF_VERSION && test "x$HAVE_SYSTEM_LIBTIFF" == x; then ++ if test -z $LOCAL_LIBTIFF_VERSION && test "x$HAVE_SYSTEM_LIBTIFF" = x; then + { $as_echo "$as_me:$LINENO: Could not find a copy of libtiff on your system. + Disabling tiff output devices." >&5 + $as_echo "$as_me: Could not find a copy of libtiff on your system. diff --git a/print/ghostscript/patches/patch-ak b/print/ghostscript/patches/patch-ak deleted file mode 100644 index 2ee9568cf4b..00000000000 --- a/print/ghostscript/patches/patch-ak +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2009/12/23 13:27:59 drochner Exp $ - ---- base/gsmisc.c.orig 2009-12-23 12:29:51.000000000 +0000 -+++ base/gsmisc.c -@@ -69,7 +69,7 @@ int outprintf(const gs_memory_t *mem, co - - va_start(args, fmt); - -- count = vsprintf(buf, fmt, args); -+ count = vsnprintf(buf, sizeof(buf), fmt, args); - outwrite(mem, buf, count); - if (count >= PRINTF_BUF_LENGTH) { - count = sprintf(buf, -@@ -89,7 +89,7 @@ int errprintf(const char *fmt, ...) - - va_start(args, fmt); - -- count = vsprintf(buf, fmt, args); -+ count = vsnprintf(buf, sizeof(buf), fmt, args); - errwrite(buf, count); - if (count >= PRINTF_BUF_LENGTH) { - count = sprintf(buf, -@@ -236,7 +236,7 @@ int gs_throw_imp(const char *func, const - va_list ap; - - va_start(ap, fmt); -- vsprintf(msg, fmt, ap); -+ vsnprintf(msg, sizeof(msg), fmt, ap); - msg[sizeof(msg) - 1] = 0; - va_end(ap); - diff --git a/print/ghostscript/patches/patch-al b/print/ghostscript/patches/patch-al new file mode 100644 index 00000000000..99ee9106062 --- /dev/null +++ b/print/ghostscript/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.3 2010/02/23 20:31:26 drochner Exp $ + +--- base/unixlink.mak.orig 2010-02-18 12:08:31.000000000 +0000 ++++ base/unixlink.mak +@@ -50,7 +50,7 @@ $(GS_A): $(obj_tr) $(ECHOGS_XE) $(INT_AR + # which has limited environment space. + ldt_tr=$(PSOBJ)ldt.tr + $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) +- $(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE) ++ $(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) $(LDFLAGS_SO) -o $(GS_XE) + $(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)gs.$(OBJ) -s + cat $(ld_tr) >>$(ldt_tr) + $(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS) |