[csw-devel] SF.net SVN: gar:[17788] csw/mgar/pkg/netsnmp/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Fri Apr 20 15:04:53 CEST 2012


Revision: 17788
          http://gar.svn.sourceforge.net/gar/?rev=17788&view=rev
Author:   cgrzemba
Date:     2012-04-20 13:04:52 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
netsnmp/trunk: correct Makefile.PL patch for version 5.6.1.1

Modified Paths:
--------------
    csw/mgar/pkg/netsnmp/trunk/Makefile
    csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff

Modified: csw/mgar/pkg/netsnmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/Makefile	2012-04-20 10:47:52 UTC (rev 17787)
+++ csw/mgar/pkg/netsnmp/trunk/Makefile	2012-04-20 13:04:52 UTC (rev 17788)
@@ -102,6 +102,12 @@
 
 include gar/category.mk
 
+pre-configure-modulated:
+	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && autoreconf
+	@$(MAKECOOKIE)
+
+
 #post-install-isa-sparcv8:
 #	( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -)
 #	ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10

Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff	2012-04-20 10:47:52 UTC (rev 17787)
+++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff	2012-04-20 13:04:52 UTC (rev 17788)
@@ -1,84 +1,66 @@
-diff -ru ../build-global/net-snmp-5.4.2.1/perl/ASN/Makefile.PL net-snmp-5.4.2.1/perl/ASN/Makefile.PL
---- ../build-global/net-snmp-5.4.2.1/perl/ASN/Makefile.PL	2007-05-31 00:53:09.000000000 +0200
-+++ net-snmp-5.4.2.1/perl/ASN/Makefile.PL	2009-03-25 07:57:32.952968532 +0100
-@@ -83,6 +83,7 @@
-       $lib_version = `$opts->{'nsconfig'} --version`;
-       
-       if (lc($opts->{'insource'}) eq "true") {
-+        $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
- 	$Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
- 	$Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
-       }
-diff -ru ../build-global/net-snmp-5.4.2.1/perl/OID/Makefile.PL net-snmp-5.4.2.1/perl/OID/Makefile.PL
---- ../build-global/net-snmp-5.4.2.1/perl/OID/Makefile.PL	2007-05-31 00:53:09.000000000 +0200
-+++ net-snmp-5.4.2.1/perl/OID/Makefile.PL	2009-03-25 07:56:23.529120339 +0100
-@@ -81,6 +81,7 @@
- 	$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
-         $lib_version = `$opts->{'nsconfig'} --version`;
- 	if (lc($opts->{'insource'}) eq "true") {
-+	    $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
- 	    $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
- 	    $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- #	} else {
-diff -ru ../build-global/net-snmp-5.4.2.1/perl/SNMP/Makefile.PL net-snmp-5.4.2.1/perl/SNMP/Makefile.PL
---- ../build-global/net-snmp-5.4.2.1/perl/SNMP/Makefile.PL	2007-05-31 00:53:09.000000000 +0200
-+++ net-snmp-5.4.2.1/perl/SNMP/Makefile.PL	2009-03-25 07:55:07.873218952 +0100
-@@ -93,6 +93,7 @@
- 	}
-         $lib_version = `$opts->{'nsconfig'} --version`;
- 	if (lc($opts->{'insource'}) eq "true") {
-+	    $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
- 	    $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
- 	    $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- #	} else {
-diff -ru ../build-global/net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL
---- ../build-global/net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL	2007-06-18 16:10:08.000000000 +0200
-+++ net-snmp-5.4.2.1/perl/TrapReceiver/Makefile.PL	2009-03-25 07:56:01.868833181 +0100
-@@ -119,6 +119,7 @@
- 	}
- 
- 	if (lc($opts->{'insource'}) eq "true") {
-+	    $Params{'LDDLFLAGS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
-             $Params{'LIBS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib " . $Params{'LIBS'};
- 	    $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- 	} else {
-diff -ru ../build-global/net-snmp-5.4.2.1/perl/agent/Makefile.PL net-snmp-5.4.2.1/perl/agent/Makefile.PL
---- ../build-global/net-snmp-5.4.2.1/perl/agent/Makefile.PL	2007-05-31 00:53:09.000000000 +0200
-+++ net-snmp-5.4.2.1/perl/agent/Makefile.PL	2009-03-25 07:57:09.785808710 +0100
-@@ -87,6 +87,7 @@
- 	$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
-         $lib_version = `$opts->{'nsconfig'} --version`;
- 	if (lc($opts->{'insource'}) eq "true") {
-+	    $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
- 	    $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ " . $Params{'LIBS'};
- 	    $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- #	} else {
-diff -ru ../build-global/net-snmp-5.4.2.1/perl/default_store/Makefile.PL net-snmp-5.4.2.1/perl/default_store/Makefile.PL
---- ../build-global/net-snmp-5.4.2.1/perl/default_store/Makefile.PL	2007-05-31 00:53:09.000000000 +0200
-+++ net-snmp-5.4.2.1/perl/default_store/Makefile.PL	2009-03-25 07:51:02.425647655 +0100
-@@ -76,6 +76,7 @@
- 	$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
-         $lib_version = `$opts->{'nsconfig'} --version`;
- 	if (lc($opts->{'insource'}) eq "true") {
-+   	    $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
- 	    $Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
- 	    $Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
- 	}
---- ../build-global/net-snmp-5.4.2.1/perl/agent/default_store/Makefile.PL	2007-05-25 01:15:36.000000000 +0200
-+++ net-snmp-5.4.2.1/perl/agent/default_store/Makefile.PL	2009-03-25 10:56:34.665497642 +0100
-@@ -69,6 +69,7 @@
+--- a/perl/ASN/Makefile.PL
++++ b/perl/ASN/Makefile.PL
+@@ -74,7 +74,7 @@ sub InitMakeParams {
+     else
+     {
+       $opts = NetSNMPGetOpts();
+-      $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++      $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
+       $Params{'LIBS'}    = `$opts->{'nsconfig'} --libs`;
+       chomp($Params{'LIBS'});
+       $Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
+--- a/perl/OID/Makefile.PL
++++ b/perl/OID/Makefile.PL
+@@ -73,7 +73,7 @@ sub InitMakeParams {
      }
      else {
- 	$opts = NetSNMPGetOpts("../../");
-+	$Params{'LDDLFLAGS'} = "-L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
+ 	$opts = NetSNMPGetOpts();
+-	$Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++	$Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
+  	$Params{'LIBS'}    = `$opts->{'nsconfig'} --libs`;
+ 	chomp($Params{'LIBS'});
+ 	$Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
+--- a/perl/SNMP/Makefile.PL
++++ b/perl/SNMP/Makefile.PL
+@@ -77,7 +77,7 @@ sub InitMakeParams {
+     }
+     else {
+ 	$opts = NetSNMPGetOpts();
+-	$Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++	$Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
+ 	if (!$ENV{'NETSNMP_LIBS'}) {
+ 	    $Params{'LIBS'}    = `$opts->{'nsconfig'} --libs`;
+ 	    chomp($Params{'LIBS'});
+--- a/perl/TrapReceiver/Makefile.PL
++++ b/perl/TrapReceiver/Makefile.PL
+@@ -106,7 +106,7 @@ sub InitMakeParams {
+     }
+     else {
+ 	$opts = NetSNMPGetOpts();
+-	$Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++	$Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
+ 	$Params{'LIBS'} = '-lnetsnmptrapd ' . `$opts->{'nsconfig'} --base-agent-libs`;
+ 	chomp($Params{'LIBS'});
+ 	if (!$ENV{'NETSNMP_CCFLAGS'}) {
+--- a/perl/agent/Makefile.PL
++++ b/perl/agent/Makefile.PL
+@@ -78,7 +78,7 @@ sub InitMakeParams {
+     }
+     else {
+ 	$opts = NetSNMPGetOpts();
+-	$Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++	$Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
+ 	$Params{'LIBS'}   = `$opts->{'nsconfig'} --base-agent-libs`;
+ 	chomp($Params{'LIBS'});
+ 	$Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
+--- a/perl/default_store/Makefile.PL
++++ b/perl/default_store/Makefile.PL
+@@ -68,7 +68,7 @@ sub InitMakeParams {
+     }
+     else {
+ 	$opts = NetSNMPGetOpts();
+-	$Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++	$Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
  	$Params{'LIBS'}    = `$opts->{'nsconfig'} --libs`;
  	chomp($Params{'LIBS'});
  	$Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
-@@ -76,6 +77,7 @@
- 	$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
-         $lib_version = `$opts->{'nsconfig'} --version`;
- 	if ($opts->{'insource'} eq "true") {
-+	    $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs -L../../../snmplib/ -L/opt/csw/lib -lperl " . $Params{'LDDLFLAGS'};
- 	    $Params{'LIBS'} = "-L../../../snmplib/.libs -L../../../snmplib/ " . $Params{'LIBS'};
- 	    $Params{'CCFLAGS'} = "-I../../../include " . $Params{'CCFLAGS'};
- 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list