From 14b151edc0d4e6859a902c854ab2fd51c61d5faf Mon Sep 17 00:00:00 2001 From: simonb Date: Mon, 25 Jun 2001 12:17:54 +0000 Subject: For NetBSD hosts, use a default device of /dev/rcd0. --- audio/cdparanoia/distinfo | 10 +- audio/cdparanoia/patches/patch-aa | 23 +- audio/cdparanoia/patches/patch-ab | 12 +- audio/cdparanoia/patches/patch-ac | 791 +++++++++++++++++++++++++++++++++++++- audio/cdparanoia/patches/patch-ae | 47 ++- 5 files changed, 836 insertions(+), 47 deletions(-) (limited to 'audio/cdparanoia') diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo index 5279fd462ab..ab086ffeac8 100644 --- a/audio/cdparanoia/distinfo +++ b/audio/cdparanoia/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.3 2001/04/29 09:47:02 skrll Exp $ +$NetBSD: distinfo,v 1.4 2001/06/25 12:17:54 simonb Exp $ SHA1 (cdparanoia-III-alpha9.7.src.tgz) = 7c379d3628878fd79ebc1d567408a4d31a7f2e39 Size (cdparanoia-III-alpha9.7.src.tgz) = 109670 bytes -SHA1 (patch-aa) = e013ea41a177441efff076bebf55ff3675ca97f3 -SHA1 (patch-ab) = 8f81f892294d069d9b86b7c4bc74e6acf2af5923 -SHA1 (patch-ac) = 895f0fcc76788d592738424e476109c7052526cb +SHA1 (patch-aa) = 31b37e9fb7be1cb16249bcd6a8561ab64c2fbf39 +SHA1 (patch-ab) = 2e8d86161008414093fa3b3a09de85718aa60740 +SHA1 (patch-ac) = 55aa40ebe0cb11c3a814ff44d554fc5fa9c37761 SHA1 (patch-ad) = 7d8084320e736e5d012e8a8f2e13653a41f03f6d -SHA1 (patch-ae) = 213d45a11dda42e19d45d4ec1b8d6dcf32cede02 +SHA1 (patch-ae) = b105910e67a0210e10cde0a1820ae3cb81088e49 SHA1 (patch-ba) = 05f8efe4f0a2753217d3c1cf1014da64b1d92b73 SHA1 (patch-ca) = 4d7c183aae36fd525a1294be4b6f9a76401c524e SHA1 (patch-cb) = aed42b4763b4a19187bbeb0714b8480f331bc5d4 diff --git a/audio/cdparanoia/patches/patch-aa b/audio/cdparanoia/patches/patch-aa index b96a75a5c6d..6a47f2edbf5 100644 --- a/audio/cdparanoia/patches/patch-aa +++ b/audio/cdparanoia/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2000/10/06 06:40:35 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2001/06/25 12:17:55 simonb Exp $ ---- configure.in.orig Sun Aug 15 18:29:43 1999 -+++ configure.in +--- configure.in.orig Mon Aug 16 08:29:43 1999 ++++ configure.in Mon Jun 25 21:15:58 2001 @@ -20,6 +20,12 @@ i?86-*-linux*) DEBUG="-g -Wall -fsigned-char" @@ -27,18 +27,29 @@ $NetBSD: patch-aa,v 1.2 2000/10/06 06:40:35 jlam Exp $ TYPESIZES="" -@@ -63,11 +72,14 @@ +@@ -62,15 +71,25 @@ + AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ") AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ") - -+AC_CHECK_FUNCS(getopt_long, GETOPT_LONG="-DGETOPT_LONG='1' ") ++AC_CHECK_HEADERS(util.h, ++ AC_CHECK_LIB(util, getrawpartition, ++ RAWPART="-DHAVE_GETRAWPARTITION='1' " LIBUTIL="-lutil" ++ ) ++) + ++AC_CHECK_FUNCS(getopt_long, GETOPT_LONG="-DGETOPT_LONG='1' ") + AC_PROG_MAKE_SET AC_C_CONST AC_SUBST(SBPCD_H) AC_SUBST(UCDROM_H) +AC_SUBST(GETOPT_LONG) ++AC_SUBST(RAWPART) AC_SUBST(TYPESIZES) AC_SUBST(OPT) AC_SUBST(DEBUG) + AC_SUBST(CC) ++AC_SUBST(LIBUTIL) + + AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile) diff --git a/audio/cdparanoia/patches/patch-ab b/audio/cdparanoia/patches/patch-ab index 22903fc1b65..58be174fbd6 100644 --- a/audio/cdparanoia/patches/patch-ab +++ b/audio/cdparanoia/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.2 2001/04/29 09:47:02 skrll Exp $ +$NetBSD: patch-ab,v 1.3 2001/06/25 12:17:55 simonb Exp $ ---- Makefile.in.orig Tue Dec 14 08:42:14 1999 -+++ Makefile.in +--- Makefile.in.orig Mon Jun 25 21:05:39 2001 ++++ Makefile.in Mon Jun 25 21:15:43 2001 @@ -3,12 +3,12 @@ # DO NOT EDIT BELOW! ########################################################## # (unless, of course, you know what you are doing :) ########################## @@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.2 2001/04/29 09:47:02 skrll Exp $ @SET_MAKE@ -FLAGS=@TYPESIZES@ @CFLAGS@ -+FLAGS=@GETOPT_LONG@ @TYPESIZES@ @CFLAGS@ ++FLAGS=@GETOPT_LONG@ @RAWPART@ @TYPESIZES@ @CFLAGS@ OPT=@OPT@ $(FLAGS) DEBUG=@DEBUG@ $(FLAGS) CC=@CC@ @@ -32,11 +32,11 @@ $NetBSD: patch-ab,v 1.2 2001/04/29 09:47:02 skrll Exp $ - LIBS = -lcdda_interface -lcdda_paranoia -lm - LIBDEP = interface/libcdda_interface.so paranoia/libcdda_paranoia.so -endif -+STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a -lm ++STLIBS = interface/libcdda_interface.a paranoia/libcdda_paranoia.a @LIBUTIL@ -lm +STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a +SHLIBDEP = interface/libcdda_interface.la paranoia/libcdda_paranoia.la -+SHLIBS = $(SHLIBDEP) -lm ++SHLIBS = $(SHLIBDEP) @LIBUTIL@ -lm -all: + diff --git a/audio/cdparanoia/patches/patch-ac b/audio/cdparanoia/patches/patch-ac index 8a919a7445f..af8572f9a33 100644 --- a/audio/cdparanoia/patches/patch-ac +++ b/audio/cdparanoia/patches/patch-ac @@ -1,45 +1,728 @@ -$NetBSD: patch-ac,v 1.2 2000/10/06 06:40:35 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2001/06/25 12:17:55 simonb Exp $ ---- configure.orig Sun Aug 15 18:29:42 1999 -+++ configure -@@ -835,6 +835,12 @@ +--- configure.orig Mon Aug 16 08:29:42 1999 ++++ configure Mon Jun 25 21:40:23 2001 +@@ -1,7 +1,7 @@ + #! /bin/sh + + # Guess values for system-dependent variables and create Makefiles. +-# Generated automatically using autoconf version 2.12 ++# Generated automatically using autoconf version 2.13 + # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. + # + # This configure script is free software; the Free Software Foundation +@@ -49,6 +49,7 @@ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= ++SHELL=${CONFIG_SHELL-/bin/sh} + # Maximum number of lines to put in a shell here document. + ac_max_here_lines=12 + +@@ -332,7 +333,7 @@ + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) +- echo "configure generated by autoconf version 2.12" ++ echo "configure generated by autoconf version 2.13" + exit 0 ;; + + -with-* | --with-*) +@@ -502,9 +503,11 @@ + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 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 + ++ac_exeext= ++ac_objext=o + if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then +@@ -543,26 +546,26 @@ + + + # Make sure we can run config.sub. +-if $ac_config_sub sun4 >/dev/null 2>&1; then : ++if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : + else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } + fi + + echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:552: checking host system type" >&5 ++echo "configure:555: checking host system type" >&5 + + host_alias=$host + case "$host_alias" in + NONE) + case $nonopt in + NONE) +- if host_alias=`$ac_config_guess`; then : ++ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; + esac + +-host=`$ac_config_sub $host_alias` ++host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` + host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +@@ -573,15 +576,16 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:577: checking for $ac_word" >&5 ++echo "configure:580: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" +@@ -602,16 +606,17 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:606: checking for $ac_word" >&5 ++echo "configure:610: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +- for ac_dir in $PATH; do ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +@@ -646,25 +651,61 @@ + echo "$ac_t""no" 1>&6 + fi + ++ if test -z "$CC"; then ++ case "`uname -s`" in ++ *win32* | *WIN32*) ++ # Extract the first word of "cl", so it can be a program name with args. ++set dummy cl; ac_word=$2 ++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:661: checking for $ac_word" >&5 ++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ ac_cv_prog_CC="cl" ++ break ++ fi ++ done ++ IFS="$ac_save_ifs" ++fi ++fi ++CC="$ac_cv_prog_CC" ++if test -n "$CC"; then ++ echo "$ac_t""$CC" 1>&6 ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ;; ++ esac ++ fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:654: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:693: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 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 + +-cat > conftest.$ac_ext < conftest.$ac_ext << EOF ++ ++#line 704 "configure" + #include "confdefs.h" ++ + main(){return(0);} + EOF +-if { (eval echo configure:668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:709: \"$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 +@@ -678,18 +719,24 @@ + ac_cv_prog_cc_works=no + fi + rm -fr conftest* ++ac_ext=c ++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ++ac_cpp='$CPP $CPPFLAGS' ++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 + + echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 + if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:688: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:735: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:693: checking whether we are using GNU C" >&5 ++echo "configure:740: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -698,7 +745,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -709,11 +756,15 @@ + + if test $ac_cv_prog_gcc = yes; then + GCC=yes +- ac_test_CFLAGS="${CFLAGS+set}" +- ac_save_CFLAGS="$CFLAGS" +- CFLAGS= +- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:717: checking whether ${CC-cc} accepts -g" >&5 ++else ++ GCC= ++fi ++ ++ac_test_CFLAGS="${CFLAGS+set}" ++ac_save_CFLAGS="$CFLAGS" ++CFLAGS= ++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ++echo "configure:768: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -728,31 +779,36 @@ + fi + + echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +- if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" +- elif test $ac_cv_prog_cc_g = yes; then ++if test "$ac_test_CFLAGS" = set; then ++ CFLAGS="$ac_save_CFLAGS" ++elif test $ac_cv_prog_cc_g = yes; then ++ if test "$GCC" = yes; then + CFLAGS="-g -O2" + else +- CFLAGS="-O2" ++ CFLAGS="-g" + fi + else +- GCC= +- test "${CFLAGS+set}" = set || CFLAGS="-g" ++ if test "$GCC" = yes; then ++ CFLAGS="-O2" ++ else ++ CFLAGS= ++ fi + fi + + fi + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:748: checking for $ac_word" >&5 ++echo "configure:803: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" +@@ -773,15 +829,16 @@ + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:777: checking for $ac_word" >&5 ++echo "configure:833: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="ar" +@@ -801,15 +858,16 @@ + # Extract the first word of "install", so it can be a program name with args. + set dummy install; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:805: checking for $ac_word" >&5 ++echo "configure:862: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_INSTALL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$INSTALL"; then + ac_cv_prog_INSTALL="$INSTALL" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in $PATH; do ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ++ ac_dummy="$PATH" ++ for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_INSTALL="install" +@@ -835,6 +893,12 @@ i?86-*-linux*) DEBUG="-g -Wall -fsigned-char" OPT="-O20 -ffast-math -fsigned-char -finline-functions";; + i?86-*-netbsd*) + DEBUG="-g -Wall -fsigned-char" -+ OPT="-O2 -ffast-math -fsigned-char -finline-functions";; ++ OPT="-O2 -ffast-math -fsigned-char -finline-functions";; + *-netbsd*) + DEBUG="-g -Wall" + OPT="-O";; *) DEBUG="-g -Wall -fsigned-char" OPT="-O20 -fsigned-char";; -@@ -1007,7 +1013,10 @@ +@@ -842,7 +906,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:846: checking how to run the C preprocessor" >&5 ++echo "configure:910: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -857,14 +921,14 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : + else +@@ -874,14 +938,31 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ CPP="${CC-cc} -nologo -E" ++ cat > conftest.$ac_ext < ++Syntax Error ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : + else +@@ -894,6 +975,8 @@ + rm -f conftest* + fi + rm -f conftest* ++fi ++rm -f conftest* + ac_cv_prog_CPP="$CPP" + fi + CPP="$ac_cv_prog_CPP" +@@ -903,12 +986,12 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:907: checking for ANSI C header files" >&5 ++echo "configure:990: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -916,8 +999,8 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:1003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_header_stdc=yes +@@ -933,7 +1016,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -951,7 +1034,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -972,7 +1055,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -983,7 +1066,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -1007,12 +1090,11 @@ fi -CFLAGS="" -+# Uncomment the following if you don't want to honor CFLAGS passed in from -+# the environment. -+# -+# CFLAGS="" TYPESIZES="" -@@ -1272,6 +1281,62 @@ - done + echo $ac_n "checking size of short""... $ac_c" 1>&6 +-echo "configure:1016: checking size of short" >&5 ++echo "configure:1098: checking size of short" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1020,7 +1102,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < + main() +@@ -1031,7 +1113,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_short=`cat conftestval` + else +@@ -1051,7 +1133,7 @@ + + + echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:1055: checking size of int" >&5 ++echo "configure:1137: checking size of int" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1059,7 +1141,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < + main() +@@ -1070,7 +1152,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_int=`cat conftestval` + else +@@ -1090,7 +1172,7 @@ + + echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:1094: checking size of long" >&5 ++echo "configure:1176: checking size of long" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1098,7 +1180,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < + main() +@@ -1109,7 +1191,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_long=`cat conftestval` + else +@@ -1129,7 +1211,7 @@ + + + echo $ac_n "checking size of long long""... $ac_c" 1>&6 +-echo "configure:1133: checking size of long long" >&5 ++echo "configure:1215: checking size of long long" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1137,7 +1219,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < + main() +@@ -1148,7 +1230,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:1152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_long_long=`cat conftestval` + else +@@ -1195,18 +1277,18 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1199: checking for $ac_hdr" >&5 ++echo "configure:1281: 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 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:1291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +@@ -1235,18 +1317,18 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1239: checking for $ac_hdr" >&5 ++echo "configure:1321: 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 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:1331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +@@ -1271,9 +1353,146 @@ + fi + done ++for ac_hdr in util.h ++do ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:1361: 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 ++else ++ cat > conftest.$ac_ext < ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=yes" ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_header_$ac_safe=no" ++fi ++rm -f conftest* ++fi ++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++ cat >> confdefs.h <&6 ++echo "configure:1392: checking for getrawpartition in -lutil" >&5 ++ac_lib_var=`echo util'_'getrawpartition | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-lutil $LIBS" ++cat > conftest.$ac_ext <&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" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ RAWPART="-DHAVE_GETRAWPARTITION='1' " LIBUTIL="-lutil" ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++done ++ ++ +for ac_func in getopt_long +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:1356: checking for $ac_func" >&5 ++echo "configure:1442: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:1470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else @@ -86,15 +769,87 @@ $NetBSD: patch-ac,v 1.2 2000/10/06 06:40:35 jlam Exp $ +fi +done + -+ + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 - echo "configure:1277: checking whether ${MAKE-make} sets \${MAKE}" >&5 +-echo "configure:1277: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:1496: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -@@ -1537,6 +1602,7 @@ + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1300,12 +1519,12 @@ + fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:1304: checking for working const" >&5 ++echo "configure:1523: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -1382,6 +1601,9 @@ + + + ++ ++ ++ + trap '' 1 2 15 + cat > confcache <<\EOF + # This file is a shell script that caches the results of configure +@@ -1405,7 +1627,7 @@ + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. + (set) 2>&1 | +- case `(ac_space=' '; set) 2>&1` in ++ case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). +@@ -1484,7 +1706,7 @@ + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) +- echo "$CONFIG_STATUS generated by autoconf version 2.12" ++ echo "$CONFIG_STATUS generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; +@@ -1503,9 +1725,11 @@ + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF + $ac_vpsub + $extrasub ++s%@SHELL@%$SHELL%g + s%@CFLAGS@%$CFLAGS%g + s%@CPPFLAGS@%$CPPFLAGS%g + s%@CXXFLAGS@%$CXXFLAGS%g ++s%@FFLAGS@%$FFLAGS%g + s%@DEFS@%$DEFS%g + s%@LDFLAGS@%$LDFLAGS%g + s%@LIBS@%$LIBS%g +@@ -1537,9 +1761,12 @@ s%@SET_MAKE@%$SET_MAKE%g s%@SBPCD_H@%$SBPCD_H%g s%@UCDROM_H@%$UCDROM_H%g +s%@GETOPT_LONG@%$GETOPT_LONG%g ++s%@RAWPART@%$RAWPART%g s%@TYPESIZES@%$TYPESIZES%g s%@OPT@%$OPT%g s%@DEBUG@%$DEBUG%g ++s%@LIBUTIL@%$LIBUTIL%g + + CEOF + EOF diff --git a/audio/cdparanoia/patches/patch-ae b/audio/cdparanoia/patches/patch-ae index 27c64918cf7..fccae284968 100644 --- a/audio/cdparanoia/patches/patch-ae +++ b/audio/cdparanoia/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ +$NetBSD: patch-ae,v 1.3 2001/06/25 12:17:55 simonb Exp $ ---- main.c.orig Tue Dec 14 17:18:44 1999 -+++ main.c Mon Jan 17 23:12:58 2000 -@@ -49,7 +49,9 @@ +--- main.c.orig Tue Dec 14 19:18:44 1999 ++++ main.c Mon Jun 25 21:41:08 2001 +@@ -49,12 +49,18 @@ #include #include #include @@ -12,7 +12,16 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ #include #include #include -@@ -231,6 +233,7 @@ + #include + ++#ifdef HAVE_GETRAWPARTITION ++#include ++#endif ++ + #include "interface/cdda_interface.h" + #include "paranoia/cdda_paranoia.h" + #include "utils.h" +@@ -231,6 +237,7 @@ " cdparanoia [options] [outfile]\n\n" "OPTIONS:\n" @@ -20,7 +29,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ " -v --verbose : extra verbose operation\n" " -q --quiet : quiet operation\n" " -e --stderr-progress : force output of progress information to\n" -@@ -274,6 +277,46 @@ +@@ -274,6 +281,46 @@ " -Z --disable-paranoia : disable all paranoia checking\n" " -Y --disable-extra-paranoia : only do cdda2wav-style overlap checking\n" " -X --abort-on-skip : abort on imperfect reads/skips\n\n" @@ -67,7 +76,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ "OUTPUT SMILIES:\n" " :-) Normal operation, low/no jitter\n" -@@ -374,7 +417,7 @@ +@@ -374,7 +421,7 @@ int graph=30; char buffer[256]; static long c_sector=0,v_sector=0; @@ -76,7 +85,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ static int last=0; static long lasttime=0; long sector,osector=0; -@@ -585,6 +628,7 @@ +@@ -585,6 +632,7 @@ const char *optstring = "escCn:o:d:g:S:prRwafvqVQhZzYXWBi:Tt:"; @@ -84,7 +93,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ struct option options [] = { {"stderr-progress",no_argument,NULL,'e'}, {"search-for-drive",no_argument,NULL,'s'}, -@@ -618,6 +662,7 @@ +@@ -618,6 +666,7 @@ {NULL,0,NULL,0} }; @@ -92,7 +101,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ long blocking_write(int outf, char *buffer, long num){ long words=0,temp; -@@ -668,7 +713,12 @@ +@@ -668,7 +717,12 @@ atexit(cleanup); @@ -106,14 +115,28 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 11:37:06 hubertf Exp $ switch(c){ case 'B': batch=1; -@@ -797,6 +847,13 @@ +@@ -797,6 +851,27 @@ report(VERSION); /* Query the cdrom/disc; we may need to override some settings */ + +#ifndef __linux__ /* XXX */ ++#ifdef __NetBSD__ ++ if (!force_generic_device) { ++ int raw; ++ static char devstring[16]; ++#ifdef HAVE_GETRAWPARTITION ++ raw = getrawpartition(); ++#else ++ raw = 'c' - 'a'; ++#endif ++ snprintf(devstring, sizeof(devstring) - 1, "/dev/rcd0%c", raw + 'a'); ++ force_generic_device=devstring; ++ } ++#else + if (!force_generic_device) -+ errx(1, "-g option is currently required by NetBSD version"); ++ errx(1, "-g option is currently required by the NetBSD pkg version"); ++#endif + if (!force_cdrom_device) + force_cdrom_device=copystring(force_generic_device); +#endif -- cgit v1.2.3