Tue Nov 5 17:40:30 2013 UTC ()
Link agent.so correctly against libperl.so.


(joerg)
diff -r1.98 -r1.99 pkgsrc/net/net-snmp/Makefile
diff -r1.77 -r1.78 pkgsrc/net/net-snmp/distinfo
diff -r0 -r1.1 pkgsrc/net/net-snmp/patches/patch-perl_agent_Makefile.PL
cvs diff -r1.98 -r1.99 pkgsrc/net/net-snmp/Makefile (switch to unified diff)

--- pkgsrc/net/net-snmp/Makefile 2013/05/31 12:41:35 1.98
+++ pkgsrc/net/net-snmp/Makefile 2013/11/05 17:40:30 1.99
@@ -1,131 +1,131 @@ @@ -1,131 +1,131 @@
1# $NetBSD: Makefile,v 1.98 2013/05/31 12:41:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.99 2013/11/05 17:40:30 joerg Exp $
2 2
3DISTNAME= net-snmp-5.7.2 3DISTNAME= net-snmp-5.7.2
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://www.net-snmp.org/ 9HOMEPAGE= http://www.net-snmp.org/
10COMMENT= Extensible SNMP implementation 10COMMENT= Extensible SNMP implementation
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13CONFLICTS= ucd-snmp-[0-9]* 13CONFLICTS= ucd-snmp-[0-9]*
14CONFLICTS+= nocol-[0-9]* # bin/snmpget bin/snmpwalk 14CONFLICTS+= nocol-[0-9]* # bin/snmpget bin/snmpwalk
15 15
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19MAKE_ENV+= OPSYS=${OPSYS} 19MAKE_ENV+= OPSYS=${OPSYS}
20MAKE_JOBS_SAFE= no 20MAKE_JOBS_SAFE= no
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24.include "options.mk" 24.include "options.mk"
25 25
26# Don't compress manual pages as they include each other. 26# Don't compress manual pages as they include each other.
27.undef MANZ 27.undef MANZ
28 28
29.if ${OPSYS} == "DragonFly" 29.if ${OPSYS} == "DragonFly"
30MAKE_ENV+= MIB_SYSTEM_LIBS=-lkinfo 30MAKE_ENV+= MIB_SYSTEM_LIBS=-lkinfo
31.endif 31.endif
32 32
33.if ${OPSYS} == "NetBSD" 33.if ${OPSYS} == "NetBSD"
34OSVERSION_SPECIFIC= YES 34OSVERSION_SPECIFIC= YES
35. if empty(CFLAGS:U:M*-Dnetbsd1*) 35. if empty(CFLAGS:U:M*-Dnetbsd1*)
36CFLAGS+= -Dnetbsd1 36CFLAGS+= -Dnetbsd1
37. endif 37. endif
38.endif 38.endif
39 39
40.if (${OPSYS} == "NetBSD") || !exists(/usr/bin/lpstat) 40.if (${OPSYS} == "NetBSD") || !exists(/usr/bin/lpstat)
41CONFIGURE_ENV+= ac_cv_path_LPSTAT_PATH=no 41CONFIGURE_ENV+= ac_cv_path_LPSTAT_PATH=no
42.endif 42.endif
43 43
44NET_SNMP_SYS_CONTACT?= default_user@contact.domain 44NET_SNMP_SYS_CONTACT?= default_user@contact.domain
45NET_SNMP_SYS_LOCATION?= defaultlocation 45NET_SNMP_SYS_LOCATION?= defaultlocation
46NET_SNMP_PERSISTENTDIR?= ${VARBASE}/net-snmp 46NET_SNMP_PERSISTENTDIR?= ${VARBASE}/net-snmp
47NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:/usr/local/share/snmp/mibs 47NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:/usr/local/share/snmp/mibs
48 48
49BUILD_DEFS+= NET_SNMP_SYS_CONTACT 49BUILD_DEFS+= NET_SNMP_SYS_CONTACT
50BUILD_DEFS+= NET_SNMP_SYS_LOCATION 50BUILD_DEFS+= NET_SNMP_SYS_LOCATION
51BUILD_DEFS+= NET_SNMP_PERSISTENTDIR 51BUILD_DEFS+= NET_SNMP_PERSISTENTDIR
52BUILD_DEFS+= NET_SNMP_MIBDIRS 52BUILD_DEFS+= NET_SNMP_MIBDIRS
53 53
54CONFIGURE_ARGS+= --enable-shared 54CONFIGURE_ARGS+= --enable-shared
55CONFIGURE_ARGS+= --with-defaults 55CONFIGURE_ARGS+= --with-defaults
56CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 56CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
57CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}/lib 57CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}/lib
58CONFIGURE_ARGS+= --with-sys-contact=${NET_SNMP_SYS_CONTACT:Q} 58CONFIGURE_ARGS+= --with-sys-contact=${NET_SNMP_SYS_CONTACT:Q}
59CONFIGURE_ARGS+= --with-sys-location=${NET_SNMP_SYS_LOCATION:Q} 59CONFIGURE_ARGS+= --with-sys-location=${NET_SNMP_SYS_LOCATION:Q}
60CONFIGURE_ARGS+= --with-install-prefix=${DESTDIR} 60CONFIGURE_ARGS+= --with-install-prefix=${DESTDIR}
61# 61#
62# NOTE: if you specify a logfile then this file will be written to by 62# NOTE: if you specify a logfile then this file will be written to by
63# default and although it can be disabled on the command line, the 63# default and although it can be disabled on the command line, the
64# daemon must be stopped to cycle it properly. Remember rc.d/snmpd 64# daemon must be stopped to cycle it properly. Remember rc.d/snmpd
65# will use '-s' to enable standard syslog logging anyway. 65# will use '-s' to enable standard syslog logging anyway.
66# 66#
67CONFIGURE_ARGS+= --with-logfile=none 67CONFIGURE_ARGS+= --with-logfile=none
68CONFIGURE_ARGS+= --with-persistent-directory=${NET_SNMP_PERSISTENTDIR} 68CONFIGURE_ARGS+= --with-persistent-directory=${NET_SNMP_PERSISTENTDIR}
69.if !empty(NET_SNMP_MIBDIRS) 69.if !empty(NET_SNMP_MIBDIRS)
70CONFIGURE_ARGS+= --with-mibdirs=${NET_SNMP_MIBDIRS:Q} 70CONFIGURE_ARGS+= --with-mibdirs=${NET_SNMP_MIBDIRS:Q}
71.endif 71.endif
72.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" 72.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
73CONFIGURE_ARGS+= --with-mib-modules="smux host ucd-snmp/diskio" 73CONFIGURE_ARGS+= --with-mib-modules="smux host ucd-snmp/diskio"
74.else 74.else
75CONFIGURE_ARGS+= --with-mib-modules="smux host" 75CONFIGURE_ARGS+= --with-mib-modules="smux host"
76.endif 76.endif
77.if !empty(MACHINE_PLATFORM:MDarwin-[567].*) 77.if !empty(MACHINE_PLATFORM:MDarwin-[567].*)
78CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/diskio mibII" 78CONFIGURE_ARGS+= --with-out-mib-modules="ucd-snmp/diskio mibII"
79.endif 79.endif
80.if !empty(MACHINE_PLATFORM:MDarwin-9.*) 80.if !empty(MACHINE_PLATFORM:MDarwin-9.*)
81CONFIGURE_ARGS+= --with-mib-modules="host ucd-snmp/diskio" 81CONFIGURE_ARGS+= --with-mib-modules="host ucd-snmp/diskio"
82CONFIGURE_ARGS+= --with-out-mib-modules="mibII/icmp host/hr_swrun" 82CONFIGURE_ARGS+= --with-out-mib-modules="mibII/icmp host/hr_swrun"
83CONFIGURE_ARGS+= --enable-as-needed 83CONFIGURE_ARGS+= --enable-as-needed
84CONFIGURE_ARGS+= --without-kmem-usage 84CONFIGURE_ARGS+= --without-kmem-usage
85CONFIGURE_ARGS+= --without-rpm 85CONFIGURE_ARGS+= --without-rpm
86.endif 86.endif
87# 87#
88# Using "dummy" values is technically not compliant with SNMP specs, but 88# Using "dummy" values is technically not compliant with SNMP specs, but
89# otherwise, some tools, e.g. net/tcl-scotty, net/tkined, may ignore results 89# otherwise, some tools, e.g. net/tcl-scotty, net/tkined, may ignore results
90# when they shouldn't. 90# when they shouldn't.
91# 91#
92CONFIGURE_ARGS+= --with-dummy-values 92CONFIGURE_ARGS+= --with-dummy-values
93# 93#
94# Install the UCD-SNMP look-alike headers and libraries to ease porting of 94# Install the UCD-SNMP look-alike headers and libraries to ease porting of
95# older software to use net-snmp. 95# older software to use net-snmp.
96# 96#
97CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility 97CONFIGURE_ARGS+= --enable-ucd-snmp-compatibility
98 98
99# Handle ${PREFIX}/share/snmp in the DEINSTALL script since it may contain 99# Handle ${PREFIX}/share/snmp in the DEINSTALL script since it may contain
100# leftover config files or pidfiles after deinstallation. 100# leftover config files or pidfiles after deinstallation.
101# 101#
102REQD_DIRS= ${PREFIX}/share/snmp 102REQD_DIRS= ${PREFIX}/share/snmp
103RCD_SCRIPTS= snmpd snmptrapd 103RCD_SCRIPTS= snmpd snmptrapd
104 104
105USE_TOOLS+= sh:run 105USE_TOOLS+= sh:run
106REPLACE_INTERPRETER+= bash 106REPLACE_INTERPRETER+= bash
107REPLACE.bash.old= /bin/bash 107REPLACE.bash.old= /bin/bash
108REPLACE.bash.new= ${SH} 108REPLACE.bash.new= ${SH}
109REPLACE_FILES.bash= local/mib2c-update 109REPLACE_FILES.bash= local/mib2c-update
110 110
111INSTALLATION_DIRS+= share/examples/net-snmp 111INSTALLATION_DIRS+= share/examples/net-snmp
112 112
113post-extract: 113post-extract:
114.if ${OPSYS} == "DragonFly" 114.if ${OPSYS} == "DragonFly"
115 cp ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/agent/mibgroup/hardware/cpu/cpu_nlist.c 115 cp ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/agent/mibgroup/hardware/cpu/cpu_nlist.c
116.endif 116.endif
117 117
118post-wrapper: 118post-wrapper:
119.if !empty(MACHINE_PLATFORM:MNetBSD-1.5.[123]*-i386) 119.if !empty(MACHINE_PLATFORM:MNetBSD-1.5.[123]*-i386)
120 mkdir ${BUILDLINK_DIR}/include/sys 120 mkdir ${BUILDLINK_DIR}/include/sys
121 cp ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys 121 cp ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys
122.endif 122.endif
123 123
124post-install: 124post-install:
125 ${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf \ 125 ${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf \
126 ${DESTDIR}${PREFIX}/share/examples/net-snmp/EXAMPLE.conf 126 ${DESTDIR}${PREFIX}/share/examples/net-snmp/EXAMPLE.conf
127 ${INSTALL_DATA} ${WRKSRC}/agent/snmp_perl.pl \ 127 ${INSTALL_DATA} ${WRKSRC}/agent/snmp_perl.pl \
128 ${DESTDIR}${PREFIX}/share/snmp/ 128 ${DESTDIR}${PREFIX}/share/snmp/
129 129
130.include "../../security/tcp_wrappers/buildlink3.mk" 130.include "../../security/tcp_wrappers/buildlink3.mk"
131.include "../../mk/bsd.pkg.mk" 131.include "../../mk/bsd.pkg.mk"
cvs diff -r1.77 -r1.78 pkgsrc/net/net-snmp/distinfo (switch to unified diff)

--- pkgsrc/net/net-snmp/distinfo 2013/04/14 19:45:30 1.77
+++ pkgsrc/net/net-snmp/distinfo 2013/11/05 17:40:30 1.78
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1$NetBSD: distinfo,v 1.77 2013/04/14 19:45:30 joerg Exp $ 1$NetBSD: distinfo,v 1.78 2013/11/05 17:40:30 joerg Exp $
2 2
3SHA1 (net-snmp-5.7.2.tar.gz) = c493027907f32400648244d81117a126aecd27ee 3SHA1 (net-snmp-5.7.2.tar.gz) = c493027907f32400648244d81117a126aecd27ee
4RMD160 (net-snmp-5.7.2.tar.gz) = 392d643e9f2f42ee4fa688b4702329ad005ee12e 4RMD160 (net-snmp-5.7.2.tar.gz) = 392d643e9f2f42ee4fa688b4702329ad005ee12e
5Size (net-snmp-5.7.2.tar.gz) = 6281352 bytes 5Size (net-snmp-5.7.2.tar.gz) = 6281352 bytes
6SHA1 (patch-ac) = 59987ecb9467b1cead9af3d4432a4dd69be93480 6SHA1 (patch-ac) = 59987ecb9467b1cead9af3d4432a4dd69be93480
7SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101 7SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101
8SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa 8SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
9SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = 346bb4cb0e905821aa3bbdda4ae0fd8526d35854 9SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = 346bb4cb0e905821aa3bbdda4ae0fd8526d35854
10SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = 7fc48c58c8f5bc73caaf3990ef61a94fb856e208 10SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = 7fc48c58c8f5bc73caaf3990ef61a94fb856e208
11SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = f04d66f823bf2b49401e6d9a62db4b39ed679907 11SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = f04d66f823bf2b49401e6d9a62db4b39ed679907
12SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = 054866e7c3ac90f183fd4a6d53763a5bba50572c 12SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = 054866e7c3ac90f183fd4a6d53763a5bba50572c
13SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e 13SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
14SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970 14SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970
15SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa 15SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa
16SHA1 (patch-ak) = 50ac67db8a9ffc16d983b4192e74db25ef439321 16SHA1 (patch-ak) = 50ac67db8a9ffc16d983b4192e74db25ef439321
17SHA1 (patch-am) = 52858b71d4e75d813f134c2d006819108430c766 17SHA1 (patch-am) = 52858b71d4e75d813f134c2d006819108430c766
18SHA1 (patch-ap) = 44a4ce6302457094ba2b200e4c47ff6c2a425746 18SHA1 (patch-ap) = 44a4ce6302457094ba2b200e4c47ff6c2a425746
19SHA1 (patch-aq) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b 19SHA1 (patch-aq) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b
20SHA1 (patch-da) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299 20SHA1 (patch-da) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
21SHA1 (patch-db) = 281be9a88860987880c71770f4050fd965dd8ed9 21SHA1 (patch-db) = 281be9a88860987880c71770f4050fd965dd8ed9
22SHA1 (patch-dl) = 92563fd6be6f27be5b348cdc8bc02061374026b0 22SHA1 (patch-dl) = 92563fd6be6f27be5b348cdc8bc02061374026b0
23SHA1 (patch-dt) = 452fee78b37f8ce0eb30049f9f18b04cff9b6e6e 23SHA1 (patch-dt) = 452fee78b37f8ce0eb30049f9f18b04cff9b6e6e
24SHA1 (patch-du) = 89a77e82d881207500fb45c422b66710e44c0eb4 24SHA1 (patch-du) = 89a77e82d881207500fb45c422b66710e44c0eb4
25SHA1 (patch-el) = b85dbef28e14fe29c9fb944508a08e7423a37152 25SHA1 (patch-el) = b85dbef28e14fe29c9fb944508a08e7423a37152
26SHA1 (patch-es) = 7336d905bac315f344f93664e4118332f88fb6ee 26SHA1 (patch-es) = 7336d905bac315f344f93664e4118332f88fb6ee
27SHA1 (patch-include_net-snmp_system_netbsd.h) = 7880fded678147b2cc75e035234b89727e213d00 27SHA1 (patch-include_net-snmp_system_netbsd.h) = 7880fded678147b2cc75e035234b89727e213d00
 28SHA1 (patch-perl_agent_Makefile.PL) = 722380debeda1552b74b60ff91cea3cbbc716e74
File Added: pkgsrc/net/net-snmp/patches/Attic/patch-perl_agent_Makefile.PL
$NetBSD: patch-perl_agent_Makefile.PL,v 1.1 2013/11/05 17:40:30 joerg Exp $

--- perl/agent/Makefile.PL.orig	2012-10-09 22:28:58.000000000 +0000
+++ perl/agent/Makefile.PL
@@ -79,7 +79,10 @@ sub InitMakeParams {
     else {
 	$opts = NetSNMPGetOpts();
 	$Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
-	$Params{'LIBS'}   = `$opts->{'nsconfig'} --base-agent-libs`;
+	chomp($Params{'LDDLFLAGS'});
+	$Params{'LDDLFLAGS'} = $Params{'LDDLFLAGS'} . " " . $Config{'ccdlflags'};
+	chomp($Params{'LDDLFLAGS'});
+	$Params{'LIBS'} = `$opts->{'nsconfig'} --base-agent-libs`;
 	chomp($Params{'LIBS'});
 	$Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
 	chomp($Params{'CCFLAGS'});