From 8262a7b51d413e11ef8f67c56e862ebbc6f182de Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Wed, 15 Sep 2010 18:35:24 +0000 Subject: Autotools update. Read ports/UPDATING 20100915 for details. Approved by: portmgr (for Mk/bsd.port.mk part) Tested by: Multiple -exp runs --- lang/expect-devel/Makefile | 3 ++- lang/gambas2-base/Makefile | 4 ++-- lang/ghc/Makefile | 4 ++-- lang/gnustep-base/Makefile | 6 +++--- lang/gprolog/Makefile | 4 ++-- lang/guile/Makefile | 6 +++--- lang/kroc/Makefile | 4 ++-- lang/otcl/Makefile | 4 ++-- lang/php4/Makefile | 8 ++++++-- lang/php4/files/patch-scripts::phpize.in | 4 ++-- lang/php5/Makefile | 8 ++++++-- lang/php5/files/patch-scripts::phpize.in | 4 ++-- lang/php52/Makefile | 7 ++++++- lang/php52/files/patch-scripts::phpize.in | 4 ++-- lang/php53/Makefile | 8 ++++++-- lang/php53/files/patch-scripts::phpize.in | 4 ++-- lang/ruby18/Makefile | 2 +- lang/sdcc-devel/Makefile | 3 ++- lang/sdcc/Makefile | 3 ++- 19 files changed, 55 insertions(+), 35 deletions(-) (limited to 'lang') diff --git a/lang/expect-devel/Makefile b/lang/expect-devel/Makefile index 9ee9e68dbfa3..8057aa7e8187 100644 --- a/lang/expect-devel/Makefile +++ b/lang/expect-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= expect PORTVERSION= 5.44.1.15 +PORTREVISION= 1 CATEGORIES= lang tcl tk MASTER_SITES= SF/wintcltk/Sources/Package%20Sources DISTNAME= expect-cvs-20091231 @@ -16,7 +17,7 @@ COMMENT= A sophisticated scripter based on tcl/tk CONFLICTS= expect-5.43* LATEST_LINK= expect-devel -USE_AUTOTOOLS= autoconf:262 +USE_AUTOTOOLS= autoconf:267 EXPECT_VER= ${PORTVERSION} diff --git a/lang/gambas2-base/Makefile b/lang/gambas2-base/Makefile index 38abf5207442..42663977714b 100644 --- a/lang/gambas2-base/Makefile +++ b/lang/gambas2-base/Makefile @@ -7,7 +7,7 @@ PORTNAME= gambas2 PORTVERSION= 2.15.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= lang kde MASTER_SITES= SF/${PORTNAME:S/2//g}/${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX?= -base @@ -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:262:env automake:19:env +USE_AUTOTOOLS= autoconf:267:env automake:19:env USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 0c424c224ea3..c2be1b189148 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -6,7 +6,7 @@ PORTNAME= ghc PORTVERSION= 6.10.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ ${MASTER_SITE_LOCAL:S/$/:boot/} \ @@ -29,7 +29,7 @@ BOOT_HADDOCK_VERSION= ${HADDOCK_VERSION} HSCOLOUR_VERSION= 1.15 GHCPATH_VERSION= 0.1.0.5 -USE_AUTOTOOLS= autoconf:262:env +USE_AUTOTOOLS= autoconf:267:env USE_BZIP2= yes LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile index b0708bcc9b84..c24e7615b3a6 100644 --- a/lang/gnustep-base/Makefile +++ b/lang/gnustep-base/Makefile @@ -8,10 +8,10 @@ PORTNAME= gnustep-base .if defined(WITH_GNUSTEP_DEVEL) PORTVERSION= 1.21.1 -PORTREVISION= 1 +PORTREVISION= 2 .else PORTVERSION= 1.19.3 -PORTREVISION= 3 +PORTREVISION= 4 .endif CATEGORIES= lang devel gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} @@ -31,7 +31,7 @@ BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config LICENSE_COMB= multi LICENSE= GPLv3 LGPL3 -USE_AUTOTOOLS= autoconf:262 +USE_AUTOTOOLS= autoconf:267 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-procfs --disable-openssl --enable-tls \ --with-tls-prefix=${LOCALBASE} TLS_CONFIG="pkg-config -gnutls" diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile index 04129eba6cc6..6e78792ed96c 100644 --- a/lang/gprolog/Makefile +++ b/lang/gprolog/Makefile @@ -7,7 +7,7 @@ PORTNAME= gprolog PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.gprolog.org/ @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262 +USE_AUTOTOOLS= autoconf:267 CONFIGURE_ARGS= --with-c-flags="${CFLAGS}" CONFIGURE_TARGET= ${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL} diff --git a/lang/guile/Makefile b/lang/guile/Makefile index f6d7c47554f0..c4c314995d61 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -7,7 +7,7 @@ PORTNAME= guile PORTVERSION= 1.8.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang scheme MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= guile @@ -17,7 +17,7 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp -USE_AUTOTOOLS= autoconf:262 libltdl:22 +USE_AUTOTOOLS= autoconf:267 libltdl:22 USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes @@ -46,6 +46,6 @@ post-extract: post-patch: @cd ${WRKSRC} ; \ ${REINPLACE_CMD} -e 's|||g' ${REINPLACE_FILES} - @${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4 + @${REINPLACE_CMD} -e 's|2.61|2.67|g' ${WRKSRC}/aclocal.m4 .include diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile index 82e2a7d2bb72..1dc9e6f98dfb 100644 --- a/lang/kroc/Makefile +++ b/lang/kroc/Makefile @@ -7,7 +7,7 @@ PORTNAME= kroc PORTVERSION= 1.5.r6372 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://ftp.i-scream.org/pub/kroc/ \ ftp://ftp.i-scream.org/pub/kroc/ @@ -29,7 +29,7 @@ USE_MYSQL= yes USE_PYTHON= yes USE_SDL= sdl sound USE_GNOME= libxslt -USE_AUTOTOOLS= autoconf:262:env automake:110:env +USE_AUTOTOOLS= autoconf:267:env automake:110:env USE_XORG= xmu xi GNU_CONFIGURE= yes diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile index 8e30e08fcfd7..511edb2921b0 100644 --- a/lang/otcl/Makefile +++ b/lang/otcl/Makefile @@ -7,7 +7,7 @@ PORTNAME= otcl PORTVERSION= 1.13 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= src- CATEGORIES= lang tcl tk MASTER_SITES= SF/${PORTNAME}-tclcl/OTcl/${PORTVERSION} @@ -22,7 +22,7 @@ USE_TK_NO_THREADS= yes INVALID_TK_VER= 85 86 USE_XORG= xext -USE_AUTOTOOLS= autoconf:262 +USE_AUTOTOOLS= autoconf:267 USE_LDCONFIG= yes .if !defined(NOPORTDOCS) diff --git a/lang/php4/Makefile b/lang/php4/Makefile index ab42906778c5..d5360cf2737c 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -7,7 +7,7 @@ PORTNAME= php4 PORTVERSION= 4.4.9 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ @@ -23,7 +23,7 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} USE_BZIP2= yes .if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf:262 +USE_AUTOTOOLS= autoconf:267 CONFIGURE_ARGS= --enable-versioning \ --enable-memory-limit \ @@ -158,7 +158,11 @@ post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* +# Work around issues with newer (>=2.64) autoconf pre-configure: + @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ + ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` + @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 post-build: diff --git a/lang/php4/files/patch-scripts::phpize.in b/lang/php4/files/patch-scripts::phpize.in index c3ebb0867fbe..504db64246c8 100644 --- a/lang/php4/files/patch-scripts::phpize.in +++ b/lang/php4/files/patch-scripts::phpize.in @@ -6,8 +6,8 @@ { - test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf - test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader -+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.62 -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.62 ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.67 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.67 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <=2.64) autoconf pre-configure: + @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ + ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` + @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 post-build: diff --git a/lang/php5/files/patch-scripts::phpize.in b/lang/php5/files/patch-scripts::phpize.in index 8d3afdbecc08..bbac86ce30ef 100644 --- a/lang/php5/files/patch-scripts::phpize.in +++ b/lang/php5/files/patch-scripts::phpize.in @@ -6,8 +6,8 @@ { - test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf - test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader -+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.62 -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.62 ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.67 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.67 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <=2.64) autoconf pre-configure: + @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ + ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` + @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 post-build: diff --git a/lang/php52/files/patch-scripts::phpize.in b/lang/php52/files/patch-scripts::phpize.in index 8d3afdbecc08..bbac86ce30ef 100644 --- a/lang/php52/files/patch-scripts::phpize.in +++ b/lang/php52/files/patch-scripts::phpize.in @@ -6,8 +6,8 @@ { - test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf - test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader -+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.62 -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.62 ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.67 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.67 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <=2.64) autoconf pre-configure: + @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ + ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` + @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 post-build: diff --git a/lang/php53/files/patch-scripts::phpize.in b/lang/php53/files/patch-scripts::phpize.in index 8d3afdbecc08..bbac86ce30ef 100644 --- a/lang/php53/files/patch-scripts::phpize.in +++ b/lang/php53/files/patch-scripts::phpize.in @@ -6,8 +6,8 @@ { - test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf - test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader -+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.62 -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.62 ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.67 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.67 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <