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.

5 files changed, 70 insertions, 41 deletions

diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 17303f10867..a3856aa50ba 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2002/06/17 10:34:38 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2002/08/25 18:39:39 jlam Exp $
 
 DISTNAME=	ucd-snmp-4.2.4
 CATEGORIES=	net
@@ -17,61 +17,72 @@ BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 BUILD_DEFS+=	USE_INET6
 
-USE_BUILDLINK_ONLY=	
+USE_BUILDLINK2=	# defined
 
 .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-logfile="/var/log/snmpd"
-CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ARGS+=--with-mib-modules="smux host"
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-defaults
+CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
+CONFIGURE_ARGS+=	--with-logfile="/var/log/snmpd"
+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
 .else
 CONFIGURE_ARGS+=--disable-ipv6
 .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"
+# This might make it easier to use scotty's MIBs and local 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"
+
+.if (${OPSYS} == "NetBSD")
+CFLAGS+=	-Dnetbsd1
+.endif
 
-# deal with libwrap bogosity by providing these variables to programs which
-# do not supply them:
+# 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
 	@${LN} ${WRKSRC}/s/netbsd.h ${WRKSRC}/s/netbsdelf.h
 
 pre-configure:
 .if (${OPSYS} == NetBSD)
-	if [ -f /usr/include/uvm/uvm_param.h ]; then		\
-	  cd ${BUILDLINK_DIR}/include;				\
-	  ${MKDIR} vm;						\
-	  ${LN} -s /usr/include/uvm/uvm_param.h vm/vm_param.h;	\
+	if [ -f /usr/include/uvm/uvm_param.h ]; then			\
+		cd ${BUILDLINK_DIR}/include;				\
+		${MKDIR} vm;						\
+		${LN} -s /usr/include/uvm/uvm_param.h vm/vm_param.h;	\
 	fi
-.if (${LOWER_ARCH} == i386 && ${OS_VERSION:M1.5.[123]*} != "")
+.  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
-.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_SCRIPT}.fixed;	\
+	${MV} -f ${CONFIGURE_SCRIPT}.orig ${CONFIGURE_SCRIPT}
 .endif
 
 post-build:
@@ -85,11 +96,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/ucd-snmp/PLIST b/net/ucd-snmp/PLIST
index 4d56a844cf7..29578681f27 100644
--- a/net/ucd-snmp/PLIST
+++ b/net/ucd-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/06/26 10:29:52 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 18:39:39 jlam Exp $
 bin/encode_keychange
 bin/mib2c
 bin/snmpbulkget
diff --git a/net/ucd-snmp/buildlink2.mk b/net/ucd-snmp/buildlink2.mk
new file mode 100644
index 00000000000..cd84642e2c4
--- /dev/null
+++ b/net/ucd-snmp/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:40 jlam Exp $
+
+.if !defined(UCD_SNMP_BUILDLINK2_MK)
+UCD_SNMP_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			ucd-snmp
+BUILDLINK_DEPENDS.ucd-snmp?=		ucd-snmp-4.2.4*
+BUILDLINK_PKGSRCDIR.ucd-snmp?=		../../net/ucd-snmp
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.ucd-snmp=ucd-snmp
+BUILDLINK_PREFIX.ucd-snmp_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.ucd-snmp=	include/ucd-snmp/*
+BUILDLINK_FILES.ucd-snmp+=	lib/libsnmp*
+BUILDLINK_FILES.ucd-snmp+=	lib/libucdagent*
+BUILDLINK_FILES.ucd-snmp+=	lib/libucdmibs*
+
+BUILDLINK_TARGETS+=	ucd-snmp-buildlink
+
+ucd-snmp-buildlink: _BUILDLINK_USE
+
+.endif	# UCD_SNMP_BUILDLINK2_MK
diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo
index fa83d5f5f61..389f5d5e7dc 100644
--- a/net/ucd-snmp/distinfo
+++ b/net/ucd-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/25 08:04:51 tron Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 18:39:40 jlam Exp $
 
 SHA1 (ucd-snmp-4.2.4.tar.gz) = b1dbf7c5f6971f1f4419d50630a4b34b82ddc57b
 Size (ucd-snmp-4.2.4.tar.gz) = 1706471 bytes
diff --git a/net/ucd-snmp/patches/patch-ac b/net/ucd-snmp/patches/patch-ac
index 8720fead9ee..3423b089ddb 100644
--- a/net/ucd-snmp/patches/patch-ac
+++ b/net/ucd-snmp/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2002/05/25 08:04:52 tron Exp $
+$NetBSD: patch-ac,v 1.8 2002/08/25 18:39:41 jlam Exp $
 
 --- agent/mibgroup/ucd_snmp.h.orig	Thu Feb  7 16:39:26 2002
 +++ agent/mibgroup/ucd_snmp.h	Sat May 25 08:36:34 2002