From 8fd0559d3948f07e42222376830558eafe46e2ad Mon Sep 17 00:00:00 2001 From: obache Date: Mon, 31 Dec 2007 02:51:55 +0000 Subject: Update isapnptools to 1.27. pkgsrc changes: * Change HOMEPAGE to information of this package. * Using libtool. * DESTDIR ready. Changes since Release 1.26 1. General * Updated to use aclocal, automake etc version 1.10. 2. isapnp (now v1.26) * Fixed build for gcc-4.x. --- sysutils/isapnptools/Makefile | 10 +- sysutils/isapnptools/distinfo | 12 +- sysutils/isapnptools/patches/patch-ad | 433 ++++++---------------------------- sysutils/isapnptools/patches/patch-ae | 14 +- 4 files changed, 86 insertions(+), 383 deletions(-) diff --git a/sysutils/isapnptools/Makefile b/sysutils/isapnptools/Makefile index 70ceea6f42b..71f11dabe54 100644 --- a/sysutils/isapnptools/Makefile +++ b/sysutils/isapnptools/Makefile @@ -1,20 +1,22 @@ -# $NetBSD: Makefile,v 1.12 2007/12/02 11:39:34 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2007/12/31 02:51:55 obache Exp $ # -DISTNAME= isapnptools-1.26 -PKGREVISION= 1 +DISTNAME= isapnptools-1.27 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/hardware/} \ ftp://ftp.demon.co.uk/pub/unix/linux/utils/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.roestock.demon.co.uk/ +HOMEPAGE= http://www.roestock.demon.co.uk/isapnptools/index.html COMMENT= Manually query and configure isapnp devices ONLY_FOR_PLATFORM= NetBSD-*-i386 +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake +USE_LIBTOOL= YES GNU_CONFIGURE= YES .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/isapnptools/distinfo b/sysutils/isapnptools/distinfo index c1ce7c425b4..5b6bb62ea8c 100644 --- a/sysutils/isapnptools/distinfo +++ b/sysutils/isapnptools/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 13:40:54 agc Exp $ +$NetBSD: distinfo,v 1.3 2007/12/31 02:51:56 obache Exp $ -SHA1 (isapnptools-1.26.tgz) = 0b12b06ed60abe8d836fa8d4c1e20bd4b033d76c -RMD160 (isapnptools-1.26.tgz) = 80fe1cc467f913be4d9df12d44ad05f55e11919e -Size (isapnptools-1.26.tgz) = 231098 bytes +SHA1 (isapnptools-1.27.tgz) = 6dd8081125086c6ecdc947c35c97ecade2b3f2f7 +RMD160 (isapnptools-1.27.tgz) = 7c5c2ce2c9c1a33d351f35a68c8646bd7818cbab +Size (isapnptools-1.27.tgz) = 499639 bytes SHA1 (patch-aa) = 150793665a3bb775a02a84a63ad69b244556ac28 SHA1 (patch-ab) = e584c500e6262e37d67184a55e8f05cd5d55db14 SHA1 (patch-ac) = 0696f3b6d091f5ae356973ed0277ca5700d6d22e -SHA1 (patch-ad) = 6f431cfd99581742ded732dc5ec43d1722bc9a2c -SHA1 (patch-ae) = baf6cf651f42f9359bc64ca377f249469b2463d5 +SHA1 (patch-ad) = 786f8ba36910db3db393ffd8e14a1a921b4ec2f3 +SHA1 (patch-ae) = ba703b7c1de4d78efbc5ddd7dfa8fdd1ceb9ef71 diff --git a/sysutils/isapnptools/patches/patch-ad b/sysutils/isapnptools/patches/patch-ad index 2b65159e2ef..4e38fa733de 100644 --- a/sysutils/isapnptools/patches/patch-ad +++ b/sysutils/isapnptools/patches/patch-ad @@ -1,380 +1,81 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $ ---- configure Tue May 8 15:52:59 2001 -+++ configure Mon Jul 22 07:48:37 2002 -@@ -1555,14 +1555,61 @@ - fi +$NetBSD: patch-ad,v 1.2 2007/12/31 02:51:56 obache Exp $ +--- configure.orig 2007-03-24 17:11:07.000000000 +0000 ++++ configure +@@ -21284,6 +21284,77 @@ fi + done -+echo $ac_n "checking for i386_iopl in -li386""... $ac_c" 1>&6 -+echo "configure:1560: checking for i386_iopl in -li386" >&5 -+ac_lib_var=`echo i386'_'i386_iopl | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for i386_iopl in -li386" >&5 ++echo $ECHO_N "checking for i386_iopl in -li386... $ECHO_C" >&6; } ++if test "${ac_cv_lib_i386_i386_iopl+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else -+ ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-li386 $LIBS" -+cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + -+int main() { -+i386_iopl() -+; return 0; } -+EOF -+if { (eval echo configure:1579: \"$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" ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char i386_iopl (); ++int ++main () ++{ ++return i386_iopl (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_lib_i386_i386_iopl=yes +else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_i386_i386_iopl=no +fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" + ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS +fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo i386 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <&5 ++echo "${ECHO_T}$ac_cv_lib_i386_i386_iopl" >&6; } ++if test $ac_cv_lib_i386_i386_iopl = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBI386 1 ++_ACEOF + + LIBS="-li386 $LIBS" + -+else -+ echo "$ac_t""no" 1>&6 +fi + - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1561: checking for ANSI C header files" >&5 -+echo "configure:1608: 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 -@@ -1570,7 +1617,7 @@ - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1621: \"$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* -@@ -1587,7 +1634,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 -@@ -1605,7 +1652,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 -@@ -1626,7 +1673,7 @@ - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1637,7 +1684,7 @@ - exit (0); } - - EOF --if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1664,17 +1711,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1668: checking for $ac_hdr" >&5 -+echo "configure:1715: 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:1678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1725: \"$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* -@@ -1702,12 +1749,12 @@ - - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:1706: checking for working const" >&5 -+echo "configure:1753: 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:1807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -1777,21 +1824,21 @@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1781: checking for inline" >&5 -+echo "configure:1828: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -1817,12 +1864,12 @@ - esac - - echo $ac_n "checking for pid_t""... $ac_c" 1>&6 --echo "configure:1821: checking for pid_t" >&5 -+echo "configure:1868: checking for pid_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -1850,12 +1897,12 @@ - fi - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:1854: checking for size_t" >&5 -+echo "configure:1901: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -1884,12 +1931,12 @@ - - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:1888: checking return type of signal handlers" >&5 -+echo "configure:1935: checking return type of signal handlers" >&5 - if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - #include -@@ -1906,7 +1953,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:1910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -1925,12 +1972,12 @@ - - - echo $ac_n "checking for vprintf""... $ac_c" 1>&6 --echo "configure:1929: checking for vprintf" >&5 -+echo "configure:1976: checking for vprintf" >&5 - if eval "test \"`echo '$''{'ac_cv_func_vprintf'+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${ac_exeext}; then -+if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_vprintf=yes" - else -@@ -1977,12 +2024,12 @@ - - if test "$ac_cv_func_vprintf" != yes; then - echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 --echo "configure:1981: checking for _doprnt" >&5 -+echo "configure:2028: checking for _doprnt" >&5 - if eval "test \"`echo '$''{'ac_cv_func__doprnt'+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${ac_exeext}; then -+if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func__doprnt=yes" - else -@@ -2033,12 +2080,12 @@ - for ac_func in strncmp - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2037: checking for $ac_func" >&5 -+echo "configure:2084: 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${ac_exeext}; then -+if { (eval echo configure:2112: \"$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 -@@ -2088,12 +2135,12 @@ - for ac_func in strdup strerror strtol strtoul nanosleep sched_setscheduler snprintf strncasecmp getdelim memcmp - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2092: checking for $ac_func" >&5 -+echo "configure:2139: 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${ac_exeext}; then -+if { (eval echo configure:2167: \"$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 -@@ -2143,12 +2190,12 @@ - for ac_func in iopl ioperm usleep delay _sleep2 - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2147: checking for $ac_func" >&5 -+echo "configure:2194: 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${ac_exeext}; then -+if { (eval echo configure:2222: \"$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 -@@ -2199,12 +2246,12 @@ - for ac_func in getopt_long - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2203: checking for $ac_func" >&5 -+echo "configure:2250: 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${ac_exeext}; then -+if { (eval echo configure:2278: \"$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 ++ + # Check whether --enable-realtime was given. + if test "${enable_realtime+set}" = set; then + enableval=$enable_realtime; if test "$enableval" = yes diff --git a/sysutils/isapnptools/patches/patch-ae b/sysutils/isapnptools/patches/patch-ae index cc4ae131e79..f9bc1c26546 100644 --- a/sysutils/isapnptools/patches/patch-ae +++ b/sysutils/isapnptools/patches/patch-ae @@ -1,11 +1,11 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $ ---- include/config.h.in Fri Apr 27 13:51:05 2001 -+++ include/config.h.in Mon Jul 22 07:48:39 2002 -@@ -142,6 +142,9 @@ - /* Define if you have the header file. */ - #undef HAVE_UNISTD_H +$NetBSD: patch-ae,v 1.2 2007/12/31 02:51:56 obache Exp $ +--- include/config.h.in.orig 2007-03-24 17:11:35.000000000 +0000 ++++ include/config.h.in +@@ -154,6 +154,9 @@ + /* Define to 1 if you have the `_sleep2' function. */ + #undef HAVE__SLEEP2 -+/* Define if you have the i386 library (-li386). */ ++/* Define if you have the i386 library (-li386). */ +#undef HAVE_LIBI386 + /* Name of package */ -- cgit v1.2.3