mk/autoconf.mk and mk/automake.mk have been removed. Replace their

usage with USE_TOOLS and any of "autoconf", "autoconf213", "automake" or "automake14". Also, we don't need to call the auto* tools via ${ACLOCAL}, ${AUTOCONF}, etc., since the tools framework takes care to symlink the correct tool to the correct name, so we can just use aclocal, autoconf, etc. (hi jlam!)
2005-06-08 15:46:59 +00:00 · 2005-06-08 15:46:59 +00:00 · 5b4276e530
parent a14cb8efcf
commit 5b4276e530
18 changed files with 70 additions and 81 deletions
--- a/alive/Makefile
+++ b/alive/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/24 16:22:08 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/08 15:47:01 dillo Exp $
 #

 DISTNAME=	alive-1.4.0
@ -12,16 +12,15 @@ COMMENT=	Login software for Swedish Telia ADSL/Comhem cable Internet users
 AUTOMAKE_REQD=  1.7.1
 MANCOMPRESSED=	yes
 GNU_CONFIGURE=  yes
+USE_TOOLS+=	automake

 LIBS.SunOS=	-lnsl -lsocket

 pre-configure:
-	cd ${WRKSRC};                                           \
-	${ACLOCAL};                                             \
-	${AUTOHEADER};                                          \
-	${AUTOMAKE} -a --foreign -i;                            \
-	${AUTOCONF}
+	cd ${WRKSRC} && aclocal
+	cd ${WRKSRC} && autoheader
+	cd ${WRKSRC} && automake -a --foreign -i
+	cd ${WRKSRC} && autoconf

 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/beast/Makefile
+++ b/beast/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/24 10:29:24 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/08 15:47:00 dillo Exp $
 #

 DISTNAME=	beast-0.5.4
@ -9,17 +9,15 @@ MAINTAINER=	collver1@comcast.net
 HOMEPAGE=	http://beast.gtk.org/
 COMMENT=	Bedevilled Audio System

-AUTOCONF_REQD=	2.13
-
 USE_X11=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake autoconf213
 GNU_CONFIGURE=	yes

 LDFLAGS+=	${LIBOSSAUDIO}

 pre-configure:
-	cd ${WRKSRC} && ${AUTOCONF}
+	cd ${WRKSRC} && autoconf

 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
@ -28,7 +26,6 @@ pre-configure:
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

-.include "../../mk/autoconf.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/gtkada/Makefile
+++ b/gtkada/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/24 10:30:04 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/08 15:47:01 dillo Exp $
 #

 DISTNAME=		GtkAda-2.2.1
@ -12,7 +12,7 @@ COMMENT=		Ada95 graphical toolkit

 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake autoconf
 USE_AUTOCONF=		yes
 USE_X11=		yes

@ -26,7 +26,8 @@ BUILD_DEFS=	USE_GCC_34
 USE_GCC_34?=	NO

 pre-configure:
-	cd ${WRKSRC}; ${AUTOCONF}
+	cd ${WRKSRC} && autoconf
+
 .if !empty(USE_GCC_34:M[Yy][Ee][Ss])
 .  include "../../lang/gcc34/preconfigure.mk"
 .else
@ -42,5 +43,4 @@ pre-configure:
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/gtkada/TODO
+++ b/gtkada/TODO
@ -9,3 +9,5 @@ gnatlink -o gate-in.exe -L. -lgtkada -Wl,-R/usr/pkg/lib -Wl,--export-dynamic -L/
  from a shared library. The library, libgcc.a, is a static
  library. The procedure, __enable_execute_stack, is called as part of
  its initialialization.
+
+- convert to options framework
--- a/k3b/Makefile
+++ b/k3b/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/24 10:30:26 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/08 15:47:02 dillo Exp $
 #

 DISTNAME=		k3b-0.11.24
