Wed Oct 10 02:18:25 2012 UTC ()
To fix PR
    pkg/47045
    pkg/47047
    pkg/47049

Following change pulled up from wip/ghostscript (9.06)
(1) patch-ah (configure)
    Add CPPFLAG to refer ghostscript-included freetype
    (regardless of X11_TYPE=native or modular).

(2) patch-af (base/unix-dll.mk)
    Adjust to build on Mac OS X.

(3) patch-freetype_include_freetype_internal_t1types_h
    Delete due to (1) patch will take care.


(mef)
diff -r1.39 -r1.40 pkgsrc/print/ghostscript/distinfo
diff -r1.7 -r1.8 pkgsrc/print/ghostscript/patches/patch-af
diff -r1.6 -r1.7 pkgsrc/print/ghostscript/patches/patch-ah
cvs diff -r1.39 -r1.40 pkgsrc/print/ghostscript/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/ghostscript/Attic/distinfo 2012/10/07 14:19:18 1.39
+++ pkgsrc/print/ghostscript/Attic/distinfo 2012/10/10 02:18:25 1.40
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1$NetBSD: distinfo,v 1.39 2012/10/07 14:19:18 mef Exp $ 1$NetBSD: distinfo,v 1.40 2012/10/10 02:18:25 mef Exp $
2 2
3SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf 3SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
4RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084 4RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
5Size (ghostscript-9.05.tar.bz2) = 28279634 bytes 5Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
6SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca 6SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
7SHA1 (patch-af) = 77683ee52c886ecc0efe23e2b62fca533a187a09 7SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
8SHA1 (patch-ah) = 7a20008f9b3974cd93a4398958692a2df286919a 8SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
9SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65 9SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
10SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c 10SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
11SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc 11SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
12SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2 12SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
13SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f 13SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
14SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae 14SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
15SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600 15SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600
16SHA1 (patch-freetype_include_freetype_internal_t1types_h) = 2f56641fb51555b83fd313534bd618764365aee0 
17SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 383db0c5909b9d7b33f8da341d82159dbf8594b5 16SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 383db0c5909b9d7b33f8da341d82159dbf8594b5
cvs diff -r1.7 -r1.8 pkgsrc/print/ghostscript/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/print/ghostscript/patches/Attic/patch-af 2012/10/07 14:19:18 1.7
+++ pkgsrc/print/ghostscript/patches/Attic/patch-af 2012/10/10 02:18:25 1.8
@@ -1,47 +1,51 @@ @@ -1,47 +1,51 @@
1$NetBSD: patch-af,v 1.7 2012/10/07 14:19:18 mef Exp $ 1$NetBSD: patch-af,v 1.8 2012/10/10 02:18:25 mef Exp $
2 2
3(From the log for revision 1.4 of print/ghostscript/patches/patch-af) 3(From the log for revision 1.4 of print/ghostscript/patches/patch-af)
4date: 2008/11/13 17:36:54; author: chuck; state: Exp; lines: +22 -4 4date: 2008/11/13 17:36:54; author: chuck; state: Exp; lines: +22 -4
5ghostscript has hand-rolled shared lib handling in src/unix-dll.mak 5ghostscript has hand-rolled shared lib handling in src/unix-dll.mak
6that does not do the right thing on Darwin (where shared libs are 6that does not do the right thing on Darwin (where shared libs are
7created with different linking flags and use dylib rather than so 7created with different linking flags and use dylib rather than so
8as an extension). 8as an extension).
9 9
10You need to manually reconfigure unix-dll.mak to make it work, so 10You need to manually reconfigure unix-dll.mak to make it work, so
11do it in hacks.mk. 11do it in hacks.mk.
12 12
13XXX: this still leaves the issue of libgs.so (et al.) being hardwired 13XXX: this still leaves the issue of libgs.so (et al.) being hardwired
14in PLIST, instead of using libgs.dylib (et al.). i'm not sure of 14in PLIST, instead of using libgs.dylib (et al.). i'm not sure of
15the best way to fix that. at least it compiles now.... 15the best way to fix that. at least it compiles now....
16 16
17--- base/unix-dll.mak.orig 2012-02-08 17:48:48.000000000 +0900 17--- base/unix-dll.mak.orig 2012-08-08 17:01:36.000000000 +0900
18+++ base/unix-dll.mak 2012-04-01 10:55:27.000000000 +0900 18+++ base/unix-dll.mak 2012-10-10 10:03:50.000000000 +0900
19@@ -58,10 +58,10 @@ 19@@ -59,13 +59,12 @@
20  20
21  21
22 # MacOS X 22 # MacOS X
23-#GS_SOEXT=dylib 23-#GS_SOEXT=dylib
24-#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) 24-#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
25-#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) 25-#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
26-#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) 26-#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
27+#Darwin#GS_SOEXT=dylib 27+#Darwin#GS_SOEXT=dylib
28+#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) 28+#Darwin#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT)
29+#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) 29+#Darwin#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT)
30+#Darwin#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) 30+#Darwin#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT)
31 #LDFLAGS_SO=-dynamiclib -flat_namespace 31 #LDFLAGS_SO=-dynamiclib -flat_namespace
32 LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR) 32-LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
33 #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME) 33-#LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
34@@ -85,11 +85,11 @@ 34+#Darwin#LDFLAGS_SO=-dynamiclib -install_name $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
 35
 36 GS_SO=$(BINDIR)/$(GS_SONAME)
 37 GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR)
 38@@ -86,11 +85,11 @@
