Honor LDFLAGS. Fixes RELRO build.

Some minor cleanup while here.

5 files changed, 19 insertions, 23 deletions

diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index ddff7846068..b562f50202e 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2015/02/21 00:09:08 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.37 2017/07/12 10:53:23 wiz Exp $
 
 DISTNAME=	cdparanoia-III-10.2
 PKGNAME=	cdparanoia-3.0.10.2
diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
index 55101faeafd..7e476c38a0a 100644
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2015/11/03 01:12:27 agc Exp $
+$NetBSD: distinfo,v 1.35 2017/07/12 10:53:23 wiz Exp $
 
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
@@ -6,10 +6,10 @@ SHA512 (cdparanoia-III-10.2.src.tgz) = 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4ee
 Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes
 SHA1 (patch-aa) = b67a318d4e5c0ca87639645096a41eaeb3fb2d1e
 SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
-SHA1 (patch-ac) = d47ec9e3ae300cc6fcb4e7377bb8a13ff0c3cacd
-SHA1 (patch-ad) = f0c79049cbc26e9483c410f00cb6df85c280c145
+SHA1 (patch-ac) = 87718f65b1994f6e266c7b8221fb8b585b9094b8
+SHA1 (patch-ad) = 861237917c229a4640b9311d371913aae78b746c
 SHA1 (patch-ae) = f12c5aca0b78803e1ab1be8518b032748a45ee0e
-SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
+SHA1 (patch-ba) = c846425d26372bada1bc086a7dc26120163feb13
 SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
 SHA1 (patch-cb) = 880d667b26891beb2c64ebe1937c4a2931dd42d5
 SHA1 (patch-cc) = e692c8f4a9811123baa6cb25c09dea0004cc9b68
diff --git a/audio/cdparanoia/patches/patch-ac b/audio/cdparanoia/patches/patch-ac
index 4ee3dd0e71c..b2db28f4c0b 100644
--- a/audio/cdparanoia/patches/patch-ac
+++ b/audio/cdparanoia/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
+$NetBSD: patch-ac,v 1.12 2017/07/12 10:53:23 wiz Exp $
 
 --- configure.orig	2006-08-16 18:02:25.000000000 +0000
 +++ configure
@@ -1127,7 +1127,7 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; }
      ;;
-@@ -632,17 +1116,16 @@ Try \`$0 --help' for more information."
+@@ -632,17 +1116,16 @@ Try \`$0 --help' for more information." 
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
@@ -3083,7 +3083,7 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2098,219 +2782,72 @@ return f (e, argv, 0) != argv[0]  ||  f
+@@ -2098,219 +2782,72 @@ return f (e, argv, 0) != argv[0]  ||  f 
    return 0;
  }
  _ACEOF
@@ -8286,7 +8286,7 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -5607,124 +6559,108 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -5607,124 +6559,106 @@ generated by GNU Autoconf 2.59.  Invocat
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -8405,8 +8405,6 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
      ac_cs_recheck=: ;;
 -  --version | --vers* | -V )
 -    echo "$ac_cs_version"; exit 0 ;;
@@ -8457,7 +8455,7 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
  
    esac
    shift
-@@ -5738,32 +6674,48 @@ if $ac_cs_silent; then
+@@ -5738,32 +6676,48 @@ if $ac_cs_silent; then
  fi
  
  _ACEOF
@@ -8519,7 +8517,7 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -5773,344 +6725,464 @@ if $ac_need_defaults; then
+@@ -5773,344 +6727,464 @@ if $ac_need_defaults; then
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -9263,7 +9261,7 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -6132,4 +7204,8 @@ if test "$no_create" != yes; then
+@@ -6132,4 +7206,8 @@ if test "$no_create" != yes; then
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
diff --git a/audio/cdparanoia/patches/patch-ad b/audio/cdparanoia/patches/patch-ad
index 4c06fbe43af..92c189f7be3 100644
--- a/audio/cdparanoia/patches/patch-ad
+++ b/audio/cdparanoia/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2012/05/29 11:08:32 obache Exp $
+$NetBSD: patch-ad,v 1.7 2017/07/12 10:53:23 wiz Exp $
 
 --- utils.h.orig	2008-08-22 09:39:06.000000000 +0000
-+++ utils.h	2010-03-24 11:10:19.000000000 +0000
++++ utils.h
 @@ -1,5 +1,20 @@
  #include <stdlib.h>
 +#ifdef __linux__
@@ -23,7 +23,7 @@ $NetBSD: patch-ad,v 1.6 2012/05/29 11:08:32 obache Exp $
  #include <stdio.h>
  #include <errno.h>
  #include <string.h>
-@@ -18,15 +33,35 @@
+@@ -18,15 +33,35 @@ static inline int bigendianp(void){
  }
  
  static inline int32_t swap32(int32_t x){
@@ -44,8 +44,7 @@ $NetBSD: patch-ad,v 1.6 2012/05/29 11:08:32 obache Exp $
 +#endif
  }
  
--static inline int16_t swap16(int16_t x){
-+static inline int16_t swap16(int16_t x){
+ static inline int16_t swap16(int16_t x){
 +#ifdef __NetBSD__
 +  return bswap16(x);
 +#else
diff --git a/audio/cdparanoia/patches/patch-ba b/audio/cdparanoia/patches/patch-ba
index 4134b545b04..c63eddaec0f 100644
--- a/audio/cdparanoia/patches/patch-ba
+++ b/audio/cdparanoia/patches/patch-ba
@@ -1,6 +1,6 @@
-$NetBSD: patch-ba,v 1.4 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ba,v 1.5 2017/07/12 10:53:23 wiz Exp $
 
---- paranoia/Makefile.in.orig	2008-09-04 21:02:47.000000000 +0200
+--- paranoia/Makefile.in.orig	2008-09-04 19:02:47.000000000 +0000
 +++ paranoia/Makefile.in
 @@ -21,10 +21,9 @@ CPPFLAGS+=-D_REENTRANT
  OFILES = paranoia.o p_block.o overlap.o gap.o isort.o 
@@ -35,7 +35,7 @@ $NetBSD: patch-ba,v 1.4 2009/08/09 16:00:53 drochner Exp $
 -	[ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
 -	[ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
 +libcdda_paranoia.la: 	$(OFILES)
-+	$(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
 +	    -version-info 1:0 -rpath $(PREFIX)/lib $(LIBS)	
 +
 +libcdda_paranoia.a:	libcdda_paranoia.la