@ -16,18 +16,17 @@ DEPENDS+=  		{cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes

-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake automake
 USE_LIBTOOL=            yes
 USE_LANGUAGES=          c c++

+# XXX: does this really need automake?  autoheader is part of autoconf
 AUTOMAKE_REQD=  1.7.9

 pre-configure:
-	cd ${WRKSRC};                                           \
-	${AUTOHEADER};                                          \
-	${AUTOCONF}
+	cd ${WRKSRC} && autoheader
+	cd ${WRKSRC} && autoconf

-.include "../../mk/automake.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
--- a/korelib/Makefile
+++ b/korelib/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/09/23 05:59:42 jlamwww Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/08 15:47:00 dillo Exp $

 DISTNAME=	korelib-1.0
 CATEGORIES=	devel kde
@ -11,13 +11,12 @@ COMMENT=	Cross-platform C++ library for developing modular applications
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_TOOLS+=	automake

 pre-configure:
-	cd ${WRKSRC} ; \
-	${ACLOCAL} ; \
-	${AUTOHEADER} ; \
-	${AUTOMAKE} -a --foreign -i ; \
-	${AUTOCONF}
+	cd ${WRKSRC} && aclocal
+	cd ${WRKSRC} && autoheader
+	cd ${WRKSRC} && automake -a --foreign -i
+	cd ${WRKSRC} && autoconf

-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/kvirc/Makefile
+++ b/kvirc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/24 10:30:30 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/08 15:47:00 dillo Exp $
 #

 DISTNAME=		kvirc-3.0.0-beta2
@ -13,7 +13,7 @@ COMMENT=		QT based irc client

 BUILD_USES_MSGFMT=	yes

-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake automake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@ -26,11 +26,10 @@ CONFIGURE_ARGS+=	--with-aa-fonts
 PTHREAD_OPTS+=		require

 pre-configure:
-	cd ${WRKSRC};			\
-	${ACLOCAL};			\
-	${AUTOHEADER};			\
-	${AUTOMAKE} -a --foreign -i;	\
-	${AUTOCONF}
+	cd ${WRKSRC} && aclocal
+	cd ${WRKSRC} && autoheader
+	cd ${WRKSRC} && automake -a --foreign -i
+	cd ${WRKSRC} && autoconf

 .include "../../mk/bsd.prefs.mk"

@ -48,6 +47,5 @@ CONFIGURE_ARGS+=	--with-ix86-asm
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"

-.include "../../mk/automake.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/libwbxml2-patched/Makefile
+++ b/libwbxml2-patched/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:13:51 tvierling Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/08 15:47:02 dillo Exp $
 #

 DISTNAME=		wbxml2-0.9.0-patched
@ -15,16 +15,15 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		automake

 pre-configure:
 	cd ${WRKSRC} && \
-		${ACLOCAL} && \
+		aclocal && \
 		${PREFIX}/bin/libtoolize --force --copy && \
-		${AUTOHEADER} && \
-		${AUTOCONF} && \
-		${AUTOMAKE} -acf
+		autoheader && \
+		autoconf && \
+		automake -acf

 .include "../../textproc/expat/buildlink3.mk"
-.include "../../mk/autoconf.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/links-hacked/Makefile
+++ b/links-hacked/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/24 10:30:42 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/08 15:47:00 dillo Exp $
 #

 DISTNAME=	links-hacked-${VER}
@ -12,7 +12,7 @@ HOMEPAGE=	http://xray.sai.msu.ru/~karpov/links-hacked/
 COMMENT=        Enhanced version of Links with tabs and more

 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake automake
 USE_X11=		yes

 VER=			030709
@ -56,13 +56,11 @@ post-extract:
 	@${MV} ${WRKDIR}/font ${WRKSRC}

 pre-configure:
-	@cd ${WRKSRC};                                           \
-	${ACLOCAL};                                             \
-	${AUTOHEADER};                                          \
-	${AUTOMAKE} -a --foreign -i;                            \
-	${AUTOCONF}
+	cd ${WRKSRC} && aclocal
+	cd ${WRKSRC} && autoheader
+	cd ${WRKSRC} && automake -a --foreign -i
+	cd ${WRKSRC} && autoconf

-.include "../../mk/automake.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
--- a/links-hacked/TODO
+++ b/links-hacked/TODO
@ -1,3 +1,4 @@
-$Id: TODO,v 1.2 2003/09/02 01:41:11 xtraeme Exp $
+$Id: TODO,v 1.3 2005/06/08 15:47:04 dillo Exp $

 * Different versions, links-hacked-{svgalib,x11,normal}
+* convert to options framework
--- a/mk/postgresql.mk
+++ b/mk/postgresql.mk
@ -1,6 +1,6 @@
-# $NetBSD: postgresql.mk,v 1.1 2004/01/10 19:11:32 mpasternak Exp $
+# $NetBSD: postgresql.mk,v 1.2 2005/06/08 15:47:01 dillo Exp $

-# $Id: postgresql.mk,v 1.1 2004/01/10 19:11:32 mpasternak Exp $
+# $Id: postgresql.mk,v 1.2 2005/06/08 15:47:01 dillo Exp $
 #
 # This is a copycat of databases/postgresql/Makefile.common, updated in 
 # such way so it allows building 1st- and 3rd-party contrib packages 
@ -58,6 +58,8 @@ PGSQL_CONFIGURE_ARGS+=	--without-python
 PGSQL_CONFIGURE_ARGS+=	--without-tcl
 PGSQL_CONFIGURE_ARGS+=	--without-tk

+USE_TOOLS+=	autoconf
+
 # Postgresql explicitly forbids any use of -ffast-math
 CFLAGS:=		${CFLAGS:S/-ffast-math//}

@ -79,8 +81,6 @@ postgresql-post-extract:
 	fi

 postgresql-do-configure:
-	cd ${PGSQL_WRKSRC} && ${AUTOCONF} && ${SETENV} \
+	cd ${PGSQL_WRKSRC} && autoconf && ${SETENV} \
 		${PGSQL_CONFIGURE_ENV} ./configure \
 		${PGSQL_CONFIGURE_ARGS}
-
-.include "../../mk/autoconf.mk"
--- a/multisync/Makefile.common
+++ b/multisync/Makefile.common
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:14:08 tvierling Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/06/08 15:47:02 dillo Exp $
 #

 DISTNAME=		multisync-0.82-1
@ -14,7 +14,6 @@ USE_LIBTOOL=		yes
 USE_X11=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		automake

-.include "../../mk/autoconf.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/pwsafe/Makefile
+++ b/pwsafe/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/24 10:31:22 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/08 15:47:03 dillo Exp $
 #

 DISTNAME=		pwsafe-0.1.6
@ -11,7 +11,7 @@ HOMEPAGE=		http://nsd.dyndns.org/pwsafe/
 COMMENT=		CLI based PasswordSafe compatible password manager

 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake autoconf

 PKG_OPTIONS_VAR=	PKG_OPTIONS.pwsafe
 PKG_SUPPORTED_OPTIONS=	readline x11
@ -39,7 +39,6 @@ CONFIGURE_ARGS+=	--without-x
 PKG_INSTALLATION_TYPES=	overwrite pkgviews

 pre-configure:
-		cd ${WRKSRC} && ${AUTOCONF}
+		cd ${WRKSRC} && autoconf

-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/sarg/Makefile
+++ b/sarg/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:15:30 tvierling Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/08 15:47:03 dillo Exp $

 DISTNAME=		sarg-2.0.5
 CATEGORIES=		www
@ -15,6 +15,7 @@ DIST_SUBDIR=		${DISTNAME}

 AUTOCONF_REQD=		2.56
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		autoconf
 CONFIGURE_ARGS+=	--enable-bindir=${PREFIX}/sbin			\
 			--enable-mandir=${PREFIX}/man/man1		\
 			--enable-sysconfdir=${DATADIR}			\
@ -64,7 +65,7 @@ post-extract:
 		@${RM} ${WRKSRC}/languages/.new

 pre-configure:
-		cd ${WRKSRC} && ${AUTOCONF}
+		cd ${WRKSRC} && autoconf

 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/sarg ${PREFIX}/sbin
@ -80,5 +81,4 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}/images
 		${INSTALL_DATA} ${WRKSRC}/languages/* ${DATADIR}/languages

-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/snes9express/Makefile
+++ b/snes9express/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:15:53 tvierling Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/08 15:47:03 dillo Exp $
 #

 DISTNAME=		snes9express-1.42
@ -12,8 +12,8 @@ COMMENT=		Frontend for snes9x written in GTK2
 DEPENDS+=		snes9x>=1.39:../../emulators/snes9x

 GNU_CONFIGURE=		yes
+USE_TOOLS+=		autoconf

-.include "../../mk/autoconf.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/umix/Makefile
+++ b/umix/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/24 10:31:47 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/08 15:46:59 dillo Exp $

 DISTNAME=	umix-1.0
 CATEGORIES=	audio
@ -11,14 +11,13 @@ COMMENT=	Replacement for aumix
 USE_LIBTOOL=	YES

 GNU_CONFIGURE=          yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake automake

 PLIST_SUBST+=           DISTNAME=${DISTNAME}

 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/automake.mk"

 .if defined(USE_GTK2)
 .include "../../x11/gtk2/buildlink3.mk"
@ -30,9 +29,9 @@ PLIST_SUBST+=           GTK="@comment "
 LIBS+=		${LIBOSSAUDIO}

 pre-configure:
-	cd ${WRKSRC} && ${ACLOCAL}
+	cd ${WRKSRC} && aclocal
 	cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake
-	cd ${WRKSRC} && ${AUTOMAKE} --add-missing
-	cd ${WRKSRC} && ${AUTOCONF}
+	cd ${WRKSRC} && automake --add-missing
+	cd ${WRKSRC} && autoconf

 .include "../../mk/bsd.pkg.mk"
--- a/umix/TODO
+++ b/umix/TODO
@ -0,0 +1 @@
+convert to options framework
--- a/wmmp/Makefile
+++ b/wmmp/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:16:14 tvierling Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/08 15:47:01 dillo Exp $
 #

 DISTNAME=		WMmp-0.10.0
@ -13,11 +13,10 @@ USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 USE_X11=		YES
+USE_TOOLS+=		autoconf

 pre-configure:
-	cd ${WRKSRC};                                           \
-	${AUTOCONF}
+	cd ${WRKSRC} && autoconf

-.include "../../mk/autoconf.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"