From owner-freebsd-ports Mon Oct 2 23:40:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A12D237B66C for ; Mon, 2 Oct 2000 23:40:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id XAA50615; Mon, 2 Oct 2000 23:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from wartch.sapros.com (rularan.sapros.com [204.182.55.17]) by hub.freebsd.org (Postfix) with ESMTP id 031C637B502 for ; Mon, 2 Oct 2000 23:37:21 -0700 (PDT) Received: (from peterh@localhost) by wartch.sapros.com (8.11.0/8.9.3) id e936aLG30393; Mon, 2 Oct 2000 23:36:21 -0700 (PDT) (envelope-from peterh) Message-Id: <200010030636.e936aLG30393@wartch.sapros.com> Date: Mon, 2 Oct 2000 23:36:21 -0700 (PDT) From: peterh@sapros.com Reply-To: peterh@sapros.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/21720: Update port to use ADNS. Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21720 >Category: ports >Synopsis: Update port to use ADNS. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 02 23:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Peter Haight >Release: FreeBSD 4.1.1-STABLE i386 >Organization: >Environment: >Description: - Update to use ADNS New files: patches/patch-ab patches/patch-ac >How-To-Repeat: >Fix: diff -ruN gale.bak/Makefile gale/Makefile --- gale.bak/Makefile Fri Sep 22 04:39:18 2000 +++ gale/Makefile Mon Oct 2 23:22:11 2000 @@ -13,8 +13,9 @@ MAINTAINER= peterh@sapros.com BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc -LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww -LIB_DEPENDS= rsaref.2:${PORTSDIR}/security/rsaref +LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww \ + adns.1:${PORTSDIR}/net/adns \ + rsaref.2:${PORTSDIR}/security/rsaref GNU_CONFIGURE= yes diff -ruN gale.bak/patches/patch-ab gale/patches/patch-ab --- gale.bak/patches/patch-ab Wed Dec 31 16:00:00 1969 +++ gale/patches/patch-ab Mon Oct 2 23:25:38 2000 @@ -0,0 +1,345 @@ +--- configure.orig Mon Oct 2 23:25:16 2000 ++++ configure Mon Oct 2 23:25:19 2000 +@@ -2626,22 +2626,65 @@ + GALE_LIBS="$GALE_LIBS -lrsaref" + fi + ++echo $ac_n "checking for res_init in -lresolv""... $ac_c" 1>&6 ++echo "configure:2631: checking for res_init in -lresolv" >&5 ++ac_lib_var=`echo resolv'_'res_init | 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="-lresolv $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 ++ ++ RESOLV_LIBS="-lresolv" ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ ++ + echo $ac_n "checking for local copy of liboop""... $ac_c" 1>&6 +-echo "configure:2631: checking for local copy of liboop" >&5 ++echo "configure:2674: checking for local copy of liboop" >&5 + if test -f "${srcdir}/liboop/oop.h"; then + echo "$ac_t""yes" 1>&6 + CPPFLAGS="-I\${top_srcdir}/liboop $CPPFLAGS" + build_liboop=true + echo $ac_n "checking for adns_init in -ladns""... $ac_c" 1>&6 +-echo "configure:2637: checking for adns_init in -ladns" >&5 ++echo "configure:2680: checking for adns_init in -ladns" >&5 + ac_lib_var=`echo adns'_'adns_init | 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="-ladns -lresolv $LIBS" ++LIBS="-ladns $RESOLV_LIBS $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2699: \"$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 +@@ -2668,7 +2711,7 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + +- GALE_LIBS="$GALE_LIBS \${top_builddir}/liboop/liboop-adns.la -ladns -lresolv" ++ GALE_LIBS="$GALE_LIBS \${top_builddir}/liboop/liboop-adns.la -ladns ${RESOLV_LIBS}" + cat >> confdefs.h <<\EOF + #define HAVE_ADNS 1 + EOF +@@ -2683,7 +2726,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for oop_sys_new in -loop""... $ac_c" 1>&6 +-echo "configure:2687: checking for oop_sys_new in -loop" >&5 ++echo "configure:2730: checking for oop_sys_new in -loop" >&5 + ac_lib_var=`echo oop'_'oop_sys_new | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2691,7 +2734,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-loop $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2749: \"$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 +@@ -2726,7 +2769,7 @@ + fi + + echo $ac_n "checking for adns_init in -ladns""... $ac_c" 1>&6 +-echo "configure:2730: checking for adns_init in -ladns" >&5 ++echo "configure:2773: checking for adns_init in -ladns" >&5 + ac_lib_var=`echo adns'_'adns_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2734,7 +2777,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ladns -lresolv $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2792: \"$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 +@@ -2776,7 +2819,7 @@ + fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:2780: checking how to run the C preprocessor" >&5 ++echo "configure:2823: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -2791,13 +2834,13 @@ + # 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:2801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2844: \"$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 + : +@@ -2808,13 +2851,13 @@ + 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:2818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2861: \"$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 + : +@@ -2825,13 +2868,13 @@ + 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:2835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2878: \"$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 + : +@@ -2859,17 +2902,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2863: checking for $ac_hdr" >&5 ++echo "configure:2906: 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:2873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2916: \"$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* +@@ -2901,17 +2944,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2905: checking for $ac_hdr" >&5 ++echo "configure:2948: 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:2915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2958: \"$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* +@@ -2946,17 +2989,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2950: checking for $ac_hdr" >&5 ++echo "configure:2993: 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:2960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3003: \"$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* +@@ -2987,7 +3030,7 @@ + fi + + echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:2991: checking size of int" >&5 ++echo "configure:3034: 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 +@@ -2995,7 +3038,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < + main() +@@ -3006,7 +3049,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3053: \"$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 +@@ -3026,7 +3069,7 @@ + + + echo $ac_n "checking size of short""... $ac_c" 1>&6 +-echo "configure:3030: checking size of short" >&5 ++echo "configure:3073: 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 +@@ -3034,7 +3077,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < + main() +@@ -3045,7 +3088,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:3049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3092: \"$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 +@@ -3065,7 +3108,7 @@ + + + echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:3069: checking size of long" >&5 ++echo "configure:3112: 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 +@@ -3073,7 +3116,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext < + main() +@@ -3084,7 +3127,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3131: \"$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 diff -ruN gale.bak/patches/patch-ac gale/patches/patch-ac --- gale.bak/patches/patch-ac Wed Dec 31 16:00:00 1969 +++ gale/patches/patch-ac Mon Oct 2 23:25:07 2000 @@ -0,0 +1,24 @@ +--- configure.in.orig Thu Jul 13 17:42:14 2000 ++++ configure.in Mon Oct 2 23:24:49 2000 +@@ -174,15 +174,19 @@ + GALE_LIBS="$GALE_LIBS -lrsaref" + fi + ++AC_CHECK_LIB(resolv,res_init,[ ++ RESOLV_LIBS="-lresolv" ++]) ++ + AC_MSG_CHECKING([for local copy of liboop]) + if test -f "${srcdir}/liboop/oop.h"; then + AC_MSG_RESULT(yes) + CPPFLAGS="-I\${top_srcdir}/liboop $CPPFLAGS" + build_liboop=true + AC_CHECK_LIB(adns,adns_init,[ +- GALE_LIBS="$GALE_LIBS \${top_builddir}/liboop/liboop-adns.la -ladns -lresolv" ++ GALE_LIBS="$GALE_LIBS \${top_builddir}/liboop/liboop-adns.la -ladns ${RESOLV_LIBS}" + AC_DEFINE(HAVE_ADNS) +- ],[:],-lresolv) ++ ],[:],$RESOLV_LIBS) + GALE_LIBS="$GALE_LIBS \${top_builddir}/liboop/liboop.la" + else + AC_MSG_RESULT(no) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message