35 # Build the small Ghostscript loaders, with Gtk+ and without 39 # Build the small Ghostscript loaders, with Gtk+ and without
36 $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) 40 $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
37 $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ 41 $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
38- -L$(BINDIR) -l$(GS) 42- -L$(BINDIR) -l$(GS)
39+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS) 43+ -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
40  44
41 $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) 45 $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
42 $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ 46 $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
43- -L$(BINDIR) -l$(GS) $(SOC_LIBS) 47- -L$(BINDIR) -l$(GS) $(SOC_LIBS)
44+ -L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS) 48+ -L$(BINDIR) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
45  49
46 # ------------------------- Recursive make targets ------------------------- # 50 # ------------------------- Recursive make targets ------------------------- #
47  51
cvs diff -r1.6 -r1.7 pkgsrc/print/ghostscript/patches/Attic/patch-ah (expand / switch to unified diff)

--- pkgsrc/print/ghostscript/patches/Attic/patch-ah 2012/10/07 14:19:18 1.6
+++ pkgsrc/print/ghostscript/patches/Attic/patch-ah 2012/10/10 02:18:25 1.7
@@ -1,13 +1,35 @@ @@ -1,13 +1,35 @@
1$NetBSD: patch-ah,v 1.6 2012/10/07 14:19:18 mef Exp $ 1$NetBSD: patch-ah,v 1.7 2012/10/10 02:18:25 mef Exp $
2 2
3--- configure.orig 2011-08-05 20:12:44.000000000 +0900 3(1) First chunk to fix the X11_TYPE=native problem, which
4+++ configure 2011-08-22 18:54:36.000000000 +0900 4 freetype2 in /usr/X11R7/ is way old, and work around to
5@@ -5249,7 +5250,7 @@ 5 use ghostscript-provided freetype2.
 6
 7(2) Second chunk existed from old days, and no idea, sorry (mef@).
 8
 9--- configure.orig 2012-08-08 17:04:57.000000000 +0900
 10+++ configure
 11@@ -3786,13 +3786,13 @@
 12 ;;
 13 *BSD)
 14 if test $ac_cv_c_compiler_gnu = yes; then
 15- CC_OPT_FLAGS_TO_TRY="-O2"
 16+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
 17 CC_DBG_FLAGS_TO_TRY="-g -O0"
 18 fi
 19 ;;
 20 Darwin*)
 21 if test $ac_cv_c_compiler_gnu = yes; then
 22- CC_OPT_FLAGS_TO_TRY="-O2"
 23+ CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
 24 CC_DBG_FLAGS_TO_TRY="-g -O0"
 25 fi
 26 SET_DT_SONAME=""
 27@@ -5331,7 +5331,7 @@
6 fi 28 fi
7  29
8 if test x$with_libpaper != xno; then 30 if test x$with_libpaper != xno; then
9- LIBS="$LIBS -lpaper" 31- LIBS="$LIBS -lpaper"
10+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper" 32+ LIBS="$LIBS -L${LPLIBDIR} -Wl,-R${LPLIBDIR} -lpaper"
11  33
12 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h 34 $as_echo "#define USE_LIBPAPER 1" >>confdefs.h
13  35