[pkgsrc/trunk]: pkgsrc/audio/rplay Add DragonFly support.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/476cfb5d82eb
branches:  trunk
changeset: 500562:476cfb5d82eb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Oct 10 15:13:58 2005 +0000

description:
Add DragonFly support.
Fix the use of errno.h vs. sys/errno.h vs. extern int errno.

diffstat:

 audio/rplay/distinfo         |    9 +-
 audio/rplay/patches/patch-ar |  216 +++++++++++++++++++++---------------------
 audio/rplay/patches/patch-at |   13 ++
 audio/rplay/patches/patch-au |   12 ++
 audio/rplay/patches/patch-av |   12 ++
 audio/rplay/patches/patch-aw |   12 ++
 audio/rplay/patches/patch-ax |   13 ++
 7 files changed, 177 insertions(+), 110 deletions(-)

diffs (truncated from 538 to 300 lines):

diff -r 9e64562f3198 -r 476cfb5d82eb audio/rplay/distinfo
--- a/audio/rplay/distinfo      Mon Oct 10 15:11:26 2005 +0000
+++ b/audio/rplay/distinfo      Mon Oct 10 15:13:58 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/05/23 08:44:37 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/10/10 15:13:58 joerg Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861
@@ -19,8 +19,13 @@
 SHA1 (patch-ao) = 01316da024026f526dd5389c3a6c2eaf89814546
 SHA1 (patch-ap) = 46e7e7fc0fb3b7d5228bf81877ac186eda1be00f
 SHA1 (patch-aq) = 41e6f83bb5c8a1223fc9d9cd8a21fee36012965f
-SHA1 (patch-ar) = f43b2a082bf6e0ce908c35ba1359e3c718689c2f
+SHA1 (patch-ar) = 2428398a2d00e3db937d3692cfedf9cdd7691db8
 SHA1 (patch-as) = 64d31c1bc4d1659a18e9bfb922550f4a390f15bd
+SHA1 (patch-at) = 6e2bc0ed0fab65c732445e111880e6e8908d4b54
+SHA1 (patch-au) = 7451e5ba18e21c3787869cf9a1d55433d9d488fc
+SHA1 (patch-av) = 6eaa0294af7d559b7e0b74e22e93aecc42db1a9a
+SHA1 (patch-aw) = 82de8a6a58f0e3db1d52f97bcaff7f4ad643bb73
+SHA1 (patch-ax) = 7b2ce8d34bca784df1fcaa53fe081c89ca882b58
 SHA1 (patch-ca) = d5ffe7a8e0f2112adf0d11b5661d565e5a57dec8
 SHA1 (patch-cb) = 24c810e43d6735c24908ba429ede32a49cff36e8
 SHA1 (patch-cc) = 824d7c70282d24e489c7c041982018da13ac70ce
diff -r 9e64562f3198 -r 476cfb5d82eb audio/rplay/patches/patch-ar
--- a/audio/rplay/patches/patch-ar      Mon Oct 10 15:11:26 2005 +0000
+++ b/audio/rplay/patches/patch-ar      Mon Oct 10 15:13:58 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ar,v 1.2 2004/12/22 16:18:42 ben Exp $
+$NetBSD: patch-ar,v 1.3 2005/10/10 15:13:58 joerg Exp $
 
---- configure.orig     Tue Jun  8 23:26:19 1999
+--- configure.orig     1999-06-09 06:26:19.000000000 +0000
 +++ configure
 @@ -1,30 +1,326 @@
  #! /bin/sh
@@ -1350,8 +1350,8 @@
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_STRING "$PACKAGE_STRING"
 +_ACEOF
-+
- 
+ 
++
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 +_ACEOF
@@ -1361,7 +1361,7 @@
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
-@@ -490,265 +1192,775 @@ if test -z "$CONFIG_SITE"; then
+@@ -490,41 +1192,106 @@ if test -z "$CONFIG_SITE"; then
  fi
  for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
@@ -1470,29 +1470,28 @@
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
 +
- 
- 
- 
- 
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+ 
+ 
 +          ac_config_headers="$ac_config_headers include/config.h"
-+
-+
-+
- export srcdir
- RPLAY_VERSION=`$srcdir/version`
+ 
+ 
+ 
+@@ -533,222 +1300,667 @@ RPLAY_VERSION=`$srcdir/version`
  
  echo configuring rplay version $RPLAY_VERSION
  
@@ -1577,7 +1576,8 @@
 +else
 +  if test -n "$ac_ct_CC"; then
 +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
@@ -1604,8 +1604,7 @@
 +fi
 +
 +  CC=$ac_ct_CC
- else
--  echo "$ac_t""no" 1>&6
++else
 +  CC="$ac_cv_prog_CC"
  fi
  
@@ -1882,11 +1881,6 @@
 -echo "configure:661: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 +  test -n "$ac_ct_CC" && break
 +done
-+
-+  CC=$ac_ct_CC
-+fi
-+
-+fi
  
 -ac_ext=c
 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1894,8 +1888,15 @@
 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 -cross_compiling=$ac_cv_prog_cc_cross
++  CC=$ac_ct_CC
++fi
++
++fi
  
 -cat > conftest.$ac_ext << EOF
+ 
+-#line 672 "configure"
+-#include "confdefs.h"
 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: no acceptable C compiler found in \$PATH
@@ -1929,8 +1930,13 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  
--#line 672 "configure"
--#include "confdefs.h"
+-main(){return(0);}
+-EOF
+-if { (eval echo configure:677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cc_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cc_cross=no
 +int
 +main ()
 +{
@@ -1987,14 +1993,7 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--main(){return(0);}
--EOF
--if { (eval echo configure:677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  ac_cv_prog_cc_works=yes
--  # If we can't run a trivial program, we are probably using a cross compiler.
--  if (./conftest; exit) 2>/dev/null; then
--    ac_cv_prog_cc_cross=no
++
 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: C compiler cannot create executables
@@ -3964,13 +3963,11 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
- /* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any gcc2 internal prototype to avoid an error.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
- /* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char opendir();
++/* We use char because int might match the return type of a gcc2
 +   builtin and then its argument prototype would still apply.  */
 +char opendir ();
 +int
@@ -4020,27 +4017,14 @@
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- 
--int main() {
--opendir()
--; return 0; }
--EOF
--if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
-+/* Override any gcc2 internal prototype to avoid an error.  */
++
+ /* Override any gcc2 internal prototype to avoid an error.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
-+/* We use char because int might match the return type of a gcc2
+ /* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char opendir();
 +   builtin and then its argument prototype would still apply.  */
 +char opendir ();
 +int
@@ -4079,16 +4063,31 @@
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
+-int main() {
+-opendir()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  done
  fi
 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 -  echo "$ac_t""yes" 1>&6
 -  LIBS="$LIBS -lx"
 -else
 -  echo "$ac_t""no" 1>&6
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+  done
-+fi
 +LIBS=$ac_func_search_save_LIBS
  fi
 +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
@@ -4418,9 +4417,10 @@
  #define TIME_WITH_SYS_TIME 1
 -EOF
 +_ACEOF
-+
-+fi
-+
+ 
+ fi
+ 
+-for ac_hdr in fcntl.h sys/file.h sys/ioctl.h sys/time.h stdlib.h unistd.h memory.h string.h strings.h utime.h limits.h gsm.h gsm/gsm.h rxposix.h rx/rxposix.h
 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 +
 +
@@ -4433,7 +4433,12 @@
 +
 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 +                inttypes.h stdint.h unistd.h
-+do
+ do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1514: checking for $ac_hdr" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6