aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorade <ade@FreeBSD.org>2004-06-05 01:29:38 +0800
committerade <ade@FreeBSD.org>2004-06-05 01:29:38 +0800
commitca808f0eaebe5bce7acf4b82ce3d8c4b67f1a02a (patch)
tree0f8268b015ec949860a3c2ab315d341fbbc7615c
parent62cb740217d0f5aa007d7cab9d007fb551534a4f (diff)
downloadfreebsd-ports-gnome-ca808f0eaebe5bce7acf4b82ce3d8c4b67f1a02a.tar.gz
freebsd-ports-gnome-ca808f0eaebe5bce7acf4b82ce3d8c4b67f1a02a.tar.zst
freebsd-ports-gnome-ca808f0eaebe5bce7acf4b82ce3d8c4b67f1a02a.zip
Sync with new bsd.autotools.mk
-rw-r--r--Mk/bsd.php.mk2
-rw-r--r--archivers/libcomprex/Makefile5
-rw-r--r--archivers/rpm/Makefile1
-rw-r--r--archivers/sectar/Makefile2
-rw-r--r--audio/ecasound/Makefile1
-rw-r--r--audio/faac/Makefile2
-rw-r--r--audio/faad/Makefile4
-rw-r--r--audio/glame/Makefile4
-rw-r--r--audio/xmms-faad/Makefile16
-rw-r--r--audio/xmms-imms/Makefile4
-rw-r--r--audio/xmms-jack/Makefile2
-rw-r--r--audio/xmms-midi/Makefile1
-rw-r--r--comms/gammu-devel/Makefile3
-rw-r--r--comms/gammu/Makefile3
-rw-r--r--comms/openobex/Makefile9
-rw-r--r--comms/openobex/files/patch-Makefile.in14
-rw-r--r--databases/firebird-client/Makefile4
-rw-r--r--databases/firebird-server/Makefile4
-rw-r--r--databases/firebird/Makefile4
-rw-r--r--databases/firebird2-server/Makefile4
-rw-r--r--databases/firebird20-server/Makefile4
-rw-r--r--databases/libodbc++/Makefile2
-rw-r--r--databases/mird/Makefile3
-rw-r--r--databases/mysql-administrator/Makefile1
-rw-r--r--deskutils/krss/Makefile15
-rw-r--r--deskutils/multisync/Makefile13
-rw-r--r--devel/apr/Makefile13
-rw-r--r--devel/apr0/Makefile13
-rw-r--r--devel/apr1/Makefile13
-rw-r--r--devel/apr2/Makefile13
-rw-r--r--devel/automake17/Makefile5
-rw-r--r--devel/avr-gcc-3/Makefile2
-rw-r--r--devel/avr-gcc/Makefile2
-rw-r--r--devel/cvsnt/Makefile3
-rw-r--r--devel/cvsutils/Makefile1
-rw-r--r--devel/fam/Makefile1
-rw-r--r--devel/gcvs/Makefile6
-rw-r--r--devel/gnulibiberty/Makefile2
-rw-r--r--devel/i386-rtems-g77/Makefile7
-rw-r--r--devel/i386-rtems-gcc/Makefile7
-rw-r--r--devel/i386-rtems-objc/Makefile7
-rw-r--r--devel/kdevelop/Makefile9
-rw-r--r--devel/kdevelop/files/patch-Makefile.in36
-rw-r--r--devel/korelib/Makefile3
-rw-r--r--devel/libbfd/Makefile2
-rw-r--r--devel/libdsp/Makefile4
-rw-r--r--devel/m6811-gcc/Makefile2
-rw-r--r--devel/mingw-gcc/Makefile4
-rw-r--r--devel/shapelib/Makefile4
-rw-r--r--devel/swig13/Makefile3
-rw-r--r--devel/swig20/Makefile3
-rw-r--r--devel/sysconftool/Makefile1
-rw-r--r--devel/umbrello/Makefile5
-rw-r--r--dns/fastresolve/Makefile1
-rw-r--r--dns/posadis/Makefile5
-rw-r--r--emulators/hfsplusutils/Makefile1
-rw-r--r--french/dico/Makefile1
-rw-r--r--games/atr3d/Makefile1
-rw-r--r--games/etuxracer/Makefile1
-rw-r--r--games/euchre/Makefile1
-rw-r--r--games/glchess/Makefile1
-rw-r--r--games/tuxracer-commercial/Makefile1
-rw-r--r--games/tuxracer/Makefile1
-rw-r--r--games/tuxtype/Makefile1
-rw-r--r--games/xinvaders/Makefile1
-rw-r--r--games/xracer/Makefile1
-rw-r--r--games/zangband/Makefile1
-rw-r--r--graphics/bmeps/Makefile2
-rw-r--r--graphics/corona/Makefile2
-rw-r--r--graphics/divxcalc/Makefile5
-rw-r--r--graphics/freeglut/Makefile11
-rw-r--r--graphics/glide3/Makefile1
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/lodju/Makefile6
-rw-r--r--graphics/pixie/Makefile4
-rw-r--r--graphics/truevision/Makefile1
-rw-r--r--graphics/utah-glx/Makefile4
-rw-r--r--irc/dancer-services/Makefile8
-rw-r--r--irc/xchat-gnome/Makefile2
-rw-r--r--japanese/aterm/Makefile7
-rw-r--r--japanese/celrw/Makefile9
-rw-r--r--japanese/eblook/Makefile1
-rw-r--r--japanese/emacs20-dl-canna/Makefile2
-rw-r--r--japanese/emacs20-dl-wnn6/Makefile4
-rw-r--r--japanese/migemo/Makefile1
-rw-r--r--japanese/mutt-devel/Makefile1
-rw-r--r--japanese/mutt/Makefile1
-rw-r--r--java/sablevm/Makefile4
-rw-r--r--lang/gambas/Makefile4
-rw-r--r--lang/glade-gpl/Makefile1
-rw-r--r--lang/gnat-glade/Makefile1
-rw-r--r--lang/guile/Makefile3
-rw-r--r--lang/mozart/Makefile3
-rw-r--r--lang/open-cobol-devel/Makefile4
-rw-r--r--lang/open-cobol/Makefile4
-rw-r--r--lang/php4/Makefile2
-rw-r--r--lang/php5/Makefile2
-rw-r--r--lang/php53/Makefile2
-rw-r--r--lang/tensile/Makefile4
-rw-r--r--mail/balsa2/Makefile4
-rw-r--r--mail/cyrus-imapd22/Makefile2
-rw-r--r--mail/cyrus-imapd23/Makefile2
-rw-r--r--mail/cyrus-imapd24/Makefile2
-rw-r--r--mail/libnewmail/Makefile4
-rw-r--r--mail/mutt-devel/Makefile1
-rw-r--r--mail/mutt/Makefile1
-rw-r--r--mail/mutt14/Makefile1
-rw-r--r--mail/pop3proxy/Makefile2
-rw-r--r--mail/up-imapproxy/Makefile2
-rw-r--r--math/asir2000/Makefile2
-rw-r--r--math/geg/Makefile1
-rw-r--r--math/plplot/Makefile4
-rw-r--r--mbone/rtpmon/Makefile4
-rw-r--r--misc/chmlib/Makefile7
-rw-r--r--misc/libmcal/Makefile3
-rw-r--r--multimedia/camserv/Makefile4
-rw-r--r--multimedia/py-gstreamer/Makefile2
-rw-r--r--multimedia/py-gstreamer80/Makefile2
-rw-r--r--net-im/ayttm/Makefile2
-rw-r--r--net-mgmt/nagios-plugins/Makefile1
-rw-r--r--net-mgmt/netsaint-plugins/Makefile1
-rw-r--r--net-p2p/gift/Makefile4
-rw-r--r--net-p2p/gkrellm-gift/Makefile2
-rw-r--r--net-p2p/gnunet/Makefile3
-rw-r--r--net/ayttm/Makefile2
-rw-r--r--net/dictd/Makefile3
-rw-r--r--net/freeradius/Makefile5
-rw-r--r--net/freeradius2/Makefile5
-rw-r--r--net/gift/Makefile4
-rw-r--r--net/gkrellm-gift/Makefile2
-rw-r--r--net/gnometelnet/Makefile5
-rw-r--r--net/gnunet/Makefile3
-rw-r--r--net/libsocket++/Makefile1
-rw-r--r--net/netdude/Makefile4
-rw-r--r--net/openldap22-server/Makefile2
-rw-r--r--net/openldap23-server/Makefile2
-rw-r--r--net/openldap24-server/Makefile2
-rw-r--r--news/newscache/Makefile4
-rw-r--r--news/newsfish/Makefile1
-rw-r--r--news/nntpcache/Makefile2
-rw-r--r--palm/prc-tools/Makefile3
-rw-r--r--print/cjk-lyx/Makefile2
-rw-r--r--print/fontforge/Makefile2
-rw-r--r--print/foomatic-db-engine/Makefile2
-rw-r--r--print/libpdf++/Makefile1
-rw-r--r--security/cyrus-sasl/Makefile1
-rw-r--r--security/mcrypt/Makefile4
-rw-r--r--security/poc/Makefile1
-rw-r--r--security/sfs/Makefile2
-rw-r--r--sysutils/apachetop/Makefile7
-rw-r--r--sysutils/cfengine/Makefile1
-rw-r--r--sysutils/cfengine3-legacy/Makefile1
-rw-r--r--sysutils/cfengine3/Makefile1
-rw-r--r--sysutils/fastresolve/Makefile1
-rw-r--r--sysutils/gfslicer/Makefile5
-rw-r--r--sysutils/gpkgdep/Makefile1
-rw-r--r--sysutils/sjog/Makefile1
-rw-r--r--textproc/dict/Makefile3
-rw-r--r--textproc/dictfmt/Makefile3
-rw-r--r--textproc/sary/Makefile1
-rw-r--r--textproc/texi2html/Makefile1
-rw-r--r--textproc/xlhtml/Makefile1
-rw-r--r--www/cherokee-devel/Makefile4
-rw-r--r--www/cherokee/Makefile4
-rw-r--r--www/comclear/Makefile1
-rw-r--r--www/lighttpd/Makefile2
-rw-r--r--www/mod_clamav/Makefile2
-rw-r--r--www/mod_webapp/Makefile8
-rw-r--r--www/privoxy+ipv6/Makefile2
-rw-r--r--x11-fonts/ttmkfdir/Makefile2
-rw-r--r--x11-servers/driglide/Makefile1
-rw-r--r--x11-toolkits/freeglut/Makefile11
-rw-r--r--x11-toolkits/lesstif/Makefile3
-rw-r--r--x11-toolkits/libgtkeditor/Makefile5
-rw-r--r--x11-toolkits/php-gtk/Makefile8
-rw-r--r--x11-toolkits/php-gtk2/Makefile8
-rw-r--r--x11-toolkits/xmhtml/Makefile3
-rw-r--r--x11-wm/epiwm/Makefile3
-rw-r--r--x11-wm/expocity/Makefile2
-rw-r--r--x11-wm/fluxbox/Makefile2
-rw-r--r--x11-wm/ion-2/Makefile4
-rw-r--r--x11-wm/ion3/Makefile4
182 files changed, 353 insertions, 307 deletions
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk
index d67ab2b1c1a2..440a515d8584 100644
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@@ -152,7 +152,7 @@ PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR}
.if defined(USE_PHPIZE)
BUILD_DEPENDS+= phpize:${PHP_PORT}
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER= 13
WANT_AUTOMAKE_VER= 15
WANT_AUTOCONF_VER= 253
CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 17347c94f4a1..215650f2c211 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -16,12 +16,13 @@ MASTER_SITE_SUBDIR= gnupdate
MAINTAINER= ports@FreeBSD.org
COMMENT= Transparently handles automatic compression and decompression of files
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= curl.2:${PORTSDIR}/ftp/curl
+
.if !exists(/usr/bin/bzip2)
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
+USE_LIBLTDL= yes
USE_GNOME= gnomehack gnometarget pkgconfig
USE_LIBTOOL_VER= 13
LIBTOOLFLAGS= # none
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index bb1257625e55..db82a6bc5b8d 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
USE_GETTEXT= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
USE_REINPLACE= yes
USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --with-glob
diff --git a/archivers/sectar/Makefile b/archivers/sectar/Makefile
index 1f33fbfa7a9b..19cee04ee6a4 100644
--- a/archivers/sectar/Makefile
+++ b/archivers/sectar/Makefile
@@ -16,6 +16,6 @@ COMMENT= A program to create encrypted tar archives
PLIST_FILES= bin/sectar
USE_GETOPT_LONG= yes
-USE_LIBTOOL_VER= 13
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index f1144869fa0a..c72cf6c360cf 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -16,6 +16,7 @@ COMMENT= Multitrack audio processing software
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
USE_LIBTOOL_VER= 13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index f698932aa40d..d1790bfc7618 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -18,7 +18,7 @@ NO_PACKAGE= Distribution in binary form is prohibited
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOMAKE_VER=15
-USE_AUTOHEADER= yes
+USE_AUTOHEADER_VER=213
AUTOMAKE_ARGS= --add-missing
USE_GMAKE= yes
USE_LIBTOOL_VER=13
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index e06e45c673c6..5a651be54d64 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOMAKE_VER=15
-USE_AUTOHEADER= yes
+USE_AUTOMAKE_VER= 15
+USE_AUTOHEADER_VER= 253
AUTOMAKE_ARGS= --add-missing
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GETOPT_LONG=yes
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 9c878e4522c4..512a4222a36c 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -15,9 +15,9 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME
BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
- ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis
+USE_LIBLTDL= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget libglade lthack
USE_GMAKE= yes
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index c27643e8eb0c..e47107efc916 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -24,14 +24,14 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOMAKE_VER= 15
-USE_AUTOHEADER= yes
-AUTOMAKE_ARGS= --add-missing
-
-USE_X_PREFIX= yes
-USE_GNOME= gtk12
-USE_GMAKE= yes
-USE_LIBTOOL_VER=13
-USE_REINPLACE= yes
+USE_AUTOCONF_VER= 253
+USE_AUTOHEADER_VER= 253
+USE_LIBTOOL_VER= 13
+AUTOMAKE_ARGS= --add-missing
+USE_X_PREFIX= yes
+USE_GNOME= gtk12
+USE_GMAKE= yes
+USE_REINPLACE= yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-xmms --with-mp4v2
diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index 4e9c305ee383..71a22ef8a651 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -25,8 +25,8 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
-USE_AUTOHEADER= yes
-USE_AUTOCONF_VER= 257
+USE_AUTOCONF_VER= 257
+USE_AUTOHEADER_VER= 257
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile
index 11d010732304..6271addc3dd1 100644
--- a/audio/xmms-jack/Makefile
+++ b/audio/xmms-jack/Makefile
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/xmms-jack
USE_X_PREFIX= yes
USE_GNOME= gtk12 gnometarget
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
PLIST_FILES= lib/xmms/Output/libjackout.so
diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile
index 75c5b87c59f1..123bea57f57d 100644
--- a/audio/xmms-midi/Makefile
+++ b/audio/xmms-midi/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_GNOME= gtk12
USE_X_PREFIX= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_LIBTOOL_VER= 13
.include <bsd.port.mk>
diff --git a/comms/gammu-devel/Makefile b/comms/gammu-devel/Makefile
index 3040af8518b2..a9cfbb659158 100644
--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES= http://www.mwiacek.com/zips/gsm/gammu/older/ \
MAINTAINER= kirill@solaris.ru
COMMENT= GNU All Mobile Management Utilities
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-
MAN1= gammu.1
USE_GMAKE= yes
GNU_CONFIGURE= yes
+WANT_AUTOCONF_VER=253
CONFIGURE_ARGS= --disable-fbuspl2303
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 3040af8518b2..a9cfbb659158 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -14,11 +14,10 @@ MASTER_SITES= http://www.mwiacek.com/zips/gsm/gammu/older/ \
MAINTAINER= kirill@solaris.ru
COMMENT= GNU All Mobile Management Utilities
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-
MAN1= gammu.1
USE_GMAKE= yes
GNU_CONFIGURE= yes
+WANT_AUTOCONF_VER=253
CONFIGURE_ARGS= --disable-fbuspl2303
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index deb840867ac0..9a7786c92efe 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -14,10 +14,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mad@madpilot.net
COMMENT= Open source implementation of the OBEX protocol
-WANT_AUTOCONF_VER= 213
+WANT_AUTOCONF_VER= 253
WANT_AUTOMAKE_VER= 14
-USE_GMAKE= yes
-WANT_LIBTOOL_VER= 14
-INSTALLS_SHLIB= yes
+WANT_LIBTOOL_VER= 15
+USE_GMAKE= yes
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/comms/openobex/files/patch-Makefile.in b/comms/openobex/files/patch-Makefile.in
new file mode 100644
index 000000000000..f782e3a86796
--- /dev/null
+++ b/comms/openobex/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.orig Wed Oct 1 11:17:31 2003
++++ Makefile.in Fri May 28 20:00:09 2004
+@@ -164,7 +164,7 @@
+ if test -f $$p; then \
+- echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+- $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)"; \
++ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir); \
+ else if test -f $(srcdir)/$$p; then \
+- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+- $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)"; \
++ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir); \
+ else :; fi; fi; \
diff --git a/databases/firebird-client/Makefile b/databases/firebird-client/Makefile
index ca52ed5ef5e7..79cfdd60ba3a 100644
--- a/databases/firebird-client/Makefile
+++ b/databases/firebird-client/Makefile
@@ -61,8 +61,8 @@ run-autotools:
do-configure:
@(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} \
- LIBTOOL=libtool13 LIBTOOLIZE=libtoolize13 ./autogen.sh \
- --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
+ ${AUTOTOOLS_VARS} ./autogen.sh --prefix=${PREFIX}/firebird \
+ --with-lock-manager --with-editline)
do-build:
@( \
diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile
index ca52ed5ef5e7..79cfdd60ba3a 100644
--- a/databases/firebird-server/Makefile
+++ b/databases/firebird-server/Makefile
@@ -61,8 +61,8 @@ run-autotools:
do-configure:
@(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} \
- LIBTOOL=libtool13 LIBTOOLIZE=libtoolize13 ./autogen.sh \
- --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
+ ${AUTOTOOLS_VARS} ./autogen.sh --prefix=${PREFIX}/firebird \
+ --with-lock-manager --with-editline)
do-build:
@( \
diff --git a/databases/firebird/Makefile b/databases/firebird/Makefile
index ca52ed5ef5e7..79cfdd60ba3a 100644
--- a/databases/firebird/Makefile
+++ b/databases/firebird/Makefile
@@ -61,8 +61,8 @@ run-autotools:
do-configure:
@(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} \
- LIBTOOL=libtool13 LIBTOOLIZE=libtoolize13 ./autogen.sh \
- --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
+ ${AUTOTOOLS_VARS} ./autogen.sh --prefix=${PREFIX}/firebird \
+ --with-lock-manager --with-editline)
do-build:
@( \
diff --git a/databases/firebird2-server/Makefile b/databases/firebird2-server/Makefile
index ca52ed5ef5e7..79cfdd60ba3a 100644
--- a/databases/firebird2-server/Makefile
+++ b/databases/firebird2-server/Makefile
@@ -61,8 +61,8 @@ run-autotools:
do-configure:
@(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} \
- LIBTOOL=libtool13 LIBTOOLIZE=libtoolize13 ./autogen.sh \
- --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
+ ${AUTOTOOLS_VARS} ./autogen.sh --prefix=${PREFIX}/firebird \
+ --with-lock-manager --with-editline)
do-build:
@( \
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index ca52ed5ef5e7..79cfdd60ba3a 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -61,8 +61,8 @@ run-autotools:
do-configure:
@(cd ${WRKSRC} && ${SETENV} CC=${CC} CXX=${CXX} MAKE=${GMAKE} \
- LIBTOOL=libtool13 LIBTOOLIZE=libtoolize13 ./autogen.sh \
- --prefix=${PREFIX}/firebird --with-lock-manager --with-editline)
+ ${AUTOTOOLS_VARS} ./autogen.sh --prefix=${PREFIX}/firebird \
+ --with-lock-manager --with-editline)
do-build:
@( \
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 8901b2d01f40..34017313d024 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= fjoe@FreeBSD.org
COMMENT= A C++ class library and toolset for ODBC access to data sources
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= pkgconfig
INSTALLS_SHLIB= yes
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/mird/Makefile b/databases/mird/Makefile
index 20983eba6afb..b16147cc5207 100644
--- a/databases/mird/Makefile
+++ b/databases/mird/Makefile
@@ -18,10 +18,9 @@ DISTNAME= Mird-${PORTVERSION}
MAINTAINER= kiwi@oav.net
COMMENT= A free database library with transaction support
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-
WRKSRC= ${WRKDIR}/${DISTNAME}
+WANT_AUTOCONF_VER=253
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/databases/mysql-administrator/Makefile b/databases/mysql-administrator/Makefile
index b75d315096ca..7ec5508a2c92 100644
--- a/databases/mysql-administrator/Makefile
+++ b/databases/mysql-administrator/Makefile
@@ -35,6 +35,7 @@ USE_ICONV= yes
USE_GNOME= libglade2
USE_MYSQL= yes
BROKEN_WITH_MYSQL= 323
+GNU_CONFIGURE= yes
LIB_DEPENDS+= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
pcre.0:${PORTSDIR}/devel/pcre
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index 8e0f495f8f68..59bfa71e9215 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -16,9 +16,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE Rich Site Summary viewer
-BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
- automake14:${PORTSDIR}/devel/automake14
-
+WANT_AUTOMAKE_VER=14
+WANT_AUTOCONF_VER=213
USE_KDEBASE_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -29,12 +28,10 @@ QTCFGLIBS+= ${PTHREAD_LIBS}
pre-configure:
${MKDIR} ${WRKSRC}/auto-bin
-.for AC in autoconf autoheader
- ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
-.endfor
-.for AM in automake aclocal
- ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
-.endfor
+ ${LN} -sf ${AUTOCONF} ${WRKSRC}/auto-bin/autoconf
+ ${LN} -sf ${AUTOHEADER} ${WRKSRC}/auto-bin/autoheader
+ ${LN} -sf ${AUTOMAKE} ${WRKSRC}/auto-bin/automake
+ ${LN} -sf ${ACLOCAL} ${WRKSRC}/auto-bin/aclocal
cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.dist
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index 2a0d1f0908c7..4e636574b915 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -14,24 +14,21 @@ DISTNAME= multisync-${PORTVERSION}
MAINTAINER?= pav@FreeBSD.org
COMMENT?= Synchronize calendars, addressbooks and other PIM data
-PATCH_DEPENDS+= ${LOCALBASE}/share/automake17/depcomp:${PORTSDIR}/devel/automake17
-
WRKSRC?= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION}
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
USE_LIBTOOL_VER=15
+WANT_AUTOMAKE_VER=17
USE_X_PREFIX= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-AUTOMAKE_FILES= missing install-sh mkinstalldirs config.guess config.sub depcomp
-
-post-patch:
+pre-configure:
@${FIND} ${WRKDIR} -type l -delete
-.for FILE in ${AUTOMAKE_FILES}
- @${CP} -f ${LOCALBASE}/share/automake17/${FILE} ${WRKSRC}
- @${CP} -f ${LOCALBASE}/share/automake17/${FILE} ${WRKSRCMASTER}
+.for FILE in missing install-sh mkinstalldirs config.guess config.sub depcomp
+ @${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRC}
+ @${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRCMASTER}
.endfor
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|-lpthread||'
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 568b308a26a2..acf2479c9074 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -28,13 +28,12 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
-USE_ICONV= yes
+USE_ICONV= yes
+USE_AUTOMAKE_VER= 17
USE_AUTOCONF_VER= 257
+WANT_LIBTOOL_VER= 15
USE_PERL5= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
-LIBTOOLFILES= # none
-USE_AUTOMAKE_VER= 17
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@@ -78,7 +77,7 @@ PKGNAMESUFFIX= -db4
.endif
.endif
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${USE_LIBTOOL_VER}.m4
+LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
pre-extract:
@${ECHO_MSG} ""
@@ -124,11 +123,11 @@ pre-configure:
${DO_NADA}
run-autotools:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+ cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${SETENV} ${SCRIPTS_EV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+ ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 568b308a26a2..acf2479c9074 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -28,13 +28,12 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
-USE_ICONV= yes
+USE_ICONV= yes
+USE_AUTOMAKE_VER= 17
USE_AUTOCONF_VER= 257
+WANT_LIBTOOL_VER= 15
USE_PERL5= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
-LIBTOOLFILES= # none
-USE_AUTOMAKE_VER= 17
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@@ -78,7 +77,7 @@ PKGNAMESUFFIX= -db4
.endif
.endif
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${USE_LIBTOOL_VER}.m4
+LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
pre-extract:
@${ECHO_MSG} ""
@@ -124,11 +123,11 @@ pre-configure:
${DO_NADA}
run-autotools:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+ cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${SETENV} ${SCRIPTS_EV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+ ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 568b308a26a2..acf2479c9074 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -28,13 +28,12 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
-USE_ICONV= yes
+USE_ICONV= yes
+USE_AUTOMAKE_VER= 17
USE_AUTOCONF_VER= 257
+WANT_LIBTOOL_VER= 15
USE_PERL5= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
-LIBTOOLFILES= # none
-USE_AUTOMAKE_VER= 17
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@@ -78,7 +77,7 @@ PKGNAMESUFFIX= -db4
.endif
.endif
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${USE_LIBTOOL_VER}.m4
+LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
pre-extract:
@${ECHO_MSG} ""
@@ -124,11 +123,11 @@ pre-configure:
${DO_NADA}
run-autotools:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+ cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${SETENV} ${SCRIPTS_EV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+ ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 568b308a26a2..acf2479c9074 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -28,13 +28,12 @@ COMMENT= The Apache Group's Portability Library
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
-USE_ICONV= yes
+USE_ICONV= yes
+USE_AUTOMAKE_VER= 17
USE_AUTOCONF_VER= 257
+WANT_LIBTOOL_VER= 15
USE_PERL5= yes
USE_GMAKE= yes
-USE_LIBTOOL_VER= 15
-LIBTOOLFILES= # none
-USE_AUTOMAKE_VER= 17
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
@@ -78,7 +77,7 @@ PKGNAMESUFFIX= -db4
.endif
.endif
-LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${USE_LIBTOOL_VER}.m4
+LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4
pre-extract:
@${ECHO_MSG} ""
@@ -124,11 +123,11 @@ pre-configure:
${DO_NADA}
run-autotools:
- cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
+ cd ${WRKDIR}/apr-${PORTVERSION}; ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
${RM} -fr xml/expat
cd ${WRKDIR}/apr-util-${PORTVERSION} ; \
- ${SETENV} ${SCRIPTS_EV} AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
+ ${SETENV} ${SCRIPTS_ENV} LIBTOOL_M4=${LIBTOOL_M4} ${SH} ./buildconf \
--with-apr=../apr-${PORTVERSION}
cd ${WRKDIR}/apr-${PORTVERSION}; \
${SETENV} ${SCRIPTS_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index 87b410486cd0..703cb52ef499 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -19,9 +19,8 @@ COMMENT= GNU Standards-compliant Makefile generator (version 1.7)
DEPRECATED= Please use devel/automake18 instead
EXPIRATION_DATE=31st December 2004
-BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257
-RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257
-
+WANT_AUTOCONF_VER=257
+WANT_AUTOCONF_RUN=yes
BUILD_VERSION= 17
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
LATEST_LINK= automake${BUILD_VERSION}
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index 93a410f28d9c..d2e1affe3059 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -28,11 +28,11 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}
+USE_AUTOHEADER_VER= 213
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
-USE_AUTOHEADER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --target=avr --disable-nls
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index 93a410f28d9c..d2e1affe3059 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -28,11 +28,11 @@ RUN_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}
+USE_AUTOHEADER_VER= 213
USE_PERL5_BUILD= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_BISON= yes
-USE_AUTOHEADER= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --target=avr --disable-nls
diff --git a/devel/cvsnt/Makefile b/devel/cvsnt/Makefile
index 1f8c7135a8e6..2f5681b69f4e 100644
--- a/devel/cvsnt/Makefile
+++ b/devel/cvsnt/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES= http://www.cvsnt.org/archive/ \
MAINTAINER= fjoe@FreeBSD.org
COMMENT= CVS clone
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL= yes
USE_LIBTOOL_VER= 13
CONFIGURE_ARGS= --enable-fork
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/cvsutils/Makefile b/devel/cvsutils/Makefile
index b07422202cd8..91b8f0e7ab9f 100644
--- a/devel/cvsutils/Makefile
+++ b/devel/cvsutils/Makefile
@@ -20,6 +20,7 @@ USE_PERL5= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOMAKE_VER=15
+USE_AUTOCONF_VER=253
AUTOMAKE_ARGS= --add-missing
MAN1= cvsutils.1
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index 0ad8ed14c3c0..b33ecddb54f4 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -21,6 +21,7 @@ COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
USE_AUTOMAKE_VER=15
+USE_AUTOCONF_VER=253
USE_LIBTOOL_VER=13
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 9a905e84fc57..06835cdb5b52 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -16,8 +16,6 @@ MASTER_SITE_SUBDIR= cvsgui
MAINTAINER= dinoex@FreeBSD.org
COMMENT= High-end interface client for CVS
-BUILD_DEPENDS+= autoconf213:${PORTSDIR}/devel/autoconf213
-BUILD_DEPENDS+= automake14:${PORTSDIR}/devel/automake14
BUILD_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84
@@ -33,7 +31,7 @@ CONFIGURE_SCRIPT= make_configure
MAN1= cvs.1
MAN5= cvs.5
MAN8= cvsbug.8
-#USE_AUTOMAKE_VER= 14
-#USE_AUTOCONF_VER= 213
+WANT_AUTOMAKE_VER= 14
+WANT_AUTOCONF_VER= 213
.include <bsd.port.mk>
diff --git a/devel/gnulibiberty/Makefile b/devel/gnulibiberty/Makefile
index a94600dfd61e..ed957f7c0cd9 100644
--- a/devel/gnulibiberty/Makefile
+++ b/devel/gnulibiberty/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}/libiberty
USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --enable-install-libiberty
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFLICTS= freelibiberty-*
diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile
index af6aed8c7f18..18bd299194ed 100644
--- a/devel/i386-rtems-g77/Makefile
+++ b/devel/i386-rtems-g77/Makefile
@@ -33,14 +33,11 @@ PLIST_SUB+= "GCCVERSION=${GCCVERSION}"
NEWLIBNAME= newlib-1.11.0
PLIST= ${PKGDIR}/pkg-plist.${LCLTARGET}
-# autoheader is used by the port but autoconf is not, setting USE_AUTOCONF
-# will break the port. Since USE_AUTOHEADER sets USE_AUTOCONF, this is
-# likely to break the port also.
-BUILD_DEPENDS= autoheader:${PORTSDIR}/devel/autoconf \
- ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
+BUILD_DEPENDS= ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
RUN_DEPENDS= ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
PKGNAMEPREFIX= ${LCLTARGET}-
+WANT_AUTOHEADER_VER=253
USE_GMAKE= yes
GNU_CONFIGURE= yes
ALL_TARGET= all info
diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index 221514f930db..a06f2a2815f6 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -39,16 +39,13 @@ NEWLIBNAME= newlib-1.11.0
PLIST= ${PKGDIR}/pkg-plist.${LCLTARGET}
USE_GETTEXT= yes
-# autoheader is used by the port but autoconf is not, setting USE_AUTOCONF
-# will break the port. Since USE_AUTOHEADER sets USE_AUTOCONF, this is
-# likely to break the port also.
-BUILD_DEPENDS= autoheader:${PORTSDIR}/devel/autoconf \
- ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
+BUILD_DEPENDS= ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
RUN_DEPENDS= ${LCLTARGET}-as:${PORTSDIR}/devel/${LCLTARGET}-binutils \
${LCLTARGET}-ld:${PORTSDIR}/devel/${LCLTARGET}-binutils
PKGNAMEPREFIX= ${LCLTARGET}-
+WANT_AUTOHEADER_VER=253
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile
index 30e7184f1d6a..443ff0544084 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -33,14 +33,11 @@ PLIST_SUB+= "GCCVERSION=${GCCVERSION}"
NEWLIBNAME= newlib-1.11.0
PLIST= ${PKGDIR}/pkg-plist.${LCLTARGET}
-# autoheader is used by the port but autoconf is not, setting USE_AUTOCONF
-# will break the port. Since USE_AUTOHEADER sets USE_AUTOCONF, this is
-# likely to break the port also.
-BUILD_DEPENDS= autoheader:${PORTSDIR}/devel/autoconf \
- ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
+BUILD_DEPENDS= ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
RUN_DEPENDS= ${LCLTARGET}-gcc:${PORTSDIR}/devel/${LCLTARGET}-gcc
PKGNAMEPREFIX= ${LCLTARGET}-
+WANT_AUTOHEADER_VER=253
USE_GMAKE= yes
GNU_CONFIGURE= yes
ALL_TARGET= all info
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index c640c462e4ac..3198c9f9999c 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -20,9 +20,7 @@ BUILD_DEPENDS= cervisia:${PORTSDIR}/devel/kdesdk3 \
msgfmt:${PORTSDIR}/devel/gettext
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
RUN_DEPENDS= extractrc:${PORTSDIR}/devel/kdesdk3 \
- gmake:${PORTSDIR}/devel/gmake \
- autoconf257:${PORTSDIR}/devel/autoconf257 \
- automake17:${PORTSDIR}/devel/automake17
+ gmake:${PORTSDIR}/devel/gmake
.if defined(WITH_OPTIONAL_DEPENDS)
RUN_DEPENDS+= kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
ark:${PORTSDIR}/misc/kdeutils3 \
@@ -31,6 +29,11 @@ RUN_DEPENDS+= kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
.endif
# KDE_DISTNAME= ${PORTNAME}-${PORTVERSION}_for_KDE_3.1
+
+WANT_AUTOMAKE_VER= 17
+WANT_AUTOMAKE_RUN= yes
+WANT_AUTOCONF_VER= 257
+WANT_AUTOCONF_RUN= yes
USE_KDELIBS_VER=3
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/kdevelop/files/patch-Makefile.in b/devel/kdevelop/files/patch-Makefile.in
new file mode 100644
index 000000000000..b450b6cdc97b
--- /dev/null
+++ b/devel/kdevelop/files/patch-Makefile.in
@@ -0,0 +1,36 @@
+--- Makefile.in.orig Mon Apr 5 14:57:43 2004
++++ Makefile.in Sun May 30 18:49:05 2004
+@@ -418,28 +418,2 @@
+ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/Doxyfile.am $(am__configure_deps)
+-#>- @for dep in $?; do \
+-#>- case '$(am__configure_deps)' in \
+-#>- *$$dep*) \
+-#>- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+-#>- cd $(srcdir) && $(AUTOMAKE) --foreign \
+-#>- && exit 0; \
+-#>- exit 1;; \
+-#>- esac; \
+-#>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+-#>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign Makefile
+-#>+ 14
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+- ( \
+- cd $(srcdir) && $(AUTOMAKE) --foreign \
+- ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign Makefile
+ cd $(top_srcdir) && perl admin/am_edit Makefile.in
+@@ -1182,4 +1156,2 @@
+ \
+- cd $(srcdir) && $(AUTOMAKE) --foreign \
+-
+ cd $(top_srcdir) && perl admin/am_edit Makefile.in
diff --git a/devel/korelib/Makefile b/devel/korelib/Makefile
index 2199e172f1fd..5088df3a45f1 100644
--- a/devel/korelib/Makefile
+++ b/devel/korelib/Makefile
@@ -16,7 +16,8 @@ COMMENT= A cross-platform C++ library for developing modular applications
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_AUTOMAKE_VER= 14
+USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
INSTALLS_SHLIB= yes
diff --git a/devel/libbfd/Makefile b/devel/libbfd/Makefile
index 576d68cbdea3..6ac4e291f7c0 100644
--- a/devel/libbfd/Makefile
+++ b/devel/libbfd/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS= --enable-install-libbfd \
CONFIGURE_ARGS+= --host=x86_64-portbld-freebsd${OSREL}
.endif
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
INFO= bfd
diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile
index 41f6022b62be..387e848d59eb 100644
--- a/devel/libdsp/Makefile
+++ b/devel/libdsp/Makefile
@@ -19,8 +19,7 @@ COMMENT= C++ class library of common digital signal processing functions
WRKSRC= ${WRKDIR}/libdsp-src/${PORTNAME:S/dsp/DSP/}-${PORTVERSION}
-USE_LIBTOOL_VER= 13
-LIBTOOLFILES= # none
+WANT_LIBTOOL_VER=13
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MKDIR="${MKDIR}" \
INLINE_VER="${INLINE_VER}"
@@ -29,7 +28,6 @@ INSTALLS_SHLIB= yes
INLINE_VER= 1.2.5
-# There's no configure script, but we need libtool to build
do-configure:
@${DO_NADA}
diff --git a/devel/m6811-gcc/Makefile b/devel/m6811-gcc/Makefile
index 27e49fa66db3..34dbee10e0db 100644
--- a/devel/m6811-gcc/Makefile
+++ b/devel/m6811-gcc/Makefile
@@ -21,7 +21,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The gcc-2.95.2 cross-compiler for the 6811
BUILD_DEPENDS= ${LOCALBASE}/bin/m6811-elf-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
-BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
# Configuration alpha-unknown-freebsdelf not supported
# Configuration sparc64-unknown-freebsdelf not supported
@@ -29,6 +28,7 @@ BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
ONLY_FOR_ARCHS= i386
MANUAL_PACKAGE_BUILD= Path problem to autoheader on bento
+WANT_AUTOCONF_VER=253
USE_GMAKE= yes
HAS_CONFIGURE= yes
.if defined(_CPUCFLAGS) && !empty(_CPUCFLAGS)
diff --git a/devel/mingw-gcc/Makefile b/devel/mingw-gcc/Makefile
index 9b64351b03a6..08f93aae83d1 100644
--- a/devel/mingw-gcc/Makefile
+++ b/devel/mingw-gcc/Makefile
@@ -19,13 +19,13 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= FSF gcc-2.95.3 for Windows cross-development
BUILD_DEPENDS= ${LOCALBASE}/i386-mingw32msvc/bin/as:${PORTSDIR}/devel/mingw-binutils \
- ${LOCALBASE}/bin/mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt \
- autoheader:${PORTSDIR}/devel/autoconf
+ ${LOCALBASE}/bin/mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt
RUN_DEPENDS= ${LOCALBASE}/i386-mingw32msvc/bin/as:${PORTSDIR}/devel/mingw-binutils \
${LOCALBASE}/bin/mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt
WRKSRC= ${WRKDIR}/gcc-${PORTVERSION}-20010828
+WANT_AUTOCONF_VER=253
USE_GMAKE= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 0b62a58aaad5..1bd2cda08911 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -13,12 +13,10 @@ MASTER_SITES= http://shapelib.maptools.org/dl/
MAINTAINER= ports@FreeBSD.org
COMMENT= C API for reading and writing ArcView Shapefiles
-USE_LIBTOOL_VER= 13
-LIBTOOLFILES= # none
+WANT_LIBTOOL_VER=13
ALL_TARGET= lib
INSTALLS_SHLIB= yes
-# no configure script, but we need the libtool environment
do-configure:
@${CP} ${LIBTOOL} ${WRKSRC}
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 3f97e744bfbc..064f85288911 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= knu@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-
+WANT_AUTOCONF_VER=253
VER= ${PORTVERSION:R}
# Supported languages: guile perl php4 python ruby tcl ocaml pike java
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 3f97e744bfbc..064f85288911 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= knu@FreeBSD.org
COMMENT= Simplified Wrapper and Interface Generator
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
-
+WANT_AUTOCONF_VER=253
VER= ${PORTVERSION:R}
# Supported languages: guile perl php4 python ruby tcl ocaml pike java
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index afd9ed708205..9e3a4ae0169a 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -17,6 +17,7 @@ COMMENT= Helps to install application configuration files
USE_BZIP2= yes
USE_PERL5= yes
USE_AUTOMAKE_VER= 15
+USE_AUTOCONF_VER= 253
MAN1= sysconftool.1 sysconftoolcheck.1
MAN7= sysconftool.7
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 8a634e7d9ccd..a38f9a763ca9 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -17,9 +17,8 @@ COMMENT= UML Modeller
CONFLICTS= kdesdk-3.[2-].*
-BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
- automake14:${PORTSDIR}/devel/automake14
-
+WANT_AUTOMAKE_VER=14
+WANT_AUTOCONF_VER=213
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index f374c39a69b2..a43fa467f7b6 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -24,6 +24,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CXXFLAGS="-I${LOCALBASE}/include" \
PERL=${PERL}
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
# Default to db3
WITH_BDB_VER?= 3
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index f48393b8442d..e626663b6e46 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -15,8 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sergei@FreeBSD.org
COMMENT= "Domain Name Server (DNS) implementation"
-LIB_DEPENDS= poslib.0:${PORTSDIR}/devel/poslib \
- ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS= poslib.0:${PORTSDIR}/devel/poslib
+
+USE_LIBLTDL= yes
.if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so)
CONFIGURE_ARGS= --enable-fam
diff --git a/emulators/hfsplusutils/Makefile b/emulators/hfsplusutils/Makefile
index 57706bf5beb0..9afd591ba4f3 100644
--- a/emulators/hfsplusutils/Makefile
+++ b/emulators/hfsplusutils/Makefile
@@ -23,6 +23,7 @@ USE_REINPLACE= yes
USE_LIBTOOL_VER= 13
INSTALLS_SHLIB= yes
USE_AUTOMAKE_VER= 15
+USE_AUTOCONF_VER= 253
AUTOMAKE_ARGS= --add-missing
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/french/dico/Makefile b/french/dico/Makefile
index e1ca47dc98c1..5d9e69d7a974 100644
--- a/french/dico/Makefile
+++ b/french/dico/Makefile
@@ -29,6 +29,7 @@ USE_ZIP= true
EXTRACT_CMD= UNZIP= unzip
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
USE_GMAKE= true
AUTOMAKE_ARGS= --add-missing --foreign --include-deps
MAKE_ARGS= prefix=${PREFIX}
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index ec5088d6be3b..ebd226521fbc 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -33,6 +33,7 @@ CONFIGURE_ARGS= --enable-sound
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
SDL_CONFIG="${SDL_CONFIG}"
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index f26fee32715d..7b773f399449 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -23,6 +23,7 @@ USE_SDL= mixer sdl
USE_GL= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIB}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/euchre/Makefile b/games/euchre/Makefile
index dd3e4815e1f3..a4e1d1ada715 100644
--- a/games/euchre/Makefile
+++ b/games/euchre/Makefile
@@ -17,6 +17,7 @@ COMMENT= Very popular card game with variable skill levels
PLIST_FILES= bin/euchre
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_GNOME= gtk12
.include <bsd.port.mk>
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 636ceaf6ba9c..6de60a80dc24 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -25,6 +25,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
MAN6= ${PORTNAME}.6
diff --git a/games/tuxracer-commercial/Makefile b/games/tuxracer-commercial/Makefile
index f26fee32715d..7b773f399449 100644
--- a/games/tuxracer-commercial/Makefile
+++ b/games/tuxracer-commercial/Makefile
@@ -23,6 +23,7 @@ USE_SDL= mixer sdl
USE_GL= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIB}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index f26fee32715d..7b773f399449 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -23,6 +23,7 @@ USE_SDL= mixer sdl
USE_GL= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= -a
CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIB}"
MAKE_ENV= ${CONFIGURE_ENV}
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index e2f0829540a8..155ee7920bd0 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -19,6 +19,7 @@ USE_SDL= image mixer sdl
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index eded4f8215d9..1cd0906a14f4 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -22,6 +22,7 @@ NO_CDROM= "don't sell for profit"
USE_GETTEXT= yes
USE_X_PREFIX= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= --include-deps
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 5051f62a24a2..30a5da9d2e31 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -25,6 +25,7 @@ USE_XLIB= yes
USE_MESA= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-esd
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index 3f3744cd2a35..34cf9dfe6139 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -19,6 +19,7 @@ COMMENT= Zangband (Zelazny Angband) with color, X11 support
USE_XLIB= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
USE_PERL5_BUILD=yes
CONFIGURE_ARGS= --datadir=${PREFIX}/lib \
--with-setgid=${SHAREGRP}
diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile
index c5c9d993f710..d7830ac9a18f 100644
--- a/graphics/bmeps/Makefile
+++ b/graphics/bmeps/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
netpbm.1:${PORTSDIR}/graphics/netpbm
-USE_AUTOCONF= 213
+USE_AUTOCONF_VER=213
USE_BZIP2= yes
CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include"
diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile
index 90ee6787559f..18cf15ec1e98 100644
--- a/graphics/corona/Makefile
+++ b/graphics/corona/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
GNU_CONFIGURE= yes
USE_GNOME= gnometarget lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index c5b0e587b4a2..14cadaa02b79 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -15,9 +15,8 @@ MASTER_SITES= http://axljab.homelinux.org/software/divxcalc/
MAINTAINER= ports@FreeBSD.org
COMMENT= DivX Calculator
-BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake \
- autoheader:${PORTSDIR}/devel/autoconf
-
+WANT_AUTOMAKE_VER=15
+WANT_AUTOCONF_VER=253
USE_QT_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index b7e1d9a4f1ba..fdd096e0e2f8 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -15,19 +15,16 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
USE_AUTOMAKE_VER= 14
-USE_AUTOHEADER= yes
+USE_AUTOCONF_VER= 213
+USE_AUTOHEADER_VER= 213
+USE_LIBTOOL_VER= 13
HAS_CONFIGURE= yes
-USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_XLIB= yes
CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib \
--enable-replace-glut
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- ACLOCAL="${ACLOCAL}" \
- AUTOCONF="${AUTOCONF}" \
- AUTOMAKE="${AUTOMAKE}" \
- AUTOHEADER="${AUTOHEADER}"
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index 2774eb642a35..71c1dcb21f0f 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -29,6 +29,7 @@ XFREE86_VERSION= 4
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER= 13
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
MAKEFILE= makefile.autoconf
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index dcffd679040b..a3376c145ea5 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -14,13 +14,13 @@ MASTER_SITE_SUBDIR= enlightenment
MAINTAINER= ports@FreeBSD.org
COMMENT= The next generation graphic library for enlightenment package
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2
+USE_LIBLTDL= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack pkgconfig
USE_REINPLACE= yes
diff --git a/graphics/lodju/Makefile b/graphics/lodju/Makefile
index 4eec110dcda9..aba9b23d9e25 100644
--- a/graphics/lodju/Makefile
+++ b/graphics/lodju/Makefile
@@ -15,16 +15,14 @@ MAINTAINER?= jylitalo@iki.fi
COMMENT?= An image management tool for the X Window System
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf \
- gtk12-config:${PORTSDIR}/x11-toolkits/gtk12
+BUILD_DEPENDS= gtk12-config:${PORTSDIR}/x11-toolkits/gtk12
LIB_DEPENDS= glade-gnome:${PORTSDIR}/x11-toolkits/rep-gtk \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
MAN1= lodju-create.1 lodju-gallery.1 lodju.1
MANCOMPRESSED= yes
-AUTOCONF= autoconf
-GNU_AUTOCONF= yes
+WANT_AUTOCONF_VER=253
HAS_CONFIGURE= yes
USE_GETTEXT= yes
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 46d65676a47a..386448f8e1f9 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -22,9 +22,9 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
USE_REINPLACE= yes
USE_GL= yes
USE_X_PREFIX= yes
-USE_AUTOCONF_VER= 213
-USE_AUTOHEADER= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
+USE_AUTOHEADER_VER= 213
USE_LIBTOOL_VER= 13
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index f77ea7f04680..34f706360e4c 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -24,6 +24,7 @@ USE_GL= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= --add-missing --include-deps
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index 4bd8dc5c1e06..1c1400ff4e54 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -19,9 +19,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= 3d@FreeBSD.org
COMMENT= A hardware OpenGL support for XFree86 X-Servers
-BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \
- autoconf:${PORTSDIR}/devel/autoconf
+BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83
+WANT_AUTOCONF_VER=253
USE_X_PREFIX= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
diff --git a/irc/dancer-services/Makefile b/irc/dancer-services/Makefile
index 547a513d5d6f..9ca10f0c728b 100644
--- a/irc/dancer-services/Makefile
+++ b/irc/dancer-services/Makefile
@@ -15,11 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= knu@FreeBSD.org
COMMENT= The IRC services (nickserv, chanserv, etc.) for dancer-ircd
-BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf:${PORTSDIR}/devel/autoconf \
- ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
-
+WANT_AUTOMAKE_VER=15
+WANT_AUTOCONF_VER=253
USE_RC_SUBR= yes
-
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -39,7 +37,7 @@ post-patch:
${WRKSRC}/bin/settings.conf.in
pre-configure:
- cd ${WRKSRC}; ${SH} ./autogen.sh
+ cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./autogen.sh
pre-build:
cd ${WRKSRC}; ${MAKE} depend
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 1ccda7e274d2..435b2dc457df 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -20,7 +20,7 @@ USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${XCHAT_VER}
XCHAT_VER= 2.0.8
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomeprefix gnomehack lthack libgnomeui
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index 9bce1bdb1f14..8a73c3490907 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -20,8 +20,8 @@ COMMENT= A color vt102 terminal emulator with transparency support
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
-BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
+WANT_AUTOCONF_VER=253
USE_X_PREFIX= yes
USE_XPM= yes
GNU_CONFIGURE= yes
@@ -38,8 +38,9 @@ MAN1= aterm.1
pre-configure:
@(cd ${WRKSRC}; \
- autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; \
- autoconf --localdir=autoconf autoconf/configure.in > configure)
+ ${AUTOHEADER} --localdir=autoconf autoconf/configure.in > autoconf/config.h.in; \
+ ${AUTOCONF} --localdir=autoconf autoconf/configure.in > configure)
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/aterm ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/aterm.1 ${PREFIX}/man/man1/
diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile
index d9a5186cc99a..b2d719cc890b 100644
--- a/japanese/celrw/Makefile
+++ b/japanese/celrw/Makefile
@@ -13,17 +13,16 @@ MASTER_SITES= http://www.nurs.or.jp/~kurati/celrw/
MAINTAINER= shuna@pop16.odn.ne.jp
COMMENT= Cellular phone-number read/write tool (in Japan only)
-BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake
-
+WANT_AUTOMAKE_VER=15
USE_BZIP2= yes
HAS_CONFIGURE= yes
ALL_TARGET=
pre-configure:
${RM} -f ${WRKSRC}/install.sh
- ${LN} -sf ${PREFIX}/share/automake/install-sh ${WRKSRC}/install-sh
- ${LN} -sf ${PREFIX}/share/automake/config.guess ${WRKSRC}/config.guess
- ${LN} -sf ${PREFIX}/share/automake/config.sub ${WRKSRC}/config.sub
+ ${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC}/install-sh
+ ${LN} -sf ${AUTOMAKE_DIR}/config.guess ${WRKSRC}/config.guess
+ ${LN} -sf ${AUTOMAKE_DIR}/config.sub ${WRKSRC}/config.sub
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/celrw ${PREFIX}/bin
diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile
index 9cf4f0352909..0e779cb9f093 100644
--- a/japanese/eblook/Makefile
+++ b/japanese/eblook/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS= eb.7:${PORTSDIR}/japanese/eb
GNU_CONFIGURE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS= --with-eb-includes=${PREFIX}/include \
--with-eb-libraries=${PREFIX}/lib
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
index aa3b35148b33..4e9b5ef575cc 100644
--- a/japanese/emacs20-dl-canna/Makefile
+++ b/japanese/emacs20-dl-canna/Makefile
@@ -43,7 +43,7 @@ DLCANNA_VER= 1.4
# hack to allow parallel build to work
.if defined(PACKAGE_BUILDING)
USE_GMAKE= yes
-BUILD_DEPENDS+= ${AUTOCONF}:${PORTSDIR}/devel/autoconf
+WANT_AUTOCONF_VER=253
.endif
post-install:
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index 4227ee5bcbdb..56a3a6768aa5 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -17,10 +17,10 @@ COMMENT= Dynamic loading module input method `Wnn' on Emacs
LIB_DEPENDS= wnn6.2:${.CURDIR}/../../japanese/Wnn6-lib
BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
- autoconf:${PORTSDIR}/devel/autoconf \
${NONEXISTENT}:${EMACSDL_DIR}:configure
RUN_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR}
+WANT_AUTOCONF_VER=253
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-wnn6 \
@@ -38,7 +38,7 @@ EMACSDL_SRCDIR= ${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
# hack to allow parallel build to work
.if defined(PARALLEL_PACKAGE_BUILD)
USE_GMAKE= yes
-BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
+WANT_AUTOCONF_VER=253
.endif
post-install:
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index ca4ae4c7f586..2d3890b573a5 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -16,6 +16,7 @@ COMMENT?= Japanese incremental search tool
.if !defined(EMACS_PORT_NAME)
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
EXTRA_PATCHES= ${FILESDIR}/extra-patch-Makefile.am ${FILESDIR}/extra-patch-configure.in
PLIST_SUB= MIGEMO="" ELISP="@comment "
.endif
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 58c05c4a3bf3..3a4434fb40bc 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -47,6 +47,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/mutt-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index aeb34837d242..d70bda84dded 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -42,6 +42,7 @@ USE_REINPLACE= yes
USE_GMAKE= yes
USE_ICONV= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index c1c6ce675e19..c080f609418c 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -21,9 +21,9 @@ COMMENT= Java VM created by McGill University's Sable Research Group
BUILD_DEPENDS= jikes:${PORTSDIR}/java/jikes
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
ffi.2:${PORTSDIR}/devel/libffi \
- gmp.6:${PORTSDIR}/math/libgmp4 \
- ltdl.4:${PORTSDIR}/devel/libltdl
+ gmp.6:${PORTSDIR}/math/libgmp4
+USE_LIBLTDL= yes
PATCH_WRKSRC= ${WRKDIR}
PATCH_STRIP= -p1
USE_LIBTOOL_VER=13
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index 908416735de9..69015a405951 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES= http://gambas.sourceforge.net/
MAINTAINER= thierry@FreeBSD.org
COMMENT= Gambas Almost Means BASic
-LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl \
- ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS= curl.2:${PORTSDIR}/ftp/curl
RUN_DEPENDS= pgrep:${PORTSDIR}/sysutils/pkill
+USE_LIBLTDL= YES
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
USE_BZIP2= yes
diff --git a/lang/glade-gpl/Makefile b/lang/glade-gpl/Makefile
index 9ebc46e25e00..6f79d2d978aa 100644
--- a/lang/glade-gpl/Makefile
+++ b/lang/glade-gpl/Makefile
@@ -19,6 +19,7 @@ COMMENT= GNU Ada distributed systems annex
BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
CONFIGURE_ENV= ADA=adagcc
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/lang/gnat-glade/Makefile b/lang/gnat-glade/Makefile
index 9ebc46e25e00..6f79d2d978aa 100644
--- a/lang/gnat-glade/Makefile
+++ b/lang/gnat-glade/Makefile
@@ -19,6 +19,7 @@ COMMENT= GNU Ada distributed systems annex
BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
CONFIGURE_ENV= ADA=adagcc
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index d6c2c55daaaa..b6b424f7be84 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= guile
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNU Ubiquitous Intelligent Language for Extension
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/lang/mozart/Makefile b/lang/mozart/Makefile
index 6abbf3243db1..ed6e72178e9a 100644
--- a/lang/mozart/Makefile
+++ b/lang/mozart/Makefile
@@ -17,7 +17,6 @@ DISTFILES+= ${MOZART_DOCS}
MAINTAINER= mathiasp@virtual-earth.de
COMMENT= A distributed language with constraint-based inference
-PATCH_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213
BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs \
${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
@@ -61,7 +60,7 @@ pre-extract:
@${ECHO} ----------------------------------------------------
@${ECHO}
-post-patch:
+pre-configure:
cd ${WRKSRC}/platform/emulator \
&& ${AUTOCONF} ${AUTOCONF_ARGS} -l ${WRKSRC}
cd ${WRKSRC}/platform/tools/gump/ozflex \
diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile
index 1dee18e1a35c..464e51801862 100644
--- a/lang/open-cobol-devel/Makefile
+++ b/lang/open-cobol-devel/Makefile
@@ -16,9 +16,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An open-source COBOL compiler
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- gmp.6:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
+USE_LIBLTDL= yes
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index 1dee18e1a35c..464e51801862 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -16,9 +16,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An open-source COBOL compiler
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- gmp.6:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
+USE_LIBLTDL= yes
USE_GETOPT_LONG= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index 38be225f0cd0..f8e98eac959e 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -370,7 +370,7 @@ CONFIGURE_ARGS+=--with-mcve=${LOCALBASE}
.if defined(WITH_MCRYPT)
LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
-LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL= yes
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
.endif
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 5c49df49fca5..d578c1f1a3c8 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -349,7 +349,7 @@ CONFIGURE_ARGS+=--with-mcve=${LOCALBASE}
.if defined(WITH_MCRYPT)
LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
-LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL= yes
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
.endif
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 5c49df49fca5..d578c1f1a3c8 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -349,7 +349,7 @@ CONFIGURE_ARGS+=--with-mcve=${LOCALBASE}
.if defined(WITH_MCRYPT)
LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt
-LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL= yes
CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE}
.endif
diff --git a/lang/tensile/Makefile b/lang/tensile/Makefile
index f785fbbbb619..bf8c5c2db66a 100644
--- a/lang/tensile/Makefile
+++ b/lang/tensile/Makefile
@@ -18,9 +18,9 @@ MASTER_SITES= http://savannah.gnu.org/download/nsl/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Programming language designed for especially complex processing texts
-LIB_DEPENDS= utils.1:${PORTSDIR}/lang/libutils \
- ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS= utils.1:${PORTSDIR}/lang/libutils
+USE_LIBLTDL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_LIBTOOL_VER=13
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 2f67bfd32840..a853d455f80e 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -17,9 +17,9 @@ COMMENT= A mail reader for the GNOME 2 desktop
LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell \
pcre.0:${PORTSDIR}/devel/pcre \
- esmtp.6:${PORTSDIR}/mail/libesmtp \
- ltdl.4:${PORTSDIR}/devel/libltdl
+ esmtp.6:${PORTSDIR}/mail/libesmtp
+USE_LIBLTDL= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 555eb20cc5c4..86a150e133cb 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -102,8 +102,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \
${FILESDIR}/extra-patch-configure.in
-USE_AUTOHEADER= YES
USE_AUTOCONF_VER=257
+USE_AUTOHEADER_VER=257
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 555eb20cc5c4..86a150e133cb 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -102,8 +102,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \
${FILESDIR}/extra-patch-configure.in
-USE_AUTOHEADER= YES
USE_AUTOCONF_VER=257
+USE_AUTOHEADER_VER=257
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 555eb20cc5c4..86a150e133cb 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -102,8 +102,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \
${FILESDIR}/extra-patch-configure.in
-USE_AUTOHEADER= YES
USE_AUTOCONF_VER=257
+USE_AUTOHEADER_VER=257
CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.endif
diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile
index 3b526d47ff08..1216d2a0d218 100644
--- a/mail/libnewmail/Makefile
+++ b/mail/libnewmail/Makefile
@@ -15,9 +15,9 @@ MAINTAINER= krion@FreeBSD.org
COMMENT= Generic mail checking library
LIB_DEPENDS= gnutls.13:${PORTSDIR}/security/gnutls \
- oop.4:${PORTSDIR}/devel/liboop \
- ltdl.4:${PORTSDIR}/devel/libltdl
+ oop.4:${PORTSDIR}/devel/liboop
+USE_LIBLTDL= yes
GNU_CONFIGURE= yes
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index ad20670ed277..97387b4877c7 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -123,6 +123,7 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
USE_REINPLACE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_OPENSSL= yes
PLIST= ${WRKDIR}/PLIST
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 48b1cbef7f49..7f86b45917a4 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -73,6 +73,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_AUTOMAKE_VER= 14 # configure.in is patched by <PATCHFILES>
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 48b1cbef7f49..7f86b45917a4 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -73,6 +73,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_AUTOMAKE_VER= 14 # configure.in is patched by <PATCHFILES>
+USE_AUTOCONF_VER= 213
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index 5de9ebf1d3bd..e09f7aa98974 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= mbr@FreeBSD.org
COMMENT= POP3 Proxy Server derived from UP IMAP Proxy
GNU_CONFIGURE= YES
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER=213
USE_RC_SUBR= YES
SAMPLE_EXT= sample
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index a5ebd85cf154..e9c08e569367 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= mbr@FreeBSD.org
COMMENT= A caching IMAP proxy server
GNU_CONFIGURE= YES
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER=213
USE_RC_SUBR= YES
SAMPLE_EXT= sample
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 1caae0673d0b..99d7413d7556 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -19,7 +19,7 @@ COMMENT= The system Risa/Asir is a general computer algebra system
LIB_DEPENDS= pari-2.2:${PORTSDIR}/math/pari-devel
GNU_CONFIGURE= yes
-USE_AUTOCONF_VER= 213
+USE_AUTOCONF_VER= 253
USE_AUTOMAKE_VER= 15
USE_XLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-plot --enable-fep --enable-interval --with-pari=new
diff --git a/math/geg/Makefile b/math/geg/Makefile
index e96a0872578f..75747b641494 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -19,6 +19,7 @@ COMMENT= Visualise multiple 2D-functions of one variable
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= -a -i
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index b3bf3d02cbe0..4da0a9d4373f 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -15,9 +15,9 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific plotting package
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- gd.4:${PORTSDIR}/graphics/gd
+LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
+USE_LIBLTDL= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index 66809181d80d..279f43f848cf 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -15,8 +15,8 @@ MAINTAINER= fenner@FreeBSD.org
COMMENT= A program to montior loss in multicast sessions
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
-BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
+WANT_AUTOCONF_VER=253
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
MAN1= rtpmon.1
@@ -29,7 +29,7 @@ BROKEN= "Does not compile on FreeBSD ${OSVERSION}"
.endif
pre-configure:
- @cd ${WRKSRC}; ${CHMOD} +w configure; autoconf
+ @cd ${WRKSRC}; ${CHMOD} +w configure; ${AUTOCONF}
post-install:
${STRIP_CMD} ${PREFIX}/bin/rtpmon
diff --git a/misc/chmlib/Makefile b/misc/chmlib/Makefile
index d6c1017bc827..eb5b11c12fbf 100644
--- a/misc/chmlib/Makefile
+++ b/misc/chmlib/Makefile
@@ -17,12 +17,11 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A library for dealing with Microsoft ITSS/CHM format files
-USE_LIBTOOL_VER=13
-LIBTOOLFILES= #
+WANT_LIBTOOL_VER=13
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-do-configure::
- # nothing (but we need the libtool dependency)
+do-configure:
+ @${DO_NADA}
.include <bsd.port.mk>
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index 1a16fedeab00..1769ae525a04 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -16,8 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
MAINTAINER= thierry@pompo.net
COMMENT= Modular Calendar Access Library
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL= yes
HAS_CONFIGURE= yes
USE_LIBTOOL_VER=13
USE_GMAKE= yes
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 5d48cac3205f..c42f35177655 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -18,11 +18,11 @@ COMMENT= Camserv is a free program to do streaming video via the web
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
Imlib2.2:${PORTSDIR}/graphics/imlib2 \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
- freetype.9:${PORTSDIR}/print/freetype2 \
- ltdl.4:${PORTSDIR}/devel/libltdl
+ freetype.9:${PORTSDIR}/print/freetype2
ONLY_FOR_ARCHS= i386 alpha
+USE_LIBLTDL= yes
USE_X_LIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index 53dca898366f..c4606543c1d7 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= gstreamerplugins \
gnomehack \
pkgconfig \
lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}"
DOCS= README.html README.txt
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index 53dca898366f..c4606543c1d7 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= gstreamerplugins \
gnomehack \
pkgconfig \
lthack
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}"
DOCS= README.html README.txt
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 61a31fc9d337..5515c6d3798a 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -16,11 +16,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
- ltdl.4:${PORTSDIR}/devel/libltdl \
jasper.4:${PORTSDIR}/graphics/jasper \
gpgme.9:${PORTSDIR}/security/gpgme \
pspell.15:${PORTSDIR}/textproc/aspell
+USE_LIBLTDL= yes
USE_BZIP2= yes
USE_GCC= 3.2
USE_X_PREFIX= yes
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index ce31211c73bc..6463a3f17f8e 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
MKDIR="${MKDIR}"
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net-mgmt/netsaint-plugins/Makefile b/net-mgmt/netsaint-plugins/Makefile
index 66625a0c3bc0..18052dfc2a60 100644
--- a/net-mgmt/netsaint-plugins/Makefile
+++ b/net-mgmt/netsaint-plugins/Makefile
@@ -28,6 +28,7 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
MKDIR="${MKDIR}"
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
pre-fetch:
diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile
index 61f2fc98b448..3ae75092a920 100644
--- a/net-p2p/gift/Makefile
+++ b/net-p2p/gift/Makefile
@@ -15,13 +15,13 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= shoesoft@gmx.net
COMMENT= An OpenFT, Gnutella and FastTrack p2p network client
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- vorbis.3:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
Magick.6:${PORTSDIR}/graphics/ImageMagick
.if defined(WITH_LIBMAGIC)
LIB_DEPENDS+= magic.1:${PORTSDIR}/sysutils/file
.endif
+USE_LIBLTDL= yes
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/net-p2p/gkrellm-gift/Makefile b/net-p2p/gkrellm-gift/Makefile
index 6c6e523db539..6e5b7e574091 100644
--- a/net-p2p/gkrellm-gift/Makefile
+++ b/net-p2p/gkrellm-gift/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f15bdc7cebb4..9da1d2744771 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -17,8 +17,7 @@ DISTNAME= GNUnet-${PORTVERSION}
MAINTAINER= krion@FreeBSD.org
COMMENT= An anonymous, distributed, reputation-based network
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL= yes
USE_BZIP2= yes
USE_GETOPT_LONG= yes
USE_GETTEXT= yes
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index 61a31fc9d337..5515c6d3798a 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -16,11 +16,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
- ltdl.4:${PORTSDIR}/devel/libltdl \
jasper.4:${PORTSDIR}/graphics/jasper \
gpgme.9:${PORTSDIR}/security/gpgme \
pspell.15:${PORTSDIR}/textproc/aspell
+USE_LIBLTDL= yes
USE_BZIP2= yes
USE_GCC= 3.2
USE_X_PREFIX= yes
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index aa22e24c70f0..21dfcc9c63ba 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -16,11 +16,10 @@ MASTER_SITE_SUBDIR= dict
MAINTAINER?= dd@FreeBSD.org
COMMENT= Dict protocol (RFC 2229) server
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
MAN1= dictzip.1
MAN8= dictd.8
+USE_LIBLTDL= yes
USE_REINPLACE= yes
USE_BISON= yes
USE_LIBTOOL_VER=13
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 3830cdf7e5f2..21e55c7366e9 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -15,12 +15,13 @@ MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A free RADIUS server implementation
-LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
- ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
+
+USE_LIBLTDL= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
USE_LIBTOOL_VER=13
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 3830cdf7e5f2..21e55c7366e9 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -15,12 +15,13 @@ MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A free RADIUS server implementation
-LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
- ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
LOGDIR?= /var/log
CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
+
+USE_LIBLTDL= yes
USE_GMAKE= yes
USE_PERL5_BUILD=yes
USE_LIBTOOL_VER=13
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 61f2fc98b448..3ae75092a920 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -15,13 +15,13 @@ DISTNAME= ${PORTNAME:L}-${PORTVERSION}
MAINTAINER= shoesoft@gmx.net
COMMENT= An OpenFT, Gnutella and FastTrack p2p network client
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- vorbis.3:${PORTSDIR}/audio/libvorbis \
+LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
Magick.6:${PORTSDIR}/graphics/ImageMagick
.if defined(WITH_LIBMAGIC)
LIB_DEPENDS+= magic.1:${PORTSDIR}/sysutils/file
.endif
+USE_LIBLTDL= yes
USE_BZIP2= yes
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/net/gkrellm-gift/Makefile b/net/gkrellm-gift/Makefile
index 6c6e523db539..6e5b7e574091 100644
--- a/net/gkrellm-gift/Makefile
+++ b/net/gkrellm-gift/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gift.0:${PORTSDIR}/net/gift
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index 15a6e6ca29a3..49101c838bd4 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -15,8 +15,7 @@ DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A nice frontend to the telnet, ssh, and rlogin clients for GNOME
-BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
-
+WANT_AUTOMAKE_VER=15
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
@@ -26,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
pre-configure:
- @${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}
+ @${LN} -sf ${AUTOMAKE_DIR}/install-sh ${WRKSRC}
@${RM} -f ${WRKSRC}/config.cache
.for file in config.guess config.sub
@${RM} -f ${WRKSRC}/${file} && ${TOUCH} ${WRKSRC}/${file}
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index f15bdc7cebb4..9da1d2744771 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -17,8 +17,7 @@ DISTNAME= GNUnet-${PORTVERSION}
MAINTAINER= krion@FreeBSD.org
COMMENT= An anonymous, distributed, reputation-based network
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL= yes
USE_BZIP2= yes
USE_GETOPT_LONG= yes
USE_GETTEXT= yes
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index bacbeb176472..030574eb1fe2 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -18,6 +18,7 @@ COMMENT= A C++ wrapper library to the sockets
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_AUTOMAKE_VER= 15
+USE_AUTOCONF_VER= 253
USE_LIBTOOL_VER= 13
INFO= socket++
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index b659ef52aebf..eb92e51eb3ba 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= yb@sainte-barbe.org
COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- netdude.0:${PORTSDIR}/net/libnetdude
+LIB_DEPENDS= netdude.0:${PORTSDIR}/net/libnetdude
+USE_LIBLTDL= yes
USE_ICONV= yes
USE_GETTEXT= yes
USE_LIBTOOL_VER= 13
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 003fa0235555..8b00daa4d0f1 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -218,7 +218,7 @@ LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
.endif
.if defined(WITH_SLAPI)
-LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL= yes
CONFIGURE_ARGS+= --enable-slapi \
--enable-modules
PLIST_SUB+= SLAPI=""
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 003fa0235555..8b00daa4d0f1 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -218,7 +218,7 @@ LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
.endif
.if defined(WITH_SLAPI)
-LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL= yes
CONFIGURE_ARGS+= --enable-slapi \
--enable-modules
PLIST_SUB+= SLAPI=""
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 003fa0235555..8b00daa4d0f1 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -218,7 +218,7 @@ LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
.endif
.if defined(WITH_SLAPI)
-LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl
+USE_LIBLTDL= yes
CONFIGURE_ARGS+= --enable-slapi \
--enable-modules
PLIST_SUB+= SLAPI=""
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index f173cd79a280..104555681632 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -17,10 +17,10 @@ COMMENT= NewsCache is a free cache server for USENET News
LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++
-USE_AUTOHEADER= yes
USE_AUTOMAKE_VER= 15
+USE_AUTOHEADER_VER= 253
USE_GETOPT_LONG= yes
-USE_REINPLACE= yes
+USE_REINPLACE= yes
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/news/newsfish/Makefile b/news/newsfish/Makefile
index ea1b174f18ea..022797baf556 100644
--- a/news/newsfish/Makefile
+++ b/news/newsfish/Makefile
@@ -16,6 +16,7 @@ MAINTAINER= asaddi@philosophysw.com
COMMENT= Batch USENET news reader with filter capabilities
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
MAN1= newsfish.1
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 6cf090b39bfb..b51ca5da3e33 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/net/news/nntpcache/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= News caching/anti-spam/server-merging system
-BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake
+WANT_AUTOMAKE_VER=15
.if defined(WITH_LDAP) || defined(WITH_LDAP2)
USE_OPENLDAP= yes
diff --git a/palm/prc-tools/Makefile b/palm/prc-tools/Makefile
index 1e58b4b4211e..ee675fc4ccd8 100644
--- a/palm/prc-tools/Makefile
+++ b/palm/prc-tools/Makefile
@@ -22,14 +22,13 @@ EXTRACT_ONLY= binutils-2.14.tar.bz2 gdb-5.3.tar.bz2 gcc-2.95.3.tar.bz2 \
MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of tools supporting C and C++ programming for Palm OS
-BUILD_DEPENDS= ${LOCALBASE}/bin/autoheader:${PORTSDIR}/devel/autoconf
-
BROKEN= "Incorrect pkg-plist"
# it is unknown whether it could actually be made to work elsewhere,
# but right now it does not.
ONLY_FOR_ARCHS= i386
+WANT_AUTOCONF_VER=253
USE_BZIP2= YES
USE_BISON= YES
USE_GMAKE= YES
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 9d1e37eb6621..37e2994c6030 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -31,7 +31,7 @@ USE_PERL5= yes
USE_PYTHON= yes
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
CONFIGURE_ARGS= --with-frontend=qt \
--with-extra-lib="${LOCALBASE}/lib" \
--with-extra-inc="${LOCALBASE}/include"
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 2093549120a4..10886d277cc7 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
-I${LOCALBASE}/include/freetype2"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
MAN1= fontforge.1 sfddiff.1
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 45b64427852a..308abeeefd11 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -14,13 +14,13 @@ MASTER_SITES= #
MAINTAINER= ports@FreeBSD.org
COMMENT= Foomatic database engine
-BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
curl.3:${PORTSDIR}/ftp/curl
USE_GMAKE= yes
USE_PERL5= yes
USE_BZIP2= yes
+WANT_AUTOMAKE_VER= 15
USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
NO_CHECKSUM= yes # the tarball is created on the fly from CVS
diff --git a/print/libpdf++/Makefile b/print/libpdf++/Makefile
index a941363a19a2..9a33454dbf1d 100644
--- a/print/libpdf++/Makefile
+++ b/print/libpdf++/Makefile
@@ -24,6 +24,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
RUN_DEPENDS= ${LOCALBASE}/include/boost/any.hpp:${PORTSDIR}/devel/boost
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index f1018ed67f59..e34a7d80070d 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -49,6 +49,7 @@ MAN8= sasldblistusers.8 saslpasswd.8 saslauthd1.8
USE_RC_SUBR= YES
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
USE_LIBTOOL_VER=13
AUTOMAKE_ARGS= --add-missing --include-deps
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index ce3a24cabe41..c4a3aea630d3 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -20,10 +20,10 @@ MASTER_SITE_SUBDIR= mcrypt
MAINTAINER= trevor@FreeBSD.org
COMMENT= Replacement for crypt(1)
-BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257
LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt/ \
mhash.2:${PORTSDIR}/security/mhash/
+WANT_AUTOCONF_VER= 257
USE_GETTEXT= yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --with-catgets
@@ -38,7 +38,7 @@ PLIST= ${WRKDIR}/pkg-plist
# to avoid having to read the configure script
pre-configure:
- cd ${WRKSRC} && ${RM} configure && autoconf257
+ cd ${WRKSRC} && ${RM} configure && ${AUTOCONF}
pre-install:
${ECHO_CMD} bin/${PORTNAME} > ${PLIST}
diff --git a/security/poc/Makefile b/security/poc/Makefile
index 46a81ddb3c87..382b72085715 100644
--- a/security/poc/Makefile
+++ b/security/poc/Makefile
@@ -21,6 +21,7 @@ PLIST_FILES= bin/poc
USE_GETOPT_LONG=yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 4809ed436419..2f860eac2b08 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -20,7 +20,7 @@ PLIST_SUB= SFS_VERSION=${PORTVERSION}
INFO= sfs
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-sfsuser=sfs \
--with-sfsgroup=sfs \
diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile
index ef2b64e504d3..ab8f60d03bf3 100644
--- a/sysutils/apachetop/Makefile
+++ b/sysutils/apachetop/Makefile
@@ -14,8 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= esn@x123.info
COMMENT= Apache RealTime log stats
-BUILD_DEPENDS= ${LOCALBASE}/bin/autoconf257:${PORTSDIR}/devel/autoconf257
-
+WANT_AUTOCONF_VER=257
GNU_CONFIGURE= yes
USE_REINPLACE= yes
@@ -24,8 +23,8 @@ PLIST_FILES= sbin/apachetop
post-configure:
${REINPLACE_CMD} \
- -e 's/--run autoconf$$/--run autoconf257/' \
- -e 's/--run autoheader$$/--run autoheader257/' \
+ -e 's/--run autoconf$$/--run $${AUTOCONF}/' \
+ -e 's/--run autoheader$$/--run $${AUTOHEADER}/' \
${WRKSRC}/Makefile
.include <bsd.port.mk>
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index ccc30be49184..d22de810455c 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -28,6 +28,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
MAN8= cfengine.8
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index ccc30be49184..d22de810455c 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -28,6 +28,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
MAN8= cfengine.8
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index ccc30be49184..d22de810455c 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -28,6 +28,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
USE_GMAKE= yes
USE_AUTOMAKE_VER=14
+USE_AUTOCONF_VER=213
MAN8= cfengine.8
diff --git a/sysutils/fastresolve/Makefile b/sysutils/fastresolve/Makefile
index f374c39a69b2..a43fa467f7b6 100644
--- a/sysutils/fastresolve/Makefile
+++ b/sysutils/fastresolve/Makefile
@@ -24,6 +24,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CXXFLAGS="-I${LOCALBASE}/include" \
PERL=${PERL}
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
# Default to db3
WITH_BDB_VER?= 3
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 775a5c16f566..96f3b310d69f 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -16,10 +16,9 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility to split and join files
-BUILD_DEPENDS= ${LOCALBASE}/share/automake14/install-sh:${PORTSDIR}/devel/automake14
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WANT_AUTOMAKE_VER=14
USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomelibs gnomeprefix
USE_GMAKE= yes
@@ -32,7 +31,7 @@ MANCOMPRESSED= yes
post-extract:
.for file in install-sh missing mkinstalldirs
- @${LN} -sf ${LOCALBASE}/share/automake14/${file} ${WRKSRC}
+ @${LN} -sf ${AUTOMAKE_DIR}/${file} ${WRKSRC}
.endfor
@${RM} -f ${WRKSRC}/config.cache
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index f33a0eee4e44..ea378f902fc9 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -17,6 +17,7 @@ COMMENT= Shows package dependencies in tree views
USE_BZIP2= yes
USE_GNOME= gtk20
USE_AUTOMAKE_VER= 15
+USE_AUTOCONF_VER= 253
AUTOMAKE_ARGS= --add-missing
USE_GMAKE= yes
PLIST_FILES= bin/gpkgdep
diff --git a/sysutils/sjog/Makefile b/sysutils/sjog/Makefile
index 393ccee44939..a029d91e5e90 100644
--- a/sysutils/sjog/Makefile
+++ b/sysutils/sjog/Makefile
@@ -17,6 +17,7 @@ COMMENT= Userland daemon for Sony Vaio Jog Dial
ONLY_FOR_ARCHS= i386
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
USE_GNOME= gtk12
USE_GMAKE= yes
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index 62e998d9dfdf..26ba222e4e06 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -17,8 +17,7 @@ DISTNAME= ${PORTNAME}d-${PORTVERSION}
MAINTAINER= dd@FreeBSD.org
COMMENT= Dictionary Server Protocol (RFC2229) client
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL= yes
USE_BISON= yes
USE_REINPLACE= yes
USE_LIBTOOL_VER=15
diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 8529e0f8205b..1184bd339a6b 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -15,8 +15,7 @@ DISTNAME= dictd-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Formats a DICT protocol dictionary database
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
-
+USE_LIBLTDL= yes
USE_GETOPT_LONG= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index 6916c281594c..d720496cf6f7 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -21,6 +21,7 @@ USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_AUTOMAKE_VER= 15
+USE_AUTOCONF_VER= 253
AUTOMAKE_ARGS= -a
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index 39dce2ef4ef5..f87f83d0a0bf 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -16,6 +16,7 @@ COMMENT= Texinfo to HTML converter
USE_BZIP2= yes
USE_AUTOMAKE_VER= 15
+USE_AUTOCONF_VER= 253
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index 869c709a1b3b..756ec1e6e1be 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -19,6 +19,7 @@ COMMENT= Convert Excel and PowerPoint files to HTML and text
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN1= ppthtml.1 xlhtml.1
diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index 7809599432c3..ff2d7b099b3b 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= ftp://www.alobbs.com/cherokee/
MAINTAINER= oksala@videotron.ca
COMMENT= Cherokee is an extremely fast and tiny web server
-#USE_AUTOCONF= yes
-#USE_AUTOMAKE= yes
+#USE_AUTOCONF_VER=213
+#USE_AUTOMAKE_VER=14
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
INSTALLS_SHLIB= yes
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 7809599432c3..ff2d7b099b3b 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES= ftp://www.alobbs.com/cherokee/
MAINTAINER= oksala@videotron.ca
COMMENT= Cherokee is an extremely fast and tiny web server
-#USE_AUTOCONF= yes
-#USE_AUTOMAKE= yes
+#USE_AUTOCONF_VER=213
+#USE_AUTOMAKE_VER=14
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
INSTALLS_SHLIB= yes
diff --git a/www/comclear/Makefile b/www/comclear/Makefile
index 688491fd690a..5c64a6bbaffe 100644
--- a/www/comclear/Makefile
+++ b/www/comclear/Makefile
@@ -18,6 +18,7 @@ USE_REINPLACE= yes
WANT_GNOME= yes
USE_GMAKE= yes
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
.include <bsd.port.pre.mk>
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index e58b3e3e49e0..5c50080a603f 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_REINPLACE= yes
USE_RC_SUBR= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= lthack
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LIBS=-L${PREFIX}/lib
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 7c9b005d33ef..bee4fe19e92b 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS+= clamav:${PORTSDIR}/${CLAMAV_PORT}
USE_APACHE= YES
WITH_APACHE2= YES
-USE_LIBTOOL= YES
+USE_LIBTOOL_VER=13
.if defined(WITH_CLAMAVDEVEL)
CLAMAV_PORT= security/clamav-devel
diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile
index e892088f2919..c25c6a289ecb 100644
--- a/www/mod_webapp/Makefile
+++ b/www/mod_webapp/Makefile
@@ -17,12 +17,12 @@ DIST_SUBDIR= mod_webapp
MAINTAINER= asachs@uunet.co.za
COMMENT= Apache module mounts Tomcat web applications
-BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract \
- ${AUTOCONF}:${PORTSDIR}/devel/autoconf
+BUILD_DEPENDS= ${NONEXISTANT}:${PORTSDIR}/devel/apr:extract
USE_APACHE= yes
-USE_LIBTOOL_VER=13
-LIBTOOLFILES= # none
+WANT_AUTOCONF_VER=253
+WANT_LIBTOOL_VER=13
+GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/www/privoxy+ipv6/Makefile b/www/privoxy+ipv6/Makefile
index 66f103cef13c..defa95177f9e 100644
--- a/www/privoxy+ipv6/Makefile
+++ b/www/privoxy+ipv6/Makefile
@@ -24,7 +24,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/+ipv6//}
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOHEADER= yes
+USE_AUTOHEADER_VER=213
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-user=${USER} --with-group=${GROUP} \
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index a6c4a8125a2c..c82c2e9a87b7 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -15,9 +15,9 @@ DISTNAME= ${PORTNAME}2
MAINTAINER= ports@FreeBSD.org
COMMENT= Create fonts.scale file for use with TrueType font server
-BUILD_DEPENDS= libtool13:${PORTSDIR}/devel/libtool13
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+WANT_LIBTOOL_VER=13
PLIST_FILES= bin/ttmkfdir
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index cb7c2757ee75..194349f19f89 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -21,6 +21,7 @@ XFREE86_VERSION= 4
INSTALLS_SHLIB= yes
USE_LIBTOOL_VER= 13
USE_AUTOMAKE_VER= 14
+USE_AUTOCONF_VER= 213
AUTOMAKE_ARGS= -a
USE_GMAKE= yes
MAKE_ARGS= PREPROCESSOR=/usr/bin/cpp
diff --git a/x11-toolkits/freeglut/Makefile b/x11-toolkits/freeglut/Makefile
index b7e1d9a4f1ba..fdd096e0e2f8 100644
--- a/x11-toolkits/freeglut/Makefile
+++ b/x11-toolkits/freeglut/Makefile
@@ -15,19 +15,16 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library
USE_AUTOMAKE_VER= 14
-USE_AUTOHEADER= yes
+USE_AUTOCONF_VER= 213
+USE_AUTOHEADER_VER= 213
+USE_LIBTOOL_VER= 13
HAS_CONFIGURE= yes
-USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
USE_XLIB= yes
CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib \
--enable-replace-glut
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- ACLOCAL="${ACLOCAL}" \
- AUTOCONF="${AUTOCONF}" \
- AUTOMAKE="${AUTOMAKE}" \
- AUTOHEADER="${AUTOHEADER}"
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 4615bb9b03fc..05c21c1f9a6d 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -14,10 +14,9 @@ MASTER_SITE_SUBDIR= lesstif
MAINTAINER= dinoex@freebsd.org
COMMENT= API compatible clone of the Motif toolkit
-BUILD_DEPENDS= ${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
-
CONFLICTS?= open-motif-*
MANUAL_PACKAGE_BUILD= do not want to install during interactive build
+WANT_AUTOMAKE_VER= 15
USE_AUTOCONF_VER= 257
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index e3790e959d0c..95c2e4bec631 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -16,9 +16,10 @@ DISTNAME= ${PORTNAME:S/lib//}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A source code editor widget for GTK+
-BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode
+WANT_AUTOMAKE_VER=15
+WANT_AUTOCONF_VER=253
USE_X_PREFIX= yes
USE_GNOME= gtk12
USE_GMAKE= yes
@@ -33,7 +34,7 @@ CONFIGURE_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL}
pre-configure:
.for file in install-sh mkinstalldirs
- @${LN} -sf ${LOCALBASE}/share/automake/${file} ${WRKSRC}/${file}
+ @${LN} -sf ${AUTOMAKE_DIR}/${file} ${WRKSRC}/${file}
.endfor
@${RM} ${WRKSRC}/config.guess ${WRKSRC}/config.sub
@${TOUCH} ${WRKSRC}/config.sub
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index 3cadf50e4d23..188efbc6a64f 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -15,12 +15,10 @@ MASTER_SITES= http://gtk.php.net/distributions/ \
MAINTAINER= kiesel@schlund.de
COMMENT= An extension to use gtk in PHP-applications
-# Don't call autoconf directly, ./buildconf does this
-GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
WANT_AUTOMAKE_VER= 15
-WANT_AUTOCONF_VER= 253
-LIBTOOLFILES= # none
+USE_AUTOCONF_VER= 253
+WANT_LIBTOOL_VER= 13
+GNU_CONFIGURE= yes
USE_PHP= yes
USE_PHPIZE= yes
WANT_PHP_CLI= yes
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index 3cadf50e4d23..188efbc6a64f 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -15,12 +15,10 @@ MASTER_SITES= http://gtk.php.net/distributions/ \
MAINTAINER= kiesel@schlund.de
COMMENT= An extension to use gtk in PHP-applications
-# Don't call autoconf directly, ./buildconf does this
-GNU_CONFIGURE= yes
-USE_LIBTOOL_VER= 13
WANT_AUTOMAKE_VER= 15
-WANT_AUTOCONF_VER= 253
-LIBTOOLFILES= # none
+USE_AUTOCONF_VER= 253
+WANT_LIBTOOL_VER= 13
+GNU_CONFIGURE= yes
USE_PHP= yes
USE_PHPIZE= yes
WANT_PHP_CLI= yes
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 497cd14ca0d6..ece4cc9a02e0 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -17,8 +17,7 @@ COMMENT= A Motif widget set for displaying HTML 3.2 documents
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
-USE_LIBTOOL_VER=13
-LIBTOOLFILES= # none
+WANT_LIBTOOL_VER=13
USE_MOTIF= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index d69dc522a89d..a4049116a664 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES= http://www.nongnu.org/epiwm/download/
MAINTAINER= trevor@FreeBSD.org
COMMENT= Another fast, small, configurable window manager
-BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
- automake14:${PORTSDIR}/devel/automake14
LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
@@ -27,6 +25,7 @@ DOCS= AUTHORS BUGS COPYING ChangeLog EPIwm-0.5.6.lsm INSTALL NEWS \
README TODO
PLIST= ${WRKDIR}/pkg-plist
USE_AUTOCONF_VER= 213
+WANT_AUTOMAKE_VER= 14
USE_X_PREFIX= yes
post-extract:
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index c203d92d2f25..e7ee7843f163 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -21,7 +21,7 @@ CONFLICTS= metacity*
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_LIBTOOL_VER=13
USE_GNOME= gnomeprefix gnomehack gnomehier gconf2 libglade2
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index d5982b5fef23..c5f5a14ec94a 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools \
xterm:${PORTSDIR}/x11/XFree86-4-clients
BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients
.if defined(WITH_REMEMBER)
-BUILD_DEPENDS+= automake14:${PORTSDIR}/devel/automake14
+WANT_AUTOMAKE_VER=14
.endif
USE_X_PREFIX= yes
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index 4d3c625ad22f..d6a8b712c469 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES= http://modeemi.fi/~tuomov/ion/dl/
MAINTAINER= anthony.ginepro@laposte.net
COMMENT= Ion is a tiling tabbed window manager
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- lua.5:${PORTSDIR}/lang/lua
+LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
CONFLICTS= ion-2002* ion-devel-* pwm-*
+USE_LIBLTDL= yes
USE_LIBTOOL_VER=15
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile
index 4d3c625ad22f..d6a8b712c469 100644
--- a/x11-wm/ion3/Makefile
+++ b/x11-wm/ion3/Makefile
@@ -14,11 +14,11 @@ MASTER_SITES= http://modeemi.fi/~tuomov/ion/dl/
MAINTAINER= anthony.ginepro@laposte.net
COMMENT= Ion is a tiling tabbed window manager
-LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl \
- lua.5:${PORTSDIR}/lang/lua
+LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua
CONFLICTS= ion-2002* ion-devel-* pwm-*
+USE_LIBLTDL= yes
USE_LIBTOOL_VER=15
USE_X_PREFIX= yes
USE_GMAKE= yes