Mechanical changes to use the pkgsrc autoconf and automake by specifying

complete paths to these programs.

5 files changed, 23 insertions, 17 deletions

diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index f351e0c3fc1..8a491aa396c 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2001/01/04 14:18:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/02/26 17:01:59 jlam Exp $
 
 DISTNAME=		freeciv-${FC_VERS}
 FC_VERS=		1.11.4
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.freeciv.org/
 
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
 BUILD_DEPENDS+=		msgfmt:../../devel/gettext
 
 FILESDIR=		${.CURDIR}/../../games/freeciv-share/files
@@ -21,6 +21,6 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 USE_LIBINTL=		yes
 
 pre-configure:
-	cd ${WRKSRC} && autoreconf
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 9ba7dbd4679..b426b27be0f 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2000/12/08 17:32:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/02/26 17:01:59 jlam Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.9.0
@@ -8,8 +8,8 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=		automake:../../devel/automake
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
 DEPENDS+=		gtk+>=1.2.8:../../x11/gtk
 DEPENDS+=		png>=1.0.8:../../graphics/png
 DEPENDS+=		tiff>=3.5.5:../../graphics/tiff
@@ -30,4 +30,6 @@ FILESDIR=		${.CURDIR}/../gdk-pixbuf/files
 PATCHDIR=		${.CURDIR}/../gdk-pixbuf/patches
 
 pre-configure:
-	cd ${WRKSRC} && ${SETENV} autoconf && ${SETENV} automake
+	cd ${WRKSRC}							\
+		&& ${SETENV} ${LOCALBASE}/bin/autoconf			\
+		&& ${SETENV} ${LOCALBASE}/bin/automake
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index 1fd0a7217be..24e507bb48a 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2000/07/22 08:14:57 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2001/02/26 17:01:59 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
 
 DISTNAME=		VFlib2-${VFLIB_VERSION}
@@ -11,7 +11,7 @@ VFLIB_SRC=		${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=		tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=		http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/
 
-BUILD_DEPENDS+=		autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 DEPENDS+=		freetype-lib>=1.3.1:../../graphics/freetype-lib
 
 VFLIB_VERSION=		2.24.2
@@ -37,6 +37,6 @@ PATCHDIR=		${.CURDIR}/../../japanese/vflib-lib/patches
 EXTRACT_ONLY=		${VFLIB_SRC}
 
 pre-configure:
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
index c9b6397343c..00267f2b34f 100644
--- a/sysutils/mc/Makefile.common
+++ b/sysutils/mc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2001/02/13 11:47:06 tron Exp $
+# $NetBSD: Makefile.common,v 1.6 2001/02/26 17:01:59 jlam Exp $
 
 DISTNAME=		mc-4.5.51
 CATEGORIES+=		sysutils
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.gnome.org/mc/
 DEPENDS+=		libslang-*:../../devel/libslang
 DEPENDS+=		glib>=1.2.0:../../devel/glib
 BUILD_DEPENDS+=		msgfmt:../../devel/gettext
-BUILD_DEPENDS+=		autoheader:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoheader:../../devel/autoconf
 
 CONFLICTS+=		mc-* gmc-*
 
diff --git a/x11/lesstif/Makefile.common b/x11/lesstif/Makefile.common
index 2206bc6ae43..19482a2176c 100644
--- a/x11/lesstif/Makefile.common
+++ b/x11/lesstif/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2000/12/22 17:26:18 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/02/26 17:02:00 jlam Exp $
 
 DISTNAME=		lesstif-${LESSTIF_VERSION}
 LESSTIF_VERSION=	0.92.6
@@ -13,8 +13,8 @@ MASTER_SITES=		ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.lesstif.org/
 
-BUILD_DEPENDS+=		autoconf:../../devel/autoconf
-BUILD_DEPENDS+=		automake:../../devel/automake
+BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
 
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
@@ -43,8 +43,12 @@ pre-configure:
 	${TOUCH} ${WRKDIR}/nonexecutable
 	${CHMOD} a-x ${WRKDIR}/nonexecutable
 	for dir in . lib/Xlt lib/Xbae test ; do				\
-		cd ${WRKSRC}/$$dir && libtoolize --force && aclocal	\
-			&& autoheader && automake -a -i && autoconf;	\
+		cd ${WRKSRC}/$$dir					\
+			&& ${LOCALBASE}/bin/libtoolize --force		\
+			&& ${LOCALBASE}/bin/aclocal			\
+			&& ${LOCALBASE}/bin/autoheader			\
+			&& ${LOCALBASE}/bin/automake -a -i		\
+			&& ${LOCALBASE}/bin/autoconf;			\
 	done
 
 .include "../../mk/bsd.pkg.mk"