diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2012-05-11 20:38:09 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2012-05-11 20:38:09 +0000 |
| commit | 6d726b6c09094afd97f1528cfff8b27850279b0d (patch) | |
| tree | ef9d4da0741b49a6a207e85f9ad78b89c296fdf5 | |
| parent | 9b4e4e3b2292946bd774693494465751f44fca20 (diff) | |
| download | ports-6d726b6c09094afd97f1528cfff8b27850279b0d.tar.gz ports-6d726b6c09094afd97f1528cfff8b27850279b0d.zip | |
Update autoconf to 2.69 and automake to 1.12
PR: 166836
Tested by: Multiple -exp runs (pav)
Notes
Notes:
svn path=/head/; revision=296454
69 files changed, 492 insertions, 223 deletions
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk index 70064b1850b3..3f110523ba1c 100644 --- a/Mk/bsd.autotools.mk +++ b/Mk/bsd.autotools.mk @@ -142,8 +142,8 @@ GNU_CONFIGURE= yes .endif .if defined(_AUTOTOOL_automake) -AUTOMAKE_VERSION= 1.11 -AUTOMAKE_APIVER= 1.11.1 +AUTOMAKE_VERSION= 1.12 +AUTOMAKE_APIVER= 1.12 AUTOMAKE_PORT= devel/automake . if ${_AUTOTOOL_automake} == "yes" @@ -202,7 +202,7 @@ GNU_CONFIGURE?= yes .endif .if defined(_AUTOTOOL_autoconf) -AUTOCONF_VERSION= 2.68 +AUTOCONF_VERSION= 2.69 AUTOCONF_PORT= devel/autoconf . if ${_AUTOTOOL_autoconf} == "yes" diff --git a/cad/salome-kernel/Makefile b/cad/salome-kernel/Makefile index 884bcac50fab..ad3097cb1768 100644 --- a/cad/salome-kernel/Makefile +++ b/cad/salome-kernel/Makefile @@ -13,4 +13,7 @@ PORTREVISION= 3 PKGNAMESUFFIX= -kernel SAL_MODULE_UPPER= KERNEL +post-configure:: + @${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/py-compile ${WRKSRC}/salome_adm/unix/config_files + .include "${MASTERDIR}/Makefile" diff --git a/comms/klog/Makefile b/comms/klog/Makefile index 7fb110f8dff6..d2283810cc24 100644 --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -21,6 +21,8 @@ USE_AUTOTOOLS= autoconf:env automake:env libtool:env GNU_CONFIGURE= yes INSTALLS_ICONS= yes +AUTOTOOLSFILES= admin/cvs.sh + post-extract: @${RM} -f ${WRKSRC}/po/gl.po diff --git a/comms/klog/files/patch-admin__cvs.sh b/comms/klog/files/patch-admin__cvs.sh index 89907240cb3d..8e57006be0b2 100644 --- a/comms/klog/files/patch-admin__cvs.sh +++ b/comms/klog/files/patch-admin__cvs.sh @@ -1,7 +1,12 @@ ---- 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 @@ - ;; +--- admin/cvs.sh.orig 2007-08-28 09:56:00.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:19:01.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - 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* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile index 145dc9b18142..2372e75aa467 100644 --- a/databases/mysql-workbench51/Makefile +++ b/databases/mysql-workbench51/Makefile @@ -47,6 +47,7 @@ LUA_COMPS= lua .if ${PKGNAMESUFFIX} == 51 CONFLICTS= mysql-workbench-oss52* +EXTRA_PATCHES= ${PATCHDIR}/extra-51-modules__wb.utils__Makefile.am .endif DATADIR= ${PREFIX}/share/mysql-workbench diff --git a/databases/mysql-workbench51/files/extra-51-modules__wb.utils__Makefile.am b/databases/mysql-workbench51/files/extra-51-modules__wb.utils__Makefile.am new file mode 100644 index 000000000000..3469f92d9c1f --- /dev/null +++ b/databases/mysql-workbench51/files/extra-51-modules__wb.utils__Makefile.am @@ -0,0 +1,10 @@ +--- modules/wb.utils/Makefile.am.orig 2009-06-29 14:51:26.000000000 -0700 ++++ modules/wb.utils/Makefile.am 2012-04-17 13:39:25.000000000 -0700 +@@ -1,5 +1,5 @@ + +-pkglibdir=$(libdir)/@PACKAGE@/modules ++wbutilsdir=$(libdir)/@PACKAGE@/modules + +-pkglib_DATA=catalog_utils.grt.lua table_utils.grt.lua tools.grt.lua wb_utils_grt.py ++wbutils_DATA=catalog_utils.grt.lua table_utils.grt.lua tools.grt.lua wb_utils_grt.py + diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile index 2e97b169cb9d..614a194852c6 100644 --- a/deskutils/kmatrix3d/Makefile +++ b/deskutils/kmatrix3d/Makefile @@ -26,6 +26,8 @@ USE_KDELIBS_VER= 3 USE_BZIP2= yes USE_PERL5_BUILD= yes +AUTOTOOLSFILES= admin/cvs.sh + pre-configure: cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${MAKE} -f admin/Makefile.common diff --git a/deskutils/kmatrix3d/files/patch-admin__cvs.sh b/deskutils/kmatrix3d/files/patch-admin__cvs.sh index 0846008c3eb0..02b9d2ec7ff1 100644 --- a/deskutils/kmatrix3d/files/patch-admin__cvs.sh +++ b/deskutils/kmatrix3d/files/patch-admin__cvs.sh @@ -1,7 +1,12 @@ ---- admin/cvs.sh.orig 2007-01-27 02:25:03.000000000 -0600 -+++ admin/cvs.sh 2010-10-07 09:17:32.000000000 -0500 -@@ -70,3 +70,3 @@ - ;; +--- admin/cvs.sh.orig 2007-01-27 00:25:03.000000000 -0800 ++++ admin/cvs.sh 2012-04-24 09:20:18.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.11* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile index ffe172521699..4d123b56d1bb 100644 --- a/deskutils/ksmoothdock/Makefile +++ b/deskutils/ksmoothdock/Makefile @@ -24,6 +24,8 @@ GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_PERL5_BUILD=yes +AUTOTOOLSFILES= admin/cvs.sh + pre-configure: @cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} . @cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} -f admin/Makefile.common diff --git a/deskutils/ksmoothdock/files/patch-admin__cvs.sh b/deskutils/ksmoothdock/files/patch-admin__cvs.sh index 8b25d1c032d0..c9aa352b5735 100644 --- a/deskutils/ksmoothdock/files/patch-admin__cvs.sh +++ b/deskutils/ksmoothdock/files/patch-admin__cvs.sh @@ -1,7 +1,12 @@ ---- 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 @@ - ;; +--- admin/cvs.sh.orig 2007-04-16 16:39:49.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:21:24.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - 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* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index f07892490b25..8fc080741558 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -36,6 +36,8 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --with-docdir=${EXAMPLESDIR}/ USE_LDCONFIG= yes +AUTOTOOLSFILES= admin/cvs.sh + .include <bsd.port.pre.mk> .if defined(WITHOUT_DOCS) diff --git a/deskutils/taskjuggler/files/patch-admin_cvs.sh b/deskutils/taskjuggler/files/patch-admin_cvs.sh index f8a852bbab64..e29083c6402f 100644 --- a/deskutils/taskjuggler/files/patch-admin_cvs.sh +++ b/deskutils/taskjuggler/files/patch-admin_cvs.sh @@ -1,7 +1,12 @@ ---- 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 @@ - ;; +--- admin/cvs.sh.orig 2009-07-15 01:33:20.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:22:32.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - 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* ) : ;; ++ automake*%%AUTOMAKE_VERSION%%* ) : ;; "" ) diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile index b4fdab409601..d81fbf822f65 100644 --- a/devel/autoconf/Makefile +++ b/devel/autoconf/Makefile @@ -6,30 +6,30 @@ # PORTNAME= autoconf -PORTVERSION= 2.68 +PORTVERSION= 2.69 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= autotools@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (2.68) +COMMENT= Automatically configure source code on many Un*x platforms BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 2.68 +BUILD_VERSION= 2.69 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf268 -USE_BZIP2= yes +USE_XZ= yes USE_GMAKE= yes USE_PERL5= yes -INFO= autoconf-${BUILD_VERSION} +INFO= autoconf GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 AWK=${AWK} +CONFIGURE_ENV+= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 AWK=${AWK} \ + ac_cv_prog_TEST_EMACS=no CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} --without-lispdir GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing @@ -45,9 +45,7 @@ post-patch: ${REINPLACE_CMD} -E 's,([^-]auto)(conf|make|reconf|update|header|scan),\1\2-${BUILD_VERSION},g ; \ s,(config\.guess|config\.sub|ifnames),\1-${BUILD_VERSION},g' $$file ; \ done) - @(cd ${WRKSRC}/doc && \ - ${RM} -f *.info && \ - ${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi) + @(cd ${WRKSRC}/doc && ${RM} -f *.info) @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' diff --git a/devel/autoconf/distinfo b/devel/autoconf/distinfo index 67a10a20920a..3359cad88dd4 100644 --- a/devel/autoconf/distinfo +++ b/devel/autoconf/distinfo @@ -1,2 +1,2 @@ -SHA256 (autoconf-2.68.tar.bz2) = c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8 -SIZE (autoconf-2.68.tar.bz2) = 1381988 +SHA256 (autoconf-2.69.tar.xz) = 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 +SIZE (autoconf-2.69.tar.xz) = 1214744 diff --git a/devel/autoconf/files/patch-autoconf.texi b/devel/autoconf/files/patch-autoconf.texi index d37b7fbbedab..a7e1f2637b53 100644 --- a/devel/autoconf/files/patch-autoconf.texi +++ b/devel/autoconf/files/patch-autoconf.texi @@ -1,21 +1,12 @@ ---- doc/autoconf.texi.orig 2008-04-05 11:43:30.000000000 -0700 -+++ doc/autoconf.texi 2008-05-16 18:27:31.000000000 -0700 -@@ -3,5 +3,5 @@ - @comment %**start of header --@setfilename autoconf.info -+@setfilename autoconf-2.68.info - @include version.texi --@settitle Autoconf -+@settitle Autoconf-2.68 - @setchapternewpage odd -@@ -205,25 +205,5 @@ +--- doc/autoconf.texi.orig 2012-04-24 19:14:19.000000000 -0700 ++++ doc/autoconf.texi 2012-04-26 10:52:26.000000000 -0700 +@@ -219,3 +219,3 @@ -@dircategory Software development +@dircategory Programming & development tools @direntry --* Autoconf: (autoconf). Create source code configuration scripts. --@end direntry -- +@@ -224,22 +224,2 @@ + -@dircategory Individual utilities -@direntry -* autoscan: (autoconf)autoscan Invocation. @@ -34,5 +25,6 @@ - Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. Recreating configurations. -* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite. -+* Autoconf-2.68: (autoconf-2.68). Create source code configuration scripts. - @end direntry +-@end direntry +- + @titlepage diff --git a/devel/autoconf/files/patch-doc-Makefile.in b/devel/autoconf/files/patch-doc-Makefile.in index ba8a63bbcb84..1cba4ecf6f6f 100644 --- a/devel/autoconf/files/patch-doc-Makefile.in +++ b/devel/autoconf/files/patch-doc-Makefile.in @@ -3,23 +3,10 @@ @@ -44,3 +44,3 @@ DIST_SOURCES = -INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info -+INFO_DEPS = $(srcdir)/autoconf-2.68.info ++INFO_DEPS = $(srcdir)/autoconf.info TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex @@ -51,3 +51,3 @@ HTMLS = autoconf.html standards.html -TEXINFOS = autoconf.texi standards.texi -+TEXINFOS = autoconf-2.68.texi ++TEXINFOS = autoconf.texi TEXI2PDF = $(TEXI2DVI) --pdf --batch -@@ -241,3 +241,3 @@ - fi --$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) -+$(srcdir)/autoconf-2.68.info: autoconf-2.68.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) - autoconf.dvi: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) -@@ -246,5 +246,5 @@ - $(srcdir)/version.texi: $(srcdir)/stamp-vti --$(srcdir)/stamp-vti: autoconf.texi $(top_srcdir)/configure -+$(srcdir)/stamp-vti: autoconf-2.68.texi $(top_srcdir)/configure - @(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \ -- set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/autoconf.texi`; \ -+ set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/autoconf-2.68.texi`; \ - echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/autoconf/pkg-plist b/devel/autoconf/pkg-plist index 69fac8d76272..2b983e668209 100644 --- a/devel/autoconf/pkg-plist +++ b/devel/autoconf/pkg-plist @@ -11,8 +11,8 @@ share/autoconf-%%BUILD_VERSION%%/Autom4te/Channels.pm share/autoconf-%%BUILD_VERSION%%/Autom4te/Configure_ac.pm share/autoconf-%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf-%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf-%%BUILD_VERSION%%/Autom4te/Getopt.pm share/autoconf-%%BUILD_VERSION%%/Autom4te/Request.pm -share/autoconf-%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf-%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf-%%BUILD_VERSION%%/INSTALL share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4 @@ -26,6 +26,7 @@ share/autoconf-%%BUILD_VERSION%%/autoconf/erlang.m4 share/autoconf-%%BUILD_VERSION%%/autoconf/fortran.m4 share/autoconf-%%BUILD_VERSION%%/autoconf/functions.m4 share/autoconf-%%BUILD_VERSION%%/autoconf/general.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/go.m4 share/autoconf-%%BUILD_VERSION%%/autoconf/headers.m4 share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 3eaff14b70e2..eeef3583dc17 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -6,28 +6,27 @@ # PORTNAME= automake -PORTVERSION= 1.11.1 +PORTVERSION= 1.12 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= autotools@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (1.11) +COMMENT= GNU Standards-compliant Makefile generator RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ automake-wrapper:${PORTSDIR}/devel/automake-wrapper USE_AUTOTOOLS= autoconf:env -BUILD_VERSION= 1.11 +BUILD_VERSION= 1.12 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= automake111 -USE_BZIP2= yes +USE_XZ= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split" -INFO= automake-${BUILD_VERSION} +INFO= automake MAN1= aclocal-${BUILD_VERSION}-${BUILD_VERSION}.1 \ aclocal-${BUILD_VERSION}.1 \ automake-${BUILD_VERSION}-${BUILD_VERSION}.1 \ @@ -35,8 +34,6 @@ MAN1= aclocal-${BUILD_VERSION}-${BUILD_VERSION}.1 \ post-patch: @${RM} ${WRKSRC}/doc/*.info - @${MV} ${WRKSRC}/doc/automake.texi \ - ${WRKSRC}/doc/automake-${BUILD_VERSION}.texi pre-su-install: @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION} diff --git a/devel/automake/distinfo b/devel/automake/distinfo index eea5ad4ca3e9..8e89bbae8ddf 100644 --- a/devel/automake/distinfo +++ b/devel/automake/distinfo @@ -1,2 +1,2 @@ -SHA256 (automake-1.11.1.tar.bz2) = 5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae -SIZE (automake-1.11.1.tar.bz2) = 1066685 +SHA256 (automake-1.12.tar.xz) = 4f920cad2dc59f1be296b7d7584e3828a36154d16191f3cad60a73e6e9bcf879 +SIZE (automake-1.12.tar.xz) = 1331352 diff --git a/devel/automake/files/patch-Makefile.in b/devel/automake/files/patch-Makefile.in index 55d85c2ed5b9..4930afd8a81c 100644 --- a/devel/automake/files/patch-Makefile.in +++ b/devel/automake/files/patch-Makefile.in @@ -1,6 +1,27 @@ ---- Makefile.in.orig Sun Oct 15 10:25:23 2006 -+++ Makefile.in Sat Apr 14 16:04:04 2007 -@@ -591,3 +591,2 @@ +--- Makefile.in.orig 2012-04-25 08:49:53.000000000 -0700 ++++ Makefile.in 2012-04-26 11:27:28.000000000 -0700 +@@ -173,4 +173,3 @@ + am__dirstamp = $(am__leading_dot)dirstamp +-INFO_DEPS = $(srcdir)/doc/automake.info \ +- $(srcdir)/doc/automake-history.info ++INFO_DEPS = $(srcdir)/doc/automake.info + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +@@ -626,3 +625,3 @@ + +-dist_system_ac_DATA = m4/acdir/README ++dist_system_ac_DATA = + +@@ -2165,3 +2164,3 @@ + am__tdf = diff-in-tests-lists.tmp +-info_TEXINFOS = doc/automake.texi doc/automake-history.texi ++info_TEXINFOS = doc/automake.texi + doc_automake_TEXINFOS = doc/fdl.texi +@@ -2200,3 +2199,3 @@ + dist_noinst_DATA = $(amhello_sources) +-dist_doc_DATA = $(srcdir)/doc/amhello-1.0.tar.gz ++dist_doc_DATA = + +@@ -3247,3 +3246,2 @@ @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - + install-html: install-html-am diff --git a/devel/automake/files/patch-doc::Makefile.in b/devel/automake/files/patch-doc::Makefile.in deleted file mode 100644 index 17a9dc7f012c..000000000000 --- a/devel/automake/files/patch-doc::Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- doc/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ doc/Makefile.in Sun Mar 14 17:12:32 2004 -@@ -53,3 +53,3 @@ - DIST_SOURCES = --INFO_DEPS = $(srcdir)/automake.info -+INFO_DEPS = $(srcdir)/automake-@APIVERSION@.info - TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex -@@ -135,3 +136,3 @@ - target_alias = @target_alias@ --info_TEXINFOS = automake.texi -+info_TEXINFOS = automake-@APIVERSION@.texi - automake_TEXINFOS = fdl.texi -@@ -142,3 +143,3 @@ - --TAGS_DEPENDENCIES = automake.texi -+TAGS_DEPENDENCIES = automake-@APIVERSION@.texi - all: all-am -@@ -222,5 +223,5 @@ - $(srcdir)/version.texi: $(srcdir)/stamp-vti --$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure -- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ -- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ -+$(srcdir)/stamp-vti: automake-@APIVERSION@.texi $(top_srcdir)/configure -+ @(dir=.; test -f ./automake-@APIVERSION@.texi || dir=$(srcdir); \ -+ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake-@APIVERSION@.texi`; \ - echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/automake/files/patch-doc::automake.texi b/devel/automake/files/patch-doc::automake.texi index 3d9f61200a71..9f2f250b4671 100644 --- a/devel/automake/files/patch-doc::automake.texi +++ b/devel/automake/files/patch-doc::automake.texi @@ -1,26 +1,16 @@ ---- doc/automake.texi.orig Sun Oct 15 10:41:24 2006 -+++ doc/automake.texi Sat Apr 14 15:32:49 2007 -@@ -2,4 +2,4 @@ - @c %**start of header --@setfilename automake.info --@settitle automake -+@setfilename automake-1.11.info -+@settitle Automake-1.11 - @setchapternewpage off -@@ -34,14 +34,5 @@ +--- doc/automake.texi.orig 2012-04-21 07:38:05.000000000 -0700 ++++ doc/automake.texi 2012-04-26 11:05:39.000000000 -0700 +@@ -38,3 +38,3 @@ --@c info Automake points to the Automake package's documentation --@c info automake points to the automake script's documentation --@c (Autoconf has a similar setup.) -@dircategory Software development -+@dircategory Programming & development tools ++@dircategory Programming & development toolS @direntry --* Automake: (automake). Making GNU standards-compliant Makefiles. --@end direntry -- +@@ -43,8 +43,2 @@ + -@dircategory Individual utilities -@direntry --* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. --* automake: (automake)Invoking Automake. Generating Makefile.in. -+* Automake-1.11: (automake-1.11). Making Makefile.in's. - @end direntry +-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. +-* automake-invocation: (automake)automake Invocation. Generating Makefile.in. +-@end direntry +- + @titlepage diff --git a/devel/automake/pkg-plist b/devel/automake/pkg-plist index 76698df4f74c..225bcde3935f 100644 --- a/devel/automake/pkg-plist +++ b/devel/automake/pkg-plist @@ -1,6 +1,7 @@ bin/aclocal-%%BUILD_VERSION%% bin/automake-%%BUILD_VERSION%% share/aclocal-%%BUILD_VERSION%%/amversion.m4 +share/aclocal-%%BUILD_VERSION%%/ar-lib.m4 share/aclocal-%%BUILD_VERSION%%/as.m4 share/aclocal-%%BUILD_VERSION%%/auxdir.m4 share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 @@ -21,14 +22,12 @@ share/aclocal-%%BUILD_VERSION%%/make.m4 share/aclocal-%%BUILD_VERSION%%/minuso.m4 share/aclocal-%%BUILD_VERSION%%/missing.m4 share/aclocal-%%BUILD_VERSION%%/mkdirp.m4 -share/aclocal-%%BUILD_VERSION%%/multi.m4 share/aclocal-%%BUILD_VERSION%%/obsol-gt.m4 share/aclocal-%%BUILD_VERSION%%/obsol-lt.m4 share/aclocal-%%BUILD_VERSION%%/obsolete.m4 share/aclocal-%%BUILD_VERSION%%/options.m4 share/aclocal-%%BUILD_VERSION%%/protos.m4 share/aclocal-%%BUILD_VERSION%%/python.m4 -share/aclocal-%%BUILD_VERSION%%/regex.m4 share/aclocal-%%BUILD_VERSION%%/runlog.m4 share/aclocal-%%BUILD_VERSION%%/sanity.m4 share/aclocal-%%BUILD_VERSION%%/silent.m4 @@ -45,13 +44,13 @@ share/automake-%%BUILD_VERSION%%/Automake/Configure_ac.pm share/automake-%%BUILD_VERSION%%/Automake/DisjConditions.pm share/automake-%%BUILD_VERSION%%/Automake/FileUtils.pm share/automake-%%BUILD_VERSION%%/Automake/General.pm +share/automake-%%BUILD_VERSION%%/Automake/Getopt.pm share/automake-%%BUILD_VERSION%%/Automake/Item.pm share/automake-%%BUILD_VERSION%%/Automake/ItemDef.pm share/automake-%%BUILD_VERSION%%/Automake/Location.pm share/automake-%%BUILD_VERSION%%/Automake/Options.pm share/automake-%%BUILD_VERSION%%/Automake/Rule.pm share/automake-%%BUILD_VERSION%%/Automake/RuleDef.pm -share/automake-%%BUILD_VERSION%%/Automake/Struct.pm share/automake-%%BUILD_VERSION%%/Automake/VarDef.pm share/automake-%%BUILD_VERSION%%/Automake/Variable.pm share/automake-%%BUILD_VERSION%%/Automake/Version.pm @@ -59,8 +58,6 @@ share/automake-%%BUILD_VERSION%%/Automake/Wrap.pm share/automake-%%BUILD_VERSION%%/Automake/XFile.pm share/automake-%%BUILD_VERSION%%/COPYING share/automake-%%BUILD_VERSION%%/INSTALL -share/automake-%%BUILD_VERSION%%/acinstall -share/automake-%%BUILD_VERSION%%/am/ansi2knr.am share/automake-%%BUILD_VERSION%%/am/check.am share/automake-%%BUILD_VERSION%%/am/check2.am share/automake-%%BUILD_VERSION%%/am/clean-hdr.am @@ -88,7 +85,6 @@ share/automake-%%BUILD_VERSION%%/am/ltlib.am share/automake-%%BUILD_VERSION%%/am/ltlibrary.am share/automake-%%BUILD_VERSION%%/am/mans-vars.am share/automake-%%BUILD_VERSION%%/am/mans.am -share/automake-%%BUILD_VERSION%%/am/multilib.am share/automake-%%BUILD_VERSION%%/am/program.am share/automake-%%BUILD_VERSION%%/am/progs.am share/automake-%%BUILD_VERSION%%/am/python.am @@ -101,10 +97,8 @@ share/automake-%%BUILD_VERSION%%/am/texibuild.am share/automake-%%BUILD_VERSION%%/am/texinfos.am share/automake-%%BUILD_VERSION%%/am/vala.am share/automake-%%BUILD_VERSION%%/am/yacc.am -share/automake-%%BUILD_VERSION%%/ansi2knr.1 -share/automake-%%BUILD_VERSION%%/ansi2knr.c +share/automake-%%BUILD_VERSION%%/ar-lib share/automake-%%BUILD_VERSION%%/compile -share/automake-%%BUILD_VERSION%%/config-ml.in share/automake-%%BUILD_VERSION%%/config.guess share/automake-%%BUILD_VERSION%%/config.sub share/automake-%%BUILD_VERSION%%/depcomp @@ -114,11 +108,11 @@ share/automake-%%BUILD_VERSION%%/mdate-sh share/automake-%%BUILD_VERSION%%/missing share/automake-%%BUILD_VERSION%%/mkinstalldirs share/automake-%%BUILD_VERSION%%/py-compile -share/automake-%%BUILD_VERSION%%/symlink-tree +share/automake-%%BUILD_VERSION%%/tap-driver.pl +share/automake-%%BUILD_VERSION%%/tap-driver.sh +share/automake-%%BUILD_VERSION%%/test-driver share/automake-%%BUILD_VERSION%%/texinfo.tex share/automake-%%BUILD_VERSION%%/ylwrap -share/doc/automake/amhello-1.0.tar.gz -@dirrm share/doc/automake @dirrm share/aclocal-%%BUILD_VERSION%% @dirrm share/automake-%%BUILD_VERSION%%/Automake @dirrm share/automake-%%BUILD_VERSION%%/am diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile index 6db04f0c469e..a6ccf4dcd957 100644 --- a/devel/autotools/Makefile +++ b/devel/autotools/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= autotools -PORTVERSION= 20101016 +PORTVERSION= 20120427 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none @@ -18,9 +18,9 @@ COMMENT= Autotools meta-port RUN_DEPENDS= libtool:${PORTSDIR}/devel/libtool \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ - autoconf-2.68:${PORTSDIR}/devel/autoconf \ + autoconf-2.69:${PORTSDIR}/devel/autoconf \ automake-1.4:${PORTSDIR}/devel/automake14 \ - automake-1.11:${PORTSDIR}/devel/automake + automake-1.12:${PORTSDIR}/devel/automake PLIST_FILES= share/${PORTNAME} NO_BUILD= yes diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile index 781d041b3ffd..c32973059938 100644 --- a/devel/git-merge-changelog/Makefile +++ b/devel/git-merge-changelog/Makefile @@ -17,8 +17,8 @@ MAINTAINER= knu@FreeBSD.org COMMENT= Git "merge" driver for GNU style ChangeLog files EXTRACT_DEPENDS= ${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORTDIR} \ - automake-1.11:${PORTSDIR}/devel/automake \ - autoconf-2.68:${PORTSDIR}/devel/autoconf + automake-1.12:${PORTSDIR}/devel/automake \ + autoconf-2.69:${PORTSDIR}/devel/autoconf GNU_CONFIGURE= yes diff --git a/devel/jzmq/Makefile b/devel/jzmq/Makefile index 60d89654f9fd..f17973734a6e 100644 --- a/devel/jzmq/Makefile +++ b/devel/jzmq/Makefile @@ -16,7 +16,7 @@ COMMENT= Java bindings for ZeroMQ LIB_DEPENDS= zmq.1:${PORTSDIR}/devel/zmq -USE_AUTOTOOLS= autoconf libtool automake +USE_AUTOTOOLS= autoconf:env libtool automake:env USE_GMAKE= yes USE_GNOME= pkgconfig USE_JAVA= 1.4+ diff --git a/devel/jzmq/files/patch-src_Makefile.am b/devel/jzmq/files/patch-src_Makefile.am index f83055b374a7..7fb0bd37cd6e 100644 --- a/devel/jzmq/files/patch-src_Makefile.am +++ b/devel/jzmq/files/patch-src_Makefile.am @@ -1,12 +1,12 @@ - -$FreeBSD$ - ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -1,5 +1,5 @@ +--- src/Makefile.am.orig 2011-05-13 08:58:24.000000000 -0700 ++++ src/Makefile.am 2012-04-17 15:25:41.000000000 -0700 +@@ -1,3 +1,3 @@ jarfile = zmq.jar -jardir = $(datadir)/java +jardir = $(datadir)/java/classes - JZMQ_JAVA_FILES = \ - org/zeromq/ZMQ.java +@@ -67,3 +67,3 @@ + +-./org/zeromq/ZMQ.class: classdist_noinst.stamp ++./org/zeromq/ZMQ.class: classnoinst.stamp + diff --git a/devel/libvirt/Makefile b/devel/libvirt/Makefile index f2a9f0105112..7347ea5a05fa 100644 --- a/devel/libvirt/Makefile +++ b/devel/libvirt/Makefile @@ -61,7 +61,11 @@ PLIST_SUB+= NLS="@comment " MAN1= virsh.1 virt-pki-validate.1 virt-xml-validate.1 virt-host-validate.1 MAN8= libvirtd.8 +AUTOTOOLSFILES= aclocal.m4 + post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + ${WRKSRC}/aclocal.m4 @${MV} ${WRKSRC}/daemon/libvirtd.conf ${WRKSRC}/daemon/libvirtd.conf.sample @${REINPLACE_CMD} -e 's|libvirtd.conf|libvirtd.conf.sample|' \ ${WRKSRC}/daemon/Makefile.am \ diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile index 97a5a8bf2612..0e3057a6f691 100644 --- a/ftp/tnftpd/Makefile +++ b/ftp/tnftpd/Makefile @@ -14,6 +14,7 @@ MAINTAINER= cejkar@fit.vutbr.cz COMMENT= Enhanced ftp server from NetBSD USE_AUTOTOOLS= aclocal automake libtool +AUTOMAKE_ARGS= --add-missing ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal .include <bsd.port.pre.mk> diff --git a/ftp/tnftpd/files/patch-configure.ac b/ftp/tnftpd/files/patch-configure.ac index 9383d31a434b..a8b66edcbf37 100644 --- a/ftp/tnftpd/files/patch-configure.ac +++ b/ftp/tnftpd/files/patch-configure.ac @@ -1,14 +1,8 @@ -Feature silent-rules needs atleast autoconf 1.11, however we still have -at most autoconf 1.10 in ports tree (2010/09/10). - ---- configure.ac.orig 2010-03-24 13:31:39.000000000 +0100 -+++ configure.ac 2010-03-24 13:31:39.000000000 +0200 -@@ -18,7 +18,7 @@ - AC_CONFIG_HEADERS([tnftpd_config.h]) - AC_CONFIG_LIBOBJ_DIR([libnetbsd]) - --AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc]) - AM_MAINTAINER_MODE - +--- configure.ac.orig 2010-03-24 05:31:39.000000000 -0700 ++++ configure.ac 2012-05-03 15:55:32.000000000 -0700 +@@ -87,3 +87,4 @@ # +-AC_PROG_CC ++AM_PROG_CC_C_O ++AM_PROG_AR + AC_PROG_AWK diff --git a/ftp/tnftpd/files/patch-libnetbsd-Makefile.am b/ftp/tnftpd/files/patch-libnetbsd-Makefile.am new file mode 100644 index 000000000000..564d9dc47fd1 --- /dev/null +++ b/ftp/tnftpd/files/patch-libnetbsd-Makefile.am @@ -0,0 +1,7 @@ +--- libnetbsd/Makefile.am.orig 2010-01-03 21:46:29.000000000 -0800 ++++ libnetbsd/Makefile.am 2012-05-03 15:58:12.000000000 -0700 +@@ -6,3 +6,3 @@ + +-CPPFLAGS = \ ++AM_CPPFLAGS = \ + -I$(srcdir) \ diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile index f2756cb6533e..f63438226613 100644 --- a/games/kmastermind/Makefile +++ b/games/kmastermind/Makefile @@ -26,11 +26,13 @@ USE_BZIP2= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} pre-configure: - ${LN} -sfh \ + @${TOUCH} ${WRKSRC}/NEWS + @${LN} -sfh \ `cd ${PORTSDIR}/x11/kdelibs3 && ${MAKE} -V WRKSRC`/admin \ ${WRKSRC}/admin - ${TOUCH} ${WRKSRC}/NEWS - @${REINPLACE_CMD} -e 's|1.10|${AUTOMAKE_VERSION}|' ${WRKSRC}/admin/cvs.sh + @${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/kdelibs3-admin-cvs.sh + @${REINPLACE_CMD} -e s,%%AUTOMAKE_VERSION%%,${AUTOMAKE_VERSION}, \ + ${WRKSRC}/admin/cvs.sh cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} -f admin/Makefile.common cvs .include <bsd.port.mk> diff --git a/games/kmastermind/files/kdelibs3-admin-cvs.sh b/games/kmastermind/files/kdelibs3-admin-cvs.sh new file mode 100644 index 000000000000..3bf1d023fc50 --- /dev/null +++ b/games/kmastermind/files/kdelibs3-admin-cvs.sh @@ -0,0 +1,12 @@ +--- admin/cvs.sh.orig 2008-08-19 13:28:39.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 10:46:19.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) ++ automake*%%AUTOMAKE_VERSION%%*) + echo "*** $AUTOMAKE_STRING found." diff --git a/games/mangos/files/patch-configure.ac b/games/mangos/files/patch-configure.ac new file mode 100644 index 000000000000..3d2908ec9648 --- /dev/null +++ b/games/mangos/files/patch-configure.ac @@ -0,0 +1,6 @@ +--- configure.ac.orig 2008-01-27 20:52:47.000000000 -0800 ++++ configure.ac 2012-05-03 17:02:50.000000000 -0700 +@@ -34,2 +34,3 @@ + AC_PROG_CXX ++AM_PROG_AR + AC_PROG_LIBTOOL diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile index 4f168dfabc80..03ffa1bdb440 100644 --- a/games/py-poker-eval/Makefile +++ b/games/py-poker-eval/Makefile @@ -30,6 +30,9 @@ MAKE_JOBS_SAFE= yes PLIST_SUB= PYVER=${_PYTHON_VERSION:S/./_/} +post-configure: + @${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/py-compile ${WRKSRC}/config + test: @cd ${WRKSRC} && ${MAKE} check diff --git a/graphics/agg/files/patch-configure.in b/graphics/agg/files/patch-configure.in new file mode 100644 index 000000000000..cc46fd046c22 --- /dev/null +++ b/graphics/agg/files/patch-configure.in @@ -0,0 +1,9 @@ +--- configure.in.orig 2006-10-08 21:06:36.000000000 -0700 ++++ configure.in 2012-05-03 17:23:22.000000000 -0700 +@@ -10,6 +10,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AM_PROG_LIBTOOL diff --git a/graphics/libpano13/files/patch-bootstrap b/graphics/libpano13/files/patch-bootstrap index 6c239b7e74ee..897ecfa0c0b8 100644 --- a/graphics/libpano13/files/patch-bootstrap +++ b/graphics/libpano13/files/patch-bootstrap @@ -1,17 +1,70 @@ ---- bootstrap.orig 2009-02-01 19:35:46.000000000 +0200 -+++ bootstrap 2011-02-27 08:26:52.000000000 +0200 -@@ -23,7 +23,7 @@ - libtool_version=`$LIBTOOLIZE --version | sed 's/.*) \([0-9.][0-9.]*\).*/\1/'` - # echo libtool version: $libtool_version - case $libtool_version in -- 1.4*|1.5*|2.0*|2.2*|2.4*) -+ 1.4*|1.5*|[2-9]*) - have_libtool=true - ;; - esac -@@ -96,27 +96,3 @@ - $AUTOMAKE --add-missing --copy || exit $? +--- bootstrap.orig 2011-02-22 11:06:38.000000000 -0800 ++++ bootstrap 2012-05-03 17:40:55.000000000 -0700 +@@ -18,63 +18,2 @@ +-DIE=0 +- +-have_libtool=false +-if $LIBTOOLIZE --version < /dev/null > /dev/null 2>&1 ; then +- libtool_version=`$LIBTOOLIZE --version | sed 's/.*) \([0-9.][0-9.]*\).*/\1/'` +-# echo libtool version: $libtool_version +- case $libtool_version in +- 1.4*|1.5*|2.0*|2.2*|2.4*) +- have_libtool=true +- ;; +- esac +-fi +-if $have_libtool ; then : ; else +- echo +- echo "You must have libtool 1.4 or later installed to compile $PROJECT." +- echo "Install the appropriate package for your distribution," +- echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" +- DIE=1 +-fi +- +-# Assume if we have this that aclocal and autoheader are available +-have_autoconf=false +-if $AUTOCONF --version < /dev/null > /dev/null 2>&1 ; then +- autoconf_version=`$AUTOCONF --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` +-# echo autoconf version: $autoconf_version +- case $autoconf_version in +- 2.5*|2.6*) +- have_autoconf=true +- ;; +- esac +-fi +-if $have_autoconf ; then : ; else +- echo +- echo "You must have autoconf installed to compile $PROJECT." +- echo "Install the appropriate package for your distribution," +- echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" +- DIE=1 +-fi +- +-have_automake=false +-if $AUTOMAKE --version < /dev/null > /dev/null 2>&1 ; then +- automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` +-# echo automake version: $automake_version +- case $automake_version in +- 1.7*|1.8*|1.9*|1.10*|1.11*) +- have_automake=true +- ;; +- esac +-fi +-if $have_automake ; then : ; else +- echo +- echo "You must have automake 1.7.x or later installed to compile $PROJECT." +- echo "Install the appropriate package for your distribution," +- echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" +- DIE=1 +-fi +- +-if test "$DIE" -eq 1; then +- exit 1 +-fi +- + test $TEST_TYPE $FILE || { +@@ -98,25 +37 @@ $AUTOCONF || exit $? - -cd $ORIGDIR || exit $? diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index fc01baebb8b5..a2b1dcfb3053 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= lept.2:${PORTSDIR}/graphics/leptonica DIST_SUBDIR= ${PORTNAME} PROJECTHOST= tesseract-ocr -USE_AUTOTOOLS= automake +USE_AUTOTOOLS= automake autoconf:env USE_LDCONFIG= yes CONFIGURE_ENV= LIBLEPT_HEADERSDIR="${LOCALBASE}/include/leptonica" @@ -55,7 +55,12 @@ PORTDOCS= AUTHORS ChangeLog README ReleaseNotes PORTEXAMPLES= eurotext.tif phototest.tif .endif +AUTOTOOLSFILES= aclocal.m4 + post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + -e 's|2.65|%%AUTOCONF_VERSION%%|g' \ + ${WRKSRC}/aclocal.m4 @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'\ ${WRKSRC}/configure @${REINPLACE_CMD} -e '1s|.*|/*|' ${WRKSRC}/ccutil/strngs.h diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile index d3d15186581c..b7886fdc3f16 100644 --- a/graphics/wxsvg/Makefile +++ b/graphics/wxsvg/Makefile @@ -27,7 +27,11 @@ USE_WX= yes USE_AUTOTOOLS= automake WX_CONF_ARGS= absolute +AUTOTOOLSFILES= aclocal.m4 + post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + ${WRKSRC}/aclocal.m4 @cd ${WRKSRC} && \ ${TOUCH} -f NEWS INSTALL # @${REINPLACE_CMD} -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=${WX_CONFIG}|' \ diff --git a/japanese/mutt-devel/files/patch-configure.ac b/japanese/mutt-devel/files/patch-configure.ac new file mode 100644 index 000000000000..4de77794ffc5 --- /dev/null +++ b/japanese/mutt-devel/files/patch-configure.ac @@ -0,0 +1,9 @@ +--- configure.ac.orig 2010-08-24 09:34:21.000000000 -0700 ++++ configure.ac 2012-05-03 18:35:26.000000000 -0700 +@@ -29,6 +29,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AC_PROG_CPP diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile index d5f9b4bb3f95..fbbb57117636 100644 --- a/mail/kshowmail/Makefile +++ b/mail/kshowmail/Makefile @@ -21,6 +21,8 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:env automake:env libtool:env GNU_CONFIGURE= yes +AUTOTOOLSFILES= admin/cvs.sh + .include <bsd.port.pre.mk> pre-configure: diff --git a/mail/kshowmail/files/patch-admin-cvs.sh b/mail/kshowmail/files/patch-admin-cvs.sh index b62efbb3b767..465a8ff8a5a8 100644 --- a/mail/kshowmail/files/patch-admin-cvs.sh +++ b/mail/kshowmail/files/patch-admin-cvs.sh @@ -1,7 +1,12 @@ ---- 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 @@ - ;; +--- admin/cvs.sh.orig 2007-05-17 11:12:38.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:23:49.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - 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* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." diff --git a/mail/mutt-devel/files/patch-configure.ac b/mail/mutt-devel/files/patch-configure.ac new file mode 100644 index 000000000000..993e53daf38d --- /dev/null +++ b/mail/mutt-devel/files/patch-configure.ac @@ -0,0 +1,9 @@ +--- configure.ac.orig 2010-08-24 09:34:21.000000000 -0700 ++++ configure.ac 2012-05-03 18:14:34.000000000 -0700 +@@ -29,6 +29,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AC_PROG_CPP diff --git a/mail/mutt/files/patch-configure.in b/mail/mutt/files/patch-configure.in index 4e27667bfdd9..e255741da094 100644 --- a/mail/mutt/files/patch-configure.in +++ b/mail/mutt/files/patch-configure.in @@ -1,11 +1,14 @@ ---- configure.in.orig Mon Nov 11 14:11:26 2002 -+++ configure.in Mon Nov 11 14:12:09 2002 -@@ -625,7 +625,7 @@ - fi]) - +--- configure.in.orig 2007-05-26 17:58:12.000000000 -0700 ++++ configure.in 2012-05-03 18:04:49.000000000 -0700 +@@ -31,6 +31,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AC_PROG_CPP +@@ -629,3 +625,3 @@ if test x$GCC = xyes -a $mutt_cv_warnings = yes; then - CFLAGS="-Wall -pedantic $CFLAGS" + CFLAGS="-Wall $CFLAGS" fi - - AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in index 4e27667bfdd9..e255741da094 100644 --- a/mail/mutt14/files/patch-configure.in +++ b/mail/mutt14/files/patch-configure.in @@ -1,11 +1,14 @@ ---- configure.in.orig Mon Nov 11 14:11:26 2002 -+++ configure.in Mon Nov 11 14:12:09 2002 -@@ -625,7 +625,7 @@ - fi]) - +--- configure.in.orig 2007-05-26 17:58:12.000000000 -0700 ++++ configure.in 2012-05-03 18:04:49.000000000 -0700 +@@ -31,6 +31,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AC_PROG_CPP +@@ -629,3 +625,3 @@ if test x$GCC = xyes -a $mutt_cv_warnings = yes; then - CFLAGS="-Wall -pedantic $CFLAGS" + CFLAGS="-Wall $CFLAGS" fi - - AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile index 50089bf18e85..605a81f3e7af 100644 --- a/multimedia/kplayer/Makefile +++ b/multimedia/kplayer/Makefile @@ -25,6 +25,8 @@ USE_GETTEXT= yes USE_PERL5_BUILD=yes USE_AUTOTOOLS= automake:env autoconf:env libtool +AUTOTOOLSFILES= admin/cvs.sh + pre-configure: @(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist) diff --git a/multimedia/kplayer/files/patch-admin__cvs.sh b/multimedia/kplayer/files/patch-admin__cvs.sh new file mode 100644 index 000000000000..bc66600b3487 --- /dev/null +++ b/multimedia/kplayer/files/patch-admin__cvs.sh @@ -0,0 +1,12 @@ +--- admin/cvs.sh.orig 2007-02-26 09:59:34.000000000 -0800 ++++ admin/cvs.sh 2012-04-24 09:25:31.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; +- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1*) ++ automake*%%AUTOMAKE_VERSION%%*) + echo "*** $AUTOMAKE_STRING found." diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile index 88985e7bed2d..6806d9e56456 100644 --- a/net-mgmt/collectd/Makefile +++ b/net-mgmt/collectd/Makefile @@ -388,7 +388,12 @@ CONFIGURE_ARGS+=--disable-xmms PLIST_SUB+= XMMS="@comment " .endif +AUTOTOOLSFILES= aclocal.m4 + post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + -e 's|2.65|%%AUTOCONF_VERSION%%|g' \ + ${WRKSRC}/aclocal.m4 @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 793e9d15193d..1787b2740eb0 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -394,7 +394,12 @@ CONFIGURE_ARGS+=--disable-xmms PLIST_SUB+= XMMS="@comment " .endif +AUTOTOOLSFILES= aclocal.m4 + post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + -e 's|2.67|%%AUTOCONF_VERSION%%|g' \ + ${WRKSRC}/aclocal.m4 @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ diff --git a/net/enet/Makefile b/net/enet/Makefile index 386846dd214d..81a0106783f0 100644 --- a/net/enet/Makefile +++ b/net/enet/Makefile @@ -15,11 +15,19 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple and robust communication library based on UDP GNU_CONFIGURE= yes -USE_AUTOTOOLS= automake +USE_AUTOTOOLS= automake autoconf:env USE_LDCONFIG= yes DOCS= design.txt docs/FAQ.dox docs/design.dox docs/tutorial.dox + +AUTOTOOLSFILES= aclocal.m4 + +post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + -e 's|2.67|%%AUTOCONF_VERSION%%|g' \ + ${WRKSRC}/aclocal.m4 + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/net/msend/files/patch-Makefile.am b/net/msend/files/patch-Makefile.am new file mode 100644 index 000000000000..4b48599ad1e3 --- /dev/null +++ b/net/msend/files/patch-Makefile.am @@ -0,0 +1,6 @@ +--- Makefile.am.orig 1999-05-02 19:01:04.000000000 -0700 ++++ Makefile.am 2012-05-03 16:56:22.000000000 -0700 +@@ -1,3 +1 @@ +-AUTOMAKE_OPTIONS = ansi2knr +- + bin_PROGRAMS = msend diff --git a/net/msend/files/patch-configure.in b/net/msend/files/patch-configure.in new file mode 100644 index 000000000000..012646095595 --- /dev/null +++ b/net/msend/files/patch-configure.in @@ -0,0 +1,6 @@ +--- configure.in.orig 1999-05-02 05:58:01.000000000 -0700 ++++ configure.in 2012-05-03 16:53:21.000000000 -0700 +@@ -17,3 +17,2 @@ + dnl Checks for typedefs, structures, and compiler characteristics. +-AM_C_PROTOTYPES + AC_C_CONST diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile index f045efecf6d2..7cdc433923a6 100644 --- a/net/ntp-devel/Makefile +++ b/net/ntp-devel/Makefile @@ -77,6 +77,12 @@ MAN8+= ntpsnmpd.8 PLIST_SUB+= NETSNMP="@comment " .endif +AUTOTOOLSFILES= aclocal.m4 + +post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + ${WRKSRC}/aclocal.m4 + post-install: @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} diff --git a/net/ntp/Makefile b/net/ntp/Makefile index 2d83f816b3cb..b4e038bbd9f1 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -61,6 +61,12 @@ CONFIGURE_ARGS+= --enable-${D} .endif .endfor +AUTOTOOLSFILES= aclocal.m4 + +post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + ${WRKSRC}/aclocal.m4 + post-install: @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 3868229e013d..028c374a193b 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -42,6 +42,13 @@ MAN8= ovs-appctl.8 ovs-controller.8 ovs-discover.8 ovs-dpctl.8 \ BROKEN= does not compile .endif +AUTOTOOLSFILES= aclocal.m4 + +post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' \ + -e 's|2.65|%%AUTOCONF_VERSION%%|g' \ + ${WRKSRC}/aclocal.m4 + post-install: ${INSTALL_DATA} ${WRKSRC}/vswitchd/vswitch.ovsschema ${PREFIX}/share/openvswitch/ diff --git a/print/gnome-specimen/Makefile b/print/gnome-specimen/Makefile index c6d6e98f0ad8..4e419bab9bef 100644 --- a/print/gnome-specimen/Makefile +++ b/print/gnome-specimen/Makefile @@ -29,4 +29,7 @@ INSTALLS_ICONS= yes pre-configure: ( cd ${WRKSRC} ; ${AUTORECONF} ; ${AUTOMAKE} ) +post-configure: + @${INSTALL_SCRIPT} ${AUTOMAKE_DIR}/py-compile ${WRKSRC} + .include <bsd.port.post.mk> diff --git a/science/kst/Makefile b/science/kst/Makefile index 18e68ca3288f..fd07764cdd34 100644 --- a/science/kst/Makefile +++ b/science/kst/Makefile @@ -25,6 +25,8 @@ USE_LDCONFIG= yes USE_GETTEXT= yes MAKE_JOBS_SAFE= yes +AUTOTOOLSFILES= admin/cvs.sh + OPTIONS= NETCDF "Enable netcdf data support" off \ CDF "Enable cdf data support" off \ KDEBASE "Enable JavaScript console" off diff --git a/science/kst/files/patch-admin__cvs.sh b/science/kst/files/patch-admin__cvs.sh index b4ba39558c05..0569b22be99b 100644 --- a/science/kst/files/patch-admin__cvs.sh +++ b/science/kst/files/patch-admin__cvs.sh @@ -1,7 +1,12 @@ ---- 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 @@ - ;; +--- admin/cvs.sh.orig 2010-03-29 03:51:00.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:33:00.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - 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* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile index a47c13a66baf..941030b1f066 100644 --- a/security/kovpn/Makefile +++ b/security/kovpn/Makefile @@ -29,6 +29,8 @@ USE_XORG= xpm GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf:env automake:env libtool +AUTOTOOLSFILES= admin/cvs.sh + .include <bsd.port.pre.mk> pre-configure: diff --git a/security/kovpn/files/patch-admin-cvs.sh b/security/kovpn/files/patch-admin-cvs.sh index e8b9f5e70eba..39fcd3ad1409 100644 --- a/security/kovpn/files/patch-admin-cvs.sh +++ b/security/kovpn/files/patch-admin-cvs.sh @@ -1,7 +1,12 @@ ---- 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 @@ - ;; +--- admin/cvs.sh.orig 2008-07-07 13:38:56.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:34:37.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - 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* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." diff --git a/security/sssd/Makefile b/security/sssd/Makefile index 47ba3479b52d..0e5e25c7aff6 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -74,7 +74,10 @@ IGNORE= is not supported prior to 8.0-RELEASE BROKEN= Does not link on ia64, powerpc, or sparc64 .endif +AUTOTOOLSFILES= aclocal.m4 + post-patch: + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' ${WRKSRC}/aclocal.m4 @${REINPLACE_CMD} -e 's|SIGCLD|SIGCHLD|g' ${WRKSRC}/src/util/signal.c @${REINPLACE_CMD} -e '/#define SIZE_T_MAX ((size_t) -1)/d' ${WRKSRC}/src/util/util.h @${REINPLACE_CMD} -e '/pam_misc/d' ${WRKSRC}/src/sss_client/pam_test_client.c diff --git a/security/suricata/Makefile b/security/suricata/Makefile index 5e287cc8679e..fba36c4c3621 100644 --- a/security/suricata/Makefile +++ b/security/suricata/Makefile @@ -87,8 +87,13 @@ CONFIGURE_ARGS+= --enable-dag \ --with-dag-libraries=${LOCALBASE}/lib .endif +AUTOTOOLSFILES= aclocal.m4 libhtp/aclocal.m4 + post-patch: @${REINPLACE_CMD} -Ee 's|^(install-data-am: )install-pkgconfigDATA|\1|' ${WRKSRC}/libhtp/Makefile.in +.for f in ${AUTOTOOLSFILES} + @${REINPLACE_CMD} -e 's|1.11.1|%%AUTOMAKE_APIVER%%|g' ${WRKSRC}/${f} +.endfor pre-install: @${REINPLACE_CMD} -e 's|/etc/suricata|${PREFIX}/etc/suricata|g' ${WRKSRC}/suricata.yaml diff --git a/sysutils/lcdproc/files/patch-server__drivers__Makefile.am b/sysutils/lcdproc/files/patch-server__drivers__Makefile.am new file mode 100644 index 000000000000..47625747a82b --- /dev/null +++ b/sysutils/lcdproc/files/patch-server__drivers__Makefile.am @@ -0,0 +1,8 @@ +--- server/drivers/Makefile.am.orig 2011-08-14 05:29:16.000000000 -0700 ++++ server/drivers/Makefile.am 2012-04-17 11:55:39.000000000 -0700 +@@ -22,3 +22,4 @@ + +-pkglib_PROGRAMS = @DRIVERS@ ++my_execbindir = $(pkglibdir) ++my_execbin_PROGRAMS = @DRIVERS@ + EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index 7828d7107012..938bbaac865c 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -33,6 +33,7 @@ MAKE_JOBS_SAFE= yes #.else USE_AUTOTOOLS= autoconf autoheader aclocal automake libtool ACLOCAL_ARGS= -I m4 +AUTOMAKE_ARGS= --add-missing #.endif CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/lighttpd --enable-static diff --git a/www/lighttpd/files/patch-configure.ac b/www/lighttpd/files/patch-configure.ac new file mode 100644 index 000000000000..2f5c627cd90e --- /dev/null +++ b/www/lighttpd/files/patch-configure.ac @@ -0,0 +1,20 @@ +--- configure.ac.orig 2011-07-03 09:33:11.000000000 -0700 ++++ configure.ac 2012-05-03 16:49:19.000000000 -0700 +@@ -18,2 +18,3 @@ + AM_PROG_CC_C_O ++AM_PROG_AR + AC_PROG_LD +@@ -26,7 +27,2 @@ + +-dnl check environment +-AC_AIX +-AC_ISC_POSIX +-AC_MINIX +- + dnl AC_CANONICAL_HOST +@@ -40,5 +36,2 @@ + +-dnl more automake stuff +-AM_C_PROTOTYPES +- + dnl libtool diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index 6e55d0514124..01aa098b70ce 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -48,7 +48,14 @@ BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif post-patch: - ${REINPLACE_CMD} -e 's,|| mv,|| cp -p,' ${WRKSRC}/proxy/config/Makefile.am + @${REINPLACE_CMD} -e 's,|| mv,|| cp -p,' ${WRKSRC}/proxy/config/Makefile.am + +pre-configure: + @${FIND} ${WRKSRC}/example ${WRKSRC}/plugins/conf_remap \ + -name Makefile.am | ${XARGS} ${REINPLACE_CMD} \ + -e 's,CFLAGS+=,AM_CFLAGS=,' \ + -e 's,CXXFLAGS+=,AM_CXXFLAGS=,' + @cd ${WRKSRC} && ${AUTORECONF} -i post-configure: @${FIND} ${WRKSRC} -name 'Makefile' | ${XARGS} ${REINPLACE_CMD} \ diff --git a/www/trafficserver/files/patch-configure.ac b/www/trafficserver/files/patch-configure.ac new file mode 100644 index 000000000000..44d97a66c01d --- /dev/null +++ b/www/trafficserver/files/patch-configure.ac @@ -0,0 +1,13 @@ +--- configure.ac.orig 2012-03-17 18:02:10.000000000 -0700 ++++ configure.ac 2012-05-03 16:16:05.000000000 -0700 +@@ -458,2 +458,6 @@ + ++# required by automake-1.12 ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR ++ + AC_PROG_CPP +@@ -467,3 +471,2 @@ + AC_CHECK_PROG(ASCPP, cpp, cpp) +-AC_CHECK_TOOL(AR, ar, ar) + AC_ISC_POSIX diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile index 8c570b304b71..45470ef376fe 100644 --- a/x11-themes/kdmtheme/Makefile +++ b/x11-themes/kdmtheme/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_PERL5_BUILD=yes USE_AUTOTOOLS= automake:env autoconf:env libtool autoheader:env USE_GMAKE= yes -AUTOTOOLSFILES= admin/detect-autoconf.sh +AUTOTOOLSFILES= admin/cvs.sh admin/detect-autoconf.sh pre-configure: @(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist) diff --git a/x11-themes/kdmtheme/files/patch-admin__cvs.sh b/x11-themes/kdmtheme/files/patch-admin__cvs.sh index 1847813fb3f8..088bb15a71f6 100644 --- a/x11-themes/kdmtheme/files/patch-admin__cvs.sh +++ b/x11-themes/kdmtheme/files/patch-admin__cvs.sh @@ -1,17 +1,22 @@ ---- admin/cvs.sh.orig 2006-11-09 16:42:52.000000000 -0600 -+++ admin/cvs.sh 2010-09-28 11:40:53.000000000 -0500 +--- admin/cvs.sh.orig 2006-11-09 14:42:52.000000000 -0800 ++++ admin/cvs.sh 2012-04-23 23:09:35.000000000 -0700 @@ -34,3 +34,3 @@ case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; -+ autoconf*2.6*) : ;; ++ autoconf*%%AUTOCONF_VERSION%%*) : ;; "" ) @@ -49,3 +49,3 @@ case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; -+ autoheader*2.6* ) : ;; ++ autoheader*%%AUTOCONF_VERSION%%* ) : ;; "" ) -@@ -70,3 +70,3 @@ - ;; +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) -+ automake*1.11* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." |