bl3ify, and remove sed workaround for Solaris now that it uses nbsed.

2 files changed, 30 insertions, 24 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 9d112a0b00e..0f7953babd4 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/25 21:50:40 christos Exp $
+# $NetBSD: Makefile,v 1.18 2004/03/29 16:23:14 jlam Exp $
 
 DISTNAME=	net-snmp-5.0.9
 PKGREVISION=	3
@@ -21,7 +21,7 @@ NET_SNMP_SYS_LOCATION?=		defaultlocation
 NET_SNMP_PERSISTENTDIR?=	/var/net-snmp
 NET_SNMP_MIBDIRS?=		\$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tcl/tnm2.1.10/mibs:/usr/local/share/snmp/mibs
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 
 USE_PKGINSTALL=		yes
@@ -37,17 +37,21 @@ CONFIGURE_ARGS+=	--enable-shared
 # net-snmp doesn't do IPv6 on Solaris
 .if (defined(USE_INET6) && (${USE_INET6} == "YES")) && ${OPSYS} != "SunOS"
 CONFIGURE_ARGS+=	--enable-ipv6
-IPV6H=			""
+PLIST_SUBST+=   	IPV6H=
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
-IPV6H=			"@comment "
+PLIST_SUBST+=   	IPV6H="@comment "
 .endif
-PLIST_SUBST+=   	IPV6H=${IPV6H}
 CONFIGURE_ARGS+=	--with-defaults
+
+.include "../../security/tcp_wrappers/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libwrap
+
 .if defined(NET_SNMP_USE_SSL) && ${NET_SNMP_USE_SSL} == "YES"
+.  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-openssl
 .endif
+
 CONFIGURE_ARGS+=	--with-sys-contact="${NET_SNMP_SYS_CONTACT}"
 CONFIGURE_ARGS+=	--with-sys-location="${NET_SNMP_SYS_LOCATION}"
 #
@@ -89,33 +93,17 @@ OSVERSION_SPECIFIC=	YES
 OWN_DIRS=	${PREFIX}/share/snmp
 RCD_SCRIPTS=	snmpd snmptrapd
 
-pre-configure:
+.include "../../lang/perl5/buildlink3.mk"
+
+post-buildlink:
 .if !empty(MACHINE_PLATFORM:MNetBSD-1.5.[123]*-i386)
 	${MKDIR} ${BUILDLINK_DIR}/include/sys
 	${CP} ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys
 .endif
-.if ${OPSYS} == "SunOS"
-	#
-	# 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}; for file in ${CONFIGURE_SCRIPT}; do		\
-		${SED}	-e "s|ac_max_sed_cmds=[0-9][0-9]*|ac_max_sed_cmds=10|" \
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-		${CHMOD} +x $${file};					\
-	done
-.endif
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/net-snmp
 	${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf				\
 		${PREFIX}/share/examples/net-snmp/EXAMPLE.conf
 
-.include "../../lang/perl5/buildlink2.mk"
-.if defined(NET_SNMP_USE_SSL) && ${NET_SNMP_USE_SSL} == "YES"
-.include "../../security/openssl/buildlink2.mk"
-.endif
-.include "../../security/tcp_wrappers/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk
new file mode 100644
index 00000000000..f878ae5f362
--- /dev/null
+++ b/net/net-snmp/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/29 16:23:14 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+NET_SNMP_BUILDLINK3_MK:=	${NET_SNMP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	net-snmp
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnet-snmp}
+BUILDLINK_PACKAGES+=	net-snmp
+
+.if !empty(NET_SNMP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.net-snmp+=	net-snmp>=5.0.9nb3
+BUILDLINK_PKGSRCDIR.net-snmp?=	../../net/net-snmp
+.endif	# NET_SNMP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}