Import of pkgsrc-2016Q3

2016-11-18 22:39:22 +01:00
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
@@ -1,26 +1,31 @@
-$NetBSD: patch-configure,v 1.2 2012/02/15 23:13:32 hans Exp $
+$NetBSD: patch-configure,v 1.3 2016/02/24 11:34:09 wiz Exp $

 Fix configury with libaudiofile-0.3+.
 Fix interpreter in get-wsound-flags.

--- configure.orig	2011-12-19 13:10:25.000000000 +0000
+--- configure.orig	2000-03-31 20:10:25.000000000 +0000
 +++ configure
-@@ -3252,11 +3252,11 @@ echo "configure:3248: checking for AUDIO
-     AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs`
-     AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags`
-     audiofile_major_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
+@@ -3249,14 +3249,11 @@ echo "configure:3248: checking for AUDIO
+   if test "$AUDIOFILE_CONFIG" = "no" ; then
+     no_audiofile=yes
+   else
+-    AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs`
+-    AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags`
+-    audiofile_major_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-+           sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\1/'`
-     audiofile_minor_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
+-    audiofile_minor_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \
 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-+           sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\2/'`
-     audiofile_micro_version=`$AUDIOFILE_CONFIG $audiofile_config_args --version | \
+-    audiofile_micro_version=`$AUDIOFILE_CONFIG $audiofile_config_args --version | \
 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-+           sed 's/\([0-9]*\).\([0-9]\)\([0-9]*\)/\3/'`
+    AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs audiofile`
+    AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags audiofile`
+    audiofile_major_version=0
+    audiofile_minor_version=3
+    audiofile_micro_version=6
     if test "x$enable_audiofiletest" = "xyes" ; then
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
-@@ -4272,7 +4272,7 @@ test "$no_create" = yes || ${CONFIG_SHEL
+@@ -4272,7 +4271,7 @@ test "$no_create" = yes || ${CONFIG_SHEL
 
 
 cat <<EOF >get-wsound-flags