diff options
55 files changed, 183 insertions, 335 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile index 1423514fe5a..bd0fb5f250e 100644 --- a/archivers/arj/Makefile +++ b/archivers/arj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:36 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 20:07:59 jlam Exp $ DISTNAME= arj-3.10.21 CATEGORIES= archivers @@ -10,7 +10,7 @@ COMMENT= Open-source ARJ PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake GNU_CONFIGURE= yes CONFIGURE_SCRIPT= ${WRKSRC}/gnu/configure MAKEFILE= makefile.gnu @@ -25,7 +25,7 @@ pre-configure: ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${WRKSRC}/environ.c.1 \ > ${WRKSRC}/environ.c ${RM} -f ${WRKSRC}/environ.c.1 - cd ${WRKSRC}/gnu; ${AUTOCONF} + cd ${WRKSRC}/gnu && autoconf post-install: ${INSTALL_DATA_DIR} ${ARJ_DOCSDIR} @@ -35,5 +35,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/resource/en/$$i ${ARJ_DOCSDIR};\ done -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 0b4b2c92c38..b7452e67037 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/01 18:02:37 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/06/01 20:07:59 jlam Exp $ DISTNAME= audacity-src-1.2.3 PKGNAME= audacity-1.2.3 @@ -13,7 +13,7 @@ COMMENT= Audio editor DEPENDS+= zip>=0.0:../../archivers/zip WRKSRC= ${WRKDIR}/audacity-src-1.2.3 -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes @@ -39,7 +39,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/lib-src/libsndfile/libtool \ .include "../../x11/wxGTK/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" # XXX Internal compiler error with -O2 diff --git a/audio/faac/Makefile b/audio/faac/Makefile index cd64883aadd..6b7c6fabb57 100644 --- a/audio/faac/Makefile +++ b/audio/faac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:52 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/06/01 20:07:59 jlam Exp $ # DISTNAME= faac-1.24 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.audiocoding.com/ COMMENT= AAC audio encoder USE_LIBTOOL= yes +USE_TOOLS+= automake GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/faac @@ -19,10 +20,6 @@ LIBTOOLIZE= ${PREFIX}/bin/libtoolize pre-configure: cd ${WRKSRC}; \ ${LIBTOOLIZE} --automake; \ - ${ACLOCAL}; \ - ${AUTOHEADER}; \ - ${AUTOMAKE} -a --foreign -i; \ - ${AUTOCONF} + aclocal; autoheader; automake -a --foreign -i; autoconf -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile index e15d31c07d9..54429eb2678 100644 --- a/audio/faad2/Makefile +++ b/audio/faad2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:37 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 20:07:59 jlam Exp $ # DISTNAME= faad2-2.0 @@ -15,11 +15,10 @@ NO_BIN_ON_FTP= ${RESTRICTED} NO_BIN_ON_CDROM=${RESTRICTED} WRKSRC= ${WRKDIR}/faad2 -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_LANGUAGES= c c++ USE_LIBTOOL= YES -AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 GNU_CONFIGURE= YES @@ -40,12 +39,11 @@ pre-configure: @${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend for dir in . ; do \ cd ${WRKSRC}/$$dir; \ - ${ACLOCAL} -I .; \ - ${AUTOHEADER}; \ + aclocal -I .; \ + autoheader; \ ${LOCALBASE}/bin/libtoolize --automake; \ - ${AUTOMAKE} --add-missing; \ - ${AUTOCONF}; \ + automake --add-missing; \ + autoconf; \ done -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile index da4691c0699..efa278c69ad 100644 --- a/audio/ices-mp3/Makefile +++ b/audio/ices-mp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:53 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 20:07:59 jlam Exp $ # DISTNAME= ices-${ICES_VERSION} @@ -12,6 +12,7 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.icecast.org/ices.php COMMENT= Source client for a streaming server +USE_TOOLS+= automake USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -32,7 +33,7 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} MODDIR= ${PREFIX}/share/${PKGBASE} pre-configure: - cd ${WRKSRC} && ${AUTORECONF} --force + cd ${WRKSRC} && autoreconf --force do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ices ${PREFIX}/bin/${PKGBASE} @@ -65,5 +66,4 @@ CONFIGURE_ARGS+= --with-python=${PYTHONBIN} .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile index f8fda3b7615..179f20ce19c 100644 --- a/audio/tremor-tools/Makefile +++ b/audio/tremor-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/06/01 20:07:59 jlam Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= tremor-tools-1.0.0.8 @@ -17,21 +17,17 @@ CONFLICTS= vorbis-[0-9]* GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \ --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \ --with-ao-prefix=${BUILDLINK_PREFIX.libao} PLIST_SUBST+= DISTNAME="${DISTNAME}" -AUTOMAKE_REQD= 1.4 PTHREAD_OPTS+= require pre-configure: - cd ${WRKSRC} && ${AUTOMAKE} - cd ${WRKSRC} && ${AUTOCONF} - -.include "../../mk/automake.mk" + cd ${WRKSRC} && automake && autoconf .include "../../audio/libao/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile index 1f7cba278dc..0a7a037e2d4 100644 --- a/audio/tremor/Makefile +++ b/audio/tremor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 20:07:59 jlam Exp $ DISTNAME= tremor_snapshot_030406 PKGNAME= tremor-1.0.2 @@ -12,19 +12,17 @@ HOMEPAGE= http://www.xiph.org/ogg/vorbis/ COMMENT= Fixed point decoding library for the Ogg Vorbis audio encoding format WRKSRC= ${WRKDIR}/Tremor -AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_LIBTOOL= yes PLIST_SUBST+= DISTNAME=${DISTNAME} 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/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile index b2d436b950a..a13b894f17b 100644 --- a/audio/xmms-faad/Makefile +++ b/audio/xmms-faad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:39 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 20:07:59 jlam Exp $ DISTNAME= faad2-2.0 PKGNAME= xmms-faad-2.0 @@ -14,12 +14,11 @@ COMMENT= XMMS plugin for faad #NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/faad2 -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_LANGUAGES= c c++ USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= libtool -AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 GNU_CONFIGURE= YES @@ -32,11 +31,11 @@ pre-configure: @${CP} ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend for dir in . ; do \ cd ${WRKSRC}/$$dir; \ - ${ACLOCAL} -I .; \ - ${AUTOHEADER}; \ + aclocal -I .; \ + autoheader; \ ${LOCALBASE}/bin/libtoolize --automake; \ - ${AUTOMAKE} --add-missing; \ - ${AUTOCONF}; \ + automake --add-missing; \ + autoconf; \ done do-build: @@ -52,5 +51,4 @@ do-install: .include "../../audio/xmms/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk index 42ae8d9b2a2..2f85eb3dcce 100644 --- a/cross/COMMON/cross.mk +++ b/cross/COMMON/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.33 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: cross.mk,v 1.34 2005/06/01 20:07:59 jlam Exp $ # Shared definitions for building a cross-compile environment. @@ -113,7 +113,7 @@ EGCS_WRKSRC= ${WRKDIR}/${EGCS_DISTNAME} EGCS_LANGUAGES= c # add to these below # only using autoheader; 2.13 and 2.54 both work fine -.include "../../mk/autoconf.mk" +USE_TOOLS+= autoconf .if defined(EGCS_MULTILIB) EGCS_INSTALL_LIB=install-multilib diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile index 741a82dbe34..8ecbc88314b 100644 --- a/cross/mipsEEel-netbsd/Makefile +++ b/cross/mipsEEel-netbsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 20:08:00 jlam Exp $ DISTNAME= cross-${TARGET_ARCH}-${DISTVERSION} TARGET_ARCH= mipsEEel-netbsd @@ -104,5 +104,6 @@ gcc-install: install-cpp lang.install-normal install-driver # just uses autoheader -- any version is ok -.include "../../mk/autoconf.mk" +USE_TOOLS+= autoconf + .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile index 07e6e21b63f..c76bb81d537 100644 --- a/databases/mysqlcc/Makefile +++ b/databases/mysqlcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:12 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= mysqlcc-0.9.4-src @@ -14,6 +14,7 @@ HOMEPAGE= http://www.mysql.com/ COMMENT= MySQL Control Center USE_PKGLOCALEDIR= YES +USE_TOOLS+= automake GNU_CONFIGURE= YES CONFIGURE_ARGS+= \ --with-mysql-lib=${BUILDLINK_PREFIX.mysql-client}/lib/mysql @@ -26,7 +27,7 @@ CONFIGURE_ENV+= QMAKESPEC="${QTDIR}/mkspecs/netbsd-g++" MYSQL_VERSIONS_ACCEPTED= 40 41 pre-configure: - cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF} + cd ${WRKSRC} && aclocal && autoconf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mysqlcc ${PREFIX}/bin/ @@ -34,6 +35,4 @@ do-install: .include "../../security/openssl/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" .include "../../mk/mysql.buildlink3.mk" -.include "../../mk/autoconf.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common index 6ab332ec62c..a0c1c0b7502 100644 --- a/databases/postgresql73/Makefile.common +++ b/databases/postgresql73/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:07:46 jlam Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/06/01 20:08:00 jlam Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -39,7 +39,7 @@ BASE_VERS?= ${DIST_VERS} BUILDLINK_DEPENDS.postgresql73-lib?= postgresql73-lib>=${BASE_VERS} BUILDLINK_DEPENDS.tcl-postgresql73?= tcl-postgresql73>=${BASE_VERS} -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake GNU_CONFIGURE= YES PKG_SYSCONFSUBDIR= postgresql @@ -90,6 +90,4 @@ post-extract: fi pre-configure: - cd ${WRKSRC} && ${AUTOCONF} - -.include "../../mk/autoconf.mk" + cd ${WRKSRC} && autoconf diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile index 6a5fb6b3c24..ec61dc14fa1 100644 --- a/devel/cdk/Makefile +++ b/devel/cdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/04/11 21:45:18 tv Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= latestCDK @@ -16,12 +16,12 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_NCURSES= # uses ncurses internals USE_LIBTOOL= yes GNU_CONFIGURE= yes -AUTOCONF_REQD= 2.13 +USE_TOOLS+= autoconf213 BUILD_TARGET= default pre-configure: - cd ${WRKSRC}; ${AUTOCONF} + cd ${WRKSRC}; autoconf post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cdk @@ -30,5 +30,4 @@ post-install: done .include "../../devel/ncurses/buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/florist/Makefile b/devel/florist/Makefile index 30ab951c737..ee91d375d28 100644 --- a/devel/florist/Makefile +++ b/devel/florist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= florist-3.15p-src @@ -15,8 +15,7 @@ COMMENT= FSU implementation of POSIX.5 (Ada binding) USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_AUTOCONF= yes -AUTOCONF_REQD= 2.12 -USE_TOOLS+= gmake +USE_TOOLS+= autoconf213 gmake .include "../../mk/bsd.prefs.mk" @@ -36,7 +35,7 @@ pre-configure: .else . include "../../lang/gcc34-ada/preconfigure.mk" .endif - cd ${WRKSRC}; ${AUTOCONF} + cd ${WRKSRC}; autoconf do-install: @${INSTALL_DATA_DIR} ${PREFIX}/lib/florist @@ -51,5 +50,4 @@ do-install: . include "../../lang/gcc34-ada/buildlink3.mk" .endif .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile index cd27fc00e91..bca6d7731aa 100644 --- a/devel/gdb6/Makefile +++ b/devel/gdb6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:51 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= gdb-6.2.1 @@ -13,12 +13,11 @@ COMMENT= The GNU Project Debugger BUILD_USES_MSGFMT= yes -USE_TOOLS= gmake +USE_TOOLS= autoconf213 gmake USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -AUTOCONF_REQD= 2.13 CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/gdb6 CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gdb6 CONFIGURE_ARGS+= --enable-libada @@ -34,9 +33,7 @@ pre-patch: ${CP} ${FILESDIR}/nbsd-nat.c ${WRKSRC}/gdb pre-configure: - cd ${WRKSRC}/gdb; \ - ${AUTOHEADER}; \ - ${AUTOCONF} + cd ${WRKSRC}/gdb; autoheader; autoconf do-test: if `${PKG_INFO} -qe dejagnu` ;then \ @@ -46,5 +43,4 @@ do-test: fi .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 2e7217e06a8..2f91f4ad541 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 20:08:00 jlam Exp $ DISTNAME= nspr-4.4.1 PKGREVISION= 1 @@ -11,13 +11,11 @@ COMMENT= Platform-neutral API for system level and libc like functions WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build -USE_TOOLS+= gmake +USE_TOOLS+= autoconf213 gmake GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-debug -AUTOCONF_REQD= 2.13 - MAKE_ENV= DIST=${WRKSRC}/dist CONFIGURE_SCRIPT= ../configure CONFIGURE_ENV= LIBRUNPATH=${PREFIX}/lib/nspr @@ -34,7 +32,7 @@ SO_SUFFIX= so.1.0 PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} pre-configure: - cd ${WRKSRC}/.. && ${AUTOCONF} + cd ${WRKSRC}/.. && autoconf do-install: ${INSTALL_DATA_DIR} ${PREFIX}/include/nspr @@ -52,6 +50,4 @@ CONFIGURE_ARGS+= --without-pthreads CONFIGURE_ARGS+= --with-pthreads .endif -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" - diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile index 5c563c268b5..5ac34f9a60c 100644 --- a/devel/prc-tools/Makefile +++ b/devel/prc-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:54 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= prc-tools-2.2 @@ -32,9 +32,8 @@ CONFLICTS+= prc-tools-binutils-[0-9]* CONFLICTS+= prc-tools-gcc-[0-9]* CONFLICTS+= prc-tools-gdb-[0-9]* -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake GNU_CONFIGURE= YES -AUTOCONF_REQD= 2.50 USE_MAKEINFO= YES INFO_FILES= prc-tools.info @@ -67,6 +66,5 @@ pre-patch: cd ${WRKDIR} \ && ${PATCH} --quiet -p0 < ${WRKSRC}/${DIST_GDB}.palmos.diff -.include "../../mk/autoconf.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile index 9435be743db..1cda943fd28 100644 --- a/emulators/twin/Makefile +++ b/emulators/twin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:48 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= twin-src-3.1.14 @@ -13,15 +13,14 @@ COMMENT= Cross-platform implementation of the win32 api WRKSRC= ${WRKDIR}/twin GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= autoconf213 gmake BUILD_TARGET= depend world -AUTOCONF_REQD= 2.13 CONFIGURE_ARGS= --enable-debugger .include "../../mk/x11.buildlink3.mk" pre-configure: - cd ${WRKSRC} && ${AUTORECONF} --force + cd ${WRKSRC} && autoreconf --force pre-build: ${CP} ${WRKSRC}/windows/Execfreebsd.c ${WRKSRC}/windows/Execnetbsd.c @@ -34,5 +33,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/documentation/debugger.1 ${PREFIX}/man/man1 ${INSTALL_PROGRAM} ${WRKSRC}/tools/rc/rc ${PREFIX}/bin -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile index 4241992dea6..0331e3f88e1 100644 --- a/fonts/ttf2pk/Makefile +++ b/fonts/ttf2pk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:47 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:00 jlam Exp $ # .include "../../graphics/freetype-lib/Makefile.common" @@ -10,7 +10,6 @@ MAINTAINER= bernhard@SDG.de,hubertf@NetBSD.org HOMEPAGE= http://www.freetype.org/ COMMENT= TrueType to TeX PK font converter - GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --prefix=${LOCALBASE} CONFIGURE_ARGS+= --with-kpathsea-dir=${PREFIX}/lib @@ -22,11 +21,12 @@ BUILD_DIRS= ${T2PSRC} BUILD_TARGET= depend all USE_LIBTOOL= # defined +USE_TOOLS+= autoconf TEXMF= ${PREFIX}/share/texmf pre-configure: - cd ${T2PSRC}; ${AUTOCONF} + cd ${T2PSRC}; autoconf do-install: ${INSTALL_PROGRAM} ${T2PSRC}/ttf2pk \ @@ -56,5 +56,4 @@ do-install: .include "../../graphics/freetype-lib/buildlink3.mk" .include "../../print/teTeX-bin/kpathsea.buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/glchess/Makefile b/games/glchess/Makefile index 14c2d3d5af4..40e752d04ea 100644 --- a/games/glchess/Makefile +++ b/games/glchess/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= glchess-0.4.7 @@ -10,14 +10,15 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://glchess.sourceforge.net/ COMMENT= 3D chess interface +USE_TOOLS+= automake GNU_CONFIGURE= YES INSTALL_DIRS= ${WRKSRC}/src ${WRKSRC}/man ${WRKSRC}/textures pre-configure: cd ${WRKSRC} && \ - ${ACLOCAL} && \ - ${AUTOMAKE} --add-missing && \ - ${AUTOCONF} && \ + aclocal && \ + automake --add-missing && \ + autoconf && \ ${CP} glchessrc glchessrc.dist && \ ${SED} -e 's|/usr/local/share/games|${PREFIX}/share|g' \ < glchessrc.dist > glchessrc && \ @@ -34,5 +35,4 @@ post-install: .include "../../graphics/glu/buildlink3.mk" .include "../../x11/gtkglarea/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile index cc9f8f497fb..b4098af4546 100644 --- a/games/xpuyopuyo/Makefile +++ b/games/xpuyopuyo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/06/01 20:08:00 jlam Exp $ DISTNAME= xpuyopuyo-0.9.1 PKGREVISION= 5 @@ -10,9 +10,8 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://chaos2.org/xpuyopuyo/ COMMENT= Tetris-like puzzle game -AUTOMAKE_REQD= 1.4 USE_DIRS+= gnome1-1.5 -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_X11BASE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig @@ -24,8 +23,7 @@ CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="${GNOME_CONFIG}" GNOME_CONFIG= ${WRKDIR}/gnome-config pre-configure: - cd ${WRKSRC} && ${AUTOHEADER} && ${AUTOMAKE} --gnu && \ - ${AUTORECONF} --force + cd ${WRKSRC} && autoheader && automake --gnu && autoreconf --force ${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/gnome-config \ > ${GNOME_CONFIG} ${CHMOD} +x ${GNOME_CONFIG} @@ -33,5 +31,4 @@ pre-configure: .include "../../audio/libmikmod/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xracer/Makefile b/games/xracer/Makefile index 0e8d04a3d10..95b1ce95aef 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/06/01 18:02:53 jlam Exp $ +# $NetBSD: Makefile,v 1.34 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= xracer-0.96.9 @@ -12,17 +12,15 @@ COMMENT= XRacer is a clone of the popular Psygnosis game Wipeout BUILD_USES_MSGFMT= # defined -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_PERL5= # defined PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/XRacer/.packlist USE_LIBTOOL= # defined - GNU_CONFIGURE= # defined -AUTOMAKE_REQD= 1.4 pre-configure: - cd ${WRKSRC} && ${AUTOMAKE} --gnu && ${AUTOCONF} + cd ${WRKSRC} && automake --gnu && autoconf pre-patch: .for perlfile in blender2track/xracer-blender2track.pl \ @@ -41,5 +39,4 @@ pre-patch: .include "../../graphics/Mesa/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile index a35e8000722..d4072b27217 100644 --- a/graphics/cal3d-examples/Makefile +++ b/graphics/cal3d-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:54 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 20:08:00 jlam Exp $ # PKGNAME= cal3d-examples-${CAL3D_VERSION} @@ -11,6 +11,8 @@ DISTFILES= TheCallyDemo-0.9.1b.zip \ COMMENT= Tools and demos for cal3d library +USE_TOOLS+= automake + CONFIGURE_ARGS+= --with-cal3d=${PREFIX} CONFIGURE_ARGS+= --with-glut=${PREFIX} CONFIGURE_DIRS= ${WRKSRC}/examples/cally \ @@ -50,6 +52,4 @@ post-install: .include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" -.include "../../mk/automake.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile index d6d9c4b3c78..0d75addadf6 100644 --- a/graphics/cal3d/Makefile +++ b/graphics/cal3d/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:00 jlam Exp $ # PKGNAME= cal3d-${CAL3D_VERSION} @@ -8,12 +8,11 @@ PKGREVISION= 1 COMMENT= Skeletal based 3d character animation library in C++ +USE_TOOLS+= automake pre-configure: cd ${WRKSRC} && ./autogen.sh .include "../../graphics/Mesa/buildlink3.mk" -.include "../../mk/automake.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common index d89a5e495da..30e69a0b474 100644 --- a/graphics/cal3d/Makefile.common +++ b/graphics/cal3d/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/04/11 21:46:00 tv Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= cal3d-${CAL3D_VERSION} @@ -13,8 +13,5 @@ COMMENT= Skeletal based 3d character animation library in C++ EXTRACT_SUFX= .tar.bz2 USE_LIBTOOL= yes +USE_TOOLS+= automake GNU_CONFIGURE= yes -#AUTOMAKE_OVERRIDE= NO - -.include "../../mk/autoconf.mk" -.include "../../mk/automake.mk" diff --git a/graphics/compface/Makefile b/graphics/compface/Makefile index a4ee2626e97..287fde933c5 100644 --- a/graphics/compface/Makefile +++ b/graphics/compface/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:04 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 20:08:00 jlam Exp $ DISTNAME= compface-1.5.1 CATEGORIES= graphics @@ -10,7 +10,7 @@ COMMENT= 48x48x1 image compression and decompression (X-face utility) CONFLICTS= faces-[0-9]* -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake GNU_CONFIGURE= yes SUBST_CLASSES+= perlpath @@ -20,10 +20,9 @@ SUBST_FILES.perlpath= xbm2xface.pl SUBST_SED.perlpath= -e 's|
||' -e 's|/usr/bin|${PREFIX}/bin|g' pre-configure: - cd ${WRKSRC}; ${AUTOCONF} + cd ${WRKSRC}; autoconf post-install: ${INSTALL_SCRIPT} ${WRKSRC}/xbm2xface.pl ${PREFIX}/bin -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 5a20fb40968..ce9e1153242 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= libgdiplus-1.1.5 @@ -10,16 +10,14 @@ HOMEPAGE= http://www.mono-project.com/ COMMENT= Implementation of the GDI+ API USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= libgdiplus.pc.in GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-glitz pre-configure: - cd ${WRKSRC}; \ - ${AUTOHEADER}; \ - ${AUTOCONF} + cd ${WRKSRC}; autoheader; autoconf BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5 BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2 @@ -37,5 +35,4 @@ BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 .include "../../x11/Xrender/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile index f228834ee52..8f0e29603be 100644 --- a/graphics/mng/Makefile +++ b/graphics/mng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:06 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 20:08:00 jlam Exp $ DISTNAME= lm1009 PKGNAME= mng-1.0.9 @@ -18,6 +18,7 @@ COMMENT= Multiple-image Network Graphics (MNG) reference library GNU_CONFIGURE= yes USE_LIBTOOL= yes +USE_TOOLS+= automake # only needed as long as we use the zip distfile EXTRACT_CMD_OPTS.zip?= -aqo @@ -32,13 +33,13 @@ DOCDIR= ${PREFIX}/share/doc/mng INSTALLATION_DIRS= man/man3 man/man5 pre-configure: - cd ${WRKSRC}; \ + cd ${WRKSRC}; \ ${RM} -f configure.in && ${LN} -sf makefiles/configure.in .; \ ${RM} -f Makefile.am && ${LN} -sf makefiles/Makefile.am .; \ - ${SETENV} AUTOM4TE=${LOCALBASE}/bin/autom4te ${ACLOCAL}; \ - ${LOCALBASE}/bin/libtoolize --automake; \ - ${SETENV} AUTOCONF=${AUTOCONF} ${AUTOMAKE} -a --foreign -i; \ - ${AUTOCONF} + aclocal; \ + ${LOCALBASE}/bin/libtoolize --automake; \ + automake -a --foreign -i; \ + autoconf post-install: ${INSTALL_DATA_DIR} ${DOCDIR} @@ -53,5 +54,4 @@ post-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common index 5f97f2cbce4..5b66bd3f661 100644 --- a/lang/dylan-interpreter/Makefile.common +++ b/lang/dylan-interpreter/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:08:09 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= gwydion-dylan-${DYLAN_VERSION} @@ -16,13 +16,12 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gwydiondylan.org/ COMMENT= Functional language -USE_TOOLS+= gmake +USE_TOOLS+= automake14 gmake USE_LIBTOOL= yes MAKEFILE= GNUmakefile BUILD_TARGET= default GNU_CONFIGURE= yes -AUTOMAKE_REQD= 1.4 AUTOCONF_REQD= 2.50 DYLAN_VERSION= 2.3.11 @@ -51,14 +50,13 @@ post-patch: done pre-configure: - cd ${WRKSRC} && ${ACLOCAL} + cd ${WRKSRC} && aclocal cd ${WRKSRC} && ${PREFIX}/bin/libtoolize --force --copy - cd ${WRKSRC} && ${AUTOHEADER} - cd ${WRKSRC} && ${AUTOCONF} + cd ${WRKSRC} && autoheader + cd ${WRKSRC} && autoconf .include "../../devel/boehm-gc/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/php/ext.mk b/lang/php/ext.mk index 0de65db4874..66374b8392e 100644 --- a/lang/php/ext.mk +++ b/lang/php/ext.mk @@ -1,4 +1,4 @@ -# $NetBSD: ext.mk,v 1.5 2004/12/12 09:13:56 jdolecek Exp $ +# $NetBSD: ext.mk,v 1.6 2005/06/01 20:08:00 jlam Exp $ # # PHP extension package framework, for both PECL and bundled PHP extensions. # @@ -40,6 +40,7 @@ CONFIGURE_ARGS+= --with-php-config=${PHP_CONFIG} USE_CONFIG_WRAPPER= YES USE_LIBTOOL= YES +USE_TOOLS+= automake # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} @@ -56,9 +57,11 @@ phpize-module: @cookie=${WRKDIR}/.phpize_module_done; \ if [ ! -f $${cookie} ]; then \ cd ${WRKSRC} && \ - ${SETENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} \ - ACLOCAL=${ACLOCAL} \ - LIBTOOLIZE=${LOCALBASE}/bin/libtoolize \ + ${SETENV} \ + AUTOCONF=${TOOLS_DIR:Q}/bin/autoconf \ + AUTOHEADER=${TOOLS_DIR:Q}/bin/autoheader \ + ACLOCAL=${TOOLS_DIR:Q}/bin/aclocal \ + LIBTOOLIZE=${LOCALBASE:Q}/bin/libtoolize \ ${PHPIZE} && \ ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \ fi @@ -79,7 +82,6 @@ do-patch: done .endif -.include "../../mk/automake.mk" .include "${PHPPKGSRCDIR}/buildlink3.mk" .endif # PHPEXT_MK diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index 21977cd33d4..ef5a738b258 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/06/01 18:02:59 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= Squeak-3.6-3 @@ -14,8 +14,9 @@ COMMENT= Full Smalltalk 80 with portability to UN*X, Mac, and Windows GNU_CONFIGURE= yes USE_LIBTOOL= yes +USE_TOOLS+= automake14 -AUTOCONF_REQD>= 2.57 +AUTOCONF_REQD= 2.57 AUTOMAKE_REQD= 1.4.6 BUILD_DIRS= ${WRKDIR}/build @@ -50,8 +51,6 @@ post-install: CONFIGURE_ARGS+= --enable-mpg-mmx .endif -.include "../../mk/autoconf.mk" -.include "../../mk/automake.mk" .include "../../audio/nas/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index fc6387c5cd0..925a4f6accb 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/05/31 10:01:37 dillo Exp $ +# $NetBSD: Makefile,v 1.31 2005/06/01 20:08:00 jlam Exp $ DISTNAME= cyrus-imapd-2.1.18 SVR4_PKGNAME= cimap @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes PERL5_CONFIGURE= no -AUTOCONF_REQD= 2.13 +USE_TOOLS+= autoconf213 USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL @@ -166,7 +166,7 @@ post-patch: done pre-configure: - cd ${WRKSRC} && ${AUTOHEADER} && ${AUTOCONF} + cd ${WRKSRC} && autoheader && autoconf post-install: ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin @@ -182,5 +182,4 @@ post-install: ${INSTALL_DATA} $$file ${HTMLDIR}; \ done -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/pulsar/Makefile b/mail/pulsar/Makefile index 09711b158bd..e541ec3fc1b 100644 --- a/mail/pulsar/Makefile +++ b/mail/pulsar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:12 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 20:08:00 jlam Exp $ # DISTNAME= pulsar-0.1.1 @@ -12,13 +12,12 @@ HOMEPAGE= http://pulsar.sourceforge.net/ COMMENT= Small, secure POP3 daemon, featuring native SSL support GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake MANCOMPRESSED= yes pre-configure: - cd ${WRKSRC}; ${AUTOCONF} + cd ${WRKSRC}; autoconf .include "../../security/openssl/buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index 0c886cf8297..f87e8006d75 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/03/06 16:45:47 chris Exp $ +# $NetBSD: Makefile,v 1.41 2005/06/01 20:08:01 jlam Exp $ .include "Makefile.common" @@ -43,11 +43,11 @@ CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed-claws PKG_SUPPORTED_OPTIONS= jpilot ldap inet6 -pre-configure: +USE_TOOLS+= autoconf - cd ${WRKSRC}; ${AUTOCONF} +pre-configure: + cd ${WRKSRC}; autoconf -.include "../../mk/autoconf.mk" .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mjpilot) diff --git a/mk/autoconf.mk b/mk/autoconf.mk deleted file mode 100644 index a0010d2b4e6..00000000000 --- a/mk/autoconf.mk +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: autoconf.mk,v 1.8 2005/05/22 19:11:12 jlam Exp $ -# -# makefile fragment for packages that use autoconf -# AUTOCONF_REQD can be set to the minimum version required. -# It adds a build dependency on the appropriate autoconf package -# and sets the following variables: -# AUTOCONF: autoconf binary to use -# AUTORECONF: autoreconf binary to use -# AUTOHEADER: autoheader binary to use -# - -.if !defined(AUTOCONF_MK) -AUTOCONF_MK= # defined - -# minimal required version -AUTOCONF_REQD?= 2.50 - -.include "../../mk/bsd.prefs.mk" - -.if empty(AUTOCONF_REQD:M2.1[0-9]*) -USE_TOOLS+= autoconf -.else -USE_TOOLS+= autoconf213 -.endif - -.endif # AUTOCONF_MK diff --git a/mk/automake.mk b/mk/automake.mk deleted file mode 100644 index b08872a521c..00000000000 --- a/mk/automake.mk +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: automake.mk,v 1.10 2005/05/22 19:11:12 jlam Exp $ -# -# makefile fragment for packages that use automake -# AUTOMAKE_REQD can be set to the minimum version required. -# It adds a build dependency on the appropriate automake and autoconf -# packages and sets the following variables: -# AUTOMAKE: automake binary to use -# ACLOCAL: aclocal binary to use -# autoconf required version will default to 2.13 if automake 1.4* is used, -# and to 2.58 otherwise. -# - -.if !defined(AUTOMAKE_MK) -AUTOMAKE_MK= # defined - -# minimal required version -AUTOMAKE_REQD?= 1.9 - -.include "../../mk/bsd.prefs.mk" - -.if !empty(AUTOMAKE_REQD:M1.4*) -USE_TOOLS+= automake14 -.else -USE_TOOLS+= automake -.endif - -.endif # AUTOMAKE_MK diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk index 773e0af085e..3bc6c5e4b47 100644 --- a/mk/tools/autoconf.mk +++ b/mk/tools/autoconf.mk @@ -1,4 +1,4 @@ -# $NetBSD: autoconf.mk,v 1.9 2005/05/21 04:53:17 jlam Exp $ +# $NetBSD: autoconf.mk,v 1.10 2005/06/01 20:08:01 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -119,13 +119,6 @@ TOOLS_REAL_CMD.autoupdate= ${_TOOLS_AC_PREFIX}/bin/autoupdate _TOOLS_AC_TYPE.ifnames= TOOLS_CREATE TOOLS_REAL_CMD.ifnames= ${_TOOLS_AC_PREFIX}/bin/ifnames - -# Continue to define the following variables until packages have been -# taught to just use "autoconf", "autoheader", and "autoreconf" instead. -# -AUTOCONF= ${TOOLS_CMD.autoconf} -AUTOHEADER= ${TOOLS_CMD.autoheader} -AUTORECONF= ${TOOLS_CMD.autoreconf} . endif .endif @@ -172,13 +165,6 @@ _TOOLS_AC_TYPE.ifnames= # empty TOOLS_REAL_CMD.ifnames-2.13= ${_TOOLS_AC_PREFIX}/bin/ifnames-2.13 TOOLS_ALIASES.ifnames-2.13= ifnames -# Continue to define the following variables until packages have been -# taught to just use "autoconf", "autoheader", and "autoreconf" instead. -# -AUTOCONF= ${TOOLS_CMD.autoconf-2.13} -AUTOHEADER= ${TOOLS_CMD.autoheader-2.13} -AUTORECONF= ${TOOLS_CMD.autoreconf-2.13} - . if defined(USE_LIBTOOL) pre-configure: tools-libtool-m4-override . endif diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk index d125bbfb045..5b3a5440826 100644 --- a/mk/tools/automake.mk +++ b/mk/tools/automake.mk @@ -1,4 +1,4 @@ -# $NetBSD: automake.mk,v 1.12 2005/05/21 04:53:17 jlam Exp $ +# $NetBSD: automake.mk,v 1.13 2005/06/01 20:08:01 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -123,12 +123,6 @@ TOOLS_REAL_CMD.aclocal= ${_TOOLS_AM_PREFIX}/bin/aclocal _TOOLS_AM_TYPE.automake= TOOLS_CREATE TOOLS_REAL_CMD.automake= ${_TOOLS_AM_PREFIX}/bin/automake - -# Continue to define the following variables until packages have been -# taught to just use "aclocal" and "automake" instead. -# -ACLOCAL= ${TOOLS_CMD.aclocal} -AUTOMAKE= ${TOOLS_CMD.automake} . endif .endif @@ -155,12 +149,6 @@ _TOOLS_AM_TYPE.automake-1.4= TOOLS_CREATE _TOOLS_AM_TYPE.automake= # empty TOOLS_REAL_CMD.automake-1.4= ${_TOOLS_AM_PREFIX}/bin/automake-1.4 TOOLS_ALIASES.automake-1.4= automake - -# Continue to define the following variables until packages have been -# taught to just use "aclocal" and "automake" instead. -# -ACLOCAL= ${TOOLS_CMD.aclocal-1.4} -AUTOMAKE= ${TOOLS_CMD.automake-1.4} . endif .endif diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 98341ad2941..fddf5825ca2 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/06/01 20:08:01 jlam Exp $ DISTNAME= transcode-0.6.12 PKGREVISION= 6 @@ -12,7 +12,7 @@ COMMENT= Command line video-stream processing tool BUILD_DEPENDS+= nasm>=0.98.36:../../devel/nasm -USE_TOOLS+= gmake +USE_TOOLS+= automake gmake USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-ft-prefix=${BUILDLINK_PREFIX.freetype2} # this used to operate on acinclude.m4 and run aclocal, but running # aclocal here breaks due to missing DLFCN checking post-patch: - -cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF} && ${AUTOMAKE} + -cd ${WRKSRC} && aclocal && autoconf && automake cd ${WRKSRC} && \ ${SED} "s|/usr/local|${PREFIX}|g; s|include/libmpeg3|include/mpeg3|g; s|-ldl -lm|-lm|g" configure > configure.new && \ ${MV} configure.new configure && ${CHMOD} a+x configure @@ -59,5 +59,4 @@ post-install: .include "../../x11/gtk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 26aa6d059b3..a945ec5b291 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= xine-lib-1.0.1 @@ -16,12 +16,11 @@ PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES -AUTOCONF_REQD= 2.58 USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= libtool libtool-nofpic PKGCONFIG_OVERRIDE= misc/libxine.pc.in -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest @@ -40,11 +39,10 @@ PLIST_SUBST+= HAVE_XV= .endif pre-configure: - cd ${WRKSRC} && ${AUTOCONF} + cd ${WRKSRC} && autoconf .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/pkgconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/autoconf.mk" diff --git a/net/irrd/Makefile b/net/irrd/Makefile index fcf8ad61669..16ef5bf97c6 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 05:35:33 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/06/01 20:08:01 jlam Exp $ DISTNAME= irrd2.2.3 PKGNAME= irrd-2.2.3 @@ -16,6 +16,7 @@ DEPENDS+= gnupg-[0-9]*:../../security/gnupg DEPENDS+= wget-[0-9]*:../../net/wget USE_PERL5= # defined +USE_TOOLS+= automake WRKSRC= ${WRKDIR}/${DISTNAME}/src @@ -32,10 +33,8 @@ CFLAGS+= -g IRRD_CACHER= irrdcacher ripe2rpsl -.include "../../mk/automake.mk" - pre-configure: - cd ${WRKSRC} && ${ACLOCAL} && ${AUTOHEADER} && ${AUTOCONF} + cd ${WRKSRC} && aclocal && autoheader && autoconf post-build: @cd ${WRKSRC}/programs/irrdcacher ; \ diff --git a/net/openslp/Makefile b/net/openslp/Makefile index 7cddf0da9fc..b56563611fe 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/26 20:14:21 adrianp Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/01 20:08:01 jlam Exp $ DISTNAME= openslp-1.2.1 CATEGORIES= net @@ -11,7 +11,7 @@ COMMENT= Open-source implementation of the Service Location Protocol # Needs pkgviews-enabled automake # PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= bison lex +USE_TOOLS+= automake bison lex USE_PKGINSTALL= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -31,15 +31,14 @@ CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} RCD_SCRIPTS= slpd .include "../../security/openssl/buildlink3.mk" -.include "../../mk/automake.mk" post-extract: @${FIND} ${WRKSRC} -name "CVS" -print | ${XARGS} ${RM} -rf @${RM} -fr ${WRKSRC}/doc/html/UsersGuide/.xvpics pre-configure: - @cd ${WRKSRC} && ${ACLOCAL} && ${AUTOHEADER} && ${AUTOCONF} && \ - ${LOCALBASE}/bin/libtoolize && ${AUTOMAKE} --add-missing + @cd ${WRKSRC} && aclocal && autoheader && autoconf && \ + ${LOCALBASE}/bin/libtoolize && automake --add-missing post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/openslp diff --git a/net/socket++/Makefile b/net/socket++/Makefile index 4f8f6c71202..d3a139d786c 100644 --- a/net/socket++/Makefile +++ b/net/socket++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:26 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= socket++-1.12.10 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.linuxhacker.at/socketxx/ COMMENT= C++ class library for UNIX Sockets with exception handling USE_LIBTOOL= YES -AUTOMAKE_REQD= 1.4 +USE_TOOLS+= automake14 AUTOCONF_REQD= 2.50 GNU_CONFIGURE= YES USE_TOOLS+= gmake @@ -20,10 +20,9 @@ TEST_TARGET= check pre-configure: cd ${WRKSRC}; \ ${LOCALBASE}/bin/libtoolize --automake; \ - ${ACLOCAL} -I .; \ - ${AUTOHEADER}; \ - ${AUTOMAKE} --add-missing; \ - ${AUTOCONF}; \ + aclocal -I .; \ + autoheader; \ + automake --add-missing; \ + autoconf -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 2cf6431b842..3a1cedbbe00 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2005/05/22 20:08:26 jlam Exp $ +# $NetBSD: Makefile,v 1.67 2005/06/01 20:08:01 jlam Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -48,7 +48,7 @@ CONF_FILES+= ${EGDIR}/vtysh.conf.sample ${PKG_SYSCONFDIR}/vtysh.conf CONFIGURE_ARGS+= --disable-vtysh .endif -USE_TOOLS+= gmake +USE_TOOLS+= automake gmake USE_MAKEINFO= # defined .include "../../devel/readline/buildlink3.mk" @@ -70,8 +70,8 @@ PLIST_SRC+= ${PKGDIR}/PLIST LIBS+= ${LDFLAGS} pre-configure: - cd ${WRKSRC} && ${AUTORECONF} --force -# cd ${WRKSRC} && ${AUTOMAKE} + cd ${WRKSRC} && autoreconf --force +# cd ${WRKSRC} && automake #post-build: # cd ${WRKSRC}/doc ; \ @@ -81,5 +81,4 @@ pre-configure: post-install: @${CHMOD} a+r ${PREFIX}/share/examples/zebra/* -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/Makefile b/print/cups/Makefile index c0753c3e24f..e7e7737834c 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2005/05/31 11:24:32 dillo Exp $ +# $NetBSD: Makefile,v 1.94 2005/06/01 20:08:01 jlam Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -33,7 +33,7 @@ UNLIMIT_RESOURCES= datasize memorysize USE_LANGUAGES= c c++ # pdftops is a C++ application USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake USE_LIBTOOL= yes INSTALL_TARGET= installcups @@ -112,10 +112,9 @@ OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1770 .include "../../graphics/tiff/buildlink3.mk" .include "../../net/openslp/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.include "../../mk/autoconf.mk" pre-configure: - cd ${WRKSRC} && ${AUTOCONF} + cd ${WRKSRC} && autoconf post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common index e2a263f5d99..76285df7977 100644 --- a/security/cyrus-sasl2/Makefile.common +++ b/security/cyrus-sasl2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:08:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.29 2005/06/01 20:08:01 jlam Exp $ # # This file is currently included by: # @@ -74,15 +74,16 @@ CONFIGURE_ARGS+= --without-saslauthd # Left here as reference for patch makers... # clean up a bit to help package maintainer produce patch files +# +#USE_TOOLS+= automake +# #post-extract: # ${_PKG_SILENT}${_PKG_DEBUG} \ # ${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f # #pre-configure: # cd ${WRKSRC}; \ -# ${ACLOCAL} -I cmulocal -I config; \ -# ${AUTOHEADER}; \ -# ${AUTOMAKE} -a --gnu -i ; \ -# ${AUTOCONF} -# -#.include "../../mk/automake.mk" +# aclocal -I cmulocal -I config; \ +# autoheader; \ +# automake -a --gnu -i ; \ +# autoconf diff --git a/security/gtk-systrace/Makefile b/security/gtk-systrace/Makefile index d954dbf6be5..d58da19526c 100644 --- a/security/gtk-systrace/Makefile +++ b/security/gtk-systrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:12 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= gtk-systrace-2002-12-01 @@ -16,14 +16,10 @@ ONLY_FOR_PLATFORM= NetBSD-1.6[H-Z]*-* NetBSD-[2-9]* WRKSRC= ${WRKDIR}/notification-0.1 GNU_CONFIGURE= YES USE_LIBTOOL= YES +USE_TOOLS+= automake pre-configure: - cd ${WRKSRC} && \ - ${ACLOCAL} && \ - ${AUTOHEADER} && \ - ${AUTOCONF} && \ - ${AUTOMAKE} -acf + cd ${WRKSRC} && aclocal && autoheader && autoconf && automake -acf .include "../../x11/gtk/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index 70338c6c481..b806e14d8c7 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/31 11:31:07 dillo Exp $ +# $NetBSD: Makefile,v 1.25 2005/06/01 20:08:01 jlam Exp $ DISTNAME= krb5-1.4 PKGNAME= mit-${DISTNAME:S/-signed$//} @@ -22,7 +22,7 @@ CONFLICTS+= heimdal-[0-9]* CONFLICTS+= kth-krb4-[0-9]* PKGSRC_USE_TOOLS+= gzcat -USE_TOOLS+= yacc +USE_TOOLS+= autoconf yacc GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -95,7 +95,7 @@ pre-configure: ${XARGS} -n 1 ${DIRNAME} | \ while read dir; do \ ${ECHO} "=> Generating configure in $$dir"; \ - (cd $$dir && ${AUTOCONF} -I ${WRKSRC} -f); \ + (cd $$dir && autoconf -I ${WRKSRC} -f); \ done post-install: @@ -108,5 +108,4 @@ post-install: done; \ done -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index 5fdb5e049e4..fc9467f1c06 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/05/31 11:24:33 dillo Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 20:08:01 jlam Exp $ # NOTE: This package is modeled on ../openssh, but does not share # files with it as that package may update faster than the gssapi @@ -57,6 +57,7 @@ MANDIR= man PLIST_SUBST+= MANDIR=${MANDIR} USE_PKGINSTALL= yes +USE_TOOLS+= autoconf GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --mandir=${PREFIX}/${MANDIR} @@ -147,7 +148,7 @@ MESSAGE_SUBST+= OPENSSH_GROUP=${OPENSSH_GROUP} INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL pre-configure: - cd ${WRKSRC} && ${AUTORECONF} + cd ${WRKSRC} && autoreconf post-install: ${INSTALL_DATA_DIR} ${EGDIR} @@ -161,6 +162,5 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile index f157367f014..c246e39885f 100644 --- a/sysutils/gnome2-system-monitor/Makefile +++ b/sysutils/gnome2-system-monitor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:22 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= gnome-system-monitor-2.10.1 @@ -16,14 +16,14 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= autoconf gmake LIBS+= -lutil GCONF2_SCHEMAS+= gnome-system-monitor.schemas pre-configure: cd ${WRKSRC} && ${PREFIX}/bin/libtoolize - cd ${WRKSRC} && ${AUTOCONF} + cd ${WRKSRC} && autoconf .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -39,5 +39,4 @@ pre-configure: .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile index 6bbaf401b53..8a30c0cf2cf 100644 --- a/wm/afterstep1/Makefile +++ b/wm/afterstep1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 20:08:01 jlam Exp $ DISTNAME= AfterStep-1.8.11 PKGNAME= ${DISTNAME:S/AfterStep/afterstep/} @@ -15,8 +15,8 @@ COMMENT= NeXT-like window manager for X11 DEPENDS+= asclock-[0-9]*:../../time/asclock DEPENDS+= xp-[0-9]*:../../x11/xp -AUTOCONF_REQD= 2.13 GNU_CONFIGURE= YES +USE_TOOLS+= autoconf213 USE_LIBTOOL= YES CONFIGURE_ARGS+= --disable-staticlibs @@ -34,13 +34,12 @@ post-patch: pre-configure: cd ${WRKSRC} && \ - ${AUTOCONF} --localdir=autoconf autoconf/configure.in > configure; \ + autoconf --localdir=autoconf autoconf/configure.in > configure; \ ${CHMOD} 755 configure; \ - ${AUTOHEADER} --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; + autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; .include "../../audio/rplay/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile index 19ddb9b573b..3cd2c43baf1 100644 --- a/wm/e16menuedit2/Makefile +++ b/wm/e16menuedit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/01 18:03:24 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= e16menuedit2-0.0.1 @@ -14,15 +14,12 @@ DEPENDS+= enlightenment-0.16.*:../../wm/enlightenment BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes +USE_TOOLS+= automake USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes pre-configure: - cd ${WRKSRC}; \ - ${ACLOCAL}; \ - ${AUTOHEADER}; \ - ${AUTOMAKE} -a --foreign -i; \ - ${AUTOCONF} + cd ${WRKSRC}; aclocal; autoheader; automake -a --foreign -i; autoconf .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" @@ -30,5 +27,4 @@ pre-configure: .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index ba511646634..803497293ca 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.56 2005/06/01 18:03:26 jlam Exp $ +# $NetBSD: Makefile.common,v 1.57 2005/06/01 20:08:01 jlam Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -16,7 +16,7 @@ BUILD_DEPENDS+= zip>=2.3:../../archivers/zip WRKSRC= ${WRKDIR}/mozilla USE_LANGUAGES= c c++ USE_PERL5= build -USE_TOOLS+= gmake +USE_TOOLS+= autoconf213 gmake GNU_CONFIGURE= yes CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess @@ -49,8 +49,6 @@ CONFIGURE_ARGS+= --disable-tests \ SHAREMODE?= 644 BUILD_TARGET= # empty -AUTOCONF_REQD= 2.13 - UNLIMIT_RESOURCES= datasize memorysize stacksize .include "../../graphics/freetype2/buildlink3.mk" @@ -165,8 +163,8 @@ post-extract: .endfor pre-configure: - cd ${WRKSRC} && ${AUTOCONF} - cd ${WRKSRC}/nsprpub && ${AUTOCONF} + cd ${WRKSRC} && autoconf + cd ${WRKSRC}/nsprpub && autoconf post-build: ${ECHO} skin,install,select,classic/1.0 >> \ @@ -200,5 +198,4 @@ SUBST_SED.pc= -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \ -e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g" SUBST_MESSAGE.pc= "Fixing pkgconfig files." -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 078ff9848e5..ccfa833b624 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -26,12 +26,11 @@ PKG_USERS= ${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\\ user EGDIR= ${PREFIX}/share/examples/privoxy -AUTOCONF_REQD= 2.13 CPPFLAGS+= -Dunix WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}-stable -USE_TOOLS+= gmake +USE_TOOLS+= autoconf213 gmake MAKEFILE= GNUmakefile USE_PERL5= build @@ -62,7 +61,7 @@ FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER} pre-configure: @cd ${WRKSRC} && \ - ( ${AUTOHEADER} && ${AUTOCONF} ; \ + ( autoheader && autoconf ; \ ${MV} config config.bak && \ ${SED} ${FILES_SUBST_SED} <config.bak >config && \ ${RM} -f config.bak \ @@ -74,5 +73,4 @@ post-install: .include "../../devel/pcre/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" -.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/wml/Makefile b/www/wml/Makefile index 527122bceac..539d64d2264 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/03 14:21:43 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/01 20:08:01 jlam Exp $ # DISTNAME= wml-2.0.9 @@ -17,6 +17,7 @@ DEPENDS+= p5-Term-ReadKey>=2.11:../../devel/p5-Term-ReadKey .include "../../mk/bsd.prefs.mk" +USE_TOOLS+= automake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-perl=${PERL5} \ --with-openworld \ @@ -39,7 +40,7 @@ pre-configure: wml_common/gd \ ; \ do \ - cd ${WRKSRC}/$$i && ${AUTORECONF} --force || exit 1; \ + cd ${WRKSRC}/$$i && autoreconf --force || exit 1; \ done post-install: @@ -58,5 +59,4 @@ post-install: .include "../../devel/ncurses/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" -.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" |