Author: ranger
Date: Wed Jan  2 16:16:49 2008
New Revision: 1101

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1101&repname=user%3a+ranger
Log:
testing a new fix

Modified:
    trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.info
    trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.patch
    trunk/experimental/common/main/finkinfo/net/net-snmp-unified.info
    trunk/experimental/common/main/finkinfo/net/net-snmp-unified.patch

Modified: trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.info&rev=1101&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.info (original)
+++ trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.info Wed Jan  2 
16:16:49 2008
@@ -1,6 +1,6 @@
 Package: net-snmp-unified
 Version: 5.4.1
-Revision: 1
+Revision: 3
 Description: SNMP tools and libraries
 License: BSD
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -16,6 +16,7 @@
        system-openssl-dev,
        system-perl
 <<
+BuildConflicts: coreutils-default
 Conflicts: <<
        net-snmp (<< 5.4-1),
        net-snmp-ssl (<< 5.4-1),
@@ -57,9 +58,13 @@
 
        eval "`/usr/bin/perl -V:archname -V:version`"
        export PERLMAKEARGS="PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/$version 
INSTALLARCHLIB=%p/lib/perl5/$version/$archname 
INSTALLSITELIB=%p/lib/perl5/$version 
INSTALLSITEARCH=%p/lib/perl5/$version/$archname 
INSTALLMAN1DIR=%p/lib/perl5/$version INSTALLMAN3DIR=%p/lib/perl5/$version 
INSTALLSITEMAN1DIR=%p/lib/perl5/$version 
INSTALLSITEMAN3DIR=%p/lib/perl5/$version INSTALLBIN=%p/bin 
INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin"
+       for dir in agent/helpers agent apps snmplib; do
+               export DYLD_LIBRARY_PATH="%b/$dir/.libs:$DYLD_LIBRARY_PATH"
+       done
 
        PERLPROG=/usr/bin/perl ./configure %c 
--with-perl-modules="$PERLMAKEARGS"
        make
+       make test
 <<
 
 InstallScript: <<

Modified: trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.patch&rev=1101&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/net/net-snmp-unified.patch Wed Jan  2 
16:16:49 2008
@@ -1,4 +1,3 @@
-
 --- net-snmp-5.4.1/configure   2007-07-27 13:04:19.000000000 -0400
 +++ net-snmp-5.4.1-new/configure       2007-12-12 12:30:15.000000000 -0500
 @@ -31784,7 +31784,7 @@
@@ -6,7 +5,7 @@
      echo "$as_me:$LINENO: checking for Perl CFLAGS" >&5
  echo $ECHO_N "checking for Perl CFLAGS... $ECHO_C" >&6
 -    perlcflags=`$myperl -MExtUtils::Embed -e ccopts`
-+    perlcflags=`$myperl -MExtUtils::Embed -e ccopts | sed -e 's,-arch [^ 
]*,,g'`
++    perlcflags=`$myperl -MExtUtils::Embed -e ccopts | /usr/bin/sed -e 
's,-arch [^ ]*,,g'`
      if test "x$perlcflags" != "x" ; then
        echo "$as_me:$LINENO: result: $perlcflags" >&5
  echo "${ECHO_T}$perlcflags" >&6
@@ -15,7 +14,7 @@
      echo "$as_me:$LINENO: checking for Perl LDFLAGS" >&5
  echo $ECHO_N "checking for Perl LDFLAGS... $ECHO_C" >&6
 -    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts`
-+    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts | sed -e 's,-arch 
[^ ]*,,g'`
++    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts | /usr/bin/sed -e 
's,-arch [^ ]*,,g'`
      if test "x$netsnmp_perlldopts" != "x" ; then
        echo "$as_me:$LINENO: result: $netsnmp_perlldopts" >&5
  echo "${ECHO_T}$netsnmp_perlldopts" >&6
@@ -24,18 +23,7 @@
  echo $ECHO_N "checking for Perl CCDLFLAGS... $ECHO_C" >&6
  
 -      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | $myperl -n -e 'print $1 
'"if (/^\s*ccdlflags='([^']+)';/);"`
-+      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | sed -e 's,-arch [^ ]*,,g' 
| $myperl -n -e 'print $1 '"if (/^\s*ccdlflags='([^']+)';/);"`
++      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | /usr/bin/sed -e 's,-arch 
[^ ]*,,g' | $myperl -n -e 'print $1 '"if (/^\s*ccdlflags='([^']+)';/);"`
  
        echo "$as_me:$LINENO: result: $netsnmp_perlccdlflags" >&5
  echo "${ECHO_T}$netsnmp_perlccdlflags" >&6
