diff options
author | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
commit | e2afa97f51a1f72e6618533019aaaae07b7d3cf2 (patch) | |
tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /net/net-snmp-current | |
parent | e97ad43756dc8382d2c6cb8a7ae09be0eb540f67 (diff) | |
download | pkgsrc-e2afa97f51a1f72e6618533019aaaae07b7d3cf2.tar.gz |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'net/net-snmp-current')
-rw-r--r-- | net/net-snmp-current/Makefile | 79 | ||||
-rw-r--r-- | net/net-snmp-current/PLIST | 2 | ||||
-rw-r--r-- | net/net-snmp-current/buildlink2.mk | 20 |
3 files changed, 65 insertions, 36 deletions
diff --git a/net/net-snmp-current/Makefile b/net/net-snmp-current/Makefile index 16eb07ba2b7..c619ce637ad 100644 --- a/net/net-snmp-current/Makefile +++ b/net/net-snmp-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/06/17 10:37:45 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/25 18:39:33 jlam Exp $ DISTNAME= net-snmp-5.0.pre2 PKGNAME= net-snmp-5.0.0.2 @@ -18,55 +18,68 @@ BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= +USE_BUILDLINK2= yes .include "../../mk/bsd.prefs.mk" -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -#CPPFLAGS+= -I${BUILDLINK_DIR}/include -#LDFLAGS+= -L${BUILDLINK_DIR}/lib - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-defaults --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} --with-logfile="/var/log/snmpd" +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-defaults +CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} +CONFIGURE_ARGS+= --with-logfile="/var/log/snmpd" +# # smux/host do not compile -#CONFIGURE_ARGS+=--with-mib-modules="smux host" +# +#CONFIGURE_ARGS+= --with-mib-modules="smux host" +# # NOTE: if you do not allow dummy values some tools such as # scotty/tkined may ignore results when they shouldn't. -CONFIGURE_ARGS+=--with-dummy-values +# +CONFIGURE_ARGS+= --with-dummy-values +# # NOTE: without this the default is USER@DOMAINNAME of the package builder -CONFIGURE_ARGS+=--with-sys-contact="default_user@contact.domain" -CONFIGURE_ARGS+=--with-sys-location="defaultlocation" -CONFIGURE_ARGS+=--enable-shared +# +CONFIGURE_ARGS+= --with-sys-contact="default_user@contact.domain" +CONFIGURE_ARGS+= --with-sys-location="defaultlocation" +CONFIGURE_ARGS+= --enable-shared .if defined(USE_INET6) && ${USE_INET6} == "YES" -CONFIGURE_ARGS+=--enable-ipv6 +CONFIGURE_ARGS+= --enable-ipv6 .else -CONFIGURE_ARGS+=--disable-ipv6 +CONFIGURE_ARGS+= --disable-ipv6 +.endif + +.if (${OPSYS} == "NetBSD") +CFLAGS+= -Dnetbsd1 .endif # this might make it easier to use scotty's mibs, and local ones too -CONFIGURE_ARGS+=--with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" +CONFIGURE_ARGS+= --with-mibdirs="${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" # deal with libwrap bogosity by providing these variables to programs which # do not supply them: post-extract: - @${ECHO} 'int allow_severity, deny_severity;' >${WRKSRC}/snmplib/libwrap.c + @${ECHO} 'int allow_severity, deny_severity;' \ + > ${WRKSRC}/snmplib/libwrap.c pre-configure: -.if (${OPSYS} == NetBSD && \ - ${LOWER_ARCH} == i386 && \ - ${OS_VERSION:M1.5.[123]*} != "") +.if (${OPSYS} == NetBSD) +. if (${LOWER_ARCH} == i386 && ${OS_VERSION:M1.5.[123]*} != "") ${MKDIR} ${BUILDLINK_DIR}/include/sys ${LN} -s ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys +. endif .endif - (cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf) -.if ${OPSYS} == SunOS + cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf +# # Adapt for the fact that the default I've seen of ac_max_sed_cmds=90 -#will not work w/ built-in sed on Solaris. - (cd ${WRKSRC} && ${SED} \ - 's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \ - configure > tmp && cp tmp configure && rm tmp) +# will not work w/ built-in sed on Solaris. +# +.if ${OPSYS} == SunOS + cd ${WRKSRC}; \ + ${SED} 's/ac_max_sed_cmds=[0-9][0-9]*/ac_max_sed_cmds=10/' \ + ${CONFIGURE_SCRIPT} > ${CONFIGURE_SCRIPTS}.fixed; \ + ${MV} ${CONFIGURE_SCRIPT}.fixed ${CONFIGURE_SCRIPTS} .endif post-build: @@ -74,8 +87,8 @@ post-build: ${SED} 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/snmptrapd.sh > ${WRKDIR}/snmptrapd pre-install: - (cd ${WRKSRC}/apps/.libs; ln -sf snmptrap snmpinform) - ${MKDIR} ${PREFIX}/share/snmp + cd ${WRKSRC}/apps/.libs; ${LN} -sf snmptrap snmpinform + ${INSTALL_DATA_DIR} ${PREFIX}/share/snmp post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucd-snmp @@ -84,11 +97,7 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/snmpd ${PREFIX}/etc/rc.d ${INSTALL_SCRIPT} ${WRKDIR}/snmptrapd ${PREFIX}/etc/rc.d -.if (${OPSYS} == "NetBSD") -CFLAGS+= -Dnetbsd1 -.endif - -.include "../../security/openssl/buildlink.mk" -.include "../../security/tcp_wrappers/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" +.include "../../security/tcp_wrappers/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/net-snmp-current/PLIST b/net/net-snmp-current/PLIST index b95513acb71..22f5433c2c2 100644 --- a/net/net-snmp-current/PLIST +++ b/net/net-snmp-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/26 10:29:52 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:33 jlam Exp $ bin/encode_keychange bin/fixproc bin/ipf-mod.pl diff --git a/net/net-snmp-current/buildlink2.mk b/net/net-snmp-current/buildlink2.mk new file mode 100644 index 00000000000..fd027ca2d28 --- /dev/null +++ b/net/net-snmp-current/buildlink2.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:34 jlam Exp $ + +.if !defined(NET_SNMP_BUILDLINK2_MK) +NET_SNMP_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= net-snmp +BUILDLINK_DEPENDS.net-snmp?= net-snmp>=5.0.0.2 +BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp + +EVAL_PREFIX+= BUILDLINK_PREFIX.net-snmp=net-snmp +BUILDLINK_PREFIX.net-snmp_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.net-snmp= include/net-snmp/* +BUILDLINK_FILES.net-snmp+= include/ucd-snmp/* +BUILDLINK_FILES.net-snmp+= lib/libnetsnmp* + +BUILDLINK_TARGETS+= net-snmp-buildlink + +net-snmp-buildlink: _BUILDLINK_USE + +.endif # NET_SNMP_BUILDLINK2_MK |