summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ORBit/Makefile12
-rw-r--r--net/ORBit/buildlink2.mk38
-rw-r--r--net/ORBit/distinfo4
-rw-r--r--net/ORBit/patches/patch-ac14
-rw-r--r--net/ORBit/patches/patch-ah2
-rw-r--r--net/ORBit/patches/patch-aj2
-rw-r--r--net/hesiod/Makefile5
-rw-r--r--net/hesiod/buildlink2.mk37
-rw-r--r--net/net-snmp-current/Makefile79
-rw-r--r--net/net-snmp-current/PLIST2
-rw-r--r--net/net-snmp-current/buildlink2.mk20
-rw-r--r--net/openslp/Makefile4
-rw-r--r--net/openslp/buildlink2.mk19
-rw-r--r--net/socks4/Makefile4
-rw-r--r--net/socks4/buildlink.mk2
-rw-r--r--net/socks4/buildlink2.mk19
-rw-r--r--net/socks5/Makefile5
-rw-r--r--net/socks5/buildlink.mk2
-rw-r--r--net/socks5/buildlink2.mk20
-rw-r--r--net/ucd-snmp/Makefile83
-rw-r--r--net/ucd-snmp/PLIST2
-rw-r--r--net/ucd-snmp/buildlink2.mk22
-rw-r--r--net/ucd-snmp/distinfo2
-rw-r--r--net/ucd-snmp/patches/patch-ac2
24 files changed, 290 insertions, 111 deletions
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 804ca8c2992..dfc48b9f672 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2002/07/18 02:19:24 rh Exp $
+# $NetBSD: Makefile,v 1.78 2002/08/25 18:39:30 jlam Exp $
#
DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -11,7 +11,6 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= high-performance CORBA ORB with support for the C language
DEPENDS+= gindent-[0-9]*:../../devel/gindent
-
BUILD_DEPENDS+= automake>=1.4:../../devel/automake
USE_GMAKE= YES
@@ -21,7 +20,7 @@ LIBTOOL_OVERRIDE+= ${WRKSRC}/popt/libtool
LIBTOOL_OVERRIDE+= ${WRKSRC}/libIDL/libtool
GNU_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
@@ -34,8 +33,9 @@ INFO_FILES= libIDL.info
AUTOMAKE_OVERRIDE= NO # Otherwise breaks 1.5 arm32
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/glib/buildlink.mk"
-.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
+
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ORBit/buildlink2.mk b/net/ORBit/buildlink2.mk
new file mode 100644
index 00000000000..efa78030933
--- /dev/null
+++ b/net/ORBit/buildlink2.mk
@@ -0,0 +1,38 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:30 jlam Exp $
+
+.if !defined(ORBIT_BUILDLINK2_MK)
+ORBIT_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= ORBit
+BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.12
+BUILDLINK_PKGSRCDIR.ORBit?= ../../net/ORBit
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.ORBit=ORBit
+BUILDLINK_PREFIX.ORBit_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.ORBit+= include/libIDL-1.0/libIDL/*
+BUILDLINK_FILES.ORBit+= include/orbit-1.0/IIOP/*
+BUILDLINK_FILES.ORBit+= include/orbit-1.0/ORBitservices/*
+BUILDLINK_FILES.ORBit+= include/orbit-1.0/ORBitutil/*
+BUILDLINK_FILES.ORBit+= include/orbit-1.0/orb/*
+BUILDLINK_FILES.ORBit+= include/orbit-1.0/orbit-idl2.h
+BUILDLINK_FILES.ORBit+= lib/libIDLConf.sh
+BUILDLINK_FILES.ORBit+= lib/libIDL.*
+BUILDLINK_FILES.ORBit+= lib/libIIOP.*
+BUILDLINK_FILES.ORBit+= lib/libORBit.*
+BUILDLINK_FILES.ORBit+= lib/libORBitCosNaming.*
+BUILDLINK_FILES.ORBit+= lib/libORBitutil.*
+BUILDLINK_FILES.ORBit+= lib/libname-server.*
+BUILDLINK_FILES.ORBit+= lib/liborbit-c-backend.*
+
+# The ORBit headers should be found at the same location as for libxml.
+#BUILDLINK_TRANSFORM.ORBit= -e "s|/include/orbit-1.0/|/include/|g"
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
+
+BUILDLINK_TARGETS+= ORBit-buildlink
+
+ORBit-buildlink: _BUILDLINK_USE
+
+.endif # ORBIT_BUILDLINK2_MK
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 8b293f28a50..7343fb73e27 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2002/07/18 02:19:24 rh Exp $
+$NetBSD: distinfo,v 1.12 2002/08/25 18:39:31 jlam Exp $
SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
SHA1 (patch-aa) = ef745d3d279d57dbdf6380053b6b4a7e63322671
SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422
-SHA1 (patch-ac) = cd1f6d8848ad11927717574dada0b164713aab23
+SHA1 (patch-ac) = cc073ac41f69671fe10be3975cb0753e163a10dd
SHA1 (patch-ad) = 688920ba423aa2994d9e2e6540f8738305cb7fd9
SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
SHA1 (patch-af) = b88b26b8fe7d42f267c6761edc3e3b8250bd14fb
diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac
index ef46f983672..cce201f4f1f 100644
--- a/net/ORBit/patches/patch-ac
+++ b/net/ORBit/patches/patch-ac
@@ -1,19 +1,7 @@
-$NetBSD: patch-ac,v 1.10 2002/04/25 12:17:05 agc Exp $
+$NetBSD: patch-ac,v 1.11 2002/08/25 18:39:31 jlam Exp $
--- configure.orig Wed Mar 20 14:45:48 2002
+++ configure Thu Apr 25 12:42:56 2002
-@@ -7189,9 +7189,9 @@
-
- rm -f conf.glibtest
-
--GMODULE_CFLAGS=`glib-config --cflags gmodule`
-+GMODULE_CFLAGS=`$GLIB_CONFIG --cflags gmodule`
-
--GMODULE_LIBS=`glib-config --libs gmodule`
-+GMODULE_LIBS=`$GLIB_CONFIG --libs gmodule`
-
- for ac_prog in 'bison -y' byacc
- do
@@ -8636,6 +8636,10 @@
THEFILE="`echo $I | sed -e 's,^-L,,'`"
echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
diff --git a/net/ORBit/patches/patch-ah b/net/ORBit/patches/patch-ah
index 052cb071845..790a964b9d9 100644
--- a/net/ORBit/patches/patch-ah
+++ b/net/ORBit/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.6 2002/07/18 02:19:25 rh Exp $
+$NetBSD: patch-ah,v 1.7 2002/08/25 18:39:32 jlam Exp $
--- ORBit.pc.in.orig Sat Sep 30 12:09:43 2000
+++ ORBit.pc.in
diff --git a/net/ORBit/patches/patch-aj b/net/ORBit/patches/patch-aj
index a95f81fdab0..b6d1608c4e8 100644
--- a/net/ORBit/patches/patch-aj
+++ b/net/ORBit/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.8 2002/07/18 02:19:25 rh Exp $
+$NetBSD: patch-aj,v 1.9 2002/08/25 18:39:32 jlam Exp $
--- libIDL/libIDL.pc.in.orig Sat Sep 30 12:09:43 2000
+++ libIDL/libIDL.pc.in
diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index 18a057d9c36..5806b1f664f 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/29 13:34:35 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 18:39:32 jlam Exp $
DISTNAME= hesiod-3.0.2
CATEGORIES= net
@@ -7,14 +7,13 @@ MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/
MAINTAINER= kpneal@pobox.org
COMMENT= Hesiod network database client and library
-USE_BUILDLINK_ONLY= YES
-
.include "../../mk/bsd.prefs.mk"
.if exists(/usr/include/hesiod.h) && !defined(USE_HESIOD)
IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution"
.endif
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/hesiod/buildlink2.mk b/net/hesiod/buildlink2.mk
new file mode 100644
index 00000000000..15dff9b311a
--- /dev/null
+++ b/net/hesiod/buildlink2.mk
@@ -0,0 +1,37 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:32 jlam Exp $
+
+.if !defined(HESIOD_BUILDLINK2_MK)
+HESIOD_BUILDLINK2_MK= # defined
+
+BUILDLINK_DEPENDS.hesiod?= hesiod>=3.0.2
+BUILDLINK_PKGSRCDIR.hesiod?= ../../net/hesiod
+
+.if defined(USE_HESIOD)
+_NEED_HESIOD= YES
+.else
+. if exists(/usr/include/hesiod.h)
+_NEED_HESIOD= NO
+. else
+_NEED_HESIOD= YES
+. endif
+.endif
+
+.if ${_NEED_HESIOD} == "YES"
+BUILDLINK_PACKAGES+= hesiod
+EVAL_PREFIX+= BUILDLINK_PREFIX.hesiod=hesiod
+BUILDLINK_PREFIX.hesiod_DEFAULT= ${LOCALBASE}
+.else
+BUILDLINK_PREFIX.hesiod= /usr
+.endif
+
+BUILDLINK_FILES.hesiod= include/hesiod.h
+#
+# if lib/libhesiod.* does not exists assume hesiod service is included in libc
+#
+BUILDLINK_FILES.hesiod+= lib/libhesiod.*
+
+BUILDLINK_TARGETS+= hesiod-buildlink
+
+hesiod-buildlink: _BUILDLINK_USE
+
+.endif # HESIOD_BUILDLINK2_MK
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
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index f42e4989788..4c10278cf3a 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/15 04:12:19 markd Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 18:39:35 jlam Exp $
DISTNAME= openslp-1.0.7
CATEGORIES= net
@@ -8,7 +8,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.openslp.org/
COMMENT= Open-source implementation of the Service Location Protocol
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=/var
diff --git a/net/openslp/buildlink2.mk b/net/openslp/buildlink2.mk
new file mode 100644
index 00000000000..faf3cdee399
--- /dev/null
+++ b/net/openslp/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:35 jlam Exp $
+
+.if !defined(OPENSLP_BUILDLINK2_MK)
+OPENSLP_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= openslp
+BUILDLINK_DEPENDS.openslp?= openslp>=1.0.1
+BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.openslp=openslp
+BUILDLINK_PREFIX.openslp_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.openslp= include/slp.h
+BUILDLINK_FILES.openslp+= lib/libslp.*
+
+BUILDLINK_TARGETS+= openslp-buildlink
+
+openslp-buildlink: _BUILDLINK_USE
+
+.endif # OPENSLP_BUILDLINK2_MK
diff --git a/net/socks4/Makefile b/net/socks4/Makefile
index 3cef4e01a98..09542be5892 100644
--- a/net/socks4/Makefile
+++ b/net/socks4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:32 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 18:39:35 jlam Exp $
#
DISTNAME= export.socks.cstc.4.2.2
@@ -17,7 +17,7 @@ RESTRICTED= "no commercial use"
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
MAKE_ENV+= OPTIMIZE="${CFLAGS}"
post-patch:
diff --git a/net/socks4/buildlink.mk b/net/socks4/buildlink.mk
index 1addf6ffb30..001ff9da884 100644
--- a/net/socks4/buildlink.mk
+++ b/net/socks4/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2002/05/25 20:01:19 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.11 2002/08/25 18:39:35 jlam Exp $
#
# This Makefile fragment is included by packages that use socks4.
#
diff --git a/net/socks4/buildlink2.mk b/net/socks4/buildlink2.mk
new file mode 100644
index 00000000000..2763376878f
--- /dev/null
+++ b/net/socks4/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:36 jlam Exp $
+
+.if !defined(SOCKS4_BUILDLINK2_MK)
+SOCKS4_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= socks4
+BUILDLINK_DEPENDS.socks4?= socks4>=2.2
+BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.socks4=socks4
+BUILDLINK_PREFIX.socks4_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.socks4= lib/libsocks4.*
+BUILDLINK_TRANSFORM+= l:socks:socks4
+
+BUILDLINK_TARGETS+= socks4-buildlink
+
+socks4-buildlink: _BUILDLINK_USE
+
+.endif # SOCKS4_BUILDLINK2_MK
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 2de725ebd10..e2735bb1c31 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile,v 1.23 2002/07/02 14:36:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 18:39:37 jlam Exp $
+# FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
#
DISTNAME= socks5-v1_0r2
@@ -26,7 +27,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
# --with-syslog-facility=LOG_AUTH \
# --with-passwd
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libconffile=${PREFIX}/etc/libsocks5.conf \
--with-srvconffile=${PREFIX}/etc/socks5.conf \
diff --git a/net/socks5/buildlink.mk b/net/socks5/buildlink.mk
index 232e8c23535..91e821b6ef4 100644
--- a/net/socks5/buildlink.mk
+++ b/net/socks5/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2002/05/25 20:01:19 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/08/25 18:39:37 jlam Exp $
#
# This Makefile fragment is included by packages that use socks5.
#
diff --git a/net/socks5/buildlink2.mk b/net/socks5/buildlink2.mk
new file mode 100644
index 00000000000..7977ae64f9a
--- /dev/null
+++ b/net/socks5/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:38 jlam Exp $
+
+.if !defined(SOCKS5_BUILDLINK2_MK)
+SOCKS5_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= socks5
+BUILDLINK_DEPENDS.socks5?= socks5>=1.0.2
+BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.socks5=socks5
+BUILDLINK_PREFIX.socks5_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.socks5= include/socks.h
+BUILDLINK_FILES.socks5+= lib/libsocks5.a
+BUILDLINK_FILES.socks5+= lib/libsocks5_sh.*
+
+BUILDLINK_TARGETS+= socks5-buildlink
+
+socks5-buildlink: _BUILDLINK_USE
+
+.endif # SOCKS5_BUILDLINK2_MK
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-23 13:07:12 +0000