aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2002-01-06 06:20:22 +0000
committerWill Andrews <will@FreeBSD.org>2002-01-06 06:20:22 +0000
commitf3171de7e6077f2297972e5effe08badee1e36f3 (patch)
tree913ef58fa0265a980c478b7264d71951bec76466
parent22a1ed809c6346fd2acc2e522d98aa1b8f8aa92c (diff)
downloadports-f3171de7e6077f2297972e5effe08badee1e36f3.tar.gz
ports-f3171de7e6077f2297972e5effe08badee1e36f3.zip
Notes
-rw-r--r--archivers/rpm/Makefile2
-rw-r--r--audio/ecasound/Makefile4
-rw-r--r--audio/flac/Makefile2
-rw-r--r--audio/freeamp/Makefile2
-rw-r--r--audio/zinf/Makefile2
-rw-r--r--devel/adabroker/Makefile2
-rw-r--r--devel/cvsutils/Makefile4
-rw-r--r--devel/fam/Makefile2
-rw-r--r--devel/flux/Makefile2
-rw-r--r--devel/orbitcpp/Makefile2
-rw-r--r--editors/emacs20/Makefile2
-rw-r--r--editors/emacs21/Makefile2
-rw-r--r--editors/xemacs-devel/Makefile2
-rw-r--r--editors/xemacs/Makefile2
-rw-r--r--editors/xemacs21/Makefile2
-rw-r--r--games/fgfs-base/Makefile6
-rw-r--r--games/flightgear-data/Makefile6
-rw-r--r--games/flightgear/Makefile6
-rw-r--r--games/gracer/Makefile2
-rw-r--r--games/quakeforge/Makefile4
-rw-r--r--games/tuxtype/Makefile3
-rw-r--r--games/zangband/Makefile2
-rw-r--r--graphics/opendx/Makefile6
-rw-r--r--japanese/tcl80/Makefile3
-rw-r--r--japanese/vflib/Makefile3
-rw-r--r--korean/bitchx/Makefile2
-rw-r--r--lang/ocaml-mode.el/Makefile3
-rw-r--r--lang/ruby-devel/Makefile2
-rw-r--r--lang/ruby/Makefile2
-rw-r--r--lang/ruby16/Makefile2
-rw-r--r--lang/ruby18/Makefile2
-rw-r--r--mail/mahogany/Makefile2
-rw-r--r--mail/nmh/Makefile2
-rw-r--r--math/oleo/Makefile2
-rw-r--r--net-im/gale/Makefile8
-rw-r--r--net-mgmt/net-snmp-devel/Makefile2
-rw-r--r--net-mgmt/net-snmp/Makefile2
-rw-r--r--net-mgmt/net-snmp4/Makefile2
-rw-r--r--net-mgmt/net-snmp53/Makefile2
-rw-r--r--net/freeradius-devel/Makefile2
-rw-r--r--net/gale/Makefile8
-rw-r--r--net/net-snmp/Makefile2
-rw-r--r--net/net-snmp4/Makefile2
-rw-r--r--net/openldap2/Makefile2
-rw-r--r--net/openldap20-server/Makefile2
-rw-r--r--net/openldap20/Makefile2
-rw-r--r--net/openldap21-server/Makefile2
-rw-r--r--net/openldap21/Makefile2
-rw-r--r--net/openldap22-server/Makefile2
-rw-r--r--net/openldap22/Makefile2
-rw-r--r--net/openldap23-server/Makefile2
-rw-r--r--net/openldap24-server/Makefile2
-rw-r--r--news/newsx/Makefile2
-rw-r--r--security/pam_smb/Makefile2
-rw-r--r--sysutils/cfengine/Makefile2
-rw-r--r--sysutils/cfengine2/Makefile2
-rw-r--r--sysutils/cfengine3-legacy/Makefile2
-rw-r--r--sysutils/cfengine3/Makefile2
-rw-r--r--sysutils/cronolog/Makefile2
-rw-r--r--textproc/sablotron/Makefile2
-rw-r--r--www/mod_php4/Makefile3
-rw-r--r--www/mod_php5/Makefile3
-rw-r--r--x11-wm/icewm/Makefile2
-rw-r--r--x11/wdm/Makefile2
64 files changed, 82 insertions, 86 deletions
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 502ba5d19286..316b753f3d7c 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-glob
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/ecasound/Makefile b/audio/ecasound/Makefile
index 559fdc1a85db..7b8a56c74898 100644
--- a/audio/ecasound/Makefile
+++ b/audio/ecasound/Makefile
@@ -15,9 +15,7 @@ MASTER_SITE_SUBDIR= ecasound
MAINTAINER= anarcat@anarcat.dyndns.org
USE_GMAKE= yes
-USE_AUTOMAKE= yes
-USE_AUTOCONF= yes
-
+USE_AUTOMAKE_VER=14
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 0e2c78d942f5..a2b947f5a39e 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -27,7 +27,7 @@ PLIST_SUB= XMMS="@comment "
BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
.endif
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
AUTOMAKE_ARGS= --include-deps
USE_LIBTOOL= yes
diff --git a/audio/freeamp/Makefile b/audio/freeamp/Makefile
index 4fabe5534daf..ad68c551e42d 100644
--- a/audio/freeamp/Makefile
+++ b/audio/freeamp/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
USE_GTK= yes
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 4fabe5534daf..ad68c551e42d 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_BZIP2= yes
USE_GTK= yes
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/devel/adabroker/Makefile b/devel/adabroker/Makefile
index 6e4b389aaaa6..a6ae604e6951 100644
--- a/devel/adabroker/Makefile
+++ b/devel/adabroker/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= adagcc:${PORTSDIR}/lang/gnat
LIB_DEPENDS= adasockets.0:${PORTSDIR}/net/adasockets
USE_LIBTOOL= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
CONFIGURE_ARGS= --enable-adasockets
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/devel/cvsutils/Makefile b/devel/cvsutils/Makefile
index f29babe7e6d2..a90f982e8ce1 100644
--- a/devel/cvsutils/Makefile
+++ b/devel/cvsutils/Makefile
@@ -13,13 +13,13 @@ MASTER_SITE_SUBDIR= knu
MAINTAINER= knu@FreeBSD.org
-USE_AUTOMAKE= YES
+USE_AUTOMAKE_VER=15
AUTOMAKE_ARGS= --add-missing
USE_PERL5= YES
WRKSRC= ${WRKDIR}/${PORTNAME}
pre-configure:
- cd ${WRKSRC} ; aclocal14
+ cd ${WRKSRC} ; ${ACLOCAL}
post-install:
.if !defined(NOPORTDOCS)
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index d2aca9a81817..8b7e91ea3fbb 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-oss-${PORTVERSION}
MAINTAINER= ishmael27@home.com
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
USE_LIBTOOL= yes
USE_GMAKE= yes
PATCH_STRIP= -p1
diff --git a/devel/flux/Makefile b/devel/flux/Makefile
index 629691de2504..ffde5947633f 100644
--- a/devel/flux/Makefile
+++ b/devel/flux/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.copyleft.no/projects/fluxlib/ \
MAINTAINER= ports@FreeBSD.org
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUOTMAKE_VER=14
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index c549365e38a4..dc4743672af4 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit
USE_GMAKE= yes
USE_GLIB= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
INSTALLS_SHLIB= yes
.include <bsd.port.mk>
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 3214134bf345..3ac3cf1bada8 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -19,7 +19,7 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_GMAKE= yes
EMACS_VER= 20.7
CONFIGURE_TARGET= ${MACHINE_ARCH}--freebsd
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 1ae9166204b5..d2224932a3c9 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -30,7 +30,7 @@ PATCHFILES= emacs-21.1-fontset-20011109.patch.gz
PATCH_DIST_STRIP= -p1
.endif
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_GMAKE= yes
ALL_TARGET= bootstrap
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 93bc7d5f72f5..ba0afe66e8c4 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -28,7 +28,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_XLIB= yes
USE_XPM= yes
STRIP=
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS?=--with-clash-detection \
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 93bc7d5f72f5..ba0afe66e8c4 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -28,7 +28,7 @@ XEMACS_ARCH= ${CONFIGURE_TARGET}
USE_XLIB= yes
USE_XPM= yes
STRIP=
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS?=--with-clash-detection \
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index a94d6bc5dc81..431fa849927c 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -28,7 +28,7 @@ SLAVEDIRS+= editors/xemacs21-mule
USE_XLIB= yes
USE_XPM= yes
STRIP=
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_TARGET=${MACHINE_ARCH}--freebsd
CONFIGURE_ARGS?=--with-clash-detection \
diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile
index 4409885d99b2..a70555288268 100644
--- a/games/fgfs-base/Makefile
+++ b/games/fgfs-base/Makefile
@@ -39,11 +39,13 @@ pre-configure:
.else
PLIST= ${MASTERDIR}/pkg-plist.notools
ADDPATCHES= ${MASTERDIR}/patches.tools/disable-tools
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
.endif
USE_NEWGCC= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= \
+ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -lGLU -lGL -lglut ${PTHREAD_LIBS}"
CONFIGURE_ARGS+=--bindir=${PREFIX}/FlightGear/bin
USE_GMAKE= yes
@@ -54,6 +56,8 @@ pre-patch:
done )
post-configure:
+ @find ${WRKSRC} -type f | xargs ${PERL} -pi -e \
+ "s@#include.*<malloc.h>@#include <stdlib.h>@g"
@(cd ${WRKSRC};touch Makefile.in */Makefile.in */*/Makefile.in \
*/*/*/Makefile.in; \
./config.status)
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 4409885d99b2..a70555288268 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -39,11 +39,13 @@ pre-configure:
.else
PLIST= ${MASTERDIR}/pkg-plist.notools
ADDPATCHES= ${MASTERDIR}/patches.tools/disable-tools
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
.endif
USE_NEWGCC= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= \
+ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -lGLU -lGL -lglut ${PTHREAD_LIBS}"
CONFIGURE_ARGS+=--bindir=${PREFIX}/FlightGear/bin
USE_GMAKE= yes
@@ -54,6 +56,8 @@ pre-patch:
done )
post-configure:
+ @find ${WRKSRC} -type f | xargs ${PERL} -pi -e \
+ "s@#include.*<malloc.h>@#include <stdlib.h>@g"
@(cd ${WRKSRC};touch Makefile.in */Makefile.in */*/Makefile.in \
*/*/*/Makefile.in; \
./config.status)
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 4409885d99b2..a70555288268 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -39,11 +39,13 @@ pre-configure:
.else
PLIST= ${MASTERDIR}/pkg-plist.notools
ADDPATCHES= ${MASTERDIR}/patches.tools/disable-tools
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
.endif
USE_NEWGCC= yes
GNU_CONFIGURE= yes
+CONFIGURE_ENV= \
+ LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -lGLU -lGL -lglut ${PTHREAD_LIBS}"
CONFIGURE_ARGS+=--bindir=${PREFIX}/FlightGear/bin
USE_GMAKE= yes
@@ -54,6 +56,8 @@ pre-patch:
done )
post-configure:
+ @find ${WRKSRC} -type f | xargs ${PERL} -pi -e \
+ "s@#include.*<malloc.h>@#include <stdlib.h>@g"
@(cd ${WRKSRC};touch Makefile.in */Makefile.in */*/Makefile.in \
*/*/*/Makefile.in; \
./config.status)
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 7f0412c0aa11..bec53b2b82d9 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
tcl82.1:${PORTSDIR}/lang/tcl82
USE_MESA= YES
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER=213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/tcl8.2 \
-I${X11BASE}/include" \
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 7aac1653cf42..74ac1deaa3e6 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -55,8 +55,8 @@ pre-configure:
.if !defined(WITH_GLX)
@${ECHO_MSG} "Define WITH_GLX to use GLX (otherwise it is explicitly disabled!)"
.endif
- @cd ${WRKSRC} ; aclocal
- @cd ${WRKSRC} ; autoheader213
+ @cd ${WRKSRC} ; ${ACLOCAL}
+ @cd ${WRKSRC} ; ${AUTOHEADER}
do-install:
@${CP} ${PKGDIR}/pkg-plist ${PLIST}
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index ede21f585603..12f96cdac131 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \
SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
USE_X_PREFIX= yes
-USE_AUTOCONF= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
USE_GMAKE= yes
SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config
CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}"
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index bed472e67e7a..faf5982021dd 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= makoto@pinpott.spnet.ne.jp
USE_XLIB= yes
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
CONFIGURE_ARGS= --datadir=${PREFIX}/lib \
--with-setgid=${SHAREGRP}
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 1e129e92c374..c9f50f427030 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -20,14 +20,13 @@ LIB_DEPENDS= Magick.5:${PORTSDIR}/graphics/ImageMagick \
netcdf.1:${PORTSDIR}/math/netcdf \
tiff.4:${PORTSDIR}/graphics/tiff
-USE_AUTOMAKE= yes
USE_BISON= yes
USE_GMAKE= yes
USE_MESA= yes
USE_MOTIF= yes
USE_NEWGCC= yes
USE_XLIB= yes
-AUTOMAKE_ARGS= -a -i
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-magick
CONFIGURE_ENV= ARCH="" \
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${PREFIX}/include" \
@@ -40,9 +39,6 @@ PLIST_SUB= ARCH=${OPSYS:L}
post-patch:
@${RM} -f ${WRKSRC}/include/stamp-h.in
-pre-configure:
- @cd ${WRKSRC} && ${ACLOCAL} && ${SETENV} ${CONFIGURE_ENV} ${AUTOHEADER}
-
post-configure:
${PERL} -pi -e "s;flex ;flex -l ;g" ${WRKSRC}/src/uipp/dxuilib/Makefile
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 90ed953e16cf..45817695e079 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -25,8 +25,7 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
.else
PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
.endif
-GNU_CONFIGURE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_ARGS= --enable-shared
RANLIB= ranlib
PKGINSTALL= ${PORTSDIR}/lang/tcl82/pkg-install.tclsh
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index a9f642ab10ee..bcb24af892e1 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -20,10 +20,9 @@ BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4
VFLIB_VERSION= 2.25.2
PLIST_SUB= VFLIB_VERSION=${VFLIB_VERSION}
-GNU_CONFIGURE= yes
USE_FREETYPE= yes
USE_XLIB= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-freetype \
--with-freetype-includedir=${PREFIX}/include/freetype \
diff --git a/korean/bitchx/Makefile b/korean/bitchx/Makefile
index 6c3c9bf92b2e..4bc35665baa8 100644
--- a/korean/bitchx/Makefile
+++ b/korean/bitchx/Makefile
@@ -21,7 +21,7 @@ MAINTAINER= hollywar@mail.holywar.net
WRKSRC= ${WRKDIR}/BitchX
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_GMAKE= yes
CONFIGURE_ARGS= --with-plugins \
--exec-prefix="${PREFIX}/share" \
diff --git a/lang/ocaml-mode.el/Makefile b/lang/ocaml-mode.el/Makefile
index ea740fbb627b..d787daf52f38 100644
--- a/lang/ocaml-mode.el/Makefile
+++ b/lang/ocaml-mode.el/Makefile
@@ -15,6 +15,9 @@ DISTNAME= ocaml-mode-3.01
MAINTAINER= jkoshy@FreeBSD.org
+BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs21
+RUN_DEPENDS= emacs:${PORTSDIR}/editors/emacs21
+
NO_BUILD= yes
#
diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 9396c36e6cdb..15d4342a90b6 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -28,7 +28,7 @@ USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
RUBY_NO_RUN_DEPENDS= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 5ba1a1a0e43c..238fb7f49964 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -26,7 +26,7 @@ USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
RUBY_NO_RUN_DEPENDS= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 5ba1a1a0e43c..238fb7f49964 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -26,7 +26,7 @@ USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
RUBY_NO_RUN_DEPENDS= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 9396c36e6cdb..15d4342a90b6 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -28,7 +28,7 @@ USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
RUBY_NO_RUN_DEPENDS= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \
diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index 32a0399fd52f..5e15c23dd6a2 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS+= latex2html:${PORTSDIR}/textproc/latex2html
.endif
PYTHON_VERSION= python1.5
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER= 213
USE_GMAKE= yes
CONFIGURE_ENV+= OSTYPE=${OPSYS}
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 52e8c590fb0b..c1dbe7b4fe54 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -56,7 +56,7 @@ MASTER_SITE_SUBDIR= jkoshy
MAINTAINER= Scott.Blachowicz@seaslug.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \
--sysconfdir=${PREFIX}/etc/nmh --enable-nmh-pop
.ifdef NMH_MTS
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 0671c52ffd13..5637a5ac2c32 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
USE_BISON= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index e6cd4444ef41..9d63739597e5 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -13,13 +13,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}gg
MAINTAINER= peterh@sapros.com
-BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc \
- automake:${PORTSDIR}/devel/automake
+BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww \
adns.1:${PORTSDIR}/net/adns
USE_OPENSSL= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -28,9 +27,6 @@ CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-pre-configure:
- cd ${WRKSRC} && aclocal
-
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index c5e8202cadbc..ba1d73f67c33 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= net-snmp
MAINTAINER= billf@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index c5e8202cadbc..ba1d73f67c33 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= net-snmp
MAINTAINER= billf@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index c5e8202cadbc..ba1d73f67c33 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= net-snmp
MAINTAINER= billf@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index c5e8202cadbc..ba1d73f67c33 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= net-snmp
MAINTAINER= billf@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net/freeradius-devel/Makefile b/net/freeradius-devel/Makefile
index 5bcfe1f5624d..d27b279c6bdd 100644
--- a/net/freeradius-devel/Makefile
+++ b/net/freeradius-devel/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= wollman@lcs.mit.edu
WRKSRC= ${WRKDIR}/freeradius-alpha-snapshot-${PORTVERSION}
-USE_AUTOCONF= YES
+USE_AUTOCONF_VER=213
USE_LIBTOOL= YES
USE_GMAKE= YES
diff --git a/net/gale/Makefile b/net/gale/Makefile
index e6cd4444ef41..9d63739597e5 100644
--- a/net/gale/Makefile
+++ b/net/gale/Makefile
@@ -13,13 +13,12 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}gg
MAINTAINER= peterh@sapros.com
-BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc \
- automake:${PORTSDIR}/devel/automake
+BUILD_DEPENDS= ${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww \
adns.1:${PORTSDIR}/net/adns
USE_OPENSSL= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -28,9 +27,6 @@ CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-pre-configure:
- cd ${WRKSRC} && aclocal
-
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index c5e8202cadbc..ba1d73f67c33 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= net-snmp
MAINTAINER= billf@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index c5e8202cadbc..ba1d73f67c33 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= net-snmp
MAINTAINER= billf@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 913beeb9ea15..7d6902b7cb0b 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
USE_OPENSSL= yes
diff --git a/news/newsx/Makefile b/news/newsx/Makefile
index edc6bf280b5c..72a828bc0cbd 100644
--- a/news/newsx/Makefile
+++ b/news/newsx/Makefile
@@ -55,7 +55,7 @@ post-install:
.endif
#GNU_CONFIGURE= yes
-USE_AUTOCONF= yes
+USE_AUTOMAKE_VER=14
MAN1= newsq.1
MAN5= newsx.conf.5 in.hosts.5
diff --git a/security/pam_smb/Makefile b/security/pam_smb/Makefile
index f857746eb11c..505a0ab0a65c 100644
--- a/security/pam_smb/Makefile
+++ b/security/pam_smb/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.csn.ul.ie/~airlied/pam_smb/devel/
MAINTAINER= nsayer@FreeBSD.org
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
USE_GMAKE= yes
STARTUP_SCRIPT= pam_smbd.sh.sample
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 98853ac58638..67873a723345 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
MAN8= cfengine.8
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 98853ac58638..67873a723345 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
MAN8= cfengine.8
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index 98853ac58638..67873a723345 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
MAN8= cfengine.8
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 98853ac58638..67873a723345 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
MAN8= cfengine.8
diff --git a/sysutils/cronolog/Makefile b/sysutils/cronolog/Makefile
index b1b42fb91922..c0ce68147a40 100644
--- a/sysutils/cronolog/Makefile
+++ b/sysutils/cronolog/Makefile
@@ -14,6 +14,6 @@ MAINTAINER= tmb_ports@maddog.u-net.com
MAN1= cronolog.1m cronosplit.1m
-USE_AUTOCONF= yes
+GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 909bb6edf0de..665b0cedafd0 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -23,7 +23,7 @@ PLIST_SUB+= SHLIB_MAJOR="${SHLIB_MAJOR}"
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
USE_GMAKE= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
AUTOMAKE_ARGS= -a
USE_LIBTOOL= yes
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index f280d92152d0..a37f579c10ef 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -31,8 +31,7 @@ PHP_DISTDIR= distributions
SLAVEDIRS= lang/php4
-USE_AUTOCONF= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF_VER=213
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
IS_INTERACTIVE= yes
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index f280d92152d0..a37f579c10ef 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -31,8 +31,7 @@ PHP_DISTDIR= distributions
SLAVEDIRS= lang/php4
-USE_AUTOCONF= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF_VER=213
.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
IS_INTERACTIVE= yes
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 85cb4fd569fd..7582af2bcbb2 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -22,7 +22,7 @@ WANT_ESOUND= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-USE_AUTOCONF= yes
+USE_AUTOCONF_VER=213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-i18n --enable-nls \
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index b04341c45e0d..dec87ce14630 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker \
DIST_SUBDIR= wdm
USE_X_PREFIX= yes
-USE_AUTOMAKE= yes
+USE_AUTOMAKE_VER=14
AUTOMAKE_ARGS= --include-deps
DEF_SERVER?= ${X11BASE}/bin/X
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \