diff options
| -rw-r--r-- | print/ghostscript-agpl/distinfo | 6 | ||||
| -rw-r--r-- | print/ghostscript-agpl/patches/patch-af | 18 | ||||
| -rw-r--r-- | print/ghostscript-agpl/patches/patch-ah | 20 |
3 files changed, 37 insertions, 7 deletions
diff --git a/print/ghostscript-agpl/distinfo b/print/ghostscript-agpl/distinfo index da9b1de4309..ca74a89ef66 100644 --- a/print/ghostscript-agpl/distinfo +++ b/print/ghostscript-agpl/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.13 2016/09/30 12:37:31 wiz Exp $ +$NetBSD: distinfo,v 1.14 2016/10/09 17:15:11 adam Exp $ SHA1 (ghostscript-9.20.tar.gz) = ed724edec652757be25e84420f3ebd17ed70e1a5 RMD160 (ghostscript-9.20.tar.gz) = ab84774fb80746e7b5bb23dcc94e3a5aadd62c15 SHA512 (ghostscript-9.20.tar.gz) = 6c9d4f669a43192119cfe1a3d8070f3024fe08ebbbc1aa906781a71d9c08c87e0b3a215e01cdf33be671bdb7400bb641b5a65d45e1b15f8c5ccaaae202fa774c Size (ghostscript-9.20.tar.gz) = 36080631 bytes -SHA1 (patch-af) = 70358e9271b64690e89556568a1456edf42c5ebb -SHA1 (patch-ah) = 360c1dcf3ee100b4639fbd8f774ce8eb9b6a7add +SHA1 (patch-af) = 60ddeee9eaf0b87a3132a722035fe94d8bd24af8 +SHA1 (patch-ah) = ad56479bdfd22444feeb579e7e8b3fbb350c1f1a SHA1 (patch-ai) = 427504a85cc08e49c18d607b434febe65c9880a2 SHA1 (patch-base_gserrors_h) = ce75cfb7528871842a3bd35e18a6d91c89823909 SHA1 (patch-devices_devs.mak) = ceb89a4d50765e146c0f3199c31b2c053bf2be09 diff --git a/print/ghostscript-agpl/patches/patch-af b/print/ghostscript-agpl/patches/patch-af index f2a46c2544c..ff9715f0ec5 100644 --- a/print/ghostscript-agpl/patches/patch-af +++ b/print/ghostscript-agpl/patches/patch-af @@ -1,9 +1,25 @@ -$NetBSD: patch-af,v 1.7 2016/09/30 12:37:31 wiz Exp $ +$NetBSD: patch-af,v 1.8 2016/10/09 17:15:11 adam Exp $ +Use correct shared library naming on Darwin. Add some rpaths. --- base/unix-dll.mak.orig 2016-09-26 10:41:28.000000000 +0000 +++ base/unix-dll.mak +@@ -91,10 +91,10 @@ GPDL_SONAME_MAJOR_MINOR=$(GPDL_SONAME_BA + + + # MacOS X +-#GS_SOEXT=dylib +-#GS_SONAME=$(GS_SONAME_BASE).$(GS_SOEXT) +-#GS_SONAME_MAJOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_SOEXT) +-#GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_SOEXT) ++#Darwin#GS_SOEXT=dylib ++#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_MAC=-dynamiclib -install_name $(GS_SONAME_MAJOR_MINOR) + #LDFLAGS_SO=-dynamiclib -install_name $(FRAMEWORK_NAME) @@ -171,11 +171,11 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UN # Build the small Ghostscript loaders, with Gtk+ and without $(GSSOC_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS) diff --git a/print/ghostscript-agpl/patches/patch-ah b/print/ghostscript-agpl/patches/patch-ah index 8ffa51fc47b..e401f895435 100644 --- a/print/ghostscript-agpl/patches/patch-ah +++ b/print/ghostscript-agpl/patches/patch-ah @@ -1,10 +1,11 @@ -$NetBSD: patch-ah,v 1.3 2016/09/30 12:37:31 wiz Exp $ +$NetBSD: patch-ah,v 1.4 2016/10/09 17:15:11 adam Exp $ Add rpath. +Use correct install_name with path on Darwin. ---- configure.orig 2012-08-08 17:04:57.000000000 +0900 +--- configure.orig 2016-09-26 10:41:58.000000000 +0000 +++ configure -@@ -5524,7 +5524,7 @@ +@@ -6297,7 +6297,7 @@ fi fi if test x$with_libpaper != xno; then @@ -13,3 +14,16 @@ Add rpath. $as_echo "#define USE_LIBPAPER 1" >>confdefs.h +@@ -9427,9 +9427,9 @@ case `uname` in + SO_LIB_EXT=".so" + ;; + Darwin*) +- GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(GS_SONAME_MAJOR_MINOR)" +- PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(PCL_SONAME_MAJOR_MINOR)" +- XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(XPS_SONAME_MAJOR_MINOR)" ++ GS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(GS_SONAME_MAJOR_MINOR)" ++ PCL_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(PCL_SONAME_MAJOR_MINOR)" ++ XPS_DYNAMIC_LDFLAGS="-dynamiclib -install_name \$(DESTDIR)\$(libdir)/\$(XPS_SONAME_MAJOR_MINOR)" + DYNAMIC_LIBS="" + SO_LIB_EXT=".dylib" + ;; |