---- net-snmp-5.4.1/perl/TrapReceiver/Makefile.PL       2007-06-18 
10:10:08.000000000 -0400
-+++ net-snmp-5.4.1-new/perl/TrapReceiver/Makefile.PL   2007-12-12 
12:30:44.000000000 -0500
-@@ -108,7 +108,7 @@
-     else {
-       $opts = NetSNMPGetOpts();
-       $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} 
--ldflags`;
--      $Params{'LIBS'} = '-lnetsnmptrapd -lnetsnmpagent -lnetsnmp';
-+      $Params{'LIBS'} = '';
-       chomp($Params{'LIBS'});
-       if (!$ENV{'NETSNMP_CCFLAGS'}) {
-           $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;

Modified: trunk/experimental/common/main/finkinfo/net/net-snmp-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/net-snmp-unified.info&rev=1101&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/net-snmp-unified.info (original)
+++ trunk/experimental/common/main/finkinfo/net/net-snmp-unified.info Wed Jan  
2 16:16:49 2008
@@ -1,6 +1,6 @@
 Package: net-snmp-unified
 Version: 5.4.1
-Revision: 1
+Revision: 3
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 Depends: <<
        daemonic, 
@@ -14,6 +14,7 @@
        system-perl
 <<
 
+BuildConflicts: coreutils-default
 Conflicts: net-snmp (<< 5.4-1), net-snmp-ssl (<< 5.4-1), ucd-snmp (<< 5.4-1)
 Replaces: net-snmp (<< 5.4-1), net-snmp-ssl (<< 5.4-1), ucd-snmp (<< 5.4-1)
 Source: mirror:sourceforge:net-snmp/net-snmp-%v.tar.gz
@@ -46,9 +47,13 @@
 
        eval "`/usr/bin/perl -V:archname -V:version`"
        export PERLMAKEARGS="PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/$version 
INSTALLARCHLIB=%p/lib/perl5/$version/$archname 
INSTALLSITELIB=%p/lib/perl5/$version 
INSTALLSITEARCH=%p/lib/perl5/$version/$archname 
INSTALLMAN1DIR=%p/lib/perl5/$version INSTALLMAN3DIR=%p/lib/perl5/$version 
INSTALLSITEMAN1DIR=%p/lib/perl5/$version 
INSTALLSITEMAN3DIR=%p/lib/perl5/$version INSTALLBIN=%p/bin 
INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin"
+       for dir in agent/helpers agent apps snmplib; do
+               export DYLD_LIBRARY_PATH="%b/$dir/.libs:$DYLD_LIBRARY_PATH"
+       done
 
        PERLPROG=/usr/bin/perl ./configure %c 
--with-perl-modules="$PERLMAKEARGS"
        make
+       make test
 <<
 InstallScript: <<
 #!/bin/sh -ev

Modified: trunk/experimental/common/main/finkinfo/net/net-snmp-unified.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/net/net-snmp-unified.patch&rev=1101&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/net/net-snmp-unified.patch 
(original)
+++ trunk/experimental/common/main/finkinfo/net/net-snmp-unified.patch Wed Jan  
2 16:16:49 2008
@@ -1,4 +1,3 @@
-diff -uNr net-snmp-5.4.1/configure net-snmp-5.4.1-new/configure
 --- net-snmp-5.4.1/configure   2007-07-27 13:04:19.000000000 -0400
 +++ net-snmp-5.4.1-new/configure       2007-12-12 12:30:15.000000000 -0500
 @@ -31784,7 +31784,7 @@
@@ -6,7 +5,7 @@
      echo "$as_me:$LINENO: checking for Perl CFLAGS" >&5
  echo $ECHO_N "checking for Perl CFLAGS... $ECHO_C" >&6
 -    perlcflags=`$myperl -MExtUtils::Embed -e ccopts`
-+    perlcflags=`$myperl -MExtUtils::Embed -e ccopts | sed -e 's,-arch [^ 
]*,,g'`
++    perlcflags=`$myperl -MExtUtils::Embed -e ccopts | /usr/bin/sed -e 
's,-arch [^ ]*,,g'`
      if test "x$perlcflags" != "x" ; then
        echo "$as_me:$LINENO: result: $perlcflags" >&5
  echo "${ECHO_T}$perlcflags" >&6
@@ -15,7 +14,7 @@
      echo "$as_me:$LINENO: checking for Perl LDFLAGS" >&5
  echo $ECHO_N "checking for Perl LDFLAGS... $ECHO_C" >&6
 -    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts`
-+    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts | sed -e 's,-arch 
[^ ]*,,g'`
++    netsnmp_perlldopts=`$myperl -MExtUtils::Embed -e ldopts | /usr/bin/sed -e 
's,-arch [^ ]*,,g'`
      if test "x$netsnmp_perlldopts" != "x" ; then
        echo "$as_me:$LINENO: result: $netsnmp_perlldopts" >&5
  echo "${ECHO_T}$netsnmp_perlldopts" >&6
@@ -24,19 +23,7 @@
  echo $ECHO_N "checking for Perl CCDLFLAGS... $ECHO_C" >&6
  
 -      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | $myperl -n -e 'print $1 
'"if (/^\s*ccdlflags='([^']+)';/);"`
-+      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | sed -e 's,-arch [^ ]*,,g' 
| $myperl -n -e 'print $1 '"if (/^\s*ccdlflags='([^']+)';/);"`
++      netsnmp_perlccdlflags=`$myperl -V:ccdlflags | /usr/bin/sed -e 's,-arch 
[^ ]*,,g' | $myperl -n -e 'print $1 '"if (/^\s*ccdlflags='([^']+)';/);"`
  
        echo "$as_me:$LINENO: result: $netsnmp_perlccdlflags" >&5
  echo "${ECHO_T}$netsnmp_perlccdlflags" >&6
-diff -uNr net-snmp-5.4.1/perl/TrapReceiver/Makefile.PL 
net-snmp-5.4.1-new/perl/TrapReceiver/Makefile.PL
---- net-snmp-5.4.1/perl/TrapReceiver/Makefile.PL       2007-06-18 
10:10:08.000000000 -0400
-+++ net-snmp-5.4.1-new/perl/TrapReceiver/Makefile.PL   2007-12-12 
12:30:44.000000000 -0500
-@@ -108,7 +108,7 @@
-     else {
-       $opts = NetSNMPGetOpts();
-       $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} 
--ldflags`;
--      $Params{'LIBS'} = '-lnetsnmptrapd -lnetsnmpagent -lnetsnmp';
-+      $Params{'LIBS'} = '';
-       chomp($Params{'LIBS'});
-       if (!$ENV{'NETSNMP_CCFLAGS'}) {
-           $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to