summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-14 17:21:32 +0000
committerjlam <jlam@pkgsrc.org>2004-02-14 17:21:32 +0000
commitec993afa1a03c673838b24572cfaae5ebd9fb235 (patch)
treef363875d965b55b56e856a921189b2693e263e28 /net
parent12db50c706ca0bcbc78542f31d7719bf81af8ece (diff)
downloadpkgsrc-ec993afa1a03c673838b24572cfaae5ebd9fb235.tar.gz
LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}. Remove redundant LIBTOOL_OVERRIDE settings that are automatically handled by the default setting in bsd.pkg.mk.
Diffstat (limited to 'net')
-rw-r--r--net/GeoIP/Makefile4
-rw-r--r--net/ORBit/Makefile6
-rw-r--r--net/ORBit2/Makefile4
-rw-r--r--net/bind9/Makefile4
-rw-r--r--net/bug-buddy/Makefile3
-rw-r--r--net/dante/Makefile3
-rw-r--r--net/ethereal/Makefile4
-rw-r--r--net/gini/Makefile4
-rw-r--r--net/gnapster/Makefile4
-rw-r--r--net/gnet/Makefile3
-rw-r--r--net/gnet1/Makefile3
-rw-r--r--net/lftp/Makefile4
-rw-r--r--net/libIDL/Makefile3
-rw-r--r--net/libsoup/Makefile3
-rw-r--r--net/linc/Makefile3
-rw-r--r--net/net-snmp/Makefile7
-rw-r--r--net/netatalk/Makefile6
-rw-r--r--net/ntop2/Makefile3
-rw-r--r--net/py-ORBit/Makefile3
-rw-r--r--net/soup/Makefile3
-rw-r--r--net/trickle/Makefile4
-rw-r--r--net/ucd-snmp/Makefile6
22 files changed, 28 insertions, 59 deletions
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 904c4bec951..5302d2df8cd 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/12/28 12:31:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $
#
DISTNAME= GeoIP-1.3.1
@@ -14,8 +14,6 @@ USE_BUILDLINK2= yes
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/GeoIP
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index e3e679894f4..1196da10ab3 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2004/02/14 15:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.102 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
@@ -19,11 +19,7 @@ DEPENDS+= gindent-[0-9]*:../../devel/gindent
.endif
USE_GNU_TOOLS+= make
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/popt/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/libIDL/libtool
GNU_CONFIGURE= YES
CONFIGURE_ENV+= LIBWRAP_PATH=${BUILDLINK_PREFIX.tcp_wrappers}/lib/libwrap.a
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index aa8d95a3e59..6ea09155680 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/10 02:16:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= ORBit2-2.8.3
@@ -20,8 +20,6 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
PKGCONFIG_OVERRIDE= ${WRKSRC}/ORBit-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-CosNaming-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/ORBit-imodule-2.0.pc.in
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index b9558db536f..9dbe585b207 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2003/12/28 10:30:07 tron Exp $
+# $NetBSD: Makefile,v 1.55 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= bind-${BIND_VERSION}
@@ -21,8 +21,6 @@ BUILD_DEFS+= USE_INET6
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/lib/bind/libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-libtool=yes \
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 1749e9c6887..237b95738f9 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/11 04:47:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= bug-buddy-2.4.2
@@ -20,7 +20,6 @@ USE_PKGLOCALEDIR= YES
USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/net/dante/Makefile b/net/dante/Makefile
index 611d2e2769b..161e104fc19 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/06 22:03:31 keihan Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= dante-1.1.14
@@ -15,7 +15,6 @@ USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --with-socks-conf=${PKG_SYSCONFDIR}/socks.conf
CONFIGURE_ARGS+= --with-sockd-conf=${PKG_SYSCONFDIR}/sockd.conf
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 21537142426..5a2522973a4 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2004/01/03 18:49:47 reed Exp $
+# $NetBSD: Makefile,v 1.91 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= ethereal-0.10.0a
@@ -23,7 +23,7 @@ USE_X11= YES
USE_PERL5= build
USE_LIBTOOL= YES
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-gtk2
diff --git a/net/gini/Makefile b/net/gini/Makefile
index 18afb6111e6..4b8f7019fd4 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/24 14:50:05 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= gini-0.5.1
@@ -16,8 +16,6 @@ USE_BUILDLINK2= yes
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../audio/libvorbis/buildlink2.mk"
.include "../../devel/glib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index 8eb30371006..2e322b64e80 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/01/24 14:50:05 grant Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:46 jlam Exp $
DISTNAME= gnapster-1.5.0
PKGREVISION= 7
@@ -15,9 +15,7 @@ USE_BUILDLINK2= YES
USE_X11= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../x11/gnome-core/buildlink2.mk"
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 2e828701347..1716a452ff6 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/07/30 13:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= gnet-2.0.4
@@ -10,7 +10,6 @@ HOMEPAGE= http://www.gnetlibrary.org/
COMMENT= Simple network library
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gnet.pc.in
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile
index 956417491dd..1bf5df8f103 100644
--- a/net/gnet1/Makefile
+++ b/net/gnet1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:10:43 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= gnet-1.1.8
@@ -14,7 +14,6 @@ COMMENT= Simple network library (older version)
CONFLICTS= gnet<=1.1.8
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gnet.pc.in
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index db54f8171c4..e8ecbc142f5 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/23 21:38:27 cube Exp $
+# $NetBSD: Makefile,v 1.33 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= lftp-2.6.12
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_GNU_READLINE= # uses GNU readline internal _rl_mark_modified_lines
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index 58499f05d38..bd1c0114abc 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/10 02:16:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= libIDL-0.8.3
@@ -14,7 +14,6 @@ USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
USE_GNU_TOOLS+= lex
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libIDL-2.0.pc.in
INFO_FILES= libIDL2.info
diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index 180605e439a..2dcd01c684d 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/11 03:06:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= libsoup-1.99.26
@@ -14,7 +14,6 @@ USE_BUILDLINK3= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/soup-2.0.pc.in
CONFIGURE_ARGS+= --disable-gtk-doc
diff --git a/net/linc/Makefile b/net/linc/Makefile
index f8c22aa7608..b2dcc4d5dba 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/12/14 19:41:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= linc-1.1.1
@@ -16,7 +16,6 @@ USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/linc.pc.in
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 06067e74e2c..6f90b916bd6 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/12/30 05:29:45 christos Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:46 jlam Exp $
DISTNAME= net-snmp-5.0.9
PKGREVISION= 2
@@ -22,12 +22,11 @@ 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_LIBTOOL= yes
+
USE_PKGINSTALL= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.if ${OPSYS} == "NetBSD" && empty(CFLAGS:U:M*-Dnetbsd1*)
CFLAGS+= -Dnetbsd1
.endif
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index ef05686bf64..00c00a945ff 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:46 jlam Exp $
DISTNAME= netatalk-1.6.2
CATEGORIES= net print
@@ -13,13 +13,11 @@ GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_PERL5= YES
+USE_LIBTOOL= YES
USE_PKGINSTALL= YES
INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
RCD_SCRIPTS= atalkd afpd papd timelord
diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile
index 8fcbfa44aa8..2593997ecc1 100644
--- a/net/ntop2/Makefile
+++ b/net/ntop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:46 jlam Exp $
DISTNAME= ntop-2.2
PKGNAME= ntop2-2.2
@@ -19,7 +19,6 @@ USE_BUILDLINK2= yes
USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
# --enable-micro-ntop causes compile to fail
CONFIGURE_ARGS+= --enable-automake171
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index eb791065c65..6c38630b918 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= pyorbit-2.0.0
@@ -16,7 +16,6 @@ PY_PATCHPLIST= YES
USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/pyorbit-2.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
diff --git a/net/soup/Makefile b/net/soup/Makefile
index bda032d7fae..5c917b9476e 100644
--- a/net/soup/Makefile
+++ b/net/soup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= soup-0.7.10
@@ -14,7 +14,6 @@ COMMENT= Callback-based mechanism for sending and servicing SOAP requests
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/soup.pc.in
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index cad828eb341..257b6dc00b1 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/27 10:30:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:46 jlam Exp $
#
DISTNAME= trickle-1.06
@@ -15,8 +15,6 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_PKGINSTALL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/trickle
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 7cceab12a9e..be4e781f7a2 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.53 2004/02/14 17:21:47 jlam Exp $
DISTNAME= ucd-snmp-4.2.4
PKGREVISION= 2
@@ -18,13 +18,11 @@ BUILD_DEFS+= USE_INET6
USE_BUILDLINK2= # defined
USE_PERL5= build
+USE_LIBTOOL= yes
USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-defaults
CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}