Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4285/10.3/unstable/main/finkinfo/net

Modified Files:
        net-snmp.info net-snmp.patch 
Log Message:
Maybe this thing will compile now? Still needs to have perl modules moved
into separate pkg


Index: net-snmp.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/net-snmp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- net-snmp.patch      27 Oct 2003 19:06:53 -0000      1.2
+++ net-snmp.patch      3 Mar 2006 18:45:07 -0000       1.3
@@ -24,6 +24,18 @@
          if test $$? != 0 ; then \
             exit 1 ; \
          fi  \
+diff -Nurd -x'*~' net-snmp-5.0.7.orig/aclocal.m4 net-snmp-5.0.7/aclocal.m4
+--- net-snmp-5.0.7.orig/aclocal.m4     2002-10-17 22:39:47.000000000 -0400
++++ net-snmp-5.0.7/aclocal.m4  2006-03-03 13:14:26.000000000 -0500
+@@ -1708,7 +1708,7 @@
+     ;;
+ 
+   darwin* | rhapsody*)
+-    allow_undefined_flag='-undefined suppress'
++    allow_undefined_flag='-undefined dynamic_lookup'
+     # FIXME: Relying on posixy $() will cause problems for
+     #        cross-compilation, but unfortunately the echo tests do not
+     #        yet detect zsh echo's removal of \ escapes.
 diff -ruN net-snmp-5.0.7.orig/agent/mibgroup/mibII/tcp.c 
net-snmp-5.0.7/agent/mibgroup/mibII/tcp.c
 --- net-snmp-5.0.7.orig/agent/mibgroup/mibII/tcp.c     Fri May 17 10:05:13 2002
 +++ net-snmp-5.0.7/agent/mibgroup/mibII/tcp.c  Mon Oct 27 10:58:36 2003
@@ -43,7 +55,7 @@
  
    darwin* | rhapsody*)
 -    allow_undefined_flag='-undefined suppress'
-+    allow_undefined_flag='-flat_namespace -undefined suppress'
++    allow_undefined_flag='-undefined dynamic_lookup'
      # FIXME: Relying on posixy $() will cause problems for
      #        cross-compilation, but unfortunately the echo tests do not
      #        yet detect zsh echo's removal of \ escapes.

Index: net-snmp.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/net/net-snmp.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- net-snmp.info       7 Oct 2005 14:09:52 -0000       1.8
+++ net-snmp.info       3 Mar 2006 18:45:07 -0000       1.9
@@ -1,9 +1,10 @@
 Package: net-snmp
 Version: 5.0.7
-Revision: 15
+Revision: 18
 Maintainer: Jeremy Higgs <[EMAIL PROTECTED]>
-Depends: daemonic, %n-shlibs
-BuildDepends: gawk, gdbm3, expat, tcltk-dev, cctools (>= 446-1), fink (>= 
0.12.0-1)
+Depends: daemonic, %n-shlibs (>= %v-%r)
+BuildDepends: autoconf, gawk
+BuildConflicts: automaken
 Conflicts: net-snmp-ssl, ucd-snmp
 Replaces: net-snmp-ssl, ucd-snmp
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
@@ -12,14 +13,16 @@
 ### Use patchscript here for perlmodule, fix to install man pages in proper 
location
 sed -e s,@FINKPREFIX@,%p,g -e s,@FINKINSTALL@,%i,g %a/%n.patch | patch -p1
 ### Fix for openssl 0.9.7 on 10.3
-perl -pi.bak -e 's,#define DES_key_sched       des_key_sched,#define 
DES_key_sched       _ossl_old_des_key_sched,g' snmplib/scapi.c
-perl -pi.bak -e 's,#define DES_ncbc_encrypt    des_ncbc_encrypt,#define 
DES_ncbc_encrypt    _ossl_old_des_ncbc_encrypt,g' snmplib/scapi.c
-perl -pi.bak -e 's,#define DES_cbc_encrypt    des_cbc_encrypt,#define 
DES_cbc_encrypt    _ossl_old_des_cbc_encrypt,g' snmplib/scapi.c
+perl -pi -e 's,#define DES_key_sched       des_key_sched,#define DES_key_sched 
      _ossl_old_des_key_sched,g' snmplib/scapi.c
+perl -pi -e 's,#define DES_ncbc_encrypt    des_ncbc_encrypt,#define 
DES_ncbc_encrypt    _ossl_old_des_ncbc_encrypt,g' snmplib/scapi.c
+perl -pi -e 's,#define DES_cbc_encrypt    des_cbc_encrypt,#define 
DES_cbc_encrypt    _ossl_old_des_cbc_encrypt,g' snmplib/scapi.c
+### modern syntax
+egrep -rI '(head|tail) +\-[0-9]' *|cut -f1 -d:|sort -u|xargs perl -pi -e 
's,(head|tail) +\-([0-9]),\1 \-n\2,g'
 <<
 UpdatePOD: True
 NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1 
