diff options
author | christos <christos> | 2004-02-20 23:25:14 +0000 |
---|---|---|
committer | christos <christos> | 2004-02-20 23:25:14 +0000 |
commit | 71ac7fd65dc44af7d0dd34a40f7fb8c5fe207e27 (patch) | |
tree | 2d8029f5d375a2ad9269f3911187eff55c6aa825 /net/ucd-snmp | |
parent | dd230816b410b28a4f946d03209844f075b7daf5 (diff) | |
download | pkgsrc-71ac7fd65dc44af7d0dd34a40f7fb8c5fe207e27.tar.gz |
This package should be deleted! It has been superceded by net-snmp and has
been bit-rotting. This is a last ditch effort to get it to work. I am not
fixing configure.in because it is really busted and autoconf does not like
it anymore.
Diffstat (limited to 'net/ucd-snmp')
-rw-r--r-- | net/ucd-snmp/distinfo | 4 | ||||
-rw-r--r-- | net/ucd-snmp/patches/patch-ah | 226 |
2 files changed, 163 insertions, 67 deletions
diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo index 7ccda0cf81d..1c6c800c4b2 100644 --- a/net/ucd-snmp/distinfo +++ b/net/ucd-snmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/02/19 22:38:10 christos Exp $ +$NetBSD: distinfo,v 1.11 2004/02/20 23:25:14 christos Exp $ SHA1 (ucd-snmp-4.2.4.tar.gz) = b1dbf7c5f6971f1f4419d50630a4b34b82ddc57b Size (ucd-snmp-4.2.4.tar.gz) = 1706471 bytes @@ -8,5 +8,5 @@ SHA1 (patch-ac) = 62464c314e6e896810901d89ff8f0bf8ea86e16a SHA1 (patch-ad) = c84a3eb4b28d83f7cc731b1174be74e56c08a00a SHA1 (patch-af) = 61b69b70ffeecd715b7691f5d78862d7c216754b SHA1 (patch-ag) = 8234307641a3a276f32ea2d2516268a31c1c5e97 -SHA1 (patch-ah) = b235a048694893c59f7b2297313b50bf66cf39e2 +SHA1 (patch-ah) = 3f19460952f8e739c20a5bc509ddff32046f5a54 SHA1 (patch-ai) = f8d172bec2a5d9a7fd8cd48552af047409748587 diff --git a/net/ucd-snmp/patches/patch-ah b/net/ucd-snmp/patches/patch-ah index 73839eb2fea..9e0cbef15d1 100644 --- a/net/ucd-snmp/patches/patch-ah +++ b/net/ucd-snmp/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ +$NetBSD: patch-ah,v 1.7 2004/02/20 23:25:14 christos Exp $ ---- configure.orig 2002-04-08 16:45:00.000000000 +0200 -+++ configure -@@ -6724,7 +6724,7 @@ EOF +--- configure.orig 2002-04-08 10:45:00.000000000 -0400 ++++ configure 2004-02-20 18:18:08.000000000 -0500 +@@ -6724,7 +6724,7 @@ fi SNMPCONFPATH="" @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ while test "x$tmpset" != "x$SNMPCONFPATH"; do SNMPCONFPATH="$tmpset" eval tmpset="$tmpset" -@@ -8180,105 +8180,21 @@ else +@@ -8180,73 +8180,40 @@ fi @@ -30,7 +30,19 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char rpmGetFilesystemList(); -- ++#AC_CHECK_LIB(rpm, rpmGetFilesystemList,[ ++# AC_DEFINE(HAVE_LIBRPM) ++# LIBS="-lrpm $_rpmlibs $LIBS" ++# CFLAGS="$CFLAGS -I/usr/include/rpm" ++#],[ ++# dnl rpm-4.0.3 librpmdb actually contains what we need. ++# AC_CHECK_LIB(rpmdb, rpmdbOpen,[ ++# AC_DEFINE(HAVE_LIBRPM) ++# LIBS="-lrpmdb -lrpm $_rpmlibs $LIBS" ++# CFLAGS="$CFLAGS -I/usr/include/rpm" ++# ],,-lrpm $_rpmlibs) ++#]) + -int main() { -rpmGetFilesystemList() -; return 0; } @@ -64,73 +76,157 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ - echo $ac_n "checking for rpmdbOpen in -lrpmdb""... $ac_c" 1>&6 -echo "configure:8231: checking for rpmdbOpen in -lrpmdb" >&5 -ac_lib_var=`echo rpmdb'_'rpmdbOpen | 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" ++echo $ac_n "checking for kstat_lookup in -lkstat""... $ac_c" 1>&6 ++echo "configure:8198: checking for kstat_lookup in -lkstat" >&5 ++ac_lib_var=`echo kstat'_'kstat_lookup | 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="-lrpmdb -lrpm $_rpmlibs $LIBS" --cat > conftest.$ac_ext <<EOF ++LIBS="-lkstat $LIBS" + cat > conftest.$ac_ext <<EOF -#line 8239 "configure" --#include "confdefs.h" --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ ++#line 8290 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ -char rpmdbOpen(); -- --int main() { ++char kstat_lookup(); + + int main() { -rpmdbOpen() --; return 0; } --EOF ++kstat_lookup() + ; return 0; } + EOF -if { (eval echo configure:8250: \"$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" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 ++if { (eval echo configure:8301: \"$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 +@@ -8261,43 +8228,39 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define HAVE_LIBRPM 1 --EOF -- ++ ac_tr_lib=HAVE_LIB`echo kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_lib 1 + EOF + - LIBS="-lrpmdb -lrpm $_rpmlibs $LIBS" - CFLAGS="$CFLAGS -I/usr/include/rpm" - --else -- echo "$ac_t""no" 1>&6 --fi -- ++ LIBS="-lkstat $LIBS" ++ + else + echo "$ac_t""no" 1>&6 + fi + - -fi - -+#AC_CHECK_LIB(rpm, rpmGetFilesystemList,[ -+# AC_DEFINE(HAVE_LIBRPM) -+# LIBS="-lrpm $_rpmlibs $LIBS" -+# CFLAGS="$CFLAGS -I/usr/include/rpm" -+#],[ -+# dnl rpm-4.0.3 librpmdb actually contains what we need. -+# AC_CHECK_LIB(rpmdb, rpmdbOpen,[ -+# AC_DEFINE(HAVE_LIBRPM) -+# LIBS="-lrpmdb -lrpm $_rpmlibs $LIBS" -+# CFLAGS="$CFLAGS -I/usr/include/rpm" -+# ],,-lrpm $_rpmlibs) -+#]) - - echo $ac_n "checking for kstat_lookup in -lkstat""... $ac_c" 1>&6 +- +-echo $ac_n "checking for kstat_lookup in -lkstat""... $ac_c" 1>&6 -echo "configure:8282: checking for kstat_lookup in -lkstat" >&5 -+echo "configure:8198: checking for kstat_lookup in -lkstat" >&5 - ac_lib_var=`echo kstat'_'kstat_lookup | sed 'y%./+-%__p_%'` +-ac_lib_var=`echo kstat'_'kstat_lookup | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 ++echo "configure:8329: checking for kvm_read in -lkvm" >&5 ++ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -8884,7 +8800,7 @@ EOF + else + ac_save_LIBS="$LIBS" +-LIBS="-lkstat $LIBS" ++LIBS="-lkvm $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 8290 "configure" ++#line 8337 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char kstat_lookup(); ++char kvm_read(); + + int main() { +-kstat_lookup() ++kvm_read() + ; return 0; } + EOF +-if { (eval echo configure:8301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:8348: \"$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 +@@ -8312,36 +8275,38 @@ + 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 kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF + #define $ac_tr_lib 1 + EOF + +- LIBS="-lkstat $LIBS" ++ LIBS="-lkvm $LIBS" + + else + echo "$ac_t""no" 1>&6 + fi + +-echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 +-echo "configure:8329: checking for kvm_read in -lkvm" >&5 +-ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` ++--- ++ ++echo $ac_n "checking for des_crypt in -ldes""... $ac_c" 1>&6 ++echo "configure:8329: checking for des_crypt in -ldes" >&5 ++ac_lib_var=`echo des'_'des_crypt | 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="-lkvm $LIBS" ++LIBS="-ldes $LIBS" + cat > conftest.$ac_ext <<EOF + #line 8337 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char kvm_read(); ++char des_crypt(); + + int main() { +-kvm_read() ++des_crypt() + ; return 0; } + EOF + if { (eval echo configure:8348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -8359,13 +8324,13 @@ + 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 kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ ac_tr_lib=HAVE_LIB`echo des | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF + #define $ac_tr_lib 1 + EOF + +- LIBS="-lkvm $LIBS" ++ LIBS="-ldes $LIBS" + + else + echo "$ac_t""no" 1>&6 +@@ -8884,7 +8849,7 @@ fi @@ -139,7 +235,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -9044,7 +8960,7 @@ else +@@ -9044,7 +9009,7 @@ fi done @@ -148,7 +244,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -@@ -12141,11 +12057,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12141,11 +12106,7 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -160,7 +256,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ #include <net/route.h> -@@ -12197,11 +12109,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12197,11 +12158,7 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -172,7 +268,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ #include <net/route.h> int main() { -@@ -12235,11 +12143,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12235,11 +12192,7 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -184,7 +280,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ #include <net/route.h> int main() { -@@ -12340,11 +12244,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12340,11 +12293,7 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -196,7 +292,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ #include <net/route.h> int main() { -@@ -12407,11 +12307,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12407,11 +12356,7 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -208,7 +304,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ #include <net/route.h> -@@ -12477,11 +12373,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12477,11 +12422,7 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -220,7 +316,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ #include <net/route.h> -@@ -12547,11 +12439,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12547,11 +12488,7 @@ #include <sys/param.h> #endif #include <sys/types.h> @@ -232,7 +328,7 @@ $NetBSD: patch-ah,v 1.6 2003/07/30 21:05:00 jmmv Exp $ #include <net/route.h> -@@ -12617,11 +12505,7 @@ cat > conftest.$ac_ext <<EOF +@@ -12617,11 +12554,7 @@ #include <sys/param.h> #endif #include <sys/types.h> |