Wed Jul 12 10:53:23 2017 UTC ()
Honor LDFLAGS. Fixes RELRO build.

Some minor cleanup while here.


(wiz)
diff -r1.36 -r1.37 pkgsrc/audio/cdparanoia/Makefile
diff -r1.34 -r1.35 pkgsrc/audio/cdparanoia/distinfo
diff -r1.11 -r1.12 pkgsrc/audio/cdparanoia/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/audio/cdparanoia/patches/patch-ad
diff -r1.4 -r1.5 pkgsrc/audio/cdparanoia/patches/patch-ba

cvs diff -r1.36 -r1.37 pkgsrc/audio/cdparanoia/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cdparanoia/Makefile 2015/02/21 00:09:08 1.36
+++ pkgsrc/audio/cdparanoia/Makefile 2017/07/12 10:53:23 1.37
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2015/02/21 00:09:08 joerg Exp $ 1# $NetBSD: Makefile,v 1.37 2017/07/12 10:53:23 wiz Exp $
2# 
3 2
4DISTNAME= cdparanoia-III-10.2 3DISTNAME= cdparanoia-III-10.2
5PKGNAME= cdparanoia-3.0.10.2 4PKGNAME= cdparanoia-3.0.10.2
6PKGREVISION= 3 5PKGREVISION= 3
7CATEGORIES= audio 6CATEGORIES= audio
8MASTER_SITES= http://downloads.xiph.org/releases/cdparanoia/ 7MASTER_SITES= http://downloads.xiph.org/releases/cdparanoia/
9EXTRACT_SUFX= .src.tgz 8EXTRACT_SUFX= .src.tgz
10 9
11MAINTAINER= kim@tac.nyc.ny.us 10MAINTAINER= kim@tac.nyc.ny.us
12HOMEPAGE= http://www.xiph.org/paranoia/ 11HOMEPAGE= http://www.xiph.org/paranoia/
13COMMENT= CDDA reading utility with extra data verification features 12COMMENT= CDDA reading utility with extra data verification features
14LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 13LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
15 14

cvs diff -r1.34 -r1.35 pkgsrc/audio/cdparanoia/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/cdparanoia/distinfo 2015/11/03 01:12:27 1.34
+++ pkgsrc/audio/cdparanoia/distinfo 2017/07/12 10:53:23 1.35
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.34 2015/11/03 01:12:27 agc Exp $ 1$NetBSD: distinfo,v 1.35 2017/07/12 10:53:23 wiz Exp $
2 2
3SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320 3SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
4RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55 4RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
5SHA512 (cdparanoia-III-10.2.src.tgz) = 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7 5SHA512 (cdparanoia-III-10.2.src.tgz) = 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
6Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes 6Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes
7SHA1 (patch-aa) = b67a318d4e5c0ca87639645096a41eaeb3fb2d1e 7SHA1 (patch-aa) = b67a318d4e5c0ca87639645096a41eaeb3fb2d1e
8SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44 8SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
9SHA1 (patch-ac) = d47ec9e3ae300cc6fcb4e7377bb8a13ff0c3cacd 9SHA1 (patch-ac) = 87718f65b1994f6e266c7b8221fb8b585b9094b8
10SHA1 (patch-ad) = f0c79049cbc26e9483c410f00cb6df85c280c145 10SHA1 (patch-ad) = 861237917c229a4640b9311d371913aae78b746c
11SHA1 (patch-ae) = f12c5aca0b78803e1ab1be8518b032748a45ee0e 11SHA1 (patch-ae) = f12c5aca0b78803e1ab1be8518b032748a45ee0e
12SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1 12SHA1 (patch-ba) = c846425d26372bada1bc086a7dc26120163feb13
13SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48 13SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
14SHA1 (patch-cb) = 880d667b26891beb2c64ebe1937c4a2931dd42d5 14SHA1 (patch-cb) = 880d667b26891beb2c64ebe1937c4a2931dd42d5
15SHA1 (patch-cc) = e692c8f4a9811123baa6cb25c09dea0004cc9b68 15SHA1 (patch-cc) = e692c8f4a9811123baa6cb25c09dea0004cc9b68
16SHA1 (patch-cd) = c37da19fc99b5aa5682b08cd6ad162687e9b1337 16SHA1 (patch-cd) = c37da19fc99b5aa5682b08cd6ad162687e9b1337
17SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b 17SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
18SHA1 (patch-cf) = 4208e82efd5bba15677dcc0ae5883bd9353624c6 18SHA1 (patch-cf) = 4208e82efd5bba15677dcc0ae5883bd9353624c6
19SHA1 (patch-cg) = a492f6d2459f75420930d8a6f264bde82119d23e 19SHA1 (patch-cg) = a492f6d2459f75420930d8a6f264bde82119d23e
20SHA1 (patch-ch) = 80672901f4ddbc4f7228cfa1f57ee477c1e1ac28 20SHA1 (patch-ch) = 80672901f4ddbc4f7228cfa1f57ee477c1e1ac28
21SHA1 (patch-ci) = bc0645bf6d2e3841817adb639bfa3ac68cb7f606 21SHA1 (patch-ci) = bc0645bf6d2e3841817adb639bfa3ac68cb7f606
22SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc 22SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
23SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb 23SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
24SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475 24SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475