-ConfigureParams: --mandir='${prefix}/share/man' 
--with-logfile=%p/var/log/snmpd.log --with-persistent-directory=%p/var/%n 
--with-openssl=no --with-default-snmp-version="3" --enable-shared 
--with-perl-modules
+SetMAKEFLAGS: -j1
+ConfigureParams: --mandir='${prefix}/share/man' 
--with-logfile=%p/var/log/snmpd.log --with-persistent-directory=%p/var/%n 
--with-openssl=no --with-default-snmp-version="3" --enable-shared 
--with-perl-modules --with-sys-location="Fink Build" --with-sys-contact="[EMAIL 
PROTECTED]"
 InstallScript: <<
 make install prefix=%i libdir=%i/lib bindir=%i/bin sbindir=%i/sbin
 install -d -m 755 %i/var/log
@@ -29,31 +32,31 @@
 <<
 Splitoff: <<
   Package: %N-shlibs
-  BuildDepends: gawk, cctools (>= 446), fink (>= 0.12.0-1)
-  Replaces: %N (<< 5.0-1), %N-ssl-shlibs
-  Conflicts: %N-ssl-shlibs
+  Replaces: net-snmp (<< 5.0-1),net-snmp-ssl (<< 5.0-1), net-snmp-ssl-shlibs
+  Conflicts: net-snmp-ssl-shlibs
   Files: lib/libnetsnmp*.5*.dylib
   Shlibs: <<
-    %p/lib/libnetsnmp.5.dylib %n (>= %v-%r)
-    %p/lib/libnetsnmpagent.5.dylib %n (>= %v-%r)
-    %p/lib/libnetsnmphelpers.5.dylib %n (>= %v-%r)
-    %p/lib/libnetsnmpmibs.5.dylib %n (>= %v-%r)
+    %p/lib/libnetsnmp.5.dylib 6.0.0 %n (>= 5.0-1)
+    %p/lib/libnetsnmpagent.5.dylib 6.0.0 %n (>= 5.0-1)
+    %p/lib/libnetsnmphelpers.5.dylib 6.0.0 %n (>= 5.0-1)
+    %p/lib/libnetsnmpmibs.5.dylib 6.0.0 %n (>= 5.0-1)
   <<
   DocFiles: AGENT.txt COPYING ChangeLog CodingStyle EXAMPLE.conf.def FAQ NEWS 
PORTING README README.agentx README.krb5 README.snmpv3 README.thread TODO
 <<
 SplitOff2: <<
   Package: %N-dev
-  Depends: %N (>= %v-%r)
-  BuildDepends: gawk, cctools (>= 446), fink (>= 0.12.0-1)
-  Replaces: %N (<< 5.0-1), %N-ssl-dev
-  Conflicts: %N-ssl-dev
-  Files: include/%N
+  Depends: %N-shlibs (= %v-%r)
+  Replaces: net-snmp (<< 5.0.7-18),net-snmp-ssl (<< 5.0.7-18), net-snmp-dev
+  Conflicts: net-snmp-ssl-dev
+  BuildDependsOnly: true
+  Files: include/net-snmp lib/libnetsnmp*.dylib
   DocFiles: AGENT.txt COPYING ChangeLog CodingStyle EXAMPLE.conf.def FAQ NEWS 
PORTING README README.agentx README.krb5 README.snmpv3 README.thread TODO
 <<
-SetCPPFLAGS: -no-cpp-precomp -I/Developer/SDKs/MacOSX10.3.0.sdk/usr/include 
-D_BSD_SOCKLEN_T_=int32_t
+#SetCPPFLAGS: -no-cpp-precomp -I/Developer/SDKs/MacOSX10.3.0.sdk/usr/include
+SetCPPFLAGS: -no-cpp-precomp
 PreRmScript: <<
 if [ $1 != "upgrade" ]; then
-        daemonic disable net-snmp
+        daemonic disable %N
 fi
 <<
 PostRmScript: <<
@@ -87,6 +90,14 @@
 Default snmp version set to 3, but can be overridden using the '-v' flag for
 the command tools, or alternatively using the 'defVersion' option in the
 snmp.conf file.
+
+This packaeg includes perl modules, but they are not up to current
+fink perl-modle packaging standards and have OSX-version-dependent
+differences.
+
+This thing has some very old auto* syntaxes, so need the old autoconf
+package.  BConf:automaken helps install autoconf, because automake1.*
+have Depends on the other autoconf*.
 <<
 DescUsage: <<
 In order to run net-snmp correctly, the community name needs to be set. The
@@ -98,15 +109,12 @@
 Added '-flat_namespace' to configure script to compile properly, and fixed
 the bash versioning bug.
 
-perl -pi.bak added by Justin F. Hallett to correctly work with openssl 097 
when the system has 096 installed.
+DES symbol changes added by Justin F. Hallett to correctly work with
+openssl 097 when the system has 096 installed.
 
 -I/Developer/SDKs/MacOSX10.3.0.sdk/usr/include added by Justin F. Hallett for
-gcc 3.3 and 10.3 since tcp_var.h is missing yet it's in the sdk, for
-10.2.6 + gcc 3.3 the MacOSX10.3.0 should be MacOSX10.2.6
-
--D_BSD_SOCKLEN_T_=int32_t added by Justin F. Hallett to fix a problem when
-compiling against net-snmp, as for some reason on 10.2 it doesn't find
-socklen_t even though 10.2 does have it.
+gcc 3.3 and 10.3 since tcp_var.h is missing yet it's in the sdk
+removed by dmacks, since it's present in recent /usr/include on 10.3 and 10.4
 <<
 License: BSD
 Homepage: http://net-snmp.sourceforge.net/



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to