pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Remove mk/autoconf.mk and mk/automake.mk and replace t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/30faff53730f
branches:  trunk
changeset: 495041:30faff53730f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 01 20:07:59 2005 +0000

description:
Remove mk/autoconf.mk and mk/automake.mk and 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.

diffstat:

 archivers/arj/Makefile                  |   7 +++----
 audio/audacity/Makefile                 |   5 ++---
 audio/faac/Makefile                     |   9 +++------
 audio/faad2/Makefile                    |  14 ++++++--------
 audio/ices-mp3/Makefile                 |   6 +++---
 audio/tremor-tools/Makefile             |  10 +++-------
 audio/tremor/Makefile                   |  12 +++++-------
 audio/xmms-faad/Makefile                |  14 ++++++--------
 cross/COMMON/cross.mk                   |   4 ++--
 cross/mipsEEel-netbsd/Makefile          |   5 +++--
 databases/mysqlcc/Makefile              |   7 +++----
 databases/postgresql73/Makefile.common  |   8 +++-----
 devel/cdk/Makefile                      |   7 +++----
 devel/florist/Makefile                  |   8 +++-----
 devel/gdb6/Makefile                     |  10 +++-------
 devel/nspr/Makefile                     |  10 +++-------
 devel/prc-tools/Makefile                |   6 ++----
 emulators/twin/Makefile                 |   8 +++-----
 fonts/ttf2pk/Makefile                   |   7 +++----
 games/glchess/Makefile                  |  10 +++++-----
 games/xpuyopuyo/Makefile                |   9 +++------
 games/xracer/Makefile                   |   9 +++------
 graphics/cal3d-examples/Makefile        |   6 +++---
 graphics/cal3d/Makefile                 |   5 ++---
 graphics/cal3d/Makefile.common          |   7 ++-----
 graphics/compface/Makefile              |   7 +++----
 graphics/libgdiplus/Makefile            |   9 +++------
 graphics/mng/Makefile                   |  14 +++++++-------
 lang/dylan-interpreter/Makefile.common  |  12 +++++-------
 lang/php/ext.mk                         |  12 +++++++-----
 lang/squeak/Makefile                    |   7 +++----
 mail/cyrus-imapd21/Makefile             |   7 +++----
 mail/pulsar/Makefile                    |   7 +++----
 mail/sylpheed-claws/Makefile            |   8 ++++----
 mk/autoconf.mk                          |  26 --------------------------
 mk/automake.mk                          |  27 ---------------------------
 mk/tools/autoconf.mk                    |  16 +---------------
 mk/tools/automake.mk                    |  14 +-------------
 multimedia/transcode/Makefile           |   7 +++----
 multimedia/xine-lib/Makefile.common     |   8 +++-----
 net/irrd/Makefile                       |   7 +++----
 net/openslp/Makefile                    |   9 ++++-----
 net/socket++/Makefile                   |  13 ++++++-------
 net/zebra/Makefile                      |   9 ++++-----
 print/cups/Makefile                     |   7 +++----
 security/cyrus-sasl2/Makefile.common    |  15 ++++++++-------
 security/gtk-systrace/Makefile          |  10 +++-------
 security/mit-krb5/Makefile              |   7 +++----
 security/openssh+gssapi/Makefile        |   6 +++---
 sysutils/gnome2-system-monitor/Makefile |   7 +++----
 wm/afterstep1/Makefile                  |   9 ++++-----
 wm/e16menuedit2/Makefile                |  10 +++-------
 www/mozilla/Makefile.common             |  11 ++++-------
 www/privoxy/Makefile                    |   8 +++-----
 www/wml/Makefile                        |   6 +++---
 55 files changed, 183 insertions(+), 335 deletions(-)

diffs (truncated from 1780 to 300 lines):

diff -r f8907efb1873 -r 30faff53730f archivers/arj/Makefile
--- a/archivers/arj/Makefile    Wed Jun 01 20:07:43 2005 +0000
+++ b/archivers/arj/Makefile    Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
 
 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 @@
        ${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 @@
                ${INSTALL_DATA} ${WRKSRC}/resource/en/$$i ${ARJ_DOCSDIR};\
                done
 
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f8907efb1873 -r 30faff53730f audio/audacity/Makefile
--- a/audio/audacity/Makefile   Wed Jun 01 20:07:43 2005 +0000
+++ b/audio/audacity/Makefile   Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
 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 @@
 .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 -r f8907efb1873 -r 30faff53730f audio/faac/Makefile
--- a/audio/faac/Makefile       Wed Jun 01 20:07:43 2005 +0000
+++ b/audio/faac/Makefile       Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
 COMMENT=       AAC audio encoder
 
 USE_LIBTOOL=   yes
+USE_TOOLS+=    automake
 GNU_CONFIGURE= yes
 WRKSRC=                ${WRKDIR}/faac
 
@@ -19,10 +20,6 @@
 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 -r f8907efb1873 -r 30faff53730f audio/faad2/Makefile
--- a/audio/faad2/Makefile      Wed Jun 01 20:07:43 2005 +0000
+++ b/audio/faad2/Makefile      Wed Jun 01 20:07:59 2005 +0000
@@ -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_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 @@
        @${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 -r f8907efb1873 -r 30faff53730f audio/ices-mp3/Makefile
--- a/audio/ices-mp3/Makefile   Wed Jun 01 20:07:43 2005 +0000
+++ b/audio/ices-mp3/Makefile   Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
 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 @@
 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 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f8907efb1873 -r 30faff53730f audio/tremor-tools/Makefile
--- a/audio/tremor-tools/Makefile       Wed Jun 01 20:07:43 2005 +0000
+++ b/audio/tremor-tools/Makefile       Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
 
 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 -r f8907efb1873 -r 30faff53730f audio/tremor/Makefile
--- a/audio/tremor/Makefile     Wed Jun 01 20:07:43 2005 +0000
+++ b/audio/tremor/Makefile     Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
 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 -r f8907efb1873 -r 30faff53730f audio/xmms-faad/Makefile
--- a/audio/xmms-faad/Makefile  Wed Jun 01 20:07:43 2005 +0000
+++ b/audio/xmms-faad/Makefile  Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
 #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 @@
        @${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 @@
 .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 -r f8907efb1873 -r 30faff53730f cross/COMMON/cross.mk
--- a/cross/COMMON/cross.mk     Wed Jun 01 20:07:43 2005 +0000
+++ b/cross/COMMON/cross.mk     Wed Jun 01 20:07:59 2005 +0000
@@ -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_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 -r f8907efb1873 -r 30faff53730f cross/mipsEEel-netbsd/Makefile
--- a/cross/mipsEEel-netbsd/Makefile    Wed Jun 01 20:07:43 2005 +0000
+++ b/cross/mipsEEel-netbsd/Makefile    Wed Jun 01 20:07:59 2005 +0000
@@ -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 @@
                install-cpp lang.install-normal install-driver
 



Home | Main Index | Thread Index | Old Index