diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-29 04:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-29 04:54:49 +0000 |
| commit | 3b65bde2f7e4aec38e1ead305f6094960fd84a31 (patch) | |
| tree | 0f7f2aeb7ecca34d147342f726930d3cafaae39e /net | |
| parent | 37360e73f33abdbb3d35f35c1f3ca74e0fb6b684 (diff) | |
| download | pkgsrc-3b65bde2f7e4aec38e1ead305f6094960fd84a31.tar.gz | |
USE_CONFIG_WRAPPER is automatically set if USE_BUILDLINK_ONLY is defined,
so remove it from package Makefiles. Also move the inclusion of the
buildlink.mk files to the end of the Makefile to just before bsd.pkg.mk
to ensure that any Makefile settings occur before the buildlink.mk files.
Diffstat (limited to 'net')
| -rw-r--r-- | net/ORBit/Makefile | 11 | ||||
| -rw-r--r-- | net/mtr/Makefile | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile index 81995309dc9..75f24cd0efc 100644 --- a/net/ORBit/Makefile +++ b/net/ORBit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2001/06/26 16:30:57 jlam Exp $ +# $NetBSD: Makefile,v 1.59 2001/06/29 04:54:55 jlam Exp $ # DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR} @@ -22,7 +22,6 @@ LTCONFIG_OVERRIDE+= ${WRKSRC}/popt/ltconfig LTCONFIG_OVERRIDE+= ${WRKSRC}/libIDL/ltconfig GNU_CONFIGURE= YES -USE_CONFIG_WRAPPER= YES USE_BUILDLINK_ONLY= YES REPLACE_BUILDLINK= libIDL/libIDLConf.sh @@ -33,12 +32,10 @@ PLIST_SUBST+= ORBIT_MAJOR=${ORBIT_MAJOR} ORBIT_MINOR=${ORBIT_MINOR} INFO_FILES= libIDL.info -.include "../../mk/bsd.prefs.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/glib/buildlink.mk" -.include "../../security/tcp_wrappers/buildlink.mk" - pre-configure: cd ${WRKSRC}/popt && ${LOCALBASE}/bin/autoreconf --include-deps --force +.include "../../devel/gettext-lib/buildlink.mk" +.include "../../devel/glib/buildlink.mk" +.include "../../security/tcp_wrappers/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 6a10255df69..fcc06788a8d 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/06/20 04:56:28 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/06/29 04:54:55 jlam Exp $ # $FreeBSD: ports/net/mtr/Makefile,v 1.16 1999/10/28 08:06:00 mharo Exp $ DISTNAME= mtr-0.42 @@ -12,9 +12,7 @@ COMMENT= Traceroute and ping in a single graphical network diagnostic tool GNU_CONFIGURE= yes USE_GMAKE= yes - USE_BUILDLINK_ONLY= yes -USE_CONFIG_WRAPPER= yes do-install: ${INSTALL} -c -s -m 4755 -o root -g wheel ${WRKSRC}/mtr ${PREFIX}/sbin |