CVS commit: pkgsrc/print/ghostscript-gpl

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Apr 11 10:31:14 UTC 2017

Modified Files:
        pkgsrc/print/ghostscript-gpl: distinfo
        pkgsrc/print/ghostscript-gpl/patches: patch-af

Log Message:
Ensure pkgsrc libraries can be found.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/ghostscript-gpl/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/ghostscript-gpl/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/ghostscript-gpl/distinfo
diff -u pkgsrc/print/ghostscript-gpl/distinfo:1.15 pkgsrc/print/ghostscript-gpl/distinfo:1.16
--- pkgsrc/print/ghostscript-gpl/distinfo:1.15  Wed Apr  5 20:11:01 2017
+++ pkgsrc/print/ghostscript-gpl/distinfo       Tue Apr 11 10:31:14 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2017/04/05 20:11:01 tez Exp $
+$NetBSD: distinfo,v 1.16 2017/04/11 10:31:14 jperkin Exp $
 
 SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
@@ -12,7 +12,7 @@ SHA1 (patch-CVE-2014-8158) = 71387f152a2
 SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a
 SHA1 (patch-CVE-2017-6196) = 311d9236dd5abcd48ae0f412bf481e105b6207dc
 SHA1 (patch-CVE-2017-7207) = 31f4a73b49b52942385eaa3c8cf2a94b5bbde6df
-SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
+SHA1 (patch-af) = a556b774993c72481284e0d0cce222c61be4ea94
 SHA1 (patch-ah) = 73a05ee51845ca70e1b18c50dee98d6799a46d52
 SHA1 (patch-ai) = 3962a3acac1d4537dbbe3fc3b205aba87387d485
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c

Index: pkgsrc/print/ghostscript-gpl/patches/patch-af
diff -u pkgsrc/print/ghostscript-gpl/patches/patch-af:1.3 pkgsrc/print/ghostscript-gpl/patches/patch-af:1.4
--- pkgsrc/print/ghostscript-gpl/patches/patch-af:1.3   Sat Apr 26 13:51:40 2014
+++ pkgsrc/print/ghostscript-gpl/patches/patch-af       Tue Apr 11 10:31:14 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2014/04/26 13:51:40 wiz Exp $
+$NetBSD: patch-af,v 1.4 2017/04/11 10:31:14 jperkin 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 @@ XXX: this still leaves the issue of libg
 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-08-08 17:01:36.000000000 +0900
-+++ base/unix-dll.mak  2012-10-10 10:03:50.000000000 +0900
-@@ -59,13 +59,12 @@
+--- base/unix-dll.mak.orig     2012-08-08 08:01:36.000000000 +0000
++++ base/unix-dll.mak
+@@ -59,13 +59,12 @@ LDFLAGS_SO=-shared -Wl,$(LD_SET_DT_SONAM
  
  
  # MacOS X
@@ -35,17 +35,17 @@ the best way to fix that.   at least it 
  
  GS_SO=$(BINDIR)/$(GS_SONAME)
  GS_SO_MAJOR=$(BINDIR)/$(GS_SONAME_MAJOR) 
-@@ -86,11 +85,11 @@
+@@ -86,11 +85,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
  # Build the small Ghostscript loaders, with Gtk+ and without
  $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
        $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -      -L$(BINDIR) -l$(GS)
-+      -L$(BINDIR) -Wl,-R$(PREFIX)/lib -l$(GS)
++      -L$(BINDIR) -L$(PREFIX)/lib -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) -l$(GS) -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
++      -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
  
  # ------------------------- Recursive make targets ------------------------- #