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 context 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,11 +1,11 @@
-$NetBSD: distinfo,v 1.39 2012/10/07 14:19:18 mef Exp $
+$NetBSD: distinfo,v 1.40 2012/10/10 02:18:25 mef Exp $
 
 SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
 RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
 Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
 SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
-SHA1 (patch-af) = 77683ee52c886ecc0efe23e2b62fca533a187a09
-SHA1 (patch-ah) = 7a20008f9b3974cd93a4398958692a2df286919a
+SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
+SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
 SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
@@ -13,5 +13,4 @@
 SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
 SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
 SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600
-SHA1 (patch-freetype_include_freetype_internal_t1types_h) = 2f56641fb51555b83fd313534bd618764365aee0
 SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 383db0c5909b9d7b33f8da341d82159dbf8594b5
cvs diff -r1.7 -r1.8 pkgsrc/print/ghostscript/patches/Attic/patch-af (expand / switch to context 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,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2012/10/07 14:19:18 mef Exp $
+$NetBSD: patch-af,v 1.8 2012/10/10 02:18:25 mef Exp $
 
 (From the log for revision 1.4 of print/ghostscript/patches/patch-af)
 date: 2008/11/13 17:36:54;  author: chuck;  state: Exp;  lines: +22 -4
@@ -14,9 +14,9 @@
 in PLIST, instead of using libgs.dylib (et al.).   i'm not sure of
 the best way to fix that.   at least it compiles now....
 
---- base/unix-dll.mak.orig	2012-02-08 17:48:48.000000000 +0900
-+++ base/unix-dll.mak	2012-04-01 10:55:27.000000000 +0900
-@@ -58,10 +58,10 @@
+--- base/unix-dll.mak.orig	2012-08-08 17:01:36.000000000 +0900
++++ base/unix-dll.mak	2012-10-10 10:03:50.000000000 +0900
+@@ -59,13 +59,12 @@
  
  
  # MacOS X
@@ -29,9 +29,13 @@
 +#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_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
- #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
-@@ -85,11 +85,11 @@
+-LDFLAGS_SO_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR)
+-#LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME)
++#Darwin#LDFLAGS_SO=-dynamiclib -install_name $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+ 
+ GS_SO=$(BINDIR)/$(GS_SONAME)
+ GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) 
+@@ -86,11 +85,11 @@
  # Build the small Ghostscript loaders, with Gtk+ and without
  $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
  	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
cvs diff -r1.6 -r1.7 pkgsrc/print/ghostscript/patches/Attic/patch-ah (expand / switch to context 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,8 +1,30 @@
-$NetBSD: patch-ah,v 1.6 2012/10/07 14:19:18 mef Exp $
+$NetBSD: patch-ah,v 1.7 2012/10/10 02:18:25 mef Exp $
 
---- configure.orig	2011-08-05 20:12:44.000000000 +0900
-+++ configure	2011-08-22 18:54:36.000000000 +0900
-@@ -5249,7 +5250,7 @@
+(1) First chunk to fix the X11_TYPE=native problem, which
+    freetype2 in /usr/X11R7/ is way old, and work around to 
+    use ghostscript-provided freetype2.
+
+(2) Second chunk existed from old days, and no idea, sorry (mef@).
+
+--- configure.orig	2012-08-08 17:04:57.000000000 +0900
++++ configure
+@@ -3786,13 +3786,13 @@
+         ;;
+         *BSD)
+         if test $ac_cv_c_compiler_gnu = yes; then
+-            CC_OPT_FLAGS_TO_TRY="-O2"
++            CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
+             CC_DBG_FLAGS_TO_TRY="-g -O0"
+         fi
+         ;;
+         Darwin*)
+         if test $ac_cv_c_compiler_gnu = yes; then
+-            CC_OPT_FLAGS_TO_TRY="-O2"
++            CC_OPT_FLAGS_TO_TRY="-O2 -I./freetype/include"
+             CC_DBG_FLAGS_TO_TRY="-g -O0"
+         fi
+         SET_DT_SONAME=""
+@@ -5331,7 +5331,7 @@
  fi
  
  if test x$with_libpaper != xno; then