aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2010-10-05 19:57:56 +0000
committerAde Lovett <ade@FreeBSD.org>2010-10-05 19:57:56 +0000
commit7e80cde3289d108a73c54656f4fde354dd2fb09e (patch)
treeb85b705571d426ca1d0ff74b6af8f029081a6a39
parent6abe3f75658b0457864b49c9fdaf298b79f2c447 (diff)
downloadports-7e80cde3289d108a73c54656f4fde354dd2fb09e.tar.gz
ports-7e80cde3289d108a73c54656f4fde354dd2fb09e.zip
Notes
-rw-r--r--archivers/par2cmdline-tbb/Makefile2
-rw-r--r--archivers/rpm5/Makefile4
-rw-r--r--archivers/torrentzip/Makefile2
-rw-r--r--archivers/zipios++/Makefile2
-rw-r--r--astro/boinc-setiathome-enhanced/Makefile2
-rw-r--r--astro/orsa/Makefile2
-rw-r--r--audio/audacity-devel/Makefile2
-rw-r--r--audio/faac/Makefile2
-rw-r--r--audio/faad/Makefile2
-rw-r--r--audio/gspeakers/Makefile2
-rw-r--r--audio/libaacplus/Makefile2
-rw-r--r--audio/libtremor/Makefile2
-rw-r--r--audio/liquidsoap/Makefile2
-rw-r--r--audio/mpiosh/Makefile2
-rw-r--r--audio/musepack/Makefile2
-rw-r--r--audio/ncmpcpp/Makefile2
-rw-r--r--audio/oggsplit/Makefile2
-rw-r--r--audio/yammi/Makefile2
-rw-r--r--biology/mopac/Makefile2
-rw-r--r--biology/phyml/Makefile2
-rw-r--r--cad/salome/Makefile.ext2
-rw-r--r--comms/aldo/Makefile4
-rw-r--r--comms/dfu-util/Makefile2
-rw-r--r--comms/klog/Makefile2
-rw-r--r--comms/klog/files/patch-admin__cvs.sh7
-rw-r--r--comms/libsyncml/Makefile2
-rw-r--r--comms/tlf/Makefile2
-rw-r--r--databases/firebird20-server/Makefile2
-rw-r--r--databases/jrrd/Makefile1
-rw-r--r--databases/jrrd/files/patch-Makefile.am11
-rw-r--r--databases/jrrd/files/patch-Makefile.in7
-rw-r--r--databases/kumofs/Makefile2
-rw-r--r--databases/memcached/Makefile2
-rw-r--r--databases/mysql-workbench51/Makefile2
-rw-r--r--databases/tora/Makefile2
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/global-menu/Makefile2
-rw-r--r--deskutils/google-gadgets/Makefile2
-rw-r--r--deskutils/ksmoothdock/Makefile2
-rw-r--r--deskutils/ksmoothdock/files/patch-admin__cvs.sh7
-rw-r--r--deskutils/multisync/Makefile2
-rw-r--r--deskutils/taskjuggler/Makefile2
-rw-r--r--deskutils/taskjuggler/files/patch-admin_cvs.sh7
-rw-r--r--devel/apr0/Makefile2
-rw-r--r--devel/apr1/Makefile2
-rw-r--r--devel/argp-standalone/Makefile2
-rw-r--r--devel/autoconf-archive/Makefile2
-rw-r--r--devel/avra/Makefile2
-rw-r--r--devel/elfio/Makefile2
-rw-r--r--devel/fam/Makefile2
-rw-r--r--devel/fb303/Makefile2
-rw-r--r--devel/git-merge-changelog/Makefile2
-rw-r--r--devel/gtkparasite/Makefile2
-rw-r--r--devel/kBuild-devel/Makefile2
-rw-r--r--devel/kBuild/Makefile2
-rw-r--r--devel/libbegemot/Makefile2
-rw-r--r--devel/libftdi/Makefile2
-rw-r--r--devel/libthai/Makefile4
-rw-r--r--devel/libunwind/Makefile2
-rw-r--r--devel/log4cxx/Makefile2
-rw-r--r--devel/ois/Makefile2
-rw-r--r--devel/patch/Makefile2
-rw-r--r--devel/php-java-bridge/Makefile2
-rw-r--r--devel/psptoolchain-pspsdk-stage1/Makefile2
-rw-r--r--devel/raknet/Makefile2
-rw-r--r--devel/rapidsvn/Makefile6
-rw-r--r--devel/rapidsvn/files/patch-aclocal.m412
-rw-r--r--devel/sysconftool/Makefile2
-rw-r--r--devel/thrift/Makefile4
-rw-r--r--dns/dnswall/Makefile4
-rw-r--r--dns/nss_mdns/Makefile6
-rw-r--r--dns/nss_mdns/files/patch-aclocal.m412
-rw-r--r--editors/xmlcopyeditor/Makefile10
-rw-r--r--editors/xmlcopyeditor/files/patch-configure.in.diff12
-rw-r--r--editors/xmlcopyeditor/files/patch-src_Makefile.in.diff (renamed from editors/xmlcopyeditor/files/patch-src_Makefile.am.diff)16
-rw-r--r--emulators/desmume/Makefile2
-rw-r--r--emulators/pcsxr/Makefile2
-rw-r--r--emulators/yabause/Makefile2
-rw-r--r--finance/khacc/Makefile2
-rw-r--r--finance/libofx/Makefile2
-rw-r--r--ftp/tnftpd/Makefile2
-rw-r--r--games/atr3d/Makefile2
-rw-r--r--games/cheech/Makefile2
-rw-r--r--games/critterding/Makefile2
-rw-r--r--games/d2x-xl/Makefile2
-rw-r--r--games/daimonin/Makefile2
-rw-r--r--games/flightgear-atlas/Makefile2
-rw-r--r--games/glest/Makefile2
-rw-r--r--games/gno3dtet/Makefile2
-rw-r--r--games/gnubg/Makefile2
-rw-r--r--games/kmastermind/Makefile3
-rw-r--r--games/lianliankan/Makefile2
-rw-r--r--games/mangos/Makefile2
-rw-r--r--games/naev/Makefile2
-rw-r--r--games/openalchemist/Makefile2
-rw-r--r--games/ri-li/Makefile4
-rw-r--r--games/ri-li/pkg-plist1
-rw-r--r--games/scorched3d/Makefile4
-rw-r--r--games/scourge/Makefile2
-rw-r--r--games/spacejunk/Makefile4
-rw-r--r--games/tecnoballz/Makefile2
-rw-r--r--games/ufoai/Makefile2
-rw-r--r--graphics/agg/Makefile2
-rw-r--r--graphics/cal3d-devel/Makefile2
-rw-r--r--graphics/cal3d/Makefile6
-rw-r--r--graphics/cal3d/files/patch-aclocal.m412
-rw-r--r--graphics/devil/Makefile2
-rw-r--r--graphics/divxcalc/Makefile2
-rw-r--r--graphics/enblend/Makefile2
-rw-r--r--graphics/gnash-devel/Makefile2
-rw-r--r--graphics/gsnapshot/Makefile2
-rw-r--r--graphics/guilib/Makefile2
-rw-r--r--graphics/iulib/Makefile2
-rw-r--r--graphics/kbarcode/Makefile2
-rw-r--r--graphics/leptonica/Makefile2
-rw-r--r--graphics/leptonlib/Makefile2
-rw-r--r--graphics/libjpeg-turbo/Makefile2
-rw-r--r--graphics/libpano12/Makefile4
-rw-r--r--graphics/libpano13/Makefile4
-rw-r--r--graphics/ocaml-images/Makefile2
-rw-r--r--graphics/ocropus/Makefile2
-rw-r--r--japanese/celrw/Makefile2
-rw-r--r--japanese/jd/Makefile2
-rw-r--r--japanese/mell/Makefile2
-rw-r--r--japanese/mutt-devel/Makefile2
-rw-r--r--japanese/mutt/Makefile2
-rw-r--r--japanese/prime-dict/Makefile2
-rw-r--r--japanese/prime-el/Makefile2
-rw-r--r--japanese/prime/Makefile2
-rw-r--r--japanese/suikyo/Makefile2
-rw-r--r--lang/gambas2-base/Makefile2
-rw-r--r--lang/maude/Makefile1
-rw-r--r--lang/maude/files/patch-src-Main-Makefile.am17
-rw-r--r--lang/maude/files/patch-src-Main-Makefile.in327
-rw-r--r--lang/ruby18/Makefile2
-rw-r--r--mail/bogofilter/Makefile2
-rw-r--r--mail/dspam-devel/Makefile2
-rw-r--r--mail/kshowmail/Makefile2
-rw-r--r--mail/kshowmail/files/patch-admin-cvs.sh7
-rw-r--r--mail/mutt-devel/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt14/Makefile2
-rw-r--r--mail/postfix-gps/Makefile2
-rw-r--r--mail/vmailmgr/Makefile3
-rw-r--r--math/asir2000/Makefile2
-rw-r--r--math/dieharder/Makefile2
-rw-r--r--math/geg/Makefile2
-rw-r--r--math/maxima/Makefile2
-rw-r--r--misc/sword/Makefile2
-rw-r--r--multimedia/kplayer/Makefile2
-rw-r--r--multimedia/mediainfo/Makefile2
-rw-r--r--multimedia/spook/Makefile3
-rw-r--r--multimedia/xmms/Makefile7
-rw-r--r--multimedia/xmms/files/patch-aclocal.m412
-rw-r--r--net-mgmt/nagios-plugins/Makefile2
-rw-r--r--net-mgmt/pixilate/Makefile2
-rw-r--r--net-mgmt/tork/Makefile2
-rw-r--r--net-mgmt/tork/files/patch-aclocal.m412
-rw-r--r--net-p2p/btpd/Makefile2
-rw-r--r--net/freeswitch-core/Makefile2
-rw-r--r--net/jicmp/Makefile1
-rw-r--r--net/jicmp/files/patch-Makefile.am11
-rw-r--r--net/jicmp/files/patch-Makefile.in7
-rw-r--r--net/libsocket++/Makefile2
-rw-r--r--net/mcast-tools/Makefile3
-rw-r--r--net/nss_ldap/Makefile2
-rw-r--r--net/ntop/Makefile2
-rw-r--r--net/ntp-devel/Makefile2
-rw-r--r--net/ntp/Makefile2
-rw-r--r--net/rabbitmq-c-devel/Makefile2
-rw-r--r--net/rabbitmq-c/Makefile2
-rw-r--r--net/scribe/Makefile2
-rw-r--r--net/torsocks/Makefile2
-rw-r--r--net/torsocks/files/patch-Makefile.in21
-rw-r--r--net/xrdp/Makefile24
-rw-r--r--net/xrdp/files/patch-sesman__Makefile.am13
-rw-r--r--net/xrdp/files/patch-xrdp__Makefile.am13
-rw-r--r--news/newscache/Makefile2
-rw-r--r--news/nntpcache/Makefile2
-rw-r--r--print/cups-magicolor/Makefile2
-rw-r--r--print/foomatic-db/Makefile2
-rw-r--r--print/gnome-specimen/Makefile2
-rw-r--r--print/gtklp/Makefile2
-rw-r--r--print/openprinting/Makefile2
-rw-r--r--science/abinit/Makefile2
-rw-r--r--science/gsmc/Makefile2
-rw-r--r--science/kst/Makefile2
-rw-r--r--science/kst/files/patch-admin__cvs.sh7
-rw-r--r--security/barnyard/Makefile2
-rw-r--r--security/fwbuilder-devel/Makefile2
-rw-r--r--security/fwbuilder/Makefile2
-rw-r--r--security/gtkpasman/Makefile2
-rw-r--r--security/klamav/Makefile2
-rw-r--r--security/kovpn/Makefile2
-rw-r--r--security/kovpn/files/patch-admin-cvs.sh7
-rw-r--r--security/libfwbuilder-devel/Makefile2
-rw-r--r--security/libfwbuilder/Makefile2
-rw-r--r--security/shibboleth2-sp/Makefile2
-rw-r--r--sysutils/boxbackup-devel/Makefile2
-rw-r--r--sysutils/boxbackup/Makefile2
-rw-r--r--sysutils/ftwin/Makefile2
-rw-r--r--sysutils/heartbeat/Makefile2
-rw-r--r--sysutils/htop/Makefile2
-rw-r--r--sysutils/knutclient/Makefile4
-rw-r--r--sysutils/lcdproc/Makefile2
-rw-r--r--sysutils/openipmi/Makefile2
-rw-r--r--sysutils/uptimed/Makefile2
-rw-r--r--textproc/augeas/Makefile2
-rw-r--r--textproc/iksemel/Makefile2
-rw-r--r--www/asterisk-gui/Makefile2
-rw-r--r--www/asterisk-gui/files/patch-bootstrap.sh2
-rw-r--r--www/bookmarkbridge/Makefile2
-rw-r--r--www/lighttpd/Makefile2
-rw-r--r--www/mod_cplusplus/Makefile2
-rw-r--r--www/mod_rivet/Makefile2
-rw-r--r--www/moonshine/Makefile2
-rw-r--r--www/suphp/Makefile4
-rw-r--r--www/tidy-devel/Makefile2
-rw-r--r--www/trafficserver/Makefile2
-rw-r--r--x11-drivers/xf86-video-radeonhd-devel/Makefile4
-rw-r--r--x11-fm/gnome-commander2/Makefile2
-rw-r--r--x11-themes/kdmtheme/Makefile2
-rw-r--r--x11-themes/kdmtheme/files/patch-admin__cvs.sh25
-rw-r--r--x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh14
-rw-r--r--x11-toolkits/lesstif/Makefile2
-rw-r--r--x11-toolkits/libgtkeditor/Makefile2
-rw-r--r--x11-toolkits/rep-gtk2/Makefile2
-rw-r--r--x11-wm/gcompmgr/Makefile2
-rw-r--r--x11-wm/lxsession-lite/Makefile2
-rw-r--r--x11-wm/waimea-devel/Makefile2
-rw-r--r--x11/gnome-launch-box/Makefile2
-rw-r--r--x11/gtk-themepreview/Makefile2
-rw-r--r--x11/libSM/Makefile2
-rw-r--r--x11/libX11/Makefile2
-rw-r--r--x11/lxmenu-data/Makefile2
-rw-r--r--x11/lxpanel/Makefile2
-rw-r--r--x11/sessreg/Makefile2
-rw-r--r--x11/xclip/Makefile2
238 files changed, 750 insertions, 347 deletions
diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile
index fd01822a36d0..cdf7aa1587ad 100644
--- a/archivers/par2cmdline-tbb/Makefile
+++ b/archivers/par2cmdline-tbb/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 amd64 ia64
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267
USE_GCC= 4.2+
PORTDOCS= README
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index c39f24112970..abdcf7a68a10 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -42,7 +42,7 @@ LATEST_LINK= rpm5
CONFLICTS= rpm-3.* rpm-4.*
# need to autogen (for xz support)
-USE_AUTOTOOLS+= aclocal:110 autoconf:267 automake:110 autoheader:267
+USE_AUTOTOOLS+= aclocal:111 autoconf:267 automake:111 autoheader:267
ACLOCAL_ARGS+= -I m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS+= -a -c
pre-configure:
@@ -134,6 +134,8 @@ post-patch::
@${REINPLACE_CMD} -e "s:/bin/sh:/usr/bin/env bash:" \
${WRKSRC}/scripts/gendiff
@${REINPLACE_CMD} -e 's:AC_DEFUN:m4_define:g' ${WRKSRC}/configure.ac
+ @${REINPLACE_CMD} -e 's:pkgincHEADERS_INSTALL:INSTALL_HEADER:' \
+ ${WRKSRC}/rpmdb/Makefile.am
.if defined(WITH_PERL)
post-configure:
diff --git a/archivers/torrentzip/Makefile b/archivers/torrentzip/Makefile
index 5739b999f47e..6b0a8dad08ee 100644
--- a/archivers/torrentzip/Makefile
+++ b/archivers/torrentzip/Makefile
@@ -15,7 +15,7 @@ DISTNAME= trrntzip_v${PORTVERSION:S/.//}_src
MAINTAINER= swhetzel@gmail.com
COMMENT= Efficient way to prepare zipfiles for BitTorrent
-USE_AUTOTOOLS= aclocal:19 automake:19 autoheader:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoheader:267
AUTOMAKE_ARGS= -a
WRKSRC= ${WRKDIR}/trrntzip
diff --git a/archivers/zipios++/Makefile b/archivers/zipios++/Makefile
index d5d0dcdd629c..395b2959c342 100644
--- a/archivers/zipios++/Makefile
+++ b/archivers/zipios++/Makefile
@@ -18,7 +18,7 @@ COMMENT= A java.util.zip-like C++ library for reading and writing Zip files
USE_GNOME= gnometarget
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:110:env
+USE_AUTOTOOLS= automake:111:env
CONFIGURE_ARGS+=--disable-static
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}+cvs.2004.02.07
diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index 53bc62e25f79..f2766e254a11 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client
LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:267:env automake:19:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= pkgconfig
diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile
index d7f74b73ef81..36a32c87a770 100644
--- a/astro/orsa/Makefile
+++ b/astro/orsa/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= gsl.15:${PORTSDIR}/math/gsl \
USE_QT_VER= 3
USE_GL= gl
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I macros -I ${LOCALBASE}/share/aclocal
CONFIGURE_ENV= ac_cv_c_inline=no
USE_LDCONFIG= yes
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index 623432afaee6..9ab74e1020b5 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= audacity-[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}-beta
-USE_AUTOTOOLS= aclocal:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoconf:267
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GCC= 4.2+
diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index 3a09f9a11cd9..762175b67a3f 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_DOS2UNIX= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --with-mp4v2
diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 190876a83956..c34ae1d9ed3e 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_DOS2UNIX= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile
index c2c6906304a2..cd9fa875ad3f 100644
--- a/audio/gspeakers/Makefile
+++ b/audio/gspeakers/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_GNOME= gnomeprefix gnometarget libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index dc7fdfd0eb38..650a75e21ab1 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -28,7 +28,7 @@ CONFLICTS= aacplusenc-0*
USE_GNOME= pkgconfig
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22 libtoolize aclocal:110 autoheader:267 automake:110
+USE_AUTOTOOLS= libtool:22 libtoolize aclocal:111 autoheader:267 automake:111
GNU_CONFIGURE= yes
AUTOMAKE_ARGS= --add-missing
diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile
index c472b24c54a5..c4e11d63b801 100644
--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@@ -18,7 +18,7 @@ COMMENT= Integer-only fully Ogg Vorbis compliant decoder library
SNAP_DATE= 02132004
WRKSRC= ${WRKDIR}/Tremor
-USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile
index 57e4e218eb95..70e8a5bf253f 100644
--- a/audio/liquidsoap/Makefile
+++ b/audio/liquidsoap/Makefile
@@ -51,7 +51,7 @@ USE_RC_SUBR= liquidsoap.sh
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
-USE_AUTOTOOLS= autoconf:267:env automake:110:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index ffa20b5cd174..da7f4bf9a179 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -19,7 +19,7 @@ USE_ICONV= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile
index e33d46af626c..301c5fc01d07 100644
--- a/audio/musepack/Makefile
+++ b/audio/musepack/Makefile
@@ -18,7 +18,7 @@ COMMENT= Decoder, encoder and replaygain for musepack (mpc)
CONFLICTS= libmpcdec-[0-9]*
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 libtoolize automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 libtoolize automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I. -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index 7817acf47ff2..f9b75fb3bd14 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_ICONV= yes
USE_GNOME= glib20
-USE_AUTOTOOLS= automake:110 aclocal:110 libtool:22
+USE_AUTOTOOLS= automake:111 aclocal:111 libtool:22
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -lpthread"
diff --git a/audio/oggsplit/Makefile b/audio/oggsplit/Makefile
index 130785cc0b18..62a0969ca86c 100644
--- a/audio/oggsplit/Makefile
+++ b/audio/oggsplit/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= ogg.7:${PORTSDIR}/audio/libogg
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --with-ogg=${LOCALBASE}
diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile
index 1f3dae7f7f4e..b073a0f22bb1 100644
--- a/audio/yammi/Makefile
+++ b/audio/yammi/Makefile
@@ -21,7 +21,7 @@ OPTIONS= XMMS "XMMS backend support" off
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gstreamer
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index 7cf2e3d35745..b7ae030fd746 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -19,7 +19,7 @@ COMMENT= Semi-empirical (MNDO, etc.) molecular orbital calculation
LIB_DEPENDS= f2c:${PORTSDIR}/lang/f2c
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing --copy
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/biology/phyml/Makefile b/biology/phyml/Makefile
index 72646fd66fe8..01876f1d0c4e 100644
--- a/biology/phyml/Makefile
+++ b/biology/phyml/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simple, fast, and accurate algorithm to estimate large phylogenies
WRKSRC= ${WRKDIR}/${PORTNAME}/src
GNU_CONFIGURE= yes
PLIST_FILES= bin/phyml
-USE_AUTOTOOLS= automake:110 aclocal:110
+USE_AUTOTOOLS= automake:111 aclocal:111
AUTOMAKE_ARGS= --add-missing
.include <bsd.port.pre.mk>
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index c6d5933cddd7..65d9e87e3d70 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -94,7 +94,7 @@ RUN_DEPENDS+= ${RESOURCEDIR}/visu:${PORTSDIR}/cad/salome-visu \
#Dependency from other ports
###########################################################################
#Dependency from autotools
-USE_AUTOTOOLS= autoconf:267 automake:15 libtool:22 aclocal:19
+USE_AUTOTOOLS= autoconf:267 automake:111 libtool:22 aclocal:111
.if ${SAL_MODULE} == "kernel"
ACLOCAL_ARGS= -I salome_adm/unix/config_files
.else
diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile
index 3c7f0ce693c3..e33b66461cd7 100644
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= ao:${PORTSDIR}/audio/libao
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 automake:111 libtool:22
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
USE_GMAKE= yes
@@ -28,7 +28,7 @@ PLIST_FILES= bin/aldo
MAN1= aldo.1
post-patch:
- @${REINPLACE_CMD} -e 's|1.10|1.10.3|g' ${WRKSRC}/aclocal.m4
+ @${REINPLACE_CMD} -e 's|1.10|1.11.1|g' ${WRKSRC}/aclocal.m4
@${REINPLACE_CMD} -e 's|2.61|2.67|g' ${WRKSRC}/aclocal.m4
do-install:
diff --git a/comms/dfu-util/Makefile b/comms/dfu-util/Makefile
index e71c34f9647e..d2fdc070694a 100644
--- a/comms/dfu-util/Makefile
+++ b/comms/dfu-util/Makefile
@@ -16,7 +16,7 @@ COMMENT= Device firmware update (DFU) USB programmer
MAN1= dfu-util.1
PLIST_FILES= bin/dfu-util
-USE_AUTOTOOLS= aclocal:19 automake:19 autoheader:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoheader:267
AUTOMAKE_ARGS= --add-missing --foreign --copy
SNAPDATE= 20090212
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index b0492bc88f00..9980fc984869 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= hamlib.2:${PORTSDIR}/comms/hamlib
USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22:env
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/comms/klog/files/patch-admin__cvs.sh b/comms/klog/files/patch-admin__cvs.sh
new file mode 100644
index 000000000000..89907240cb3d
--- /dev/null
+++ b/comms/klog/files/patch-admin__cvs.sh
@@ -0,0 +1,7 @@
+--- admin/cvs.sh.orig 2007-08-28 11:56:00.000000000 -0500
++++ admin/cvs.sh 2010-10-02 13:46:42.000000000 -0500
+@@ -70,3 +70,3 @@
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
+ echo "*** $AUTOMAKE_STRING found."
diff --git a/comms/libsyncml/Makefile b/comms/libsyncml/Makefile
index 46455b7cf4d1..0c06765dbce0 100644
--- a/comms/libsyncml/Makefile
+++ b/comms/libsyncml/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= wbxml2:${PORTSDIR}/textproc/wbxml2 \
openobex:${PORTSDIR}/comms/openobex \
soup-2.2.8:${PORTSDIR}/devel/libsoup22
-USE_AUTOTOOLS= autoheader:267 automake:110 libtool:22
+USE_AUTOTOOLS= autoheader:267 automake:111 libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= glib20 libxml2
diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile
index 921b99b1845c..b0f185f987b4 100644
--- a/comms/tlf/Makefile
+++ b/comms/tlf/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio curses based logging program
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_AUTOTOOLS= autoconf:267 libtool:22 aclocal:19 automake:19
+USE_AUTOTOOLS= autoconf:267 libtool:22 aclocal:111 automake:111
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \
--libdir="${LOCALBASE}/lib"
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 0c07c15e02ba..dd751477f63d 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -22,7 +22,7 @@ USE_BISON= build
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:19 libtool:22
+USE_AUTOTOOLS= autoconf:267 aclocal:111 libtool:22
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \
-I ${WRKSRC}/m4
MAKE_JOBS_UNSAFE= yes
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index 06e9d13ef1bf..7e172bc89fcc 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -23,7 +23,6 @@ JAVA_RUN= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:19
PLIST_FILES= %%JAVAJARDIR%%/jrrd.jar \
lib/libjrrd.la \
diff --git a/databases/jrrd/files/patch-Makefile.am b/databases/jrrd/files/patch-Makefile.am
deleted file mode 100644
index f1326755df75..000000000000
--- a/databases/jrrd/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2008-06-25 15:15:08.000000000 +0000
-+++ Makefile.am 2008-06-25 15:15:15.000000000 +0000
-@@ -26,7 +26,7 @@
- cd $(classdir) && \
- $(JAR) cvf ../$@ *
-
--jardir=$(datadir)/java
-+jardir=$(datadir)/java/classes
- jar_DATA = jrrd.jar
-
- deploy:
diff --git a/databases/jrrd/files/patch-Makefile.in b/databases/jrrd/files/patch-Makefile.in
new file mode 100644
index 000000000000..0969f9b001af
--- /dev/null
+++ b/databases/jrrd/files/patch-Makefile.in
@@ -0,0 +1,7 @@
+--- Makefile.in.orig 2008-05-06 10:54:40.000000000 -0500
++++ Makefile.in 2010-10-02 18:06:58.000000000 -0500
+@@ -224,3 +224,3 @@
+ CLEANFILES = org_opennms_netmgt_rrd_rrdtool_Interface.h jrrd.jar
+-jardir = $(datadir)/java
++jardir = $(datadir)/java/classes
+ jar_DATA = jrrd.jar
diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index 9d56c3e40e2f..6fde94d546fb 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= msgpack:${PORTSDIR}/devel/msgpack \
RUN_DEPENDS= rubygem-msgpack>0:${PORTSDIR}/devel/rubygem-msgpack
LICENSE= ASL
-USE_AUTOTOOLS= libtool:22 autoheader:267 autoconf:267 automake:110 aclocal:110
+USE_AUTOTOOLS= libtool:22 autoheader:267 autoconf:267 automake:111 aclocal:111
ACLOCAL_ARGS= # empty
AUTOMAKE_ARGS= --add-missing --copy
CONFIGURE_ARGS= --with-msgpack=${LOCALBASE} --with-tokyocabinet=${LOCALBASE}
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index ea56c75e3fdd..7a48691d574a 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
CONFLICTS= memcached-1.2*
-USE_AUTOTOOLS= autoconf:267 aclocal:110 automake:110
+USE_AUTOTOOLS= autoconf:267 aclocal:111 automake:111
AUTOMAKE_ARGS+= --add-missing
USE_RC_SUBR= memcached
GNU_CONFIGURE= YES
diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile
index 9fbb2a04fe42..48af09a5b8ee 100644
--- a/databases/mysql-workbench51/Makefile
+++ b/databases/mysql-workbench51/Makefile
@@ -28,7 +28,7 @@ MAKE_JOBS_UNSAFE= yes
OPTIONS= PYTHON "Enable Python scripting and modules" off
-USE_AUTOTOOLS= autoheader:267 autoconf:267 automake:110 aclocal:110 libtool:22
+USE_AUTOTOOLS= autoheader:267 autoconf:267 automake:111 aclocal:111 libtool:22
AUTOMAKE_ARGS= --add-missing --foreign
ACLOCAL_ARGS=
AUTOCONF_ARGS=
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index ca65d18ff54e..98af42ff484d 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -23,7 +23,7 @@ OPTIONS= ORACLE "Build with Oracle support (i386 only)" off \
PGSQL "Build with PostgreSQL support" on \
MYSQL "Build with MySQL support" on
-USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267 autoheader:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267 autoheader:267 libtool:22
USE_QT_VER= 4
QT_COMPONENTS= gui corelib sql xml network linguist moc_build uic_build rcc_build
USE_GMAKE= yes
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 4e78a9e03f7e..71fccf898080 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
-USE_AUTOTOOLS= libtool:22 autoconf:267:env automake:110:env
+USE_AUTOTOOLS= libtool:22 autoconf:267:env automake:111:env
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 59ed954141c5..4dde66286d2e 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -22,7 +22,7 @@ USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 automake:19:env autoheader:267:env
+USE_AUTOTOOLS= libtool:22 automake:111:env autoheader:267:env
INSTALLS_ICONS= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile
index ac4afb6b74e5..e59d421d4eaf 100644
--- a/deskutils/google-gadgets/Makefile
+++ b/deskutils/google-gadgets/Makefile
@@ -38,7 +38,7 @@ USE_GSTREAMER= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-werror --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
-USE_AUTOTOOLS= libtool:22:env autoconf:267:env automake:110:env aclocal:110:env libltdl:22
+USE_AUTOTOOLS= libtool:22:env autoconf:267:env automake:111:env aclocal:111:env libltdl:22
WANT_GNOME= yes
USE_GNOME= gnomehack
INSTALLS_ICONS= yes
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index 3e2b9213993a..420fcdbdd5b8 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_PERL5_BUILD=yes
diff --git a/deskutils/ksmoothdock/files/patch-admin__cvs.sh b/deskutils/ksmoothdock/files/patch-admin__cvs.sh
new file mode 100644
index 000000000000..8b25d1c032d0
--- /dev/null
+++ b/deskutils/ksmoothdock/files/patch-admin__cvs.sh
@@ -0,0 +1,7 @@
+--- admin/cvs.sh.orig 2007-04-16 18:39:49.000000000 -0500
++++ admin/cvs.sh 2010-10-02 14:07:16.000000000 -0500
+@@ -70,3 +70,3 @@
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
+ echo "*** $AUTOMAKE_STRING found."
diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile
index ce6f47fb18d4..084a23c99488 100644
--- a/deskutils/multisync/Makefile
+++ b/deskutils/multisync/Makefile
@@ -19,7 +19,7 @@ WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION}
USE_BZIP2= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env libtool:22
+USE_AUTOTOOLS= automake:111:env libtool:22
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
MAKE_JOBS_UNSAFE= yes
diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index b3ae8b455eca..bd77245064bd 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -29,7 +29,7 @@ USE_BZIP2= yes
USE_QT_VER= 3
USE_PERL5_RUN= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}"
diff --git a/deskutils/taskjuggler/files/patch-admin_cvs.sh b/deskutils/taskjuggler/files/patch-admin_cvs.sh
new file mode 100644
index 000000000000..f8a852bbab64
--- /dev/null
+++ b/deskutils/taskjuggler/files/patch-admin_cvs.sh
@@ -0,0 +1,7 @@
+--- admin/cvs.sh.orig 2009-07-15 03:33:20.000000000 -0500
++++ admin/cvs.sh 2010-10-02 14:13:26.000000000 -0500
+@@ -70,3 +70,3 @@
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) : ;;
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) : ;;
+ "" )
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 07ed4f365eac..86ecd33219f2 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -33,7 +33,7 @@ APU_VERSION= 0.9.17
NO_LATEST_LINK= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22:env
+USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22:env
USE_PERL5_BUILD= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index cf4fc44ebc45..7fd75a4e7798 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -34,7 +34,7 @@ APR_VERSION= 1.4.2
APU_VERSION= 1.3.9
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22:env
+USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22:env
USE_PERL5_BUILD= yes
USE_PYTHON_BUILD= -2.7
USE_LDCONFIG= yes
diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile
index 2fcb25897be8..74bfee84810f 100644
--- a/devel/argp-standalone/Makefile
+++ b/devel/argp-standalone/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= sem@FreeBSD.org
COMMENT= Standalone version of arguments parsing functions from GLIBC
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoconf:267 automake:111 libtool:22
AUTOMAKE_ARGS= -c -a
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
diff --git a/devel/autoconf-archive/Makefile b/devel/autoconf-archive/Makefile
index 7359088a446a..e5b78a3a6ac1 100644
--- a/devel/autoconf-archive/Makefile
+++ b/devel/autoconf-archive/Makefile
@@ -18,7 +18,7 @@ COMMENT= A set of useful GNU Autoconf macros
DISTDATE= 2009-04-19
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:267:env automake:110:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env
GNU_CONFIGURE= yes
PLIST_SUB= MACRODIR=share/aclocal
diff --git a/devel/avra/Makefile b/devel/avra/Makefile
index 3aa0ac839df2..2984aefb7fda 100644
--- a/devel/avra/Makefile
+++ b/devel/avra/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= wes@FreeBSD.org
COMMENT= Macro Assembler for Atmel AVR microcontrollers
WRKSRC= ${WRKDIR}
-USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110
+USE_AUTOTOOLS= aclocal:111 autoconf:267 automake:111
AUTOMAKE_ARGS= -a
PORTDOCS= README
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 65164e89f2f5..7d49343d41b9 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= libtoolize:${PORTSDIR}/devel/libtool22
GNU_CONFIGURE= yes
USE_GNOME= gnometarget
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267 libtool:22
AUTOMAKE_ARGS= -c -a
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index fb565134a4db..088417867ca8 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -17,7 +17,7 @@ COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267 libtool:22
AUTOMAKE_ARGS= -c -a
USE_GMAKE= yes
USE_GNOME= gnometarget
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index bf521e6675c7..95f8edfa73db 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -24,7 +24,7 @@ AUTOMAKE_ARGS= -a
CONFIGURE_ARGS= PY_PREFIX="${PREFIX}"
PLIST_SUB+= PYTHON_VERSION_SHORTNAME="${PYTHON_VERSION_SHORTNAME}"
PYTHON_VERSION_SHORTNAME= ${PYTHON_VERSION:S/thon//}
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5_RUN= yes
diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile
index 3a8b09ca85f0..f24cd2b3bf66 100644
--- a/devel/git-merge-changelog/Makefile
+++ b/devel/git-merge-changelog/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= knu@FreeBSD.org
COMMENT= Git "merge" driver for GNU style ChangeLog files
EXTRACT_DEPENDS= ${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR} \
- automake-1.10:${PORTSDIR}/devel/automake110 \
+ automake-1.11:${PORTSDIR}/devel/automake111 \
autoconf-2.67:${PORTSDIR}/devel/autoconf267
GNU_CONFIGURE= yes
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index cd19a623db37..ff5f330ca385 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -23,7 +23,7 @@ PORTDOCS= USAGE
PLIST_FILES= lib/gtk-2.0/modules/libgtkparasite.a \
lib/gtk-2.0/modules/libgtkparasite.la \
lib/gtk-2.0/modules/libgtkparasite.so
-USE_AUTOTOOLS= autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 automake:111 libtool:22
pre-configure:
cd ${WRKSRC} && ${REINPLACE_CMD} -e '/.\/configure/d' ./autogen.sh \
diff --git a/devel/kBuild-devel/Makefile b/devel/kBuild-devel/Makefile
index d0796ae173d0..21e673b479e1 100644
--- a/devel/kBuild-devel/Makefile
+++ b/devel/kBuild-devel/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= gahr@FreeBSD.org
COMMENT= Makefile framework
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index d0796ae173d0..21e673b479e1 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= gahr@FreeBSD.org
COMMENT= Makefile framework
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile
index f8560d1c70ec..1dac896815d6 100644
--- a/devel/libbegemot/Makefile
+++ b/devel/libbegemot/Makefile
@@ -17,7 +17,7 @@ COMMENT= A function library for begemot tools
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libltdl:22 libtool:22
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libltdl:22 libtool:22
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile
index e5f00eb0cc49..caea5c86fdbc 100644
--- a/devel/libftdi/Makefile
+++ b/devel/libftdi/Makefile
@@ -16,7 +16,7 @@ COMMENT= A library (using libusb) to talk to FTDI chips
OPTIONS= BOOST "Build with boost" off
-USE_AUTOTOOLS= autoconf:267 libtool:22 automake:110
+USE_AUTOTOOLS= autoconf:267 libtool:22 automake:111
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
USE_LDCONFIG= yes
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index faad6b1b4e44..911be6bfae28 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -17,7 +17,7 @@ COMMENT= Thai language support library
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22
MAKE_JOBS_UNSAFE= yes
ALL_TARGET= all check
@@ -27,7 +27,7 @@ MAN3= libthai.3 thctype.3 wtt.3
post-patch:
@${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,' \
${WRKSRC}/Makefile.am
- @${REINPLACE_CMD} -e 's,15,-1.9,' -e 's,259,-2.67,' \
+ @${REINPLACE_CMD} -e 's,15,-1.11,' -e 's,259,-2.67,' \
${WRKSRC}/autogen.sh
pre-configure:
diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile
index dd4ed5a5b447..5ff0a25848d2 100644
--- a/devel/libunwind/Makefile
+++ b/devel/libunwind/Makefile
@@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= i386 amd64
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 \
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 \
libtoolize libtool:22
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -c -a
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index f04cfff545c2..0e53363455a4 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -34,7 +34,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-lib
.endif
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22:env
MAKE_JOBS_UNSAFE= yes
diff --git a/devel/ois/Makefile b/devel/ois/Makefile
index 5c079110eb03..3aff47189412 100644
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@@ -18,7 +18,7 @@ COMMENT= Object Oriented Input System
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack
-USE_AUTOTOOLS= libtool:22:env aclocal:19:env autoheader:267:env automake:19:env autoconf:267:env
+USE_AUTOTOOLS= libtool:22:env aclocal:111:env autoheader:267:env automake:111:env autoconf:267:env
USE_XORG= x11 xaw
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index f7dafa6fe41f..cff88ad1a2b9 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= patch
MAINTAINER= glarkin@FreeBSD.org
COMMENT= GNU patch utility
-USE_AUTOTOOLS= autoconf:267 aclocal:110
+USE_AUTOTOOLS= autoconf:267 aclocal:111
CONFIGURE_ARGS= --program-prefix=g
USE_GMAKE= yes
USE_XZ= yes
diff --git a/devel/php-java-bridge/Makefile b/devel/php-java-bridge/Makefile
index 2cbe7906a356..f13455950c2a 100644
--- a/devel/php-java-bridge/Makefile
+++ b/devel/php-java-bridge/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP module wich connects the PHP object with the Java/ECMA 335 object
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_JAVA= yes
diff --git a/devel/psptoolchain-pspsdk-stage1/Makefile b/devel/psptoolchain-pspsdk-stage1/Makefile
index 2c5adbe00f8b..6115ac320bee 100644
--- a/devel/psptoolchain-pspsdk-stage1/Makefile
+++ b/devel/psptoolchain-pspsdk-stage1/Makefile
@@ -18,7 +18,7 @@ COMMENT= PlayStation Portable development toolchain ${PORTNAME}
PSP_SDK_STAGE_PREFIX= psp/stage1
-USE_AUTOTOOLS= libtool:22:env aclocal:19:env autoheader:267:env automake:19:env autoconf:267:env
+USE_AUTOTOOLS= libtool:22:env aclocal:111:env autoheader:267:env automake:111:env autoconf:267:env
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS?= --prefix=${PREFIX}/${PSP_SDK_STAGE_PREFIX} --with-pspdev="${PREFIX}/${PSP_SDK_STAGE_PREFIX}"
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index d1f92626b591..e219789ef0a3 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -21,7 +21,7 @@ COMMENT= Networking API that provides reliable UDP primarily for online games
USE_ZIP= yes
NO_WRKSUBDIR= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 autoconf:267 automake:111 libtool:22
AUTOMAKE_ARGS= --add-missing
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \
-I ${LOCALBASE}/share/aclocal \
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 6568e209cbe9..331b4d0b7385 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -25,7 +25,7 @@ WX_CONF_ARGS= absolute
GNU_CONFIGURE= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= autoconf:267 libtool:22 automake:19
+USE_AUTOTOOLS= autoconf:267 libtool:22 automake:111
CONFIGURE_TARGET=
CONFIGURE_ARGS= --with-apr-config=apr-1-config \
--with-apu-config=apu-1-config \
@@ -40,6 +40,10 @@ CONFIGURE_ARGS= --with-apr-config=apr-1-config \
USE_LDCONFIG= yes
MAN1= rapidsvn.1
+post-configure:
+ @${FIND} ${WRKSRC} -name Makefile -print | \
+ ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|'
+
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/manpage/rapidsvn.1 ${MAN1PREFIX}/man/man1/
diff --git a/devel/rapidsvn/files/patch-aclocal.m4 b/devel/rapidsvn/files/patch-aclocal.m4
new file mode 100644
index 000000000000..4aa6c69323f8
--- /dev/null
+++ b/devel/rapidsvn/files/patch-aclocal.m4
@@ -0,0 +1,12 @@
+--- aclocal.m4.orig 2009-10-20 02:01:36.000000000 -0500
++++ aclocal.m4 2010-09-29 14:49:41.000000000 -0500
+@@ -7985,3 +7985,3 @@
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+
+@@ -7992,3 +7992,3 @@
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.6])])
++ [AM_AUTOMAKE_VERSION([1.11.1])])
+
diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile
index 5e69dbadbe7b..9eaea71b8839 100644
--- a/devel/sysconftool/Makefile
+++ b/devel/sysconftool/Makefile
@@ -19,7 +19,7 @@ USE_PERL5= yes
HAS_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:267
MAN1= sysconftool.1 sysconftoolcheck.1
MAN7= sysconftool.7
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 150dbf6be45a..6d2df4638fa9 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -20,8 +20,8 @@ COMMENT= Framework for scalable cross-language services development
LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs \
event-1.4:${PORTSDIR}/devel/libevent
-USE_AUTOTOOLS= autoconf:267:env autoheader:267:env aclocal:19:env \
- automake:19:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env autoheader:267:env aclocal:111:env \
+ automake:111:env libtool:22:env
USE_GNOME= pkgconfig
USE_GCC= 4.2+
GNU_CONFIGURE= yes
diff --git a/dns/dnswall/Makefile b/dns/dnswall/Makefile
index 57f4a403c27b..7db654887194 100644
--- a/dns/dnswall/Makefile
+++ b/dns/dnswall/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A daemon that filters out private IP addresses in DNS responses
PROJECTHOST= google-dnswall
-USE_AUTOTOOLS= automake:110
+USE_AUTOTOOLS= automake:111
USE_DOS2UNIX= yes
MAKE_JOBS_SAFE= yes
@@ -27,7 +27,7 @@ PORTDOCS= README
PLIST_FILES= bin/dnswall
post-patch:
- @${REINPLACE_CMD} -e 's|1.10|1.10.3|g' ${WRKSRC}/aclocal.m4
+ @${REINPLACE_CMD} -e 's|1.10|1.11.1|g' ${WRKSRC}/aclocal.m4
@${REINPLACE_CMD} -e 's|2.61|2.67|g' ${WRKSRC}/aclocal.m4
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e '/^dist_doc_DATA/d' ${WRKSRC}/Makefile.am
diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile
index 5bba3f13f39f..127505c5079c 100644
--- a/dns/nss_mdns/Makefile
+++ b/dns/nss_mdns/Makefile
@@ -15,7 +15,7 @@ DISTNAME= nss-mdns-${PORTVERSION}
MAINTAINER= ashish@FreeBSD.org
COMMENT= NSS module implementing multicast DNS name resolution
-USE_AUTOTOOLS= autoconf:267 automake:19 libtool:22
+USE_AUTOTOOLS= autoconf:267 automake:111 libtool:22
USE_GMAKE= yes
USE_LDCONFIG= yes
@@ -64,4 +64,8 @@ PORTDOCS= README README.html
CONFIGURE_ARGS+= --enable-search-domains
.endif
+post-configure:
+ @${FIND} ${WRKSRC} -name Makefile -print | \
+ ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g'
+
.include <bsd.port.post.mk>
diff --git a/dns/nss_mdns/files/patch-aclocal.m4 b/dns/nss_mdns/files/patch-aclocal.m4
new file mode 100644
index 000000000000..08516a72e6c8
--- /dev/null
+++ b/dns/nss_mdns/files/patch-aclocal.m4
@@ -0,0 +1,12 @@
+--- aclocal.m4.orig 2007-05-12 09:55:30.000000000 -0500
++++ aclocal.m4 2010-09-28 10:18:36.000000000 -0500
+@@ -6392,3 +6392,3 @@
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+
+@@ -6399,3 +6399,3 @@
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.6])])
++ [AM_AUTOMAKE_VERSION([1.11.1])])
+
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 0df3b13361e2..c604bfdd9143 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -39,15 +39,7 @@ LIB_DEPENDS+= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-# workaround for automake (it needs config.rpath)
-post-extract:
- ${TOUCH} ${WRKSRC}/config.rpath
-
-# iconv.m4 is located in ${LOCALBASE}/share/aclocal
-ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
-USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110 libtool:22
-
-GNU_CONFIGURE= yes
+USE_AUTOTOOLS= libtool:22
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/editors/xmlcopyeditor/files/patch-configure.in.diff b/editors/xmlcopyeditor/files/patch-configure.in.diff
deleted file mode 100644
index 0e7f6af76fb8..000000000000
--- a/editors/xmlcopyeditor/files/patch-configure.in.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in.orig
-+++ configure.in
-@@ -35,6 +35,9 @@
- # Call WXTEST func
- WXTEST
-
-+# Call iconv checks
-+AM_ICONV
-+
- # Verify minimus requires
- vers=`echo $wxversion | $AWK 'BEGIN { FS = "."; } { printf "% d", ($1 * 1000 + $2) * 1000 + $3;}'`
- if test -n "$vers" && test "$vers" -ge 2008000; then
diff --git a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff b/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff
index b31b629663b3..de0ea14e7441 100644
--- a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff
+++ b/editors/xmlcopyeditor/files/patch-src_Makefile.in.diff
@@ -1,19 +1,13 @@
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -9,8 +9,8 @@
- bin_PROGRAMS = xmlcopyeditor
- bindir = ${prefix}/bin
+--- src/Makefile.in.orig 2009-04-14 11:38:17.000000000 -0500
++++ src/Makefile.in 2010-10-02 16:22:21.000000000 -0500
+@@ -228,4 +228,4 @@
xmlcopyeditordir = ${prefix}/share/xmlcopyeditor
-pixmapdir = /usr/share/pixmaps
-applicationsdir = /usr/share/applications
+pixmapdir = ${prefix}/share/pixmaps
+applicationsdir = ${prefix}/share/applications
- # the application source, library search path, and link libraries
- xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
-@@ -49,15 +49,6 @@
- templates/*.lzx \
- templates/*.xlf \
+@@ -269,11 +269,2 @@
help/*.* help/html/*.* \
- copying/*.txt copying/boost_shared_ptr/* \
- copying/Expat/* copying/libxml2/* copying/libxslt/* \
@@ -25,5 +19,3 @@
- copying/Apache/LICENSE-2.0 \
- copying/Apache/LICENSE-2_files/* \
po/sk/messages.mo \
- po/sv/messages.mo \
- po/fr/messages.mo \
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index 97c9e2c0302a..98ab83793bee 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -24,7 +24,7 @@ USE_GETTEXT= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= GMSGFMT=msgfmt DATADIRNAME=share
-USE_AUTOTOOLS= aclocal:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoconf:267
ACLOCAL_ARGS=
AUTOCONF_ARGS=
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index a99941528c6d..92ddb4cc3d6e 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
-USE_AUTOTOOLS= autoconf:267:env aclocal:110:env automake:110:env libtool:22
+USE_AUTOTOOLS= autoconf:267:env aclocal:111:env automake:111:env libtool:22
USE_GMAKE= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 9548c32c0977..57b051a6af9d 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= yes
-USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:267
SUB_FILES= pkg-message
MAN1= yabause.1
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index f2ad338548e4..70e9f96f2197 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_KDELIBS_VER=3
USE_PERL5_BUILD=yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22
CONFIGURE_ARGS= --with-qhacc-config=${LOCALBASE}/bin
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index c1dac2ad4e65..ae6a0e67c129 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \
USE_ICONV= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I m4
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-doxygen --disable-dot --disable-gengetopt \
diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile
index 5cefe02a1da4..8a3548b45d3d 100644
--- a/ftp/tnftpd/Makefile
+++ b/ftp/tnftpd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/
MAINTAINER= cejkar@fit.vutbr.cz
COMMENT= Enhanced ftp server from NetBSD
-USE_AUTOTOOLS= aclocal:110 automake:110 libtool:22
+USE_AUTOTOOLS= aclocal:111 automake:111 libtool:22
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
.include <bsd.port.pre.mk>
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index 9434bdf249ee..09fa0f17d5ba 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -30,7 +30,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sound
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
SDL_CONFIG="${SDL_CONFIG}"
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/games/cheech/Makefile b/games/cheech/Makefile
index e149ea3df1b3..3f23d4d58c2e 100644
--- a/games/cheech/Makefile
+++ b/games/cheech/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
DESKTOP_ENTRIES= "cheech" \
"A networked Chinese Checkers Game" \
diff --git a/games/critterding/Makefile b/games/critterding/Makefile
index 1fb553822b59..b69289a2bcb3 100644
--- a/games/critterding/Makefile
+++ b/games/critterding/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:267:env aclocal:110:env automake:110:env libtool:22
+USE_AUTOTOOLS= autoconf:267:env aclocal:111:env automake:111:env libtool:22
USE_SDL= sdl
USE_GL= gl
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index bf374de8168c..07f6d1ab491f 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS= --disable-debug --enable-release=yes \
--with-sharepath=${PREFIX}/share/d2x-xl
USE_SDL= sdl mixer image
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267
USE_MOTIF= yes
MAKE_JOBS_SAFE= yes
AUTOMAKE_ARGS= --add-missing --copy
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index d89acbcd4745..d44ce403f0e6 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -23,7 +23,7 @@ FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --disable-simplelayout --enable-getaddrinfo
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
-USE_AUTOTOOLS= automake:110 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_SDL= mixer image
SUB_FILES= daimonin.sh
SUB_LIST= PORTVERSION=${PORTVERSION}
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index a63b11055015..738ca2d2c727 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \
${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/flightgear-data
-USE_AUTOTOOLS= aclocal:19 autoheader:267 automake:15 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267
AUTOMAKE_ARGS= --add-missing
GNU_CONFIGURE= yes
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 61bd845263bf..588bcdc488f1 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data
-USE_AUTOTOOLS= automake:19:env autoconf:267:env
+USE_AUTOTOOLS= automake:111:env autoconf:267:env
USE_ZIP= yes
USE_OPENAL= al alut
USE_DOS2UNIX= yes
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 60454af15028..a5506b1e264e 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -19,7 +19,7 @@ EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui librsvg2
USE_GMAKE= yes
-USE_AUTOTOOLS= autoheader:267 automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS= autoheader:267 automake:111 aclocal:111 autoconf:267
ACLOCAL_ARGS= -I m4 -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a -c -f
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index cee3c27d71ce..583eb371699a 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
USE_GNOME= gnomehack gnometarget libxml2
USE_GMAKE= yes
USE_PYTHON= 2.0+
-USE_AUTOTOOLS= libtool:22 automake:110
+USE_AUTOTOOLS= libtool:22 automake:111
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile
index 8ec86b207850..114287579083 100644
--- a/games/kmastermind/Makefile
+++ b/games/kmastermind/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11/kdelibs3:extract
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22
USE_PERL5_BUILD= yes
USE_KDELIBS_VER= 3
USE_BZIP2= yes
@@ -30,6 +30,7 @@ pre-configure:
`cd ${PORTSDIR}/x11/kdelibs3 && ${MAKE} -V WRKSRC`/admin \
${WRKSRC}/admin
${TOUCH} ${WRKSRC}/NEWS
+ @${REINPLACE_CMD} -e 's|1.10|1.11|' ${WRKSRC}/admin/cvs.sh
cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f admin/Makefile.common cvs
.include <bsd.port.mk>
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 36b35bfbede5..cc47eced7411 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -15,7 +15,7 @@ DISTNAME= llk_linux-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A scarce recreation game
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
USE_GNOME= gtk20 esound
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/games/mangos/Makefile b/games/mangos/Makefile
index 6b997bdd389c..d806118b3d2a 100644
--- a/games/mangos/Makefile
+++ b/games/mangos/Makefile
@@ -23,7 +23,7 @@ OPTIONS= SCRIPTDEV2 "ScriptDev2" on \
RA "Remote Administration support" off \
DBC "Install DBC files" on
-USE_AUTOTOOLS= aclocal:19 libtoolize autoconf:267 autoheader:267 automake:19 libtool:22
+USE_AUTOTOOLS= aclocal:111 libtoolize autoconf:267 autoheader:267 automake:111 libtool:22
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a
USE_MYSQL= yes
diff --git a/games/naev/Makefile b/games/naev/Makefile
index 1c00929af603..0896cb9b936b 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/ndata-${PORTVERSION}:${PORTSDIR}/games/naev-data
-USE_AUTOTOOLS= automake:19:env aclocal:19:env autoconf:267:env
+USE_AUTOTOOLS= automake:111:env aclocal:111:env autoconf:267:env
USE_BZIP2= yes
USE_DOS2UNIX= conf.example
GNU_CONFIGURE= yes
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 98c774962ed2..0fdfcfd1b00b 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib \
jpeg.11:${PORTSDIR}/graphics/jpeg \
png.6:${PORTSDIR}/graphics/png
-USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267
# Necessary to find pkg.m4 (PKG_CHECK_MODULES)
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile
index 4d3948d9f0c8..cdcfd97f4a6a 100644
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@@ -7,14 +7,13 @@
PORTNAME= Ri-li
PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}%20Linux_Unix/${PORTNAME}%20V${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Drive a toy wood train in many levels - snake-like arcade game
-USE_AUTOTOOLS= automake:19
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -32,6 +31,7 @@ DESKTOP_ENTRIES="Ri-li" \
post-patch:
@${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs`|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's| gentoo||' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e '/strcpy.*DefPath/ s|.*|strcpy(DefPath,"${DATADIR}/");|' ${WRKSRC}/src/main.cc
.include <bsd.port.mk>
diff --git a/games/ri-li/pkg-plist b/games/ri-li/pkg-plist
index 0f77d8bfc3e5..5178551f355b 100644
--- a/games/ri-li/pkg-plist
+++ b/games/ri-li/pkg-plist
@@ -1,6 +1,5 @@
bin/Ri_li
%%DATADIR%%/COPYING.Music
-%%DATADIR%%/Ri-li-2.0.1-r1.ebuild
%%DATADIR%%/Ri-li-icon-16x16.png
%%DATADIR%%/Ri-li-icon-32x32.png
%%DATADIR%%/Ri-li-icon-48x48.png
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 911fa964bef9..98257ade0543 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -32,7 +32,7 @@ USE_SDL= mixer net sdl
GNU_CONFIGURE= yes
USE_GL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_PERL5= yes
USE_WX= 2.4+
WX_CONF_ARGS= absolute
@@ -61,6 +61,8 @@ post-patch:
pre-configure:
@cd ${WRKSRC}/scripts && ${PERL} createAMMakefile.pl
@cd ${WRKSRC} && ${ACLOCAL}
+ @${INSTALL_SCRIPT} ${AUTOCONF_DIR}/install-sh ${WRKSRC}
+# @${REINPLACE_CMD} -e 's/ $$//' ${WRKSRC}/install-sh
pre-install:
@${MKDIR} ${PREFIX}/games/scorched3d
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index 6497681fdf1e..8d0482d93924 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -19,7 +19,7 @@ COMMENT= S.C.O.U.R.G.E. is a rogue-like game
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${DATADIR}/config/scourge.cfg:${PORTSDIR}/games/scourge-data
-USE_AUTOTOOLS= autoconf:267:env automake:19:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env
USE_GL= gl
USE_SDL= sdl image mixer net ttf
USE_GMAKE= yes
diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile
index dfc52287f0d4..310394c76640 100644
--- a/games/spacejunk/Makefile
+++ b/games/spacejunk/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org
COMMENT= A video game about traveling in 2D planetary systems
USE_SDL= sdl mixer image
-USE_AUTOTOOLS= automake:110
+USE_AUTOTOOLS= automake:111
AUTOMAKE_ARGS= -i --add-missing
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
@@ -45,7 +45,7 @@ post-patch:
${WRKSRC}/libinfo/gem-uta.c
@${REINPLACE_CMD} -e 's|data/|${DATADIR}/&|' ${WRKSRC}/src/*.c*
@${RM} -f ${WRKSRC}/config.guess
- @${REINPLACE_CMD} -e 's|1.10.1|1.10.3|' ${WRKSRC}/aclocal.m4
+ @${REINPLACE_CMD} -e 's|1.10.1|1.11.1|' ${WRKSRC}/aclocal.m4
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/spacejunk ${PREFIX}/libexec/
diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile
index 5cffa473bbd2..7c1909017cbc 100644
--- a/games/tecnoballz/Makefile
+++ b/games/tecnoballz/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod \
ogg.7:${PORTSDIR}/audio/libogg \
smpeg.1:${PORTSDIR}/multimedia/smpeg
-USE_AUTOTOOLS= automake:19 aclocal:19
+USE_AUTOTOOLS= automake:111 aclocal:111
USE_SDL= sdl mixer image
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 00b7e9d717b9..cd62d2000e68 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
xvidcore.4:${PORTSDIR}/multimedia/xvid
RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data
-USE_AUTOTOOLS= aclocal:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoconf:267
USE_BZIP2= yes
USE_GL= yes
USE_SDL= sdl image mixer ttf
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 57c9fe7b35af..ba2ab7cc0fcb 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -24,7 +24,7 @@ USE_GNOME= pkgconfig gnomehack
USE_GMAKE= yes
USE_LDCONFIG= yes
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22:env
MAKE_ENV= C="${CC}" AGGCXXFLAGS="${CXXFLAGS}"
CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index b13e156bd0c3..fcc3122d5b72 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= cal3d-[0-9]*
USE_BZIP2= yes
USE_GNOME= pkgconfig
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:19 autoheader:267 libtool:22
+USE_AUTOTOOLS= automake:111 autoheader:267 libtool:22
AUTOMAKE_ARGS= --add-missing
MAN1= cal3d_converter.1
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 04eb1e7757d5..572d2be2cd46 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -19,7 +19,7 @@ CONFLICTS= cal3d-devel-[0-9]*
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 autoheader:267 libtool:22
+USE_AUTOTOOLS= automake:111 autoheader:267 libtool:22
USE_LDCONFIG= yes
MAN1= cal3d_converter.1
@@ -34,4 +34,8 @@ post-patch:
${WRKSRC}/src/cal3d/streamsource.h
@${REINPLACE_CMD} -e '/^all_libraries/d' ${WRKSRC}/src/cal3d/Makefile.am
+post-configure:
+ @${FIND} ${WRKSRC} -name Makefile -print | \
+ ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g'
+
.include <bsd.port.mk>
diff --git a/graphics/cal3d/files/patch-aclocal.m4 b/graphics/cal3d/files/patch-aclocal.m4
new file mode 100644
index 000000000000..d3ff6efe4588
--- /dev/null
+++ b/graphics/cal3d/files/patch-aclocal.m4
@@ -0,0 +1,12 @@
+--- aclocal.m4.orig 2006-06-29 11:04:20.000000000 -0500
++++ aclocal.m4 2010-09-28 19:09:08.000000000 -0500
+@@ -6392,3 +6392,3 @@
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+
+@@ -6399,3 +6399,3 @@
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.6])])
++ [AM_AUTOMAKE_VERSION([1.11.1])])
+
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 9e8b5bfbe079..01462148c053 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -30,7 +30,7 @@ OPTIONS= JPEG "Enable JPEG support" on \
WRKSRC= ${WRKDIR}/${DISTNAME:L}
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing --copy --force-missing
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index 510bc200fddc..98da689a7192 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -19,7 +19,7 @@ USE_XORG= x11 ice xext
USE_BZIP2= yes
USE_QT_VER= 3
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env
+USE_AUTOTOOLS= automake:111:env autoconf:267:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile
index 5fe689c01e29..6c53d8cde9c9 100644
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS= OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR
USE_BZIP2= yes
-USE_AUTOTOOLS= automake:110:env autoconf:267:env
+USE_AUTOTOOLS= automake:111:env autoconf:267:env
# GCC 4.2 has some problems, see
# http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index ecf45d6ae80e..1b7d4943513e 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -34,7 +34,7 @@ USE_GCC= 4.2+ # triggers compiler error on gcc 3.4
WANT_GSTREAMER= yes
USE_GNOME= pkgconfig libxml2
USE_XORG= x11 xau xdmcp xext xi xinerama ice sm
-USE_AUTOTOOLS= libltdl:22 libtool:22:env autoconf:267:env automake:110:env
+USE_AUTOTOOLS= libltdl:22 libtool:22:env autoconf:267:env automake:111:env
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \
diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile
index 21a8a64ece7a..ce1f4ee4ad0f 100644
--- a/graphics/gsnapshot/Makefile
+++ b/graphics/gsnapshot/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/gould/${PORTNAME}/release%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A gtk+ based screen capture
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
USE_GNOME= pkgconfig gtk20 libwnck libxml2
USE_XORG= x11 xmu
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index d9adf8ca1716..25f09974f167 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -19,7 +19,7 @@ USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:19:env
+USE_AUTOTOOLS= aclocal:111:env
post-patch:
@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile
index 2f2933237653..5dd5bc6fdf4d 100644
--- a/graphics/iulib/Makefile
+++ b/graphics/iulib/Makefile
@@ -24,7 +24,7 @@ OPTIONS= SDL "Enable SDL for graphical debugging" off \
MAKE_JOBS_SAFE= yes
USE_PYTHON_BUILD= yes
-USE_AUTOTOOLS= libtool:22 aclocal:110 automake:110 autoconf:267
+USE_AUTOTOOLS= libtool:22 aclocal:111 automake:111 autoconf:267
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_LDCONFIG= yes
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index c3dcd2b125ad..d3460c1169e8 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22:env
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22:env
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile
index 4d0ff39e81c1..2a27e50e600b 100644
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
PROJECTHOST= leptonica
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22 aclocal:110 automake:110 autoconf:267
+USE_AUTOTOOLS= libtool:22 aclocal:111 automake:111 autoconf:267
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/leptonlib/Makefile b/graphics/leptonlib/Makefile
index 4d0ff39e81c1..2a27e50e600b 100644
--- a/graphics/leptonlib/Makefile
+++ b/graphics/leptonlib/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
PROJECTHOST= leptonica
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22 aclocal:110 automake:110 autoconf:267
+USE_AUTOTOOLS= libtool:22 aclocal:111 automake:111 autoconf:267
ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal
USE_LDCONFIG= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/graphics/libjpeg-turbo/Makefile b/graphics/libjpeg-turbo/Makefile
index faba9a0c1e2e..9c8ae4499ffc 100644
--- a/graphics/libjpeg-turbo/Makefile
+++ b/graphics/libjpeg-turbo/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
CONFLICTS= jpeg-[0-9]*
ONLY_FOR_ARCHS= amd64 i386
-USE_AUTOTOOLS= autoconf:267 autoheader:267 aclocal:110 automake:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 autoheader:267 aclocal:111 automake:111 libtool:22
ACLOCAL_ARGS= -I.
USE_LDCONFIG= yes
diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile
index d65603d6044b..7a7fc8877066 100644
--- a/graphics/libpano12/Makefile
+++ b/graphics/libpano12/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
USE_GNOME= gtk20 glib20 pango atk
-USE_AUTOTOOLS= autoconf:267:env autoheader:267:env aclocal:19:env \
- automake:19:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env autoheader:267:env aclocal:111:env \
+ automake:111:env libtool:22:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
-I${LOCALBASE}/include/glib-2.0 \
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 5e206facf8a6..a16e0b64c1e7 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
USE_GNOME= gtk20 glib20 pango atk
-USE_AUTOTOOLS= autoconf:267:env autoheader:267:env aclocal:110:env \
- automake:110:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env autoheader:267:env aclocal:111:env \
+ automake:111:env libtool:22:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \
-I${LOCALBASE}/include/glib-2.0 \
diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile
index 37ce71fd46e3..ba6794acae1b 100644
--- a/graphics/ocaml-images/Makefile
+++ b/graphics/ocaml-images/Makefile
@@ -22,7 +22,7 @@ COMMENT= Objective Caml image processing library
BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ocaml.m4:${PORTSDIR}/lang/ocaml-autoconf
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_OCAML= yes
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 1f4c5585570a..f2782ef955c1 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -27,7 +27,7 @@ OPTIONS= SDL "Enable SDL for graphical debugging" off \
MAKE_JOBS_UNSAFE= yes
USE_PYTHON_BUILD= yes
-USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267
USE_GMAKE= yes
CONFIGURE_ARGS= --without-fst --without-tesseract --with-iulib=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
diff --git a/japanese/celrw/Makefile b/japanese/celrw/Makefile
index a712b845f549..b1c31cf71a8a 100644
--- a/japanese/celrw/Makefile
+++ b/japanese/celrw/Makefile
@@ -13,7 +13,7 @@ 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)
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
USE_BZIP2= yes
HAS_CONFIGURE= yes
ALL_TARGET=
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index 24acec0233cb..6e15015d8ff9 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -20,7 +20,7 @@ COMMENT= A 2ch browser
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 automake:111 libtool:22
LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls \
gtkmm:${PORTSDIR}/x11-toolkits/gtkmm24
diff --git a/japanese/mell/Makefile b/japanese/mell/Makefile
index 1e983588a277..57678746bd6a 100644
--- a/japanese/mell/Makefile
+++ b/japanese/mell/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= otsuji@users.sourceforge.jp
COMMENT= Emacs Lisp for taiyaki-elisp, especially for the prime
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
AUTOMAKE_ARGS= -af
pre-configure:
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index b4950de94c3c..f04104a0d6d0 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -70,7 +70,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/mutt-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 867d9828bace..a91e2a378d83 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -34,7 +34,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
USE_GMAKE= yes
USE_ICONV= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION}
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/japanese/prime-dict/Makefile b/japanese/prime-dict/Makefile
index e93f4a190dbc..3d1dee888c67 100644
--- a/japanese/prime-dict/Makefile
+++ b/japanese/prime-dict/Makefile
@@ -20,7 +20,7 @@ USE_RUBY= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime-el/Makefile b/japanese/prime-el/Makefile
index 7ade0694ab82..819e953332fb 100644
--- a/japanese/prime-el/Makefile
+++ b/japanese/prime-el/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/emacs/site-lisp/init-mell.el:${PORTSDIR}/japane
prime:${PORTSDIR}/japanese/prime
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/japanese/prime/Makefile b/japanese/prime/Makefile
index 5e4fd6258bf4..7448e267b80e 100644
--- a/japanese/prime/Makefile
+++ b/japanese/prime/Makefile
@@ -26,7 +26,7 @@ RUBY_WITH_PTHREAD= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
MAKE_JOBS_UNSAFE= yes
PLIST_SUB= LOCALBASE=${LOCALBASE}
diff --git a/japanese/suikyo/Makefile b/japanese/suikyo/Makefile
index 4babdb2270a0..a7ec6589bd14 100644
--- a/japanese/suikyo/Makefile
+++ b/japanese/suikyo/Makefile
@@ -18,7 +18,7 @@ USE_RUBY= yes
USE_GNOME= pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-rubydir=${RUBY_SITELIBDIR}
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
pre-configure:
@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL})
diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile
index 42663977714b..43847a1bca59 100644
--- a/lang/gambas2-base/Makefile
+++ b/lang/gambas2-base/Makefile
@@ -19,7 +19,7 @@ COMMENT?= A basic language with object extensions
BUILD_DEPENDS= xdg-mime:${PORTSDIR}/devel/xdg-utils
LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi
-USE_AUTOTOOLS= autoconf:267:env automake:19:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/lang/maude/Makefile b/lang/maude/Makefile
index c3a24df59159..a93d3d39d1ca 100644
--- a/lang/maude/Makefile
+++ b/lang/maude/Makefile
@@ -20,7 +20,6 @@ LIB_DEPENDS= bdd:${PORTSDIR}/science/buddy \
gmp:${PORTSDIR}/math/gmp
USE_BISON= build
-USE_AUTOTOOLS= aclocal:19 automake:19
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --datadir=${DATADIR}
diff --git a/lang/maude/files/patch-src-Main-Makefile.am b/lang/maude/files/patch-src-Main-Makefile.am
deleted file mode 100644
index 9bc8ccfd1616..000000000000
--- a/lang/maude/files/patch-src-Main-Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/Main/Makefile.am.orig 2008-08-11 01:13:04.000000000 +0200
-+++ src/Main/Makefile.am 2008-08-11 01:14:38.000000000 +0200
-@@ -1,5 +1,14 @@
- bin_PROGRAMS = maude
-
-+data_DATA = \
-+ prelude.maude \
-+ model-checker.maude \
-+ socket.maude \
-+ linear.maude \
-+ machine-int.maude \
-+ term-order.maude
-+
-+
- if BUILD_COMPILER
- FULL_COMPILER_LIB = ../FullCompiler/libfullCompiler.a
- endif
diff --git a/lang/maude/files/patch-src-Main-Makefile.in b/lang/maude/files/patch-src-Main-Makefile.in
new file mode 100644
index 000000000000..bc609e8061a0
--- /dev/null
+++ b/lang/maude/files/patch-src-Main-Makefile.in
@@ -0,0 +1,327 @@
+--- src/Main/Makefile.in.orig 2007-02-02 19:22:06.000000000 -0600
++++ src/Main/Makefile.in 2010-09-28 10:17:08.000000000 -0500
+@@ -1,2 +1,2 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
+ # @configure_input@
+@@ -4,3 +4,4 @@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+@@ -16,6 +17,3 @@
+
+-SOURCES = $(maude_SOURCES)
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -24,5 +22,3 @@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -50,3 +46,3 @@
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@@ -55,6 +51,3 @@
+ maude_OBJECTS = $(am_maude_OBJECTS)
+-@BUILD_COMPILER_TRUE@am__DEPENDENCIES_1 = \
+-@BUILD_COMPILER_TRUE@ ../FullCompiler/libfullCompiler.a
+-am__DEPENDENCIES_2 =
+-@USE_DLMALLOC_TRUE@am__DEPENDENCIES_3 = ../3rdParty/libdlmalloc.a
++am__DEPENDENCIES_1 =
+ maude_DEPENDENCIES = ../Mixfix/libmixfix.a \
+@@ -71,7 +64,6 @@
+ ../MSCP10/libmscp10.a ../Temporal/libtemporal.a \
+- ../IO_Stuff/libIO_Stuff.a $(am__DEPENDENCIES_1) \
+- ../Utility/libutility.a $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+- $(am__DEPENDENCIES_3)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++ ../IO_Stuff/libIO_Stuff.a $(FULL_COMPILER_LIB) \
++ ../Utility/libutility.a $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(DLMALLOC_LIB)
++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -85,2 +77,10 @@
+ DIST_SOURCES = $(maude_SOURCES)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ *) f=$$p;; \
++ esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++dataDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(data_DATA)
+ ETAGS = etags
+@@ -89,4 +89,2 @@
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+@@ -98,4 +96,2 @@
+ BUDDY_LIB = @BUDDY_LIB@
+-BUILD_COMPILER_FALSE = @BUILD_COMPILER_FALSE@
+-BUILD_COMPILER_TRUE = @BUILD_COMPILER_TRUE@
+ CC = @CC@
+@@ -118,2 +114,4 @@
+ GMP_LIBS = @GMP_LIBS@
++GREP = @GREP@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -127,2 +125,3 @@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ OBJEXT = @OBJEXT@
+@@ -133,2 +132,3 @@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+@@ -140,13 +140,9 @@
+ TECLA_LIBS = @TECLA_LIBS@
+-USE_DLMALLOC_FALSE = @USE_DLMALLOC_FALSE@
+-USE_DLMALLOC_TRUE = @USE_DLMALLOC_TRUE@
+ VERSION = @VERSION@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+@@ -162,3 +158,7 @@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+@@ -169,2 +169,3 @@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ includedir = @includedir@
+@@ -174,2 +175,3 @@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+@@ -178,8 +180,22 @@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
++data_DATA = \
++ prelude.maude \
++ model-checker.maude \
++ socket.maude \
++ linear.maude \
++ machine-int.maude \
++ term-order.maude
++
+ @BUILD_COMPILER_TRUE@FULL_COMPILER_LIB = ../FullCompiler/libfullCompiler.a
+@@ -260,4 +276,4 @@
+ *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+@@ -310,3 +326,3 @@
+ @rm -f maude$(EXEEXT)
+- $(CXXLINK) $(maude_LDFLAGS) $(maude_OBJECTS) $(maude_LDADD) $(LIBS)
++ $(CXXLINK) $(maude_OBJECTS) $(maude_LDADD) $(LIBS)
+
+@@ -321,4 +337,4 @@
+ .cc.o:
+-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@@ -328,4 +344,4 @@
+ .cc.obj:
+-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@@ -335,4 +351,4 @@
+ maude-main.o: main.cc
+-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.o -MD -MP -MF "$(DEPDIR)/maude-main.Tpo" -c -o maude-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc; \
+-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/maude-main.Tpo" "$(DEPDIR)/maude-main.Po"; else rm -f "$(DEPDIR)/maude-main.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.o -MD -MP -MF $(DEPDIR)/maude-main.Tpo -c -o maude-main.o `test -f 'main.cc' || echo '$(srcdir)/'`main.cc
++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/maude-main.Tpo $(DEPDIR)/maude-main.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cc' object='maude-main.o' libtool=no @AMDEPBACKSLASH@
+@@ -342,4 +358,4 @@
+ maude-main.obj: main.cc
+-@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.obj -MD -MP -MF "$(DEPDIR)/maude-main.Tpo" -c -o maude-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`; \
+-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/maude-main.Tpo" "$(DEPDIR)/maude-main.Po"; else rm -f "$(DEPDIR)/maude-main.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT maude-main.obj -MD -MP -MF $(DEPDIR)/maude-main.Tpo -c -o maude-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`
++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/maude-main.Tpo $(DEPDIR)/maude-main.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='main.cc' object='maude-main.obj' libtool=no @AMDEPBACKSLASH@
+@@ -347,3 +363,19 @@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(maude_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o maude-main.obj `if test -f 'main.cc'; then $(CYGPATH_W) 'main.cc'; else $(CYGPATH_W) '$(srcdir)/main.cc'; fi`
+-uninstall-info-am:
++install-dataDATA: $(data_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
++ @list='$(data_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
++ $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
++ done
++
++uninstall-dataDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(data_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
++ rm -f "$(DESTDIR)$(datadir)/$$f"; \
++ done
+
+@@ -354,4 +386,4 @@
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+@@ -367,4 +399,4 @@
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+@@ -378,3 +410,2 @@
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -383,4 +414,4 @@
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+@@ -398,18 +429,17 @@
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(mkdir_p) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+@@ -426,5 +456,5 @@
+ check: check-am
+-all-am: Makefile $(PROGRAMS)
++all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+@@ -471,2 +501,4 @@
+
++html-am:
++
+ info: info-am
+@@ -475,3 +507,7 @@
+
+-install-data-am:
++install-data-am: install-dataDATA
++
++install-dvi: install-dvi-am
++
++install-dvi-am:
+
+@@ -479,6 +515,20 @@
+
++install-html: install-html-am
++
++install-html-am:
++
+ install-info: install-info-am
+
++install-info-am:
++
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-pdf-am:
++
++install-ps: install-ps-am
++
++install-ps-am:
++
+ installcheck-am:
+@@ -502,3 +552,5 @@
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA
++
++.MAKE: install-am install-strip
+
+@@ -508,8 +560,11 @@
+ html-am info info-am install install-am install-binPROGRAMS \
+- install-data install-data-am install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-binPROGRAMS uninstall-info-am
++ install-data install-data-am install-dataDATA install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-binPROGRAMS \
++ uninstall-dataDATA
+
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 9c61d516e374..41c4315e37c7 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ENV= CFLAGS="-I${OPENSSLINC} ${CFLAGS}" \
CPPFLAGS="-I${OPENSSLINC} ${CPPFLAGS}"
USE_OPENSSL= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= aclocal:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoconf:267
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index e05670a4fdcc..e41fc87f41a0 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_PERL5_RUN= yes
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:267 autoheader:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267 autoheader:267
ACLOCAL_ARGS= -Im4
.include <bsd.port.pre.mk>
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index bc4fcc9fe354..92c7fd3481f2 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -98,7 +98,7 @@ OPTIONS+= LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off
USE_PERL5= yes
USE_AUTOTOOLS= libtool:22
.ifdef(SNAP_DATE)
-USE_AUTOTOOLS+= autoconf:267:env automake:19
+USE_AUTOTOOLS+= autoconf:267:env automake:111
.endif
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index f96d13da8b48..f19f028a2338 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= mimelib.1:${PORTSDIR}/deskutils/kdepim3
USE_KDELIBS_VER= 3
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22:env
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
diff --git a/mail/kshowmail/files/patch-admin-cvs.sh b/mail/kshowmail/files/patch-admin-cvs.sh
new file mode 100644
index 000000000000..b62efbb3b767
--- /dev/null
+++ b/mail/kshowmail/files/patch-admin-cvs.sh
@@ -0,0 +1,7 @@
+--- admin/cvs.sh.orig 2007-05-17 13:12:38.000000000 -0500
++++ admin/cvs.sh 2010-10-02 14:47:03.000000000 -0500
+@@ -70,3 +70,3 @@
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
+ echo "*** $AUTOMAKE_STRING found."
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 104069096d75..57161f8ab41d 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -165,7 +165,7 @@ CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \
CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS}
.endif
-USE_AUTOTOOLS= automake:110 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_OPENSSL= yes
PLIST= ${WRKDIR}/PLIST
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 44231bdc8c88..0a170a3bc088 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -93,7 +93,7 @@ RUN_DEPENDS+= slrnface:${PORTSDIR}/news/slrnface
DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 44231bdc8c88..0a170a3bc088 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -93,7 +93,7 @@ RUN_DEPENDS+= slrnface:${PORTSDIR}/news/slrnface
DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \
diff --git a/mail/postfix-gps/Makefile b/mail/postfix-gps/Makefile
index ff9a8dcc11b6..4a8b1b7c8e0f 100644
--- a/mail/postfix-gps/Makefile
+++ b/mail/postfix-gps/Makefile
@@ -26,7 +26,7 @@ SUB_FILES= pkg-message
WRKSRC= ${WRKDIR}/release-${PORTVERSION}
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS= --bindir=${PREFIX}/libexec --includedir=${PREFIX}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile
index 1e3bd3a66190..8d0e1843d9bc 100644
--- a/mail/vmailmgr/Makefile
+++ b/mail/vmailmgr/Makefile
@@ -25,11 +25,10 @@ MAN8= vmailmgrd.8
# get python paths (PYTHON_SITELIBDIR) in case we install the python API
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:110 aclocal:110
+USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:111 aclocal:111
USE_PYTHON= yes
USE_PERL5_BUILD= yes
AUTOMAKE_ARGS+= --add-missing -Wno-portability
-USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110
MAKE_JOBS_SAFE= yes
OPTIONS= PYTHONLIB "Install the Python API" Off
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 7396e742307a..e480ed22f0ac 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= pari-gmp.2:${PORTSDIR}/math/pari
USE_XORG= x11 xaw xext xt
GNU_CONFIGURE= yes
-#XXX USE_AUTOTOOLS= automake:15 autoconf:267
+#XXX USE_AUTOTOOLS= automake:111 autoconf:267
CONFIGURE_ARGS= --enable-shared --enable-plot --enable-fep --enable-interval --with-pari
ASIR_SRC_VERSION= ${PORTVERSION}
ASIR_DOC_VERSION= 20070718
diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile
index 15bcb1917556..e913814b2e53 100644
--- a/math/dieharder/Makefile
+++ b/math/dieharder/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl
MAKE_JOBS_UNSAFE= yes
USE_DOS2UNIX= yes
-USE_AUTOTOOLS= aclocal:110 autoheader:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 libtool:22
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/math/geg/Makefile b/math/geg/Makefile
index f4ae8a85d9ff..7df449436b97 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= domi@saargate.de
COMMENT= Visualise multiple 2D-functions of one variable
USE_GNOME= gtk12
-USE_AUTOTOOLS= automake:19 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
AUTOMAKE_ARGS= -a -i
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 0280aff2acd6..96afe0888bbf 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -24,7 +24,7 @@ LICENSE= GPLv2
USE_TK = 84+
USE_GMAKE= yes
USE_PERL5_BUILD= yes
-USE_AUTOTOOLS= aclocal:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoconf:267
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-posix-shell=${LOCALBASE}/bin/bash \
--with-wish=${WISH} \
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 0755e1af891a..2e4c460334b6 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -24,7 +24,7 @@ MAKE_JOBS_SAFE= yes
USE_GNOME= pkgconfig
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:110 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
CONFIGURE_ARGS+= --without-conf --without-clucene --with-zlib --without-icu
USE_LDCONFIG= yes
SUB_FILES= pkg-message
diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile
index afddb049bb60..13c6b6b39c1c 100644
--- a/multimedia/kplayer/Makefile
+++ b/multimedia/kplayer/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_GETTEXT= yes
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22
pre-configure:
@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 182c7ba91f3d..a4fface0c0c4 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES= bin/mediainfo
EXTRACT_CMD= 7z
EXTRACT_BEFORE_ARGS= x -o${WRKSRC}
EXTRACT_AFTER_ARGS= >/dev/null
-USE_AUTOTOOLS= aclocal:110:env automake:110:env autoconf:267:env libtool:22:env
+USE_AUTOTOOLS= aclocal:111:env automake:111:env autoconf:267:env libtool:22:env
WRKSRC= ${WRKDIR}/MediaInfo${DISTVERSIONSUFFIX}
diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile
index ed4c176c50cb..796db77bc4a9 100644
--- a/multimedia/spook/Makefile
+++ b/multimedia/spook/Makefile
@@ -27,7 +27,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:19 automake:19
+USE_AUTOTOOLS= autoconf:267 aclocal:111 automake:111
+AUTOMAKE_ARGS= --add-missing
NOMAN= defined
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 95921c57947b..85441a0b40b0 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -23,7 +23,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
USE_ICONV= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22
+AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
@@ -159,6 +160,10 @@ post-patch:
.endif
@${CP} ${FILESDIR}/xmms.desktop.in ${WRKSRC}/xmms.desktop
+post-configure:
+ @${FIND} ${WRKSRC} -name Makefile | \
+ ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g'
+
post-install:
@${INSTALL} -d ${PREFIX}/share/xmms/Skins
@${INSTALL} -d ${PREFIX}/share/applications
diff --git a/multimedia/xmms/files/patch-aclocal.m4 b/multimedia/xmms/files/patch-aclocal.m4
new file mode 100644
index 000000000000..2178ed9fd5ed
--- /dev/null
+++ b/multimedia/xmms/files/patch-aclocal.m4
@@ -0,0 +1,12 @@
+--- aclocal.m4.orig 2007-11-16 15:54:32.000000000 -0600
++++ aclocal.m4 2010-09-28 00:40:44.000000000 -0500
+@@ -3872,3 +3872,3 @@
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
+
+@@ -3879,3 +3879,3 @@
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.6])])
++ [AM_AUTOMAKE_VERSION([1.11.1])])
+
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 565dd82844ed..09d6fd0fd47a 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -18,7 +18,7 @@ COMMENT= Plugins for Nagios
USE_SUBMAKE= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= libtool:22 aclocal:19 autoconf:267 automake:19
+USE_AUTOTOOLS= libtool:22 aclocal:111 autoconf:267 automake:111
ACLOCAL_ARGS= -I m4 -I gl/m4
OPTIONS= QSTAT "Game server query support (check_game)" OFF \
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index b733d3978a99..4e0a11941e28 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
WRKSRC= ${WRKDIR}/pixilate
-USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoconf:267 automake:111 libtool:22
AUTOMAKE_ARGS= --add-missing
MAN1= pixilate.1
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index ac29b62966a8..8ad395202b6c 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -16,7 +16,7 @@ COMMENT= TorK is an Anonymity Manager for the KDE Desktop
USE_GMAKE= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= libtool:22 aclocal:19
+USE_AUTOTOOLS= libtool:22 aclocal:110:env
USE_GETTEXT= yes
USE_XORG= xext
USE_LDCONFIG= yes
diff --git a/net-mgmt/tork/files/patch-aclocal.m4 b/net-mgmt/tork/files/patch-aclocal.m4
new file mode 100644
index 000000000000..9722a1a5a221
--- /dev/null
+++ b/net-mgmt/tork/files/patch-aclocal.m4
@@ -0,0 +1,12 @@
+--- aclocal.m4.orig 2008-10-25 15:14:57.000000000 -0500
++++ aclocal.m4 2010-09-28 18:17:38.000000000 -0500
+@@ -23,3 +23,3 @@
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.10"])
+
+@@ -30,3 +30,3 @@
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.6])])
++ [AM_AUTOMAKE_VERSION([1.10.3])])
+
diff --git a/net-p2p/btpd/Makefile b/net-p2p/btpd/Makefile
index fce4cf0f22d7..0a3dd9d8ded5 100644
--- a/net-p2p/btpd/Makefile
+++ b/net-p2p/btpd/Makefile
@@ -17,7 +17,7 @@ COMMENT= Bittorrent client consisting of a daemon and client commands
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-USE_AUTOTOOLS= autoconf:267 aclocal:110
+USE_AUTOTOOLS= autoconf:267 aclocal:111
GNU_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 1db232076503..99a0aa3bbedb 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -38,7 +38,7 @@ WRKSRC= ${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
ONLY_FOR_ARCHS= i386 amd64
-USE_AUTOTOOLS= autoconf:267:env automake:110:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22:env
USE_PERL5_BUILD=yes
diff --git a/net/jicmp/Makefile b/net/jicmp/Makefile
index 5e8bdd91767f..63304167b637 100644
--- a/net/jicmp/Makefile
+++ b/net/jicmp/Makefile
@@ -20,7 +20,6 @@ JAVA_RUN= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= JAVA_HOME=${JAVA_HOME}
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:19
pre-everything::
@${ECHO_MSG} ""
diff --git a/net/jicmp/files/patch-Makefile.am b/net/jicmp/files/patch-Makefile.am
deleted file mode 100644
index adc409ddd682..000000000000
--- a/net/jicmp/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig 2008-06-25 14:46:42.000000000 +0000
-+++ Makefile.am 2008-06-25 14:46:58.000000000 +0000
-@@ -67,7 +67,7 @@
- cd $(classdir) && \
- $(JAR) cvf ../$@ *
-
--jardir=$(datadir)/java
-+jardir=$(datadir)/java/classes
- jar_DATA = jicmp.jar
-
- deploy:
diff --git a/net/jicmp/files/patch-Makefile.in b/net/jicmp/files/patch-Makefile.in
new file mode 100644
index 000000000000..d6783b69b083
--- /dev/null
+++ b/net/jicmp/files/patch-Makefile.in
@@ -0,0 +1,7 @@
+--- Makefile.in.orig 2010-02-08 13:43:46.000000000 -0600
++++ Makefile.in 2010-10-02 18:09:59.000000000 -0500
+@@ -272,3 +272,3 @@
+ CLEANFILES = org_*.h jicmp.jar
+-jardir = $(datadir)/java
++jardir = $(datadir)/java/classes
+ jar_DATA = jicmp.jar
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 28a494e4acbd..9bcdf5897f58 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -20,7 +20,7 @@ LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22
SCRIPTS_ENV+= ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
INFO= socket++
diff --git a/net/mcast-tools/Makefile b/net/mcast-tools/Makefile
index dea67aaa435c..b01a9daf0807 100644
--- a/net/mcast-tools/Makefile
+++ b/net/mcast-tools/Makefile
@@ -17,7 +17,8 @@ COMMENT= IPv6 multicast routing daemons and tools
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:267
+AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS=
CONFIGURE_ENV=
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index e7430f73f5ee..0d5e5f5acec5 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -21,7 +21,7 @@ NSS_LDAP_VERSION=265
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:267 autoheader:267
+USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:267 autoheader:267
USE_LDCONFIG= yes
USE_OPENLDAP= yes
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index ea916534efc0..96ac5b43783e 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz \
DBDIR?= /var/db
MAKE_JOBS_SAFE= yes
-USE_AUTOTOOLS= libtool:22 automake:19 autoconf:267
+USE_AUTOTOOLS= libtool:22 automake:111 autoconf:267
USE_GNOME= libxml2
USE_LUA= 5.1
USE_GMAKE= yes
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index d6f1c82ed091..3ea7b012d24b 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -21,7 +21,7 @@ COMMENT= The Network Time Protocol Distribution
LATEST_LINK= ${PORTNAME}-dev
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:110 libtool:22
+USE_AUTOTOOLS= automake:111 libtool:22
.if defined(ENABLE_RAWDCF)
CONFIGURE_ARGS+= --enable-RAWDCF
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index d86b964cd519..71e4f584f880 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -21,7 +21,7 @@ COMMENT= The Network Time Protocol Distribution
LATEST_LINK= ${PORTNAME}
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:110 libtool:22
+USE_AUTOTOOLS= automake:111 libtool:22
MAN1= sntp.1 \
ntpd.1 \
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index fbfe0dc6129d..44e8ac3c8b1a 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE= YES
USE_PYTHON= YES
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
-USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110 autoheader:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoconf:267 automake:111 autoheader:267 libtool:22
AUTOMAKE_ARGS= -i --add-missing
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index 0184145ec171..95dcceb745e3 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE= YES
USE_PYTHON= YES
USE_LDCONFIG= YES
GNU_CONFIGURE= YES
-USE_AUTOTOOLS= aclocal:110 autoconf:267 automake:110 autoheader:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoconf:267 automake:111 autoheader:267 libtool:22
AUTOMAKE_ARGS= -i --add-missing
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index 3c0f09a4120a..f03d8643a6f0 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS= --with-boost-filesystem=boost_filesystem \
PY_PREFIX="${PREFIX}"
PLIST_SUB+= PYTHON_VERSION_SHORTNAME="${PYTHON_VERSION_SHORTNAME}"
PYTHON_VERSION_SHORTNAME= ${PYTHON_VERSION:S/thon//}
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267
USE_GMAKE= yes
USE_PYTHON= yes
USE_RC_SUBR= ${PORTNAME}
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 5f5b5f8e1b27..8420dacfab60 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-epsilon
MAINTAINER= andy.lavr@gmail.com
COMMENT= Most SOCKS-friendly applications way with Tor
-USE_AUTOTOOLS= libtool:22 aclocal:110 autoconf:267
+USE_AUTOTOOLS= libtool:22 aclocal:111 autoconf:267
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
USE_GMAKE= yes
diff --git a/net/torsocks/files/patch-Makefile.in b/net/torsocks/files/patch-Makefile.in
index d8a54444b644..2d1fd7b0ccb1 100644
--- a/net/torsocks/files/patch-Makefile.in
+++ b/net/torsocks/files/patch-Makefile.in
@@ -1,20 +1,17 @@
---- src/Makefile.in.orig 2009-11-08 13:39:45.000000000 +0100
-+++ src/Makefile.in 2009-12-18 17:12:56.000000000 +0100
-@@ -143,7 +143,7 @@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
+--- src/Makefile.in.orig 2009-11-08 06:39:45.000000000 -0600
++++ src/Makefile.in 2010-10-02 15:56:22.000000000 -0500
+@@ -145,3 +145,3 @@
LIBOBJS = @LIBOBJS@
-LIBS = -ldl -lc -lresolv
+LIBS = -lc
LIBTOOL = @LIBTOOL@
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
- LIPO = @LIPO@
-@@ -239,7 +239,7 @@
-
- # Install configuration file
+@@ -207,3 +207,3 @@
+ install_sh = @install_sh@
+-libdir = @prefix@/lib/torsocks
++libdir = @prefix@/lib
+ libexecdir = @libexecdir@
+@@ -241,3 +241,3 @@
usewithtorconfdir = $(CONFDIR)/
-usewithtorconf_DATA = torsocks.conf
+usewithtorconf_DATA = torsocks.conf.sample
- # Install invocation scripts
- bin_SCRIPTS = torsocks usewithtor
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 4bae2fe21631..93131de6d4b9 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= LOCAL/pav
MAINTAINER= ports@FreeBSD.org
COMMENT= An open source Remote Desktop Protocol (RDP) server
-USE_AUTOTOOLS= autoconf:267:env automake:110:env libtool:22
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22
GNU_CONFIGURE= yes
USE_RC_SUBR= xrdp
@@ -30,27 +30,19 @@ MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
SUB_FILES= pkg-message
post-patch:
- @${REINPLACE_CMD} -e '/chmod/s|startwm.sh|startwm.sh.sample|' ${WRKSRC}/sesman/Makefile.am
- @${REINPLACE_CMD} -e '/chmod/s|rsakeys.ini|rsakeys.ini.sample|' ${WRKSRC}/xrdp/Makefile.am
+.for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini
+ @${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample
+.endfor
pre-configure:
@cd ${WRKSRC} && ./bootstrap
- @${REINPLACE_CMD} -e 's|sesmansysconfdir)/$$$$f|sesmansysconfdir)/$$$$f.sample|' ${WRKSRC}/sesman/Makefile.in
- @${REINPLACE_CMD} -e 's|xrdpsysconfdir)/$$$$f|xrdpsysconfdir)/$$$$f.sample|' ${WRKSRC}/xrdp/Makefile.in
post-install:
- @if [ ! -f ${PREFIX}/etc/xrdp/startwm.sh ]; then \
- ${CP} -p ${PREFIX}/etc/xrdp/startwm.sh.sample ${PREFIX}/etc/xrdp/startwm.sh ; \
- fi
- @if [ ! -f ${PREFIX}/etc/xrdp/rsakeys.ini ]; then \
- ${CP} -p ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini ; \
- fi
- @if [ ! -f ${PREFIX}/etc/xrdp/sesman.ini ]; then \
- ${CP} -p ${PREFIX}/etc/xrdp/sesman.ini.sample ${PREFIX}/etc/xrdp/sesman.ini ; \
- fi
- @if [ ! -f ${PREFIX}/etc/xrdp/xrdp.ini ]; then \
- ${CP} -p ${PREFIX}/etc/xrdp/xrdp.ini.sample ${PREFIX}/etc/xrdp/xrdp.ini ; \
+.for f in rsakeys.ini sesman.ini startwm.sh xrdp.ini
+ @if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
+ ${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \
fi
+.endfor
@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
.include <bsd.port.mk>
diff --git a/net/xrdp/files/patch-sesman__Makefile.am b/net/xrdp/files/patch-sesman__Makefile.am
new file mode 100644
index 000000000000..456fe30d0441
--- /dev/null
+++ b/net/xrdp/files/patch-sesman__Makefile.am
@@ -0,0 +1,13 @@
+--- sesman/Makefile.am.orig 2009-05-18 23:23:48.000000000 -0500
++++ sesman/Makefile.am 2010-10-02 16:07:53.000000000 -0500
+@@ -55,4 +55,4 @@
+ sesmansysconf_DATA = \
+- sesman.ini \
+- startwm.sh
++ sesman.ini.sample \
++ startwm.sh.sample
+
+@@ -66,2 +66,2 @@
+ install-data-hook:
+- chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh
++ chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh.sample
diff --git a/net/xrdp/files/patch-xrdp__Makefile.am b/net/xrdp/files/patch-xrdp__Makefile.am
new file mode 100644
index 000000000000..d6f24f808229
--- /dev/null
+++ b/net/xrdp/files/patch-xrdp__Makefile.am
@@ -0,0 +1,13 @@
+--- xrdp/Makefile.am.orig 2009-05-18 23:23:48.000000000 -0500
++++ xrdp/Makefile.am 2010-10-02 16:05:10.000000000 -0500
+@@ -36,4 +36,4 @@
+ xrdpsysconf_DATA = \
+- xrdp.ini \
+- rsakeys.ini
++ xrdp.ini.sample \
++ rsakeys.ini.sample
+
+@@ -50,2 +50,2 @@
+ install-data-hook:
+- chmod 600 $(DESTDIR)$(sysconfdir)/xrdp/rsakeys.ini
++ chmod 600 $(DESTDIR)$(sysconfdir)/xrdp/rsakeys.ini.sample
diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index 79a8712b7f67..e82715f6768c 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -17,7 +17,7 @@ COMMENT= NewsCache is a free cache server for USENET News
LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++
-USE_AUTOTOOLS= automake:19 autoheader:267 autoconf:267
+USE_AUTOTOOLS= automake:111 autoheader:267 autoconf:267
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index db42ceb708a6..44f5de29dbda 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.xs4all.nl/~suelette/
MAINTAINER= leeym@FreeBSD.org
COMMENT= News caching/anti-spam/server-merging system
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
# This may be set interactively at install-time. NNTPCache will
# cache news articles and related data in ${SPOOLDIR}/nntpcache.
diff --git a/print/cups-magicolor/Makefile b/print/cups-magicolor/Makefile
index c683fb8a78e0..84c412fafc63 100644
--- a/print/cups-magicolor/Makefile
+++ b/print/cups-magicolor/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= espgs:${PORTSDIR}/print/cups-pstoraster
WRKSRC= ${WRKDIR}/magicolor2430DL-${PORTVERSION}
-USE_AUTOTOOLS= automake:19:env autoconf:267
+USE_AUTOTOOLS= automake:111:env autoconf:267
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 648788a111ff..211edb35f952 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
PROJECTHOST= bsdistfiles
USE_GMAKE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267
+USE_AUTOTOOLS= automake:111:env autoconf:267
GNU_CONFIGURE= yes
diff --git a/print/gnome-specimen/Makefile b/print/gnome-specimen/Makefile
index 46c335ea46ec..34e4bc97c5da 100644
--- a/print/gnome-specimen/Makefile
+++ b/print/gnome-specimen/Makefile
@@ -20,7 +20,7 @@ GCONF_SCHEMAS= gnome-specimen.schemas
USE_GMAKE= yes
USE_PYTHON= yes
USE_GETTEXT= yes
-USE_AUTOTOOLS= automake:110:env autoconf:267:env
+USE_AUTOTOOLS= automake:111:env autoconf:267:env
INSTALLS_ICONS= yes
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index 2d4a5fc0fc82..4d25355d8a8a 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_GNOME= gnometarget gtk20
USE_OPENSSL= yes
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/print/openprinting/Makefile b/print/openprinting/Makefile
index 1397b37560b8..5b56462adedb 100644
--- a/print/openprinting/Makefile
+++ b/print/openprinting/Makefile
@@ -30,7 +30,7 @@ USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/libexec
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
-USE_AUTOTOOLS= aclocal:19 autoconf:267 autoheader:267 automake:19 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoconf:267 autoheader:267 automake:111 libtool:22
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS+= -a -c
diff --git a/science/abinit/Makefile b/science/abinit/Makefile
index c5f2c31d80f0..8a5d32da9a98 100644
--- a/science/abinit/Makefile
+++ b/science/abinit/Makefile
@@ -22,7 +22,7 @@ USE_FORTRAN= yes
USE_GMAKE= yes
USE_PYTHON= yes
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= autoconf:267 automake:110
+USE_AUTOTOOLS= autoconf:267 automake:111
CONFIGURE_ENV= WGET=${TRUE}
CONFIGURE_ARGS= --disable-wannier90 --disable-bigdft --disable-etsf-io \
--with-plugins-tardir=/dev/null \
diff --git a/science/gsmc/Makefile b/science/gsmc/Makefile
index c29304d30f30..eff42fbcfa96 100644
--- a/science/gsmc/Makefile
+++ b/science/gsmc/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267
AUTOMAKE_ARGS= -i --add-missing --foreign --copy
MAN1= gsmc.1
diff --git a/science/kst/Makefile b/science/kst/Makefile
index a1b3d0f21487..4494e1fdb47c 100644
--- a/science/kst/Makefile
+++ b/science/kst/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= cfitsio.0:${PORTSDIR}/astro/cfitsio \
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22
USE_LDCONFIG= yes
USE_GETTEXT= yes
MAKE_JOBS_SAFE= yes
diff --git a/science/kst/files/patch-admin__cvs.sh b/science/kst/files/patch-admin__cvs.sh
new file mode 100644
index 000000000000..b4ba39558c05
--- /dev/null
+++ b/science/kst/files/patch-admin__cvs.sh
@@ -0,0 +1,7 @@
+--- admin/cvs.sh.orig 2010-03-29 05:51:00.000000000 -0500
++++ admin/cvs.sh 2010-10-02 14:50:38.000000000 -0500
+@@ -70,3 +70,3 @@
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
+ echo "*** $AUTOMAKE_STRING found."
diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index 41c1db22edb4..cf140d4e21dc 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -22,7 +22,7 @@ OPTIONS= MYSQL "Enable MySQL support" on \
DEPRECATED= Use security/barnyard2 instead
EXPIRATION= 2010-12-31
-USE_AUTOTOOLS= autoheader:267 aclocal:19
+USE_AUTOTOOLS= autoheader:267 aclocal:111
USE_RC_SUBR= barnyard.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index 28a8a112a97c..160a42d3bcb6 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -48,7 +48,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 aclocal:111 libtool:22
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 0ae52ca0b728..0b35a394fa3f 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -47,7 +47,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 aclocal:111 libtool:22
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 93a6876296a3..303dc35ab12e 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+= gpgv:${PORTSDIR}/security/gnupg1
USE_GMAKE= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS= automake:111 aclocal:111 autoconf:267
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 5c7a1f63e5d5..3cc34b5122a6 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -27,7 +27,7 @@ USE_GNOME= pkgconfig
USE_GETTEXT= yes
INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22 aclocal:19
+USE_AUTOTOOLS= libtool:22 aclocal:111
LIBTOOLFILES= acinclude.m4 configure
CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib"
CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile
index d8079a331a42..5d60587746a8 100644
--- a/security/kovpn/Makefile
+++ b/security/kovpn/Makefile
@@ -27,7 +27,7 @@ INSTALLS_ICONS= yes
USE_GMAKE= yes
USE_XORG= xpm
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:267:env automake:19:env libtool:22
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22
.include <bsd.port.pre.mk>
diff --git a/security/kovpn/files/patch-admin-cvs.sh b/security/kovpn/files/patch-admin-cvs.sh
new file mode 100644
index 000000000000..e8b9f5e70eba
--- /dev/null
+++ b/security/kovpn/files/patch-admin-cvs.sh
@@ -0,0 +1,7 @@
+--- admin/cvs.sh.orig 2008-07-07 15:38:56.000000000 -0500
++++ admin/cvs.sh 2010-10-02 14:54:47.000000000 -0500
+@@ -70,3 +70,3 @@
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
+ echo "*** $AUTOMAKE_STRING found."
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index f2818a646bc1..0bb25f3ce5c3 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -50,7 +50,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 aclocal:111 libtool:22
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index a1988a022ed1..c060bad24b55 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -47,7 +47,7 @@ QTDIR?= ${QT_PREFIX}
USE_OPENSSL= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 aclocal:111 libtool:22
CONFIGURE_SCRIPT= autogen.sh
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
index 2360257cb236..20716ccc8be8 100644
--- a/security/shibboleth2-sp/Makefile
+++ b/security/shibboleth2-sp/Makefile
@@ -23,7 +23,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_RC_SUBR= shibboleth-sp
-USE_AUTOTOOLS= autoconf:267 automake:110:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267 automake:111:env libtool:22:env
WRKSRC= ${WRKDIR}/shibboleth-${PORTVERSION}
LATEST_LINK= shibboleth2-sp
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 320d5c288b38..af8b197984c5 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -18,7 +18,7 @@ COMMENT= An open source, completely automatic on-line backup system for UNIX
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:19 autoheader:267
+USE_AUTOTOOLS= autoconf:267 aclocal:111 autoheader:267
ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 320d5c288b38..af8b197984c5 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -18,7 +18,7 @@ COMMENT= An open source, completely automatic on-line backup system for UNIX
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_PERL5= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:19 autoheader:267
+USE_AUTOTOOLS= autoconf:267 aclocal:111 autoheader:267
ACLOCAL_ARGS+= -I ${WRKSRC}/infrastructure/m4
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/sysutils/ftwin/Makefile b/sysutils/ftwin/Makefile
index 5e11db382fca..75c4cfa3ce0f 100644
--- a/sysutils/ftwin/Makefile
+++ b/sysutils/ftwin/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= puzzle.1:${PORTSDIR}/graphics/libpuzzle \
USE_BZIP2= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:110 automake:110 autoheader:267
+USE_AUTOTOOLS= autoconf:267 aclocal:111 automake:111 autoheader:267
CONFIGURE_ARGS+= --with-puzzle=${LOCALBASE}
PLIST_FILES= bin/ftwin
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 34a7a29fe0aa..6fde6a531328 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \
xml2:${PORTSDIR}/textproc/libxml2
PATCH_DEPENDS= ${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool22
-USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:110 aclocal:110 \
+USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:111 aclocal:111 \
libtool:22 libltdl:22
AUTOMAKE_ARGS+= --add-missing --include-deps --copy
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 5cffe3ab6097..73661ff191b7 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -20,7 +20,7 @@ NOT_FOR_ARCHS= sparc64
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-proc=/compat/linux/proc --enable-unicode
-USE_AUTOTOOLS= autoconf:267 aclocal:19 automake:19 libtool:22
+USE_AUTOTOOLS= autoconf:267 aclocal:111 automake:111 libtool:22
ACLOCAL_ARGS= -I ${ACLOCAL_DIR}
USE_PYTHON_BUILD= yes
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index 33eeee83de76..7326ed6bf3af 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -17,11 +17,9 @@ COMMENT= A visual client for UPS system NUT
MAKE_JOBS_UNSAFE= yes
-BUILD_DEPENDS= automake>=0:${PORTSDIR}/devel/automake19
-
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= libtool:22 automake:111:env aclocal:111:env
CONFIGURE_ARGS= --disable-fast-perl --enable-mt --program-transform-name=''
post-patch:
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 583c0cb8dc09..c6909415dbc8 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -16,7 +16,7 @@ COMMENT= A client/server suite for LCD devices
ONLY_FOR_ARCHS= i386 amd64
-USE_AUTOTOOLS= autoconf:267 automake:19 aclocal:19
+USE_AUTOTOOLS= autoconf:267 automake:111 aclocal:111
GNU_CONFIGURE= yes
USE_GNOME= pkgconfig
USE_RC_SUBR= LCDd lcdproc lcdexec
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index 999dcbf2218f..3fdf505fc977 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -21,7 +21,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= pkgconfig
-USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:110 aclocal:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:111 aclocal:111 libtool:22
AUTOMAKE_ARGS+= --add-missing --copy --foreign
ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal
diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile
index 59dad1c550e8..f282d88ca30f 100644
--- a/sysutils/uptimed/Makefile
+++ b/sysutils/uptimed/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG= yes
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22 aclocal:110
+USE_AUTOTOOLS= libtool:22 aclocal:111
ACLOCAL_ARGS= # empty
MAN1= uprecords.1
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index e4072c9f0d0e..58f5b08ae786 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -17,7 +17,7 @@ COMMENT= A configuration editing tool
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:267 aclocal:110 autoheader:267 automake:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 aclocal:111 autoheader:267 automake:111 libtool:22
ACLOCAL_ARGS= -I . -I gnulib/m4 -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
USE_LDCONFIG= yes
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index b47e54d03851..4000377b8444 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -16,7 +16,7 @@ COMMENT= XML parser library mainly designed for Jabber applications
LIB_DEPENDS= gnutls.40:${PORTSDIR}/security/gnutls
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/www/asterisk-gui/Makefile b/www/asterisk-gui/Makefile
index 29b35bbf384e..c517b4e50d01 100644
--- a/www/asterisk-gui/Makefile
+++ b/www/asterisk-gui/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk \
wget:${PORTSDIR}/ftp/wget
PROJECTHOST= asterisk-bsd
-USE_AUTOTOOLS= autoconf:267 automake:19
+USE_AUTOTOOLS= autoconf:267 automake:111
USE_GMAKE= yes
SUB_FILES= pkg-message
diff --git a/www/asterisk-gui/files/patch-bootstrap.sh b/www/asterisk-gui/files/patch-bootstrap.sh
index 55d76d3563ff..d65faa8a32f0 100644
--- a/www/asterisk-gui/files/patch-bootstrap.sh
+++ b/www/asterisk-gui/files/patch-bootstrap.sh
@@ -7,7 +7,7 @@
- MY_AC_VER=259
- MY_AM_VER=19
+ MY_AC_VER=-2.67
-+ MY_AM_VER=-1.9
++ MY_AM_VER=-1.11
else # linux case
MY_AC_VER=
MY_AM_VER=
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index c15f44138b02..7cb6c2300521 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -22,7 +22,7 @@ USE_QT_VER= 4
QT_COMPONENTS= corelib gui moc_build rcc_build uic_build qt3support
USE_GNOME= gnometarget libxml2
USE_GMAKE= yes
-USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:267
+USE_AUTOTOOLS= aclocal:111 automake:111 autoconf:267
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
.include <bsd.port.pre.mk>
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index aae10fdfe42b..4b96588e1ca8 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= lthack
-USE_AUTOTOOLS= autoconf:267 autoheader:267 aclocal:110 automake:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 autoheader:267 aclocal:111 automake:111 libtool:22
ACLOCAL_ARGS= -I m4
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd --enable-static
diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile
index d02d3510d10a..0799b3ae92a0 100644
--- a/www/mod_cplusplus/Makefile
+++ b/www/mod_cplusplus/Makefile
@@ -18,7 +18,7 @@ COMMENT= Apache module for loading C++ objects as handlers
MAKE_JOBS_SAFE= yes
USE_APACHE= 2.0+
-USE_AUTOTOOLS= autoconf:267 autoheader:267 libtool:22 automake:19 aclocal:19
+USE_AUTOTOOLS= autoconf:267 autoheader:267 libtool:22 automake:111 aclocal:111
CFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index e89b429c81a4..725360be98ca 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/rivet-${PORTVERSION}
MAKE_JOBS_SAFE= yes
USE_APACHE= 2.2+
-USE_AUTOTOOLS= automake:110 autoconf:267
+USE_AUTOTOOLS= automake:111 autoconf:267
USE_TCL= 84+
GMAKE= yes
diff --git a/www/moonshine/Makefile b/www/moonshine/Makefile
index 5494e711932f..40c7b5209ba7 100644
--- a/www/moonshine/Makefile
+++ b/www/moonshine/Makefile
@@ -20,7 +20,7 @@ GITCOMMIT= 35085a4
USE_GMAKE= yes
USE_GECKO= libxul
-USE_AUTOTOOLS= libtool:22 libtoolize aclocal:110 autoconf:267 autoheader:267 automake:110
+USE_AUTOTOOLS= libtool:22 libtoolize aclocal:111 autoconf:267 autoheader:267 automake:111
LIBTOOLIZE_ARGS= --force --copy --automake
AUTOMAKE_ARGS= --gnu --add-missing --force --copy -Wno-portability
ACLOCAL_ARGS=
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index de3dc96912e3..7e25e1a214f8 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= yzlin@FreeBSD.org
COMMENT= Securely execute PHP scripts under Apache
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= aclocal:110:env automake:110:env autoconf:267:env libtool:22:env
+USE_AUTOTOOLS= aclocal:111:env automake:111:env autoconf:267:env libtool:22:env
# Maintainer has not tested suPHP 0.6.x on Apache 1.3.
USE_APACHE= 2.0+
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --with-apr=${LOCALBASE}
post-patch:
@${REINPLACE_CMD} -e 's|2.61|2.67|g' ${WRKSRC}/aclocal.m4
- @${REINPLACE_CMD} -e 's|1.10.1|1.10.3|g' ${WRKSRC}/aclocal.m4
+ @${REINPLACE_CMD} -e 's|1.10.1|1.11.1|g' ${WRKSRC}/aclocal.m4
@${CHMOD} 755 ${WRKSRC}/config/install-sh
post-install:
diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index c21d14f6828f..ad96b059d326 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -32,7 +32,7 @@ USE_GMAKE= yes
PLIST_SUB= SHLIB="@comment " NSHLIB=""
CONFLICTS= tidy-20000804* tidy-lib-[0-9]*
.else
-USE_AUTOTOOLS= automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= automake:111 autoconf:267 libtool:22
AUTOMAKE_ARGS+= -a -c --foreign
USE_LDCONFIG= yes
PLIST_SUB= SHLIB="" NSHLIB="@comment "
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 3693916c1b78..ce390aee4079 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= expat>0:${PORTSDIR}/textproc/expat2 \
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_AUTOTOOLS= autoconf:267 automake:110 libtool:22
+USE_AUTOTOOLS= autoconf:267 automake:111 libtool:22
USE_BZIP2= yes
USE_ICONV= yes
USE_OPENSSL= yes
diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile
index c453e633a3c5..12ffae60e030 100644
--- a/x11-drivers/xf86-video-radeonhd-devel/Makefile
+++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= pciaccess.0:${PORTSDIR}/devel/libpciaccess
XORG_CAT= driver
USE_XORG= damageproto glproto videoproto xextproto xf86driproto
-USE_AUTOTOOLS= aclocal:19 autoconf:267 libtool:22
+USE_AUTOTOOLS= automake:111:env aclocal:111:env autoconf:267 libtool:22
CONFLICTS= xf86-video-radeonhd-[0-9]*
@@ -31,7 +31,7 @@ MAN4= radeonhd.4x
ACLOCAL_ARGS= --acdir=${LOCALBASE}/share/aclocal
pre-configure:
- cd ${WRKSRC} && ${AUTORECONF} -i
+ cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} --force -v --install
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${PREFIX}/sbin
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index 5086bfeef4d9..8470b31ed325 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2= yes
USE_GNOME= gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:22 autoconf:267:env aclocal:19:env automake:19:env
+USE_AUTOTOOLS= libtool:22 autoconf:267:env aclocal:111:env automake:111:env
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile
index cf24dfcdb49c..e82a99d4ee5b 100644
--- a/x11-themes/kdmtheme/Makefile
+++ b/x11-themes/kdmtheme/Makefile
@@ -18,7 +18,7 @@ COMMENT= KDM Theme Manager
USE_KDEBASE_VER=3
USE_BZIP2= yes
USE_PERL5_BUILD=yes
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22 autoheader:267:env
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22 autoheader:267:env
USE_GMAKE= yes
pre-configure:
diff --git a/x11-themes/kdmtheme/files/patch-admin__cvs.sh b/x11-themes/kdmtheme/files/patch-admin__cvs.sh
index c51ca1bf9dbe..1847813fb3f8 100644
--- a/x11-themes/kdmtheme/files/patch-admin__cvs.sh
+++ b/x11-themes/kdmtheme/files/patch-admin__cvs.sh
@@ -1,20 +1,17 @@
---- ./admin/cvs.sh.orig 2006-11-10 01:42:52.000000000 +0300
-+++ ./admin/cvs.sh 2007-12-17 21:13:50.000000000 +0300
-@@ -32,7 +32,7 @@
- required_autoconf_version="2.53 or newer"
- AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+--- admin/cvs.sh.orig 2006-11-09 16:42:52.000000000 -0600
++++ admin/cvs.sh 2010-09-28 11:40:53.000000000 -0500
+@@ -34,3 +34,3 @@
case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
-+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6*) : ;;
++ autoconf*2.6*) : ;;
"" )
- echo "*** AUTOCONF NOT FOUND!."
- echo "*** KDE requires autoconf $required_autoconf_version"
-@@ -47,7 +47,7 @@
-
- AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+@@ -49,3 +49,3 @@
case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
-+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
++ autoheader*2.6* ) : ;;
"" )
- echo "*** AUTOHEADER NOT FOUND!."
- echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -70,3 +70,3 @@
+ ;;
+- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
++ automake*1.11* )
+ echo "*** $AUTOMAKE_STRING found."
diff --git a/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
index ff6bf4b82b82..824f0df462f7 100644
--- a/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
+++ b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
@@ -1,11 +1,9 @@
---- ./admin/detect-autoconf.sh.orig 2006-11-10 01:42:52.000000000 +0300
-+++ ./admin/detect-autoconf.sh 2007-12-17 21:15:07.000000000 +0300
-@@ -10,7 +10,7 @@
- # Please add higher versions first. The last version number is the minimum
- # needed to compile KDE. Do not forget to include the name/version #
+--- admin/detect-autoconf.sh.orig 2006-11-09 16:42:52.000000000 -0600
++++ admin/detect-autoconf.sh 2010-09-28 11:41:11.000000000 -0500
+@@ -12,4 +12,4 @@
# separator if one is present, e.g. -1.2 where - is the separator.
-KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
-+KDE_AUTOCONF_VERS="-2.67 -2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
- KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOCONF_VERS="-2.67"
++KDE_AUTOMAKE_VERS="-1.11"
- # We don't use variable here for remembering the type ... strings. Local
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 35b21cde6078..eb1216207797 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
CONFLICTS?= open-motif-*
USE_BZIP2= yes
-USE_AUTOTOOLS= automake:19:env autoconf:267 libtool:22
+USE_AUTOTOOLS= automake:111:env autoconf:267 libtool:22
USE_XORG= sm ice xt xp xext x11 xextproto xrender xft
USE_LDCONFIG= yes
LIBTOOLFILES= aclocal.m4 test/aclocal.m4
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index f99dfc849cb1..5243977f3bad 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -17,7 +17,7 @@ COMMENT= A source code editor widget for GTK+
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode
-USE_AUTOTOOLS= automake:19:env autoconf:267:env libtool:22
+USE_AUTOTOOLS= automake:111:env autoconf:267:env libtool:22
USE_GNOME= gtk12
USE_GMAKE= yes
USE_PERL5_BUILD=yes
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 09d402b5f62b..800ab1991e2d 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE= yes
USE_BZIP2= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= autoconf:267:env automake:110:env libtool:22:env
+USE_AUTOTOOLS= autoconf:267:env automake:111:env libtool:22:env
CONFIGURE_SCRIPT= autogen.sh
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index c5a605eb7f57..be514788df09 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= xcompmgr:${PORTSDIR}/x11-wm/xcompmgr
LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
DESKTOP_ENTRIES="gcompmgr" \
"Configure window effects" \
diff --git a/x11-wm/lxsession-lite/Makefile b/x11-wm/lxsession-lite/Makefile
index 489737acca6c..44d0c3da814b 100644
--- a/x11-wm/lxsession-lite/Makefile
+++ b/x11-wm/lxsession-lite/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal
CONFLICTS= lxsession-[0-9]*
USE_GNOME= gtk20
-USE_AUTOTOOLS= automake:110:env
+USE_AUTOTOOLS= automake:111:env
USE_GMAKE= yes
USE_ICONV= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index 91ff9ed355c8..9094cd96a7ba 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
LATEST_LINK= ${PORTNAME}-devel
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
USE_GMAKE= yes
USE_ICONV= yes
USE_XORG= x11
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 0de6af063ef7..a359d9de958a 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= libgnomeui evolutiondataserver gnomemenus gnomedesktop
-USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:19 aclocal:19 libtool:22
+USE_AUTOTOOLS= autoconf:267 autoheader:267 automake:111 aclocal:111 libtool:22
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= -a
LIBTOOLFILES=
diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile
index a62024134a6d..6ec0d1a1b2e4 100644
--- a/x11/gtk-themepreview/Makefile
+++ b/x11/gtk-themepreview/Makefile
@@ -18,7 +18,7 @@ COMMENT= A small application for preview your theme widgets in one small window
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_AUTOTOOLS= automake:19:env
+USE_AUTOTOOLS= automake:111:env
PLIST_FILES= bin/${PORTNAME}
WRKSRC= ${WRKDIR}/ThemePreview-2
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 69f84e53c911..a31361c4c036 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -16,7 +16,7 @@ COMMENT= Session Management library for X11
BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
XORG_CAT= lib
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 27c487136246..87dee81a4f72 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267 libtool:22
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267 libtool:22
ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \
diff --git a/x11/lxmenu-data/Makefile b/x11/lxmenu-data/Makefile
index 5c3f9190a8af..5148a8e3f49c 100644
--- a/x11/lxmenu-data/Makefile
+++ b/x11/lxmenu-data/Makefile
@@ -17,7 +17,7 @@ USE_XORG= x11 xmu
USE_GNOME= intltool
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:110:env
+USE_AUTOTOOLS= automake:111:env
CONFIGURE_ARGS+=--prefix=${LOCALBASE} --sysconfdir=${LOCALBASE}/etc
USE_GMAKE= yes
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index 5e6279523d18..ade93e908e34 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -22,7 +22,7 @@ OPTIONS= ALSA "enable ALSA audio architecture support" Off \
USE_XORG= x11 xmu
USE_GNOME= gtk20 pkgconfig
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:110:env
+USE_AUTOTOOLS= automake:111:env
CONFIGURE_ARGS= --prefix=${PREFIX} \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index e95d8272f407..1a9ecd890f41 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg
XORG_CAT= app
USE_XORG= x11
-USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267
+USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267
ACLOCAL_ARGS= -I${LOCALBASE}/share/aclocal
PLIST_FILES= bin/sessreg
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 68f3bf33140e..15b1be930c1e 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= SF
MAINTAINER= ports@eitanadler.com
COMMENT= An interface to X selections ("the clipboard") from the command line
-USE_AUTOTOOLS= autoconf:267:env aclocal:19:env automake:19:env
+USE_AUTOTOOLS= autoconf:267:env aclocal:111:env automake:111:env
USE_XORG= x11 xmu
USE_GMAKE= yes
GNU_CONFIGURE= yes