CVS commit: pkgsrc/graphics/netpbm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 12 09:00:33 UTC 2017

Modified Files:
        pkgsrc/graphics/netpbm: distinfo
        pkgsrc/graphics/netpbm/patches: patch-lib_Makefile

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/graphics/netpbm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/netpbm/patches/patch-lib_Makefile

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

Modified files:

Index: pkgsrc/graphics/netpbm/distinfo
diff -u pkgsrc/graphics/netpbm/distinfo:1.105 pkgsrc/graphics/netpbm/distinfo:1.106
--- pkgsrc/graphics/netpbm/distinfo:1.105       Wed Mar  8 14:48:30 2017
+++ pkgsrc/graphics/netpbm/distinfo     Wed Jul 12 09:00:33 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.105 2017/03/08 14:48:30 jperkin Exp $
+$NetBSD: distinfo,v 1.106 2017/07/12 09:00:33 wiz Exp $
 
 SHA1 (netpbm-10.77.02.tar.gz) = 73b6815ea922394050c7c596b3f7d502cde22866
 RMD160 (netpbm-10.77.02.tar.gz) = 99afb99fcce4f20aee35ecc67ff1522b17e8aa7b
@@ -9,6 +9,6 @@ RMD160 (netpbm-docs-r2897.tar.gz) = 77a3
 SHA512 (netpbm-docs-r2897.tar.gz) = 7625c1ae6c8689b896e762d368605f74060751bd4948951b788cff07a29d9f74aabf63ea57e172187e56a4dd7bff379d1672d224bc29fd7fdf5b4eb310ccbccd
 Size (netpbm-docs-r2897.tar.gz) = 469000 bytes
 SHA1 (patch-common.mk) = f590cc66e0fe6a07e848b9b46662bca350557bea
-SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca
+SHA1 (patch-lib_Makefile) = ff67c418c9d16bdc9d9c95ba658686aa36f213a0
 SHA1 (patch-lib_util_nstring.h) = 394e258902f3d8fceea8840bca11cffd030060c6
 SHA1 (patch-pm__config.in.h) = dfe51691507a2c7be2946013b1f1b6bdd9b39f49

Index: pkgsrc/graphics/netpbm/patches/patch-lib_Makefile
diff -u pkgsrc/graphics/netpbm/patches/patch-lib_Makefile:1.1 pkgsrc/graphics/netpbm/patches/patch-lib_Makefile:1.2
--- pkgsrc/graphics/netpbm/patches/patch-lib_Makefile:1.1       Thu Oct 23 23:41:32 2014
+++ pkgsrc/graphics/netpbm/patches/patch-lib_Makefile   Wed Jul 12 09:00:33 2017
@@ -1,9 +1,20 @@
-$NetBSD: patch-lib_Makefile,v 1.1 2014/10/23 23:41:32 fhajny Exp $
+$NetBSD: patch-lib_Makefile,v 1.2 2017/07/12 09:00:33 wiz Exp $
 
-Simple install target.
---- lib/Makefile.orig  2014-09-01 21:22:27.000000000 +0000
+Honor LDFLAGS.
+Simplify install target.
+
+--- lib/Makefile.orig  2017-02-04 18:09:33.000000000 +0000
 +++ lib/Makefile
-@@ -213,7 +213,7 @@ libpm.o: compile.h
+@@ -130,7 +130,7 @@ $(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).
+       $(SYMLINK) $< $@
+ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
+       $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
+-          $(SHLIB_CLIB) -lm $(LADD)
++          $(SHLIB_CLIB) -lm $(LDFLAGS) $(LADD)
+ endif
+ 
+ ifeq ($(NETPBMLIBTYPE),dll)
+@@ -217,7 +217,7 @@ libpm.o: compile.h
  .PHONY: install.lib
  ifeq ($(NETPBMLIBTYPE),unixshared)
  # install a Unix-style shared library
@@ -12,7 +23,7 @@ Simple install target.
        cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
        $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
          libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)  $(PKGDIR)/lib/
-@@ -255,28 +255,28 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(P
+@@ -259,28 +259,28 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(P
          $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/
  
  .PHONY: install.staticlib