cvs diff -r1.11 -r1.12 pkgsrc/audio/cdparanoia/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/cdparanoia/patches/patch-ac 2013/12/12 16:41:32 1.11
+++ pkgsrc/audio/cdparanoia/patches/patch-ac 2017/07/12 10:53:23 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.11 2013/12/12 16:41:32 jperkin Exp $ 1$NetBSD: patch-ac,v 1.12 2017/07/12 10:53:23 wiz Exp $
2 2
3--- configure.orig 2006-08-16 18:02:25.000000000 +0000 3--- configure.orig 2006-08-16 18:02:25.000000000 +0000
4+++ configure 4+++ configure
5@@ -1,25 +1,82 @@ 5@@ -1,25 +1,82 @@
6 #! /bin/sh 6 #! /bin/sh
7 # Guess values for system-dependent variables and create Makefiles. 7 # Guess values for system-dependent variables and create Makefiles.
8-# Generated by GNU Autoconf 2.59. 8-# Generated by GNU Autoconf 2.59.
9+# Generated by GNU Autoconf 2.63. 9+# Generated by GNU Autoconf 2.63.
10 # 10 #
11-# Copyright (C) 2003 Free Software Foundation, Inc. 11-# Copyright (C) 2003 Free Software Foundation, Inc.
12+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 12+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
13+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 13+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14 # This configure script is free software; the Free Software Foundation 14 # This configure script is free software; the Free Software Foundation
@@ -1117,27 +1117,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 @@ -1117,27 +1117,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4
1117+ eval with_$ac_useropt=no ;; 1117+ eval with_$ac_useropt=no ;;
1118  1118
1119 --x) 1119 --x)
1120 # Obsolete; use --with-x. 1120 # Obsolete; use --with-x.
1121@@ -623,7 +1107,7 @@ do 1121@@ -623,7 +1107,7 @@ do
1122 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 1122 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1123 x_libraries=$ac_optarg ;; 1123 x_libraries=$ac_optarg ;;
1124  1124
1125- -*) { echo "$as_me: error: unrecognized option: $ac_option 1125- -*) { echo "$as_me: error: unrecognized option: $ac_option
1126+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option 1126+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
1127 Try \`$0 --help' for more information." >&2 1127 Try \`$0 --help' for more information." >&2
1128 { (exit 1); exit 1; }; } 1128 { (exit 1); exit 1; }; }
1129 ;; 1129 ;;
1130@@ -632,17 +1116,16 @@ Try \`$0 --help' for more information." 1130@@ -632,17 +1116,16 @@ Try \`$0 --help' for more information."
1131 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` 1131 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
1132 # Reject names that are not valid shell variable names. 1132 # Reject names that are not valid shell variable names.
1133 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && 1133 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
1134- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 1134- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1135+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 1135+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
1136 { (exit 1); exit 1; }; } 1136 { (exit 1); exit 1; }; }
1137- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` 1137- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
1138- eval "$ac_envvar='$ac_optarg'" 1138- eval "$ac_envvar='$ac_optarg'"
1139+ eval $ac_envvar=\$ac_optarg 1139+ eval $ac_envvar=\$ac_optarg
1140 export $ac_envvar ;; 1140 export $ac_envvar ;;
1141  1141
1142 *) 1142 *)
1143 # FIXME: should be removed in autoconf 3.0. 1143 # FIXME: should be removed in autoconf 3.0.
@@ -3073,27 +3073,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 @@ -3073,27 +3073,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4
3073 array size at least. It's necessary to write '\x00'==0 to get something 3073 array size at least. It's necessary to write '\x00'==0 to get something
3074- that's true only with -std1. */ 3074- that's true only with -std1. */
3075+ that's true only with -std. */ 3075+ that's true only with -std. */
3076 int osf4_cc_array ['\x00' == 0 ? 1 : -1]; 3076 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
3077  3077
3078+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters 3078+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
3079+ inside strings and character constants. */ 3079+ inside strings and character constants. */
3080+#define FOO(x) 'x' 3080+#define FOO(x) 'x'
3081+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; 3081+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
3082+ 3082+
3083 int test (int i, double x); 3083 int test (int i, double x);
3084 struct s1 {int (*f) (int a);}; 3084 struct s1 {int (*f) (int a);};
3085 struct s2 {int (*f) (double a);}; 3085 struct s2 {int (*f) (double a);};
3086@@ -2098,219 +2782,72 @@ return f (e, argv, 0) != argv[0] || f 3086@@ -2098,219 +2782,72 @@ return f (e, argv, 0) != argv[0] || f
3087 return 0; 3087 return 0;
3088 } 3088 }
3089 _ACEOF 3089 _ACEOF
3090-# Don't try gcc -ansi; that turns off useful extensions and 3090-# Don't try gcc -ansi; that turns off useful extensions and
3091-# breaks some systems' header files. 3091-# breaks some systems' header files.
3092-# AIX -qlanglvl=ansi 3092-# AIX -qlanglvl=ansi
3093-# Ultrix and OSF/1 -std1 3093-# Ultrix and OSF/1 -std1
3094-# HP-UX 10.20 and later -Ae 3094-# HP-UX 10.20 and later -Ae
3095-# HP-UX older versions -Aa -D_HPUX_SOURCE 3095-# HP-UX older versions -Aa -D_HPUX_SOURCE
3096-# SVR4 -Xc -D__EXTENSIONS__ 3096-# SVR4 -Xc -D__EXTENSIONS__
3097-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" 3097-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
3098+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ 3098+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
3099+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" 3099+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
@@ -8276,27 +8276,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 @@ -8276,27 +8276,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4
8276-## Running $as_me. ## 8276-## Running $as_me. ##
8277-_ASBOX 8277-_ASBOX
8278-} >&5 8278-} >&5
8279-cat >&5 <<_CSEOF 8279-cat >&5 <<_CSEOF
8280- 8280-
8281+# values after options handling. 8281+# values after options handling.
8282+ac_log=" 8282+ac_log="
8283 This file was extended by $as_me, which was 8283 This file was extended by $as_me, which was
8284-generated by GNU Autoconf 2.59. Invocation command line was 8284-generated by GNU Autoconf 2.59. Invocation command line was
8285+generated by GNU Autoconf 2.63. Invocation command line was 8285+generated by GNU Autoconf 2.63. Invocation command line was
8286  8286
8287 CONFIG_FILES = $CONFIG_FILES 8287 CONFIG_FILES = $CONFIG_FILES
8288 CONFIG_HEADERS = $CONFIG_HEADERS 8288 CONFIG_HEADERS = $CONFIG_HEADERS
8289@@ -5607,124 +6559,108 @@ generated by GNU Autoconf 2.59. Invocat 8289@@ -5607,124 +6559,106 @@ generated by GNU Autoconf 2.59. Invocat
8290 CONFIG_COMMANDS = $CONFIG_COMMANDS 8290 CONFIG_COMMANDS = $CONFIG_COMMANDS
8291 $ $0 $@ 8291 $ $0 $@
8292  8292
8293-_CSEOF 8293-_CSEOF
8294-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 8294-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
8295-echo >&5 8295-echo >&5
8296+on `(hostname || uname -n) 2>/dev/null | sed 1q` 8296+on `(hostname || uname -n) 2>/dev/null | sed 1q`
8297+" 8297+"
8298+ 8298+
8299 _ACEOF 8299 _ACEOF
8300  8300
8301-# Files that config.status was made for. 8301-# Files that config.status was made for.
8302-if test -n "$ac_config_files"; then 8302-if test -n "$ac_config_files"; then
@@ -8395,28 +8395,26 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 @@ -8395,28 +8395,26 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4
8395 ac_shift=shift 8395 ac_shift=shift
8396 ;; 8396 ;;
8397- *) # This is not an option, so the user has probably given explicit 8397- *) # This is not an option, so the user has probably given explicit
8398- # arguments. 8398- # arguments.
8399- ac_option=$1 8399- ac_option=$1
8400- ac_need_defaults=false;; 8400- ac_need_defaults=false;;
8401 esac 8401 esac
8402  8402
8403 case $ac_option in 8403 case $ac_option in
8404 # Handling of the options. 8404 # Handling of the options.
8405-_ACEOF 8405-_ACEOF
8406-cat >>$CONFIG_STATUS <<\_ACEOF 8406-cat >>$CONFIG_STATUS <<\_ACEOF
8407 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 8407 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
8408+ : Avoid regenerating within pkgsrc 
8409+ exit 0 
8410 ac_cs_recheck=: ;; 8408 ac_cs_recheck=: ;;
8411- --version | --vers* | -V ) 8409- --version | --vers* | -V )
8412- echo "$ac_cs_version"; exit 0 ;; 8410- echo "$ac_cs_version"; exit 0 ;;
8413- --he | --h) 8411- --he | --h)
8414- # Conflict between --help and --header 8412- # Conflict between --help and --header
8415- { { echo "$as_me:$LINENO: error: ambiguous option: $1 8413- { { echo "$as_me:$LINENO: error: ambiguous option: $1
8416-Try \`$0 --help' for more information." >&5 8414-Try \`$0 --help' for more information." >&5
8417-echo "$as_me: error: ambiguous option: $1 8415-echo "$as_me: error: ambiguous option: $1
8418-Try \`$0 --help' for more information." >&2;} 8416-Try \`$0 --help' for more information." >&2;}
8419- { (exit 1); exit 1; }; };; 8417- { (exit 1); exit 1; }; };;
8420- --help | --hel | -h ) 8418- --help | --hel | -h )
8421- echo "$ac_cs_usage"; exit 0 ;; 8419- echo "$ac_cs_usage"; exit 0 ;;
8422- --debug | --d* | -d ) 8420- --debug | --d* | -d )
@@ -8447,27 +8445,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 @@ -8447,27 +8445,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4
8447-Try \`$0 --help' for more information." >&5 8445-Try \`$0 --help' for more information." >&5
8448-echo "$as_me: error: unrecognized option: $1 8446-echo "$as_me: error: unrecognized option: $1
8449-Try \`$0 --help' for more information." >&2;} 8447-Try \`$0 --help' for more information." >&2;}
8450+ -*) { $as_echo "$as_me: error: unrecognized option: $1 8448+ -*) { $as_echo "$as_me: error: unrecognized option: $1
8451+Try \`$0 --help' for more information." >&2 8449+Try \`$0 --help' for more information." >&2
8452 { (exit 1); exit 1; }; } ;; 8450 { (exit 1); exit 1; }; } ;;
8453  8451
8454- *) ac_config_targets="$ac_config_targets $1" ;; 8452- *) ac_config_targets="$ac_config_targets $1" ;;
8455+ *) ac_config_targets="$ac_config_targets $1" 8453+ *) ac_config_targets="$ac_config_targets $1"
8456+ ac_need_defaults=false ;; 8454+ ac_need_defaults=false ;;
8457  8455
8458 esac 8456 esac
8459 shift 8457 shift
8460@@ -5738,32 +6674,48 @@ if $ac_cs_silent; then 8458@@ -5738,32 +6676,48 @@ if $ac_cs_silent; then
8461 fi 8459 fi
8462  8460
8463 _ACEOF 8461 _ACEOF
8464-cat >>$CONFIG_STATUS <<_ACEOF 8462-cat >>$CONFIG_STATUS <<_ACEOF
8465+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 8463+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
8466 if \$ac_cs_recheck; then 8464 if \$ac_cs_recheck; then
8467- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 8465- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
8468- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 8466- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
8469+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 8467+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
8470+ shift 8468+ shift
8471+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 8469+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
8472+ CONFIG_SHELL='$SHELL' 8470+ CONFIG_SHELL='$SHELL'
8473+ export CONFIG_SHELL 8471+ export CONFIG_SHELL
@@ -8509,27 +8507,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 @@ -8509,27 +8507,27 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4
8509+ "interface/Makefile") CONFIG_FILES="$CONFIG_FILES interface/Makefile" ;; 8507+ "interface/Makefile") CONFIG_FILES="$CONFIG_FILES interface/Makefile" ;;
8510+ "paranoia/Makefile") CONFIG_FILES="$CONFIG_FILES paranoia/Makefile" ;; 8508+ "paranoia/Makefile") CONFIG_FILES="$CONFIG_FILES paranoia/Makefile" ;;
8511+ 8509+
8512+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 8510+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
8513+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 8511+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
8514 { (exit 1); exit 1; }; };; 8512 { (exit 1); exit 1; }; };;
8515 esac 8513 esac
8516 done 8514 done
8517  8515
8518+ 8516+
8519 # If the user did not use the arguments to specify the items to instantiate, 8517 # If the user did not use the arguments to specify the items to instantiate,
8520 # then the envvar interface is used. Set only those that are not. 8518 # then the envvar interface is used. Set only those that are not.
8521 # We use the long form for the default assignment because of an extremely 8519 # We use the long form for the default assignment because of an extremely
8522@@ -5773,344 +6725,464 @@ if $ac_need_defaults; then 8520@@ -5773,344 +6727,464 @@ if $ac_need_defaults; then
8523 fi 8521 fi
8524  8522
8525 # Have a temporary directory for convenience. Make it in the build tree 8523 # Have a temporary directory for convenience. Make it in the build tree
8526-# simply because there is no reason to put it here, and in addition, 8524-# simply because there is no reason to put it here, and in addition,
8527+# simply because there is no reason against having it here, and in addition, 8525+# simply because there is no reason against having it here, and in addition,
8528 # creating and moving files from /tmp can sometimes cause problems. 8526 # creating and moving files from /tmp can sometimes cause problems.
8529-# Create a temporary directory, and hook for its removal unless debugging. 8527-# Create a temporary directory, and hook for its removal unless debugging.
8530+# Hook for its removal unless debugging. 8528+# Hook for its removal unless debugging.
8531+# Note that there is a small window in which the directory will not be cleaned: 8529+# Note that there is a small window in which the directory will not be cleaned:
8532+# after its creation but before its name has been assigned to `$tmp'. 8530+# after its creation but before its name has been assigned to `$tmp'.
8533 $debug || 8531 $debug ||
8534 { 8532 {
8535- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 8533- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
@@ -9253,22 +9251,22 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4 @@ -9253,22 +9251,22 @@ $NetBSD: patch-ac,v 1.11 2013/12/12 16:4
9253 { (exit 0); exit 0; } 9251 { (exit 0); exit 0; }
9254 _ACEOF 9252 _ACEOF
9255 chmod +x $CONFIG_STATUS 9253 chmod +x $CONFIG_STATUS
9256 ac_clean_files=$ac_clean_files_save 9254 ac_clean_files=$ac_clean_files_save
9257  9255
9258+test $ac_write_fail = 0 || 9256+test $ac_write_fail = 0 ||
9259+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 9257+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
9260+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} 9258+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
9261+ { (exit 1); exit 1; }; } 9259+ { (exit 1); exit 1; }; }
9262+ 9260+
9263  9261
9264 # configure is writing to config.log, and then calls config.status. 9262 # configure is writing to config.log, and then calls config.status.
9265 # config.status does its own redirection, appending to config.log. 9263 # config.status does its own redirection, appending to config.log.
9266@@ -6132,4 +7204,8 @@ if test "$no_create" != yes; then 9264@@ -6132,4 +7206,8 @@ if test "$no_create" != yes; then
9267 # would make configure fail if this is the last instruction. 9265 # would make configure fail if this is the last instruction.
9268 $ac_cs_success || { (exit 1); exit 1; } 9266 $ac_cs_success || { (exit 1); exit 1; }
9269 fi 9267 fi
9270+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 9268+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
9271+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 9269+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
9272+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} 9270+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
9273+fi 9271+fi
9274  9272

cvs diff -r1.6 -r1.7 pkgsrc/audio/cdparanoia/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/audio/cdparanoia/patches/patch-ad 2012/05/29 11:08:32 1.6
+++ pkgsrc/audio/cdparanoia/patches/patch-ad 2017/07/12 10:53:23 1.7
@@ -1,61 +1,60 @@ @@ -1,61 +1,60 @@
1$NetBSD: patch-ad,v 1.6 2012/05/29 11:08:32 obache Exp $ 1$NetBSD: patch-ad,v 1.7 2017/07/12 10:53:23 wiz Exp $
2 2
3--- utils.h.orig 2008-08-22 09:39:06.000000000 +0000 3--- utils.h.orig 2008-08-22 09:39:06.000000000 +0000
4+++ utils.h 2010-03-24 11:10:19.000000000 +0000 4+++ utils.h
5@@ -1,5 +1,20 @@ 5@@ -1,5 +1,20 @@
6 #include <stdlib.h> 6 #include <stdlib.h>
7+#ifdef __linux__ 7+#ifdef __linux__
8 #include <endian.h> 8 #include <endian.h>
9+#endif 9+#endif
10+#ifdef __NetBSD__ 10+#ifdef __NetBSD__
11+#include <sys/param.h> 11+#include <sys/param.h>
12+#if __NetBSD_Version__ >= 104010000 12+#if __NetBSD_Version__ >= 104010000
13+#include <sys/endian.h> 13+#include <sys/endian.h>
14+#else 14+#else
15+#include <machine/endian.h> 15+#include <machine/endian.h>
16+#include <machine/bswap.h> 16+#include <machine/bswap.h>
17+#endif 17+#endif
18+#endif 18+#endif
19+#if defined(__APPLE__) && defined(__MACH__) 19+#if defined(__APPLE__) && defined(__MACH__)
20+#include <stdint.h> 20+#include <stdint.h>
21+#include <machine/endian.h> 21+#include <machine/endian.h>
22+#endif 22+#endif
23 #include <stdio.h> 23 #include <stdio.h>
24 #include <errno.h> 24 #include <errno.h>
25 #include <string.h> 25 #include <string.h>
26@@ -18,15 +33,35 @@ 26@@ -18,15 +33,35 @@ static inline int bigendianp(void){
27 } 27 }
28  28
29 static inline int32_t swap32(int32_t x){ 29 static inline int32_t swap32(int32_t x){
30+#ifdef __NetBSD__ 30+#ifdef __NetBSD__
31+ return bswap32(x); 31+ return bswap32(x);
32+#else 32+#else
33+#if defined(__APPLE__) && defined(__MACH__) 33+#if defined(__APPLE__) && defined(__MACH__)
34+ return((((uint32_t)x & 0x000000ffU) << 24) |  34+ return((((uint32_t)x & 0x000000ffU) << 24) |
35+ (((uint32_t)x & 0x0000ff00U) << 8) |  35+ (((uint32_t)x & 0x0000ff00U) << 8) |
36+ (((uint32_t)x & 0x00ff0000U) >> 8) |  36+ (((uint32_t)x & 0x00ff0000U) >> 8) |
37+ (((uint32_t)x & 0xff000000U) >> 24)); 37+ (((uint32_t)x & 0xff000000U) >> 24));
38+#else 38+#else
39 return((((u_int32_t)x & 0x000000ffU) << 24) |  39 return((((u_int32_t)x & 0x000000ffU) << 24) |
40 (((u_int32_t)x & 0x0000ff00U) << 8) |  40 (((u_int32_t)x & 0x0000ff00U) << 8) |
41 (((u_int32_t)x & 0x00ff0000U) >> 8) |  41 (((u_int32_t)x & 0x00ff0000U) >> 8) |
42 (((u_int32_t)x & 0xff000000U) >> 24)); 42 (((u_int32_t)x & 0xff000000U) >> 24));
43+#endif 43+#endif
44+#endif 44+#endif
45 } 45 }
46  46
47-static inline int16_t swap16(int16_t x){ 47 static inline int16_t swap16(int16_t x){
48+static inline int16_t swap16(int16_t x){ 
49+#ifdef __NetBSD__ 48+#ifdef __NetBSD__
50+ return bswap16(x); 49+ return bswap16(x);
51+#else 50+#else
52+#if defined(__APPLE__) && defined(__MACH__) 51+#if defined(__APPLE__) && defined(__MACH__)
53+ return((((uint16_t)x & 0x00ffU) << 8) |  52+ return((((uint16_t)x & 0x00ffU) << 8) |
54+ (((uint16_t)x & 0xff00U) >> 8)); 53+ (((uint16_t)x & 0xff00U) >> 8));
55+#else 54+#else
56 return((((u_int16_t)x & 0x00ffU) << 8) |  55 return((((u_int16_t)x & 0x00ffU) << 8) |
57 (((u_int16_t)x & 0xff00U) >> 8)); 56 (((u_int16_t)x & 0xff00U) >> 8));
58+#endif 57+#endif
59+#endif 58+#endif
60 } 59 }
61  60

cvs diff -r1.4 -r1.5 pkgsrc/audio/cdparanoia/patches/patch-ba (expand / switch to unified diff)

--- pkgsrc/audio/cdparanoia/patches/patch-ba 2009/08/09 16:00:53 1.4
+++ pkgsrc/audio/cdparanoia/patches/patch-ba 2017/07/12 10:53:23 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ba,v 1.4 2009/08/09 16:00:53 drochner Exp $ 1$NetBSD: patch-ba,v 1.5 2017/07/12 10:53:23 wiz Exp $
2 2
3--- paranoia/Makefile.in.orig 2008-09-04 21:02:47.000000000 +0200 3--- paranoia/Makefile.in.orig 2008-09-04 19:02:47.000000000 +0000
4+++ paranoia/Makefile.in 4+++ paranoia/Makefile.in
5@@ -21,10 +21,9 @@ CPPFLAGS+=-D_REENTRANT 5@@ -21,10 +21,9 @@ CPPFLAGS+=-D_REENTRANT
6 OFILES = paranoia.o p_block.o overlap.o gap.o isort.o  6 OFILES = paranoia.o p_block.o overlap.o gap.o isort.o
7 #TFILES = isort.t gap.t p_block.t paranoia.t 7 #TFILES = isort.t gap.t p_block.t paranoia.t
8  8
9-LIBS = ../interface/libcdda_interface.a -lm 9-LIBS = ../interface/libcdda_interface.a -lm
10-export VERSION 10-export VERSION
11+LIBS = ../interface/libcdda_interface.la -lm 11+LIBS = ../interface/libcdda_interface.la -lm
12  12
13-all: lib slib 13-all: lib slib
14+all: slib 14+all: slib
15  15
16 debug:  16 debug:
@@ -25,26 +25,26 @@ $NetBSD: patch-ba,v 1.4 2009/08/09 16:00 @@ -25,26 +25,26 @@ $NetBSD: patch-ba,v 1.4 2009/08/09 16:00
25  25
26 #test: $(TFILES) 26 #test: $(TFILES)
27 # 27 #
28  28
29-libcdda_paranoia.a: $(OFILES)  29-libcdda_paranoia.a: $(OFILES)
30- $(AR) -r libcdda_paranoia.a $(OFILES) 30- $(AR) -r libcdda_paranoia.a $(OFILES)
31- $(RANLIB) libcdda_paranoia.a 31- $(RANLIB) libcdda_paranoia.a
32- 32-
33-libcdda_paranoia.so: $(OFILES)  33-libcdda_paranoia.so: $(OFILES)
34- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface 34- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
35- [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 35- [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
36- [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so 36- [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
37+libcdda_paranoia.la: $(OFILES) 37+libcdda_paranoia.la: $(OFILES)
38+ $(LIBTOOL) --mode=link $(CC) -o libcdda_paranoia.la $(OFILES:.o=.lo) \ 38+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libcdda_paranoia.la $(OFILES:.o=.lo) \
39+ -version-info 1:0 -rpath $(PREFIX)/lib $(LIBS)  39+ -version-info 1:0 -rpath $(PREFIX)/lib $(LIBS)
40+ 40+
41+libcdda_paranoia.a: libcdda_paranoia.la 41+libcdda_paranoia.a: libcdda_paranoia.la
42+ 42+
43+libcdda_paranoia.so: libcdda_paranoia.la 43+libcdda_paranoia.so: libcdda_paranoia.la
44  44
45 .c.o: 45 .c.o:
46- $(CC) $(CFLAGS) -c $< 46- $(CC) $(CFLAGS) -c $<
47+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< 47+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
48  48
49 .c.t: 49 .c.t:
50 $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS) 50 $(CC) -g -DTEST $(DEBUG) -o $@ $< $(LIBS)