CVS commit: pkgsrc/print/ghostscript-gpl

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Fri Nov 10 18:17:55 UTC 2017

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

Log Message:
Add support for LDFLAGS

This notably fixes building with RELRO enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/ghostscript-gpl/distinfo
cvs rdiff -u -r1.4 -r1.5 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.19 pkgsrc/print/ghostscript-gpl/distinfo:1.20
--- pkgsrc/print/ghostscript-gpl/distinfo:1.19  Fri Oct 27 16:17:49 2017
+++ pkgsrc/print/ghostscript-gpl/distinfo       Fri Nov 10 18:17:55 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2017/10/27 16:17:49 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2017/11/10 18:17:55 khorben Exp $
 
 SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238
 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d
@@ -16,7 +16,7 @@ SHA1 (patch-CVE-2016-10220) = 6edfa87948
 SHA1 (patch-CVE-2017-5951) = a4af8e561b9f5a6a330fbc2f915257bf5ba3cb2a
 SHA1 (patch-CVE-2017-6196) = 311d9236dd5abcd48ae0f412bf481e105b6207dc
 SHA1 (patch-CVE-2017-7207) = 31f4a73b49b52942385eaa3c8cf2a94b5bbde6df
-SHA1 (patch-af) = a556b774993c72481284e0d0cce222c61be4ea94
+SHA1 (patch-af) = 9644b665deee3e11a4510f9edf4c35ebabc192ea
 SHA1 (patch-ah) = 7548f6f78b8029febec044bc11214f9d6674c9d3
 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.4 pkgsrc/print/ghostscript-gpl/patches/patch-af:1.5
--- pkgsrc/print/ghostscript-gpl/patches/patch-af:1.4   Tue Apr 11 10:31:14 2017
+++ pkgsrc/print/ghostscript-gpl/patches/patch-af       Fri Nov 10 18:17:55 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2017/04/11 10:31:14 jperkin Exp $
+$NetBSD: patch-af,v 1.5 2017/11/10 18:17:55 khorben 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
@@ -35,16 +35,19 @@ 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 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
+@@ -85,12 +84,12 @@ $(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 \
+-      $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
 -      -L$(BINDIR) -l$(GS)
++      $(GLCC) -g -o $(GSSOC_XE) $(LDFLAGS) $(PSSRC)dxmainc.c \
 +      -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) \
+-      $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
 -      -L$(BINDIR) -l$(GS) $(SOC_LIBS)
++      $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(LDFLAGS) $(PSSRC)$(SOC_LOADER) \
 +      -L$(BINDIR) -L$(PREFIX)/lib -Wl,-R$(PREFIX)/lib -l$(GS) $(SOC_LIBS)
  
  # ------------------------- Recursive make targets ------------------------- #