diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/autoconf/Makefile | 18 | ||||
| -rw-r--r-- | devel/autoconf/distinfo | 4 | ||||
| -rw-r--r-- | devel/autoconf/files/patch-autoconf.texi | 24 | ||||
| -rw-r--r-- | devel/autoconf/files/patch-doc-Makefile.in | 17 | ||||
| -rw-r--r-- | devel/autoconf/pkg-plist | 3 | ||||
| -rw-r--r-- | devel/automake/Makefile | 13 | ||||
| -rw-r--r-- | devel/automake/distinfo | 4 | ||||
| -rw-r--r-- | devel/automake/files/patch-Makefile.in | 29 | ||||
| -rw-r--r-- | devel/automake/files/patch-doc::Makefile.in | 26 | ||||
| -rw-r--r-- | devel/automake/files/patch-doc::automake.texi | 32 | ||||
| -rw-r--r-- | devel/automake/pkg-plist | 18 | ||||
| -rw-r--r-- | devel/autotools/Makefile | 6 | ||||
| -rw-r--r-- | devel/git-merge-changelog/Makefile | 4 | ||||
| -rw-r--r-- | devel/jzmq/Makefile | 2 | ||||
| -rw-r--r-- | devel/jzmq/files/patch-src_Makefile.am | 16 | ||||
| -rw-r--r-- | devel/libvirt/Makefile | 4 |
16 files changed, 89 insertions, 131 deletions
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 \ |