diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2007-07-28 06:33:59 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2007-07-28 06:33:59 +0000 |
| commit | 3b3128196e8706c3616c88df7206b4a27f7b8959 (patch) | |
| tree | 31433c1d06ed5be6756933b97f6d80a77f17b710 | |
| parent | 8cc5d5476277491942e4695f3ffd43176f7badc6 (diff) | |
| download | ports-3b3128196e8706c3616c88df7206b4a27f7b8959.tar.gz ports-3b3128196e8706c3616c88df7206b4a27f7b8959.zip | |
Update to the autotools new world order.
Tested by: numerous package build runs
Approved by: portmgr
Thanks to: des, kris, linimon, pav
Notes
Notes:
svn path=/head/; revision=196437
176 files changed, 2432 insertions, 2012 deletions
@@ -1130,7 +1130,6 @@ www/mozilla-devel-gtk1||2004-06-28|removed obsolete port security/drwebd|security/drweb|2004-06-29|functionality already in security/drweb www/drivel|deskutils/drivel|2004-06-30|moved to category deskutils devel/autoconf257||2004-07-01|autotools cleanup -devel/automake17||2004-07-01|autotools cleanup devel/libtool14||2004-07-01|autotools cleanup math/libgmp-freebsd|math/libgmp4|2004-07-02|superseded by API compatible version devel/umbrello|devel/kdesdk3|2004-07-02|Umbrello was integrated into kdesdk package @@ -1210,7 +1209,6 @@ misc/kwordquiz|misc/kdeedu3|2004-10-13|kwordquiz was integrated into the kdeedu3 audio/libvorbis-aotuv|audio/libvorbis|2004-10-13|The aoTuV enhancement has been merged into the mainstream graphics/kolourpaint|graphics/kdegraphics3|2004-10-13|kolourpaint was integrated into the kdegraphics3 port graphics/kimagemapeditor|www/kdewebdev|2004-10-13|kimagemapeditor was integrated into the kdewebdev port -devel/automake18|devel/automake19|2004-10-15|automake18 replaced with automake19 www/zope-cmftransforms|www/zope-portaltransforms|2004-10-16|renamed by authors dns/bind9-sdb-mysql||2004-10-17|No longer maintained www/phpnuke||2004-10-17|security vulnerabilities and no longer maintained diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk index f142750aa3c1..4fe59ce24b62 100644 --- a/Mk/bsd.autotools.mk +++ b/Mk/bsd.autotools.mk @@ -11,21 +11,6 @@ Autotools_Include_MAINTAINER= ade@FreeBSD.org #--------------------------------------------------------------------------- -# IMPORTANT! READ ME! YES, THAT MEANS YOU! -# -# The "versioned" autotools referenced here are for BUILDING other ports -# only. THIS CANNOT BE STRESSED HIGHLY ENOUGH. Things WILL BREAK if you -# try to use them for anything other than ports/ work. This particularly -# includes use as a run-time dependency. -# -# If you need unmodified versions of autotools, such as for use in an -# IDE, then you MUST use the devel/gnu-* equivalents, and NOT these. -# See devel/anjuta and devel/kdevelop for examples. -# -# You have been WARNED! -#--------------------------------------------------------------------------- - -#--------------------------------------------------------------------------- # Entry point into the autotools system #--------------------------------------------------------------------------- # @@ -34,6 +19,10 @@ Autotools_Include_MAINTAINER= ade@FreeBSD.org # 'tool' can currently be one of: # libtool, libltdl, autoconf, autoheader, automake, aclocal # +# There is also a special tool, called 'autotools', which is +# a convenience function to simply bring in dependencies of +# all the autotools. +# # 'version' is tool dependent # # ':env' is used to pecify that the environment variables are needed, @@ -75,10 +64,23 @@ Autotools_Include_MAINTAINER= ade@FreeBSD.org AUTOTOOL_${item:C/^([^:]+).*/\1/}${item:M*\:*\:*:C/^[^:]+:[^:]+:([^:]+)/_\1/}= ${item:C/^[^:]+:([^:]+).*/\1/} .endfor -# XXX: temporary to highlight any missed ports in the conversion -# -.if defined(AUTOTOOL_libtool_inc) -IGNORE+= error: libtool:${AUTOTOOL_libtool_inc}:inc construct no longer available +#--------------------------------------------------------------------------- +# AUTOTOOLS handling (for build, runtime, and both) +#--------------------------------------------------------------------------- +.if defined(AUTOTOOL_autotools) +AUTOTOOLS_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools + +. if ${AUTOTOOL_autotools} == "build" +BUILD_DEPENDS+= ${AUTOTOOLS_DEPENDS} +. elif ${AUTOTOOL_autotools} == "run" +RUN_DEPENDS+= ${AUTOTOOLS_DEPENDS} +. elif ${AUTOTOOL_autotools} == "both" +BUILD_DEPENDS+= ${AUTOTOOLS_DEPENDS} +RUN_DEPENDS+= ${AUTOTOOLS_DEPENDS} +. else +IGNORE+= Unknown autotools stanza: ${AUTOTOOL_autotools} +. endif + .endif #--------------------------------------------------------------------------- @@ -97,6 +99,7 @@ GNU_CONFIGURE?= yes .if defined(AUTOTOOL_automake_env) AUTOMAKE_VERSION= ${AUTOTOOL_automake_env} +AUTOMAKE_SUFFIX= ${AUTOMAKE_VERSION:C/([0-9])(.*)/\1.\2/} # Make sure we specified a legal version of automake # @@ -106,12 +109,11 @@ IGNORE+= cannot install: unknown AUTOMAKE version: ${AUTOMAKE_VERSION} # Set up the automake environment # -AUTOMAKE= ${LOCALBASE}/bin/automake${AUTOMAKE_VERSION} -AUTOMAKE_DIR= ${LOCALBASE}/share/automake${AUTOMAKE_VERSION} -ACLOCAL= ${LOCALBASE}/bin/aclocal${AUTOMAKE_VERSION} -ACLOCAL_DIR= ${LOCALBASE}/share/aclocal${AUTOMAKE_VERSION} -AUTOMAKE_PATH= ${LOCALBASE}/libexec/automake${AUTOMAKE_VERSION}: -AUTOMAKE_VARS= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} +AUTOMAKE= ${LOCALBASE}/bin/automake-${AUTOMAKE_SUFFIX} +AUTOMAKE_DIR= ${LOCALBASE}/share/automake-${AUTOMAKE_SUFFIX} +ACLOCAL= ${LOCALBASE}/bin/aclocal-${AUTOMAKE_SUFFIX} +ACLOCAL_DIR= ${LOCALBASE}/share/aclocal-${AUTOMAKE_SUFFIX} +AUTOMAKE_VARS= ACLOCAL=${ACLOCAL} AUTOMAKE=${AUTOMAKE} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} AUTOMAKE_DEPENDS= ${AUTOMAKE}:${PORTSDIR}/devel/automake${AUTOMAKE_VERSION} BUILD_DEPENDS+= ${AUTOMAKE_DEPENDS} @@ -143,6 +145,7 @@ GNU_CONFIGURE?= yes .if defined(AUTOTOOL_autoconf_env) AUTOCONF_VERSION= ${AUTOTOOL_autoconf_env} +AUTOCONF_SUFFIX= ${AUTOCONF_VERSION:C/([0-9])(.*)/\1.\2/} # Make sure we specified a legal version of autoconf # @@ -152,16 +155,15 @@ IGNORE+= cannot install: unknown AUTOCONF version: ${AUTOCONF_VERSION} # Set up the autoconf/autoheader environment # -AUTOCONF= ${LOCALBASE}/bin/autoconf${AUTOCONF_VERSION} -AUTOCONF_DIR= ${LOCALBASE}/share/autoconf${AUTOCONF_VERSION} -AUTOHEADER= ${LOCALBASE}/bin/autoheader${AUTOCONF_VERSION} -AUTOIFNAMES= ${LOCALBASE}/bin/ifnames${AUTOCONF_VERSION} -AUTOM4TE= ${LOCALBASE}/bin/autom4te${AUTOCONF_VERSION} -AUTORECONF= ${LOCALBASE}/bin/autoreconf${AUTOCONF_VERSION} -AUTOSCAN= ${LOCALBASE}/bin/autoscan${AUTOCONF_VERSION} -AUTOUPDATE= ${LOCALBASE}/bin/autoupdate${AUTOCONF_VERSION} -AUTOCONF_PATH= ${LOCALBASE}/libexec/autoconf${AUTOCONF_VERSION}: -AUTOCONF_VARS= AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} AUTOIFNAMES=${AUTOIFNAMES} AUTOM4TE=${AUTOM4TE} AUTORECONF=${AUTORECONF} AUTOSCAN=${AUTOSCAN} AUTOUPDATE=${AUTOUPDATE} +AUTOCONF= ${LOCALBASE}/bin/autoconf-${AUTOCONF_SUFFIX} +AUTOCONF_DIR= ${LOCALBASE}/share/autoconf-${AUTOCONF_SUFFIX} +AUTOHEADER= ${LOCALBASE}/bin/autoheader-${AUTOCONF_SUFFIX} +AUTOIFNAMES= ${LOCALBASE}/bin/ifnames-${AUTOCONF_SUFFIX} +AUTOM4TE= ${LOCALBASE}/bin/autom4te-${AUTOCONF_SUFFIX} +AUTORECONF= ${LOCALBASE}/bin/autoreconf-${AUTOCONF_SUFFIX} +AUTOSCAN= ${LOCALBASE}/bin/autoscan-${AUTOCONF_SUFFIX} +AUTOUPDATE= ${LOCALBASE}/bin/autoupdate-${AUTOCONF_SUFFIX} +AUTOCONF_VARS= AUTOCONF=${AUTOCONF} AUTOHEADER=${AUTOHEADER} AUTOIFNAMES=${AUTOIFNAMES} AUTOM4TE=${AUTOM4TE} AUTORECONF=${AUTORECONF} AUTOSCAN=${AUTOSCAN} AUTOUPDATE=${AUTOUPDATE} AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOCONF_DEPENDS= ${AUTOCONF}:${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION} BUILD_DEPENDS+= ${AUTOCONF_DEPENDS} @@ -221,21 +223,8 @@ LIBTOOLFILES?= ${CONFIGURE_SCRIPT} # Now that we've got our environments defined for autotools, add them # in so that the rest of the world can handle them # -AUTOTOOLS_PATH= ${AUTOMAKE_PATH}${AUTOCONF_PATH} AUTOTOOLS_VARS= ${AUTOMAKE_VARS} ${AUTOCONF_VARS} ${LIBTOOL_VARS} -.if defined(AUTOTOOLS_PATH) && (${AUTOTOOLS_PATH} != "") -AUTOTOOLS_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -CONFIGURE_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -MAKE_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -SCRIPTS_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -. for item in automake aclocal autoconf autoheader libtool -. if defined(AUTOTOOL_${item}_env) -${item:U}_ENV+= PATH=${AUTOTOOLS_PATH}${PATH} -. endif -. endfor -.endif - .if defined(AUTOTOOLS_VARS) && (${AUTOTOOLS_VARS} != "") AUTOTOOLS_ENV+= ${AUTOTOOLS_VARS} CONFIGURE_ENV+= ${AUTOTOOLS_VARS} @@ -6,6 +6,25 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20070727: + AFFECTS: autotools + AUTHOR: ade@FreeBSD.org + +Extensive reworking of the autotools ports has occurred, putting them in +the canonical locations, along with a suitable wrapper port to make +developing autotools-using code (as opposed to just building ports) +considerably easier. + +Upgrade path is as follows for portupgrade, substitute the appropriate +commands if you are using portmaster: + + 1. portupgrade -f 'autoconf*' 'automake*' + 2. cd /usr/ports/devel/autotools; make install + 3. portupgrade -a + +The second step is optional, but is recommended to bring in all versions +of autoconf and automake. + 20070723: AFFECTS: users of x11/nvidia-driver and slave ports AUTHOR: danfe@FreeBSD.org diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index 911374757a39..f0213673881a 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-newpy PORTVERSION= 12.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= chinese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -23,7 +23,6 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/chinese/iiimf-le-newpy/files/patch-Makefile b/chinese/iiimf-le-newpy/files/patch-Makefile index c13173f534a8..a72a0f768306 100644 --- a/chinese/iiimf-le-newpy/files/patch-Makefile +++ b/chinese/iiimf-le-newpy/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile index 69e109af0fa4..57372b63f19e 100644 --- a/chinese/iiimf-le-ude/Makefile +++ b/chinese/iiimf-le-ude/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-ude PORTVERSION= 12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= chinese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -23,7 +23,6 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile index c13173f534a8..a72a0f768306 100644 --- a/chinese/iiimf-le-ude/files/patch-Makefile +++ b/chinese/iiimf-le-ude/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/devel/Makefile b/devel/Makefile index fee6e2ce2832..16871d3b3dcb 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -62,6 +62,7 @@ SUBDIR += aunit SUBDIR += autobook SUBDIR += autoconf-archive + SUBDIR += autoconf-wrapper SUBDIR += autoconf213 SUBDIR += autoconf253 SUBDIR += autoconf259 @@ -69,10 +70,15 @@ SUBDIR += autodia SUBDIR += autodist SUBDIR += autogen + SUBDIR += automake-wrapper SUBDIR += automake110 SUBDIR += automake14 SUBDIR += automake15 + SUBDIR += automake16 + SUBDIR += automake17 + SUBDIR += automake18 SUBDIR += automake19 + SUBDIR += autotools SUBDIR += avalon-framework SUBDIR += avarice SUBDIR += avltree diff --git a/devel/autoconf-wrapper/Makefile b/devel/autoconf-wrapper/Makefile new file mode 100644 index 000000000000..d4594b46688d --- /dev/null +++ b/devel/autoconf-wrapper/Makefile @@ -0,0 +1,44 @@ +# New ports collection makefile for: autoconf-wrapper +# Date created: 4th April 2007 +# Whom: des +# +# $FreeBSD$ +# + +PORTNAME?= autoconf-wrapper +PORTVERSION= 20070404 +CATEGORIES= devel +MASTER_SITES= # none +DISTFILES= # none + +MAINTAINER= des@FreeBSD.org +COMMENT?= Wrapper script for GNU autoconf + +WRKSRC= ${WRKDIR} +NO_BUILD= YES + +TOOL?= AUTOCONF +WRAPPED_TOOLS?= autoconf autoheader autom4te autoreconf autoscan \ + autoupdates ifnames +.include <bsd.port.pre.mk> + +TOOLS_CASE!= ${ECHO_CMD} ${WRAPPED_TOOLS} | ${TR} ' ' '|' +PLIST_FILES= bin/${PORTNAME} +.for tool in ${WRAPPED_TOOLS} +PLIST_FILES+= bin/${tool} +.endfor + +do-configure: + @${SED} \ + -e 's,%%PREFIX%%,${PREFIX},g' \ + -e 's,%%TOOL%%,${TOOL},g' \ + -e 's,%%TOOLS_CASE%%,${TOOLS_CASE},g' \ + <${FILESDIR}/autotools-wrapper.sh >${WRKDIR}/${PORTNAME}.sh + +do-install: + @${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME} +.for tool in ${WRAPPED_TOOLS} + @${LN} -s ${PORTNAME} ${PREFIX}/bin/${tool} +.endfor + +.include <bsd.port.post.mk> diff --git a/devel/autoconf-wrapper/files/autotools-wrapper.sh b/devel/autoconf-wrapper/files/autotools-wrapper.sh new file mode 100644 index 000000000000..571520c321d1 --- /dev/null +++ b/devel/autoconf-wrapper/files/autotools-wrapper.sh @@ -0,0 +1,95 @@ +#!/bin/sh +#- +# Copyright (c) 2007 Dag-Erling Coïdan Smørgrav +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer +# in this position and unchanged. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +bindir=%%PREFIX%%/bin +tool=$(basename $0) + +error() { + echo "$@" 1>&2 + exit 1 +} + +# Verify that the requested tool is one we know about +case ${tool} in +%%TOOLS_CASE%%) + ;; +*) + error "${tool}: unknown tool" + ;; +esac + +if [ -n "${AUTOTOOLS_DEBUG}" -a -n "${%%TOOL%%_VERSION}" ] ; then + echo "Requested ${tool} version ${%%TOOL%%_VERSION}" 1>&2 +fi + +# +# Identify available versions. Most of the complexity here stems from +# the fact that some versions are installed as "toolXYZ" while some +# are installed as "tool-X.YZ". The latter is the canonical form, +# i.e. the one intended by the authors and expected by the tools +# themselves. +# +# The double sort is necessary to correctly identify 1.10 as newer +# than 1.9. +# +# Note that it is conceivable that version A.BC of the requested tool +# is present both as "toolABC" and as "tool-A.BC". We take no special +# measures to handle this case. +# +find ${bindir} -name "${tool}*[0-9]" | sed -E \ + -e "s@^.*/${tool}-([0-9])\\.([0-9]+)\$@\1 \2 -\1.\2@" \ + -e "s@^.*/${tool}([0-9])([0-9]+)\$@\1 \2 \1\2@" | \ + sort -n -k1 | sort -n -s -k2 | { +while read maj min suffix ; do + selected_version="$maj$min" + selected_suffix=$suffix + if [ -n "${%%TOOL%%_VERSION}" -a \ + "x${%%TOOL%%_VERSION}" = x${selected_version} ] ; then + break + fi +done + +if [ -z "${selected_version}" ] ; then + error "${tool}: not installed" +fi + +if [ -n "${%%TOOL%%_VERSION}" -a \ + "x${%%TOOL%%_VERSION}" != x${selected_version} ] ; then + error "${tool}: required version" \ + "${%%TOOL%%_VERSION} not found" +fi + +if [ -n "${AUTOTOOLS_DEBUG}" ] ; then + echo "Selecting ${tool} version ${selected_version}" \ + "(${bindir}/${tool}${selected_suffix})" 1>&2 +fi + +exec ${bindir}/${tool}${selected_suffix} "$@" +} diff --git a/devel/autoconf-wrapper/pkg-descr b/devel/autoconf-wrapper/pkg-descr new file mode 100644 index 000000000000..ee8c066ca729 --- /dev/null +++ b/devel/autoconf-wrapper/pkg-descr @@ -0,0 +1,3 @@ +This port installs a wrapper script for autoconf, with symlinks to the +unversioned name of each tool included with autoconf. This allows the +correct version to be selected depending on the user's requirements. diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile index 48984a9558a9..795de66d8fb2 100644 --- a/devel/autoconf213/Makefile +++ b/devel/autoconf213/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.13.000227 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ade/gnu @@ -17,32 +17,29 @@ MAINTAINER= ade@FreeBSD.org COMMENT= Automatically configure source code on many Un*x platforms (2.13) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 213 +BUILD_VERSION= 2.13 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf${BUILD_VERSION} +LATEST_LINK= autoconf213 USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} WRKSRC= ${WRKDIR}/autoconf -INFO= autoconf${BUILD_VERSION} +INFO= autoconf-${BUILD_VERSION} + +STRIP= # none post-patch: @${RM} ${WRKSRC}/*.info* >/dev/null 2>&1 || true post-install: - @${CHMOD} +x ${PREFIX}/share/autoconf${BUILD_VERSION}/config.* + @${CHMOD} +x ${PREFIX}/share/autoconf-${BUILD_VERSION}/config.* @${INSTALL_SCRIPT} ${WRKSRC}/install-sh \ - ${PREFIX}/share/autoconf${BUILD_VERSION} - @-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION} -.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i} -.endfor + ${PREFIX}/share/autoconf-${BUILD_VERSION} .include <bsd.port.mk> diff --git a/devel/autoconf213/files/patch-Makefile.in b/devel/autoconf213/files/patch-Makefile.in index c2f58f6abbb7..cddd63509ff7 100644 --- a/devel/autoconf213/files/patch-Makefile.in +++ b/devel/autoconf213/files/patch-Makefile.in @@ -1,80 +1,36 @@ ---- Makefile.in.orig Sun Feb 27 11:18:10 2000 -+++ Makefile.in Sat Oct 12 19:40:56 2002 -@@ -49,7 +49,7 @@ - - # Directory in which to install library files. +--- Makefile.in.orig Sun Feb 27 08:18:10 2000 ++++ Makefile.in Thu Apr 5 02:14:57 2007 +@@ -51,3 +51,3 @@ datadir = @datadir@ -acdatadir = $(datadir)/autoconf -+acdatadir = $(datadir)/autoconf213 ++acdatadir = $(datadir)/autoconf-2.13 - # Directory in which to install documentation info files. - infodir = @infodir@ -@@ -68,7 +68,7 @@ - DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ - Makefile.in NEWS README TODO $(M4FILES) \ +@@ -70,3 +70,3 @@ acconfig.h acfunctions acheaders acidentifiers \ - acmakevars acprograms autoconf.info* \ -+ acmakevars acprograms autoconf213.info* \ ++ acmakevars acprograms autoconf-2.13.info* \ autoconf.sh autoconf.texi install.texi \ - autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \ - config.guess config.sub configure configure.in \ -@@ -106,10 +106,10 @@ - autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 - autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 +@@ -108,6 +108,6 @@ -info: autoconf.info @standards_info@ INSTALL -+info: autoconf213.info ++info: autoconf-2.13.info # Use --no-split to avoid creating filenames > 14 chars. -autoconf.info: autoconf.texi install.texi -+autoconf213.info: autoconf.texi install.texi ++autoconf-2.13.info: autoconf.texi install.texi $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ - - INSTALL: install.texi -@@ -119,7 +119,7 @@ - standards.info: standards.texi make-stds.texi - $(MAKEINFO) -I$(srcdir) $(srcdir)/standards.texi --no-split --output=$@ - --dvi: autoconf.dvi @standards_dvi@ -+dvi: autoconf.dvi - - autoconf.dvi: autoconf.texi - $(TEXI2DVI) $(srcdir)/autoconf.texi -@@ -141,7 +141,7 @@ - - install: all $(M4FILES) acconfig.h installdirs install-info - for p in $(ASCRIPTS); do \ -- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ -+ $(INSTALL) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - done - for i in $(M4FROZEN); do \ - $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ -@@ -150,16 +150,16 @@ - $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ - done - -if test -f autoscan; then \ -- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ -+ $(INSTALL) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ +@@ -154,3 +154,3 @@ for i in acfunctions acheaders acidentifiers acprograms \ - acmakevars; do \ + acmakevars config.guess config.sub; do \ $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ - done; \ - else :; fi - - # Don't cd, to avoid breaking install-sh references. +@@ -161,3 +161,3 @@ install-info: info installdirs - if test -f autoconf.info; then \ -+ if test -f autoconf213.info; then \ ++ if test -f autoconf-2.13.info; then \ for i in *.info*; do \ - $(INSTALL_DATA) $$i $(infodir)/$$i; \ - done; \ -@@ -174,7 +174,7 @@ - rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ - done +@@ -176,3 +176,3 @@ rm -fr $(acdatadir) - cd $(infodir) && rm -f autoconf.info* -+ cd $(infodir) && rm -f autoconf213.info* ++ cd $(infodir) && rm -f autoconf-2.13.info* if test -f standards.info || test -f $(srcdir)/standards.info; \ - then cd $(infodir) && rm -f standards.info*; fi - diff --git a/devel/autoconf213/files/patch-autoconf.texi b/devel/autoconf213/files/patch-autoconf.texi index 7f621a6e827e..85f0dbb08b70 100644 --- a/devel/autoconf213/files/patch-autoconf.texi +++ b/devel/autoconf213/files/patch-autoconf.texi @@ -5,8 +5,8 @@ @c %**start of header -@setfilename autoconf.info -@settitle Autoconf -+@setfilename autoconf213.info -+@settitle Autoconf213 ++@setfilename autoconf-2.13.info ++@settitle Autoconf-2.13 @c For double-sided printing, uncomment: @c @setchapternewpage odd +@dircategory Programming & development tools @@ -18,7 +18,7 @@ @format START-INFO-DIR-ENTRY -* Autoconf: (autoconf). Create source code configuration scripts. -+* Autoconf213: (autoconf213). Create source code configuration scripts. ++* Autoconf-2.13: (autoconf-2.13). Create source code configuration scripts. END-INFO-DIR-ENTRY @end format diff --git a/devel/autoconf213/pkg-plist b/devel/autoconf213/pkg-plist index bc5307aebbbe..a9bb8e2e926d 100644 --- a/devel/autoconf213/pkg-plist +++ b/devel/autoconf213/pkg-plist @@ -1,30 +1,23 @@ -bin/autoconf%%BUILD_VERSION%% -bin/autoheader%%BUILD_VERSION%% -bin/autoreconf%%BUILD_VERSION%% -bin/autoscan%%BUILD_VERSION%% -bin/autoupdate%%BUILD_VERSION%% -bin/ifnames%%BUILD_VERSION%% -libexec/autoconf%%BUILD_VERSION%%/autoconf -libexec/autoconf%%BUILD_VERSION%%/autoheader -libexec/autoconf%%BUILD_VERSION%%/autoreconf -libexec/autoconf%%BUILD_VERSION%%/autoscan -libexec/autoconf%%BUILD_VERSION%%/autoupdate -libexec/autoconf%%BUILD_VERSION%%/ifnames -share/autoconf%%BUILD_VERSION%%/acconfig.h -share/autoconf%%BUILD_VERSION%%/acfunctions -share/autoconf%%BUILD_VERSION%%/acgeneral.m4 -share/autoconf%%BUILD_VERSION%%/acheaders -share/autoconf%%BUILD_VERSION%%/acidentifiers -share/autoconf%%BUILD_VERSION%%/acmakevars -share/autoconf%%BUILD_VERSION%%/acoldnames.m4 -share/autoconf%%BUILD_VERSION%%/acprograms -share/autoconf%%BUILD_VERSION%%/acspecific.m4 -share/autoconf%%BUILD_VERSION%%/autoconf.m4 -share/autoconf%%BUILD_VERSION%%/autoconf.m4f -share/autoconf%%BUILD_VERSION%%/autoheader.m4 -share/autoconf%%BUILD_VERSION%%/autoheader.m4f -share/autoconf%%BUILD_VERSION%%/config.guess -share/autoconf%%BUILD_VERSION%%/config.sub -share/autoconf%%BUILD_VERSION%%/install-sh -@dirrm libexec/autoconf%%BUILD_VERSION%% -@dirrm share/autoconf%%BUILD_VERSION%% +bin/autoconf-%%BUILD_VERSION%% +bin/autoheader-%%BUILD_VERSION%% +bin/autoreconf-%%BUILD_VERSION%% +bin/autoscan-%%BUILD_VERSION%% +bin/autoupdate-%%BUILD_VERSION%% +bin/ifnames-%%BUILD_VERSION%% +share/autoconf-%%BUILD_VERSION%%/acconfig.h +share/autoconf-%%BUILD_VERSION%%/acfunctions +share/autoconf-%%BUILD_VERSION%%/acgeneral.m4 +share/autoconf-%%BUILD_VERSION%%/acheaders +share/autoconf-%%BUILD_VERSION%%/acidentifiers +share/autoconf-%%BUILD_VERSION%%/acmakevars +share/autoconf-%%BUILD_VERSION%%/acoldnames.m4 +share/autoconf-%%BUILD_VERSION%%/acprograms +share/autoconf-%%BUILD_VERSION%%/acspecific.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf.m4f +share/autoconf-%%BUILD_VERSION%%/autoheader.m4 +share/autoconf-%%BUILD_VERSION%%/autoheader.m4f +share/autoconf-%%BUILD_VERSION%%/config.guess +share/autoconf-%%BUILD_VERSION%%/config.sub +share/autoconf-%%BUILD_VERSION%%/install-sh +@dirrm share/autoconf-%%BUILD_VERSION%% diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile index b546aa6353cf..b05b78eecbaa 100644 --- a/devel/autoconf253/Makefile +++ b/devel/autoconf253/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.53 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -17,19 +17,20 @@ COMMENT= Automatically configure source code on many Un*x platforms (2.53) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man -RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 253 +BUILD_VERSION= 2.53 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf${BUILD_VERSION} +LATEST_LINK= autoconf253 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5_RUN= yes -INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} +INFO= autoconf-${BUILD_VERSION} GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ @@ -37,31 +38,21 @@ GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ MAN1_PAGES= autoconf autoheader autom4te autoreconf autoscan \ autoupdate config.guess config.sub ifnames -MAN1= ${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g} +MAN1= ${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g} post-patch: - @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure) + @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1-${BUILD_VERSION},' configure) @(cd ${WRKSRC}/man && \ for file in *.[1x]; do \ - ${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 ; \ + ${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 && \ - ${MV} standards.texi standards${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in) + @(cd ${WRKSRC}/doc && ${RM} -f *.info && \ + ${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi) post-install: .for FILE in ${GENERIC_TOOLS} - @${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION} -.endfor - @-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION} -.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i} + @${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION} .endfor .include <bsd.port.mk> diff --git a/devel/autoconf253/files/patch-autoconf.texi b/devel/autoconf253/files/patch-autoconf.texi index 96be39a790c3..ccff64a74e97 100644 --- a/devel/autoconf253/files/patch-autoconf.texi +++ b/devel/autoconf253/files/patch-autoconf.texi @@ -1,13 +1,16 @@ ---- doc/autoconf.texi.orig Fri Mar 8 12:57:41 2002 -+++ doc/autoconf.texi Thu Oct 14 20:14:14 2004 +--- doc/autoconf.texi.orig Fri Mar 8 04:57:41 2002 ++++ doc/autoconf.texi Sat Apr 14 15:36:01 2007 @@ -2,4 +2,4 @@ @c %**start of header -@setfilename autoconf.info -@settitle Autoconf -+@setfilename autoconf253.info -+@settitle Autoconf253 ++@setfilename autoconf-2.53.info ++@settitle Autoconf-2.53 -@@ -36,21 +36,3 @@ +@@ -34,23 +34,5 @@ + +-@dircategory GNU admin ++@dircategory Programming & development tools @direntry -* Autoconf: (autoconf). Create source code configuration scripts -@end direntry @@ -28,5 +31,5 @@ - Recreating a configuration -* testsuite: (autoconf)testsuite Invocation. - Running an Autotest test suite -+* Autoconf253: (autoconf253). Create source code configuration scripts ++* Autoconf-2.53: (autoconf-2.53). Create source code configuration scripts. @end direntry diff --git a/devel/autoconf253/files/patch-doc-Makefile.in b/devel/autoconf253/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..a4d4c79be5f0 --- /dev/null +++ b/devel/autoconf253/files/patch-doc-Makefile.in @@ -0,0 +1,28 @@ +--- doc/Makefile.in.orig Fri Mar 8 05:10:30 2002 ++++ doc/Makefile.in Thu Apr 5 01:01:20 2007 +@@ -86,3 +86,3 @@ + +-info_TEXINFOS = autoconf.texi standards.texi ++info_TEXINFOS = autoconf-2.53.texi + autoconf_TEXINFOS = fdl.texi install.texi +@@ -103,5 +103,5 @@ + TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex +-INFO_DEPS = autoconf.info standards.info +-DVIS = autoconf.dvi standards.dvi +-TEXINFOS = autoconf.texi standards.texi ++INFO_DEPS = autoconf-2.53.info ++DVIS = autoconf.dvi ++TEXINFOS = autoconf-2.53.texi + DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \ +@@ -120,4 +120,4 @@ + @: +-$(srcdir)/stamp-vti: autoconf.texi $(top_srcdir)/configure.ac +- @(set `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/autoconf.texi`; \ ++$(srcdir)/stamp-vti: autoconf-2.53.texi $(top_srcdir)/configure.ac ++ @(set `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/autoconf-2.53.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ +@@ -138,3 +138,3 @@ + +-autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) ++autoconf-2.53.info: autoconf-2.53.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) + autoconf.dvi: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) diff --git a/devel/autoconf253/files/patch-standards.texi b/devel/autoconf253/files/patch-standards.texi deleted file mode 100644 index a0386512057f..000000000000 --- a/devel/autoconf253/files/patch-standards.texi +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/standards.texi.orig Fri Nov 2 08:29:03 2001 -+++ doc/standards.texi Wed Feb 11 00:11:15 2004 -@@ -2,3 +2,3 @@ - @c %**start of header --@setfilename standards.info -+@setfilename standards253.info - @settitle GNU Coding Standards -@@ -11,3 +11,3 @@ - START-INFO-DIR-ENTRY --* Standards: (standards). GNU coding standards. -+* Standards253: (standards253). GNU coding standards. - END-INFO-DIR-ENTRY diff --git a/devel/autoconf253/pkg-plist b/devel/autoconf253/pkg-plist index c8c9fde3e23c..7dc8deef61d1 100644 --- a/devel/autoconf253/pkg-plist +++ b/devel/autoconf253/pkg-plist @@ -1,63 +1,56 @@ -bin/autoconf%%BUILD_VERSION%% -bin/autoheader%%BUILD_VERSION%% -bin/autom4te%%BUILD_VERSION%% -bin/autoreconf%%BUILD_VERSION%% -bin/autoscan%%BUILD_VERSION%% -bin/autoupdate%%BUILD_VERSION%% -bin/ifnames%%BUILD_VERSION%% -libexec/autoconf%%BUILD_VERSION%%/autoconf -libexec/autoconf%%BUILD_VERSION%%/autoheader -libexec/autoconf%%BUILD_VERSION%%/autoreconf -libexec/autoconf%%BUILD_VERSION%%/autoscan -libexec/autoconf%%BUILD_VERSION%%/autoupdate -libexec/autoconf%%BUILD_VERSION%%/ifnames -share/autoconf%%BUILD_VERSION%%/Autom4te/General.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 -share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f -share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/c.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/headers.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/status.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/types.m4 -share/autoconf%%BUILD_VERSION%%/autom4te.cfg -share/autoconf%%BUILD_VERSION%%/autoscan/functions -share/autoconf%%BUILD_VERSION%%/autoscan/headers -share/autoconf%%BUILD_VERSION%%/autoscan/identifiers -share/autoconf%%BUILD_VERSION%%/autoscan/libraries -share/autoconf%%BUILD_VERSION%%/autoscan/makevars -share/autoconf%%BUILD_VERSION%%/autoscan/programs -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f -share/autoconf%%BUILD_VERSION%%/autotest/general.m4 -share/autoconf%%BUILD_VERSION%%/config.guess -share/autoconf%%BUILD_VERSION%%/config.sub -share/autoconf%%BUILD_VERSION%%/elisp-comp -share/autoconf%%BUILD_VERSION%%/install-sh -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4 -share/autoconf%%BUILD_VERSION%%/mdate-sh -share/autoconf%%BUILD_VERSION%%/missing -share/autoconf%%BUILD_VERSION%%/mkinstalldirs -@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar -@dirrm share/autoconf%%BUILD_VERSION%%/autotest -@dirrm share/autoconf%%BUILD_VERSION%%/autoscan -@dirrm share/autoconf%%BUILD_VERSION%%/autoconf -@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te -@dirrm share/autoconf%%BUILD_VERSION%% -@dirrm libexec/autoconf%%BUILD_VERSION%% +bin/autoconf-%%BUILD_VERSION%% +bin/autoheader-%%BUILD_VERSION%% +bin/autom4te-%%BUILD_VERSION%% +bin/autoreconf-%%BUILD_VERSION%% +bin/autoscan-%%BUILD_VERSION%% +bin/autoupdate-%%BUILD_VERSION%% +bin/ifnames-%%BUILD_VERSION%% +share/autoconf-%%BUILD_VERSION%%/Autom4te/General.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 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f +share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/c.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/headers.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4 +share/autoconf-%%BUILD_VERSION%%/autom4te.cfg +share/autoconf-%%BUILD_VERSION%%/autoscan/functions +share/autoconf-%%BUILD_VERSION%%/autoscan/headers +share/autoconf-%%BUILD_VERSION%%/autoscan/identifiers +share/autoconf-%%BUILD_VERSION%%/autoscan/libraries +share/autoconf-%%BUILD_VERSION%%/autoscan/makevars +share/autoconf-%%BUILD_VERSION%%/autoscan/programs +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f +share/autoconf-%%BUILD_VERSION%%/autotest/general.m4 +share/autoconf-%%BUILD_VERSION%%/config.guess +share/autoconf-%%BUILD_VERSION%%/config.sub +share/autoconf-%%BUILD_VERSION%%/elisp-comp +share/autoconf-%%BUILD_VERSION%%/install-sh +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4 +share/autoconf-%%BUILD_VERSION%%/mdate-sh +share/autoconf-%%BUILD_VERSION%%/missing +share/autoconf-%%BUILD_VERSION%%/mkinstalldirs +@dirrm share/autoconf-%%BUILD_VERSION%%/m4sugar +@dirrm share/autoconf-%%BUILD_VERSION%%/autotest +@dirrm share/autoconf-%%BUILD_VERSION%%/autoscan +@dirrm share/autoconf-%%BUILD_VERSION%%/autoconf +@dirrm share/autoconf-%%BUILD_VERSION%%/Autom4te +@dirrm share/autoconf-%%BUILD_VERSION%% diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile index a0f79d3491cd..bddac5571165 100644 --- a/devel/autoconf259/Makefile +++ b/devel/autoconf259/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -18,20 +18,20 @@ COMMENT= Automatically configure source code on many Un*x platforms (2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man -RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 259 +BUILD_VERSION= 2.59 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf${BUILD_VERSION} +LATEST_LINK= autoconf259 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes -INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} +INFO= autoconf-${BUILD_VERSION} GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIG_SHELL=${SH} -CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir +CONFIGURE_ENV= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ @@ -39,31 +39,24 @@ GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh \ MAN1_PAGES= autoconf autoheader autom4te autoreconf autoscan \ autoupdate config.guess config.sub ifnames -MAN1= ${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g} +MAN1= ${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g} post-patch: - @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure) + @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1-${BUILD_VERSION},' configure) @(cd ${WRKSRC}/man && \ for file in *.[1x]; do \ - ${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 ; \ + ${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 && \ - ${MV} standards.texi standards${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in) + ${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi) + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' post-install: .for FILE in ${GENERIC_TOOLS} - @${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION} -.endfor - @-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION} -.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i} + @${INSTALL_SCRIPT} ${WRKSRC}/config/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION} .endfor .include <bsd.port.mk> diff --git a/devel/autoconf259/files/patch-autoconf.texi b/devel/autoconf259/files/patch-autoconf.texi index 32c58797956f..ed60d7beab00 100644 --- a/devel/autoconf259/files/patch-autoconf.texi +++ b/devel/autoconf259/files/patch-autoconf.texi @@ -1,14 +1,17 @@ ---- doc/autoconf.texi.orig Wed Nov 5 10:38:29 2003 -+++ doc/autoconf.texi Thu Oct 14 20:17:35 2004 +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sat Apr 14 15:45:02 2007 @@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf259.info ++@setfilename autoconf-2.59.info @include version.texi -@settitle Autoconf -+@settitle Autoconf259 ++@settitle Autoconf-2.59 @setchapternewpage odd -@@ -212,23 +212,3 @@ +@@ -210,25 +210,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools @direntry -* Autoconf: (autoconf). Create source code configuration scripts. -@end direntry @@ -31,5 +34,5 @@ - Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. Recreating configurations. -* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite. -+* Autoconf259: (autoconf259). Create source code configuration scripts. ++* Autoconf-2.59: (autoconf-2.59). Create source code configuration scripts. @end direntry diff --git a/devel/autoconf259/files/patch-configure b/devel/autoconf259/files/patch-configure deleted file mode 100644 index bc622f2b52b1..000000000000 --- a/devel/autoconf259/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- configure.orig Thu Nov 6 01:33:28 2003 -+++ configure Sun Mar 14 16:53:34 2004 -@@ -1536,3 +1536,3 @@ - # Define the identity of the package. -- PACKAGE='autoconf' -+ PACKAGE='autoconf259' - VERSION='2.59' diff --git a/devel/autoconf259/files/patch-doc-Makefile.in b/devel/autoconf259/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..b894361faf69 --- /dev/null +++ b/devel/autoconf259/files/patch-doc-Makefile.in @@ -0,0 +1,31 @@ +--- doc/Makefile.in.orig Thu Nov 6 01:33:27 2003 ++++ doc/Makefile.in Thu Apr 5 01:23:42 2007 +@@ -50,3 +50,3 @@ + am__TEXINFO_TEX_DIR = $(top_srcdir)/config +-INFO_DEPS = autoconf.info standards.info ++INFO_DEPS = autoconf-2.59.info + DVIS = autoconf.dvi standards.dvi +@@ -55,3 +55,3 @@ + HTMLS = autoconf.html standards.html +-TEXINFOS = autoconf.texi standards.texi ++TEXINFOS = autoconf-2.59.texi + TEXI2PDF = $(TEXI2DVI) --pdf --batch +@@ -123,3 +123,3 @@ + TEXI2HTML_FLAGS = -split_chapter +-info_TEXINFOS = autoconf.texi standards.texi ++info_TEXINFOS = autoconf-2.59.texi + autoconf_TEXINFOS = fdl.texi install.texi +@@ -199,3 +199,3 @@ + -o $@ $< +-autoconf.info: autoconf.texi version.texi $(autoconf_TEXINFOS) ++autoconf-2.59.info: autoconf-2.59.texi version.texi $(autoconf_TEXINFOS) + autoconf.dvi: autoconf.texi version.texi $(autoconf_TEXINFOS) +@@ -204,5 +204,5 @@ + version.texi: stamp-vti +-stamp-vti: autoconf.texi $(top_srcdir)/configure +- @(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \ +- set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf.texi`; \ ++stamp-vti: autoconf-2.59.texi $(top_srcdir)/configure ++ @(dir=.; test -f ./autoconf-2.59.texi || dir=$(srcdir); \ ++ set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf-2.59.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/autoconf259/files/patch-standards.texi b/devel/autoconf259/files/patch-standards.texi deleted file mode 100644 index 9d6134950668..000000000000 --- a/devel/autoconf259/files/patch-standards.texi +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 -+++ doc/standards.texi Sun Mar 14 16:47:41 2004 -@@ -2,3 +2,3 @@ - @c %**start of header --@setfilename standards.info -+@setfilename standards259.info - @settitle GNU Coding Standards -@@ -10,3 +10,3 @@ - @direntry --* Standards: (standards). GNU coding standards. -+* Standards259: (standards259). GNU coding standards. - @end direntry diff --git a/devel/autoconf259/pkg-plist b/devel/autoconf259/pkg-plist index ac4409d55537..2df241eb80b0 100644 --- a/devel/autoconf259/pkg-plist +++ b/devel/autoconf259/pkg-plist @@ -1,65 +1,58 @@ -bin/autoconf%%BUILD_VERSION%% -bin/autoheader%%BUILD_VERSION%% -bin/autom4te%%BUILD_VERSION%% -bin/autoreconf%%BUILD_VERSION%% -bin/autoscan%%BUILD_VERSION%% -bin/autoupdate%%BUILD_VERSION%% -bin/ifnames%%BUILD_VERSION%% -libexec/autoconf%%BUILD_VERSION%%/autoconf -libexec/autoconf%%BUILD_VERSION%%/autoheader -libexec/autoconf%%BUILD_VERSION%%/autoreconf -libexec/autoconf%%BUILD_VERSION%%/autoscan -libexec/autoconf%%BUILD_VERSION%%/autoupdate -libexec/autoconf%%BUILD_VERSION%%/ifnames -share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm -share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm -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/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 -share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f -share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/c.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/headers.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/status.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/types.m4 -share/autoconf%%BUILD_VERSION%%/autom4te.cfg -share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f -share/autoconf%%BUILD_VERSION%%/autotest/general.m4 -share/autoconf%%BUILD_VERSION%%/config.guess -share/autoconf%%BUILD_VERSION%%/config.sub -share/autoconf%%BUILD_VERSION%%/elisp-comp -share/autoconf%%BUILD_VERSION%%/install-sh -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4 -share/autoconf%%BUILD_VERSION%%/mdate-sh -share/autoconf%%BUILD_VERSION%%/missing -share/autoconf%%BUILD_VERSION%%/mkinstalldirs -@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar -@dirrm share/autoconf%%BUILD_VERSION%%/autotest -@dirrm share/autoconf%%BUILD_VERSION%%/autoscan -@dirrm share/autoconf%%BUILD_VERSION%%/autoconf -@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te -@dirrm share/autoconf%%BUILD_VERSION%% -@dirrm libexec/autoconf%%BUILD_VERSION%% +bin/autoconf-%%BUILD_VERSION%% +bin/autoheader-%%BUILD_VERSION%% +bin/autom4te-%%BUILD_VERSION%% +bin/autoreconf-%%BUILD_VERSION%% +bin/autoscan-%%BUILD_VERSION%% +bin/autoupdate-%%BUILD_VERSION%% +bin/ifnames-%%BUILD_VERSION%% +share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +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/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 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f +share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoscan.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/c.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/headers.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4 +share/autoconf-%%BUILD_VERSION%%/autom4te.cfg +share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f +share/autoconf-%%BUILD_VERSION%%/autotest/general.m4 +share/autoconf-%%BUILD_VERSION%%/config.guess +share/autoconf-%%BUILD_VERSION%%/config.sub +share/autoconf-%%BUILD_VERSION%%/elisp-comp +share/autoconf-%%BUILD_VERSION%%/install-sh +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4 +share/autoconf-%%BUILD_VERSION%%/mdate-sh +share/autoconf-%%BUILD_VERSION%%/missing +share/autoconf-%%BUILD_VERSION%%/mkinstalldirs +@dirrm share/autoconf-%%BUILD_VERSION%%/m4sugar +@dirrm share/autoconf-%%BUILD_VERSION%%/autotest +@dirrm share/autoconf-%%BUILD_VERSION%%/autoscan +@dirrm share/autoconf-%%BUILD_VERSION%%/autoconf +@dirrm share/autoconf-%%BUILD_VERSION%%/Autom4te +@dirrm share/autoconf-%%BUILD_VERSION%% diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile index 4185285da65c..bbb91a356664 100644 --- a/devel/autoconf261/Makefile +++ b/devel/autoconf261/Makefile @@ -7,6 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.61 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -17,27 +18,28 @@ COMMENT= Automatically configure source code on many Un*x platforms (2.61) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man -RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 261 +BUILD_VERSION= 2.61 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf${BUILD_VERSION} +LATEST_LINK= autoconf261 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes -INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} +INFO= autoconf-${BUILD_VERSION} GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIG_SHELL=${SH} -CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 +CONFIGURE_ENV+= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing +GENERIC_LINKS= autoconf autoheader autom4te autoreconf autoscan autoupdate \ + ifnames -MAN1_PAGES= autoconf autoheader autom4te autoreconf autoscan \ - autoupdate config.guess config.sub ifnames -MAN1= ${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g} +MAN1_PAGES= ${GENERIC_LINKS} config.guess config.sub +MAN1= ${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g} post-patch: @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure) @@ -48,20 +50,13 @@ post-patch: done) @(cd ${WRKSRC}/doc && \ ${RM} -f *.info && \ - ${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \ - ${MV} standards.texi standards${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in) + ${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi) + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' post-install: .for FILE in ${GENERIC_TOOLS} - @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION} -.endfor - @-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION} -.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i} + @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION} .endfor .include <bsd.port.mk> diff --git a/devel/autoconf261/files/patch-autoconf.texi b/devel/autoconf261/files/patch-autoconf.texi index f561aee323f9..96b0ec210a63 100644 --- a/devel/autoconf261/files/patch-autoconf.texi +++ b/devel/autoconf261/files/patch-autoconf.texi @@ -1,14 +1,17 @@ ---- doc/autoconf.texi.orig Wed Nov 5 10:38:29 2003 -+++ doc/autoconf.texi Thu Oct 14 20:17:35 2004 +--- doc/autoconf.texi.orig Thu Nov 16 16:16:27 2006 ++++ doc/autoconf.texi Sat Apr 14 15:41:27 2007 @@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf261.info ++@setfilename autoconf-2.61.info @include version.texi -@settitle Autoconf -+@settitle Autoconf261 ++@settitle Autoconf-2.61 @setchapternewpage odd -@@ -212,23 +212,3 @@ +@@ -205,25 +205,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools @direntry -* Autoconf: (autoconf). Create source code configuration scripts. -@end direntry @@ -31,5 +34,5 @@ - Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. Recreating configurations. -* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite. -+* Autoconf261: (autoconf261). Create source code configuration scripts. ++* Autoconf-2.61: (autoconf-2.61). Create source code configuration scripts. @end direntry diff --git a/devel/autoconf261/files/patch-configure b/devel/autoconf261/files/patch-configure deleted file mode 100644 index 0d805971c245..000000000000 --- a/devel/autoconf261/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- configure.orig Fri Nov 17 11:05:17 2006 -+++ configure Sun Dec 3 16:58:50 2006 -@@ -2013,3 +2013,3 @@ - # Define the identity of the package. -- PACKAGE='autoconf' -+ PACKAGE='autoconf261' - VERSION='2.61' diff --git a/devel/autoconf261/files/patch-doc-Makefile.in b/devel/autoconf261/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..8597e60bd979 --- /dev/null +++ b/devel/autoconf261/files/patch-doc-Makefile.in @@ -0,0 +1,25 @@ +--- doc/Makefile.in.orig Mon Oct 16 13:58:44 2006 ++++ doc/Makefile.in Thu Apr 5 01:51:13 2007 +@@ -44,3 +44,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info ++INFO_DEPS = $(srcdir)/autoconf-2.61.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.61.texi + TEXI2PDF = $(TEXI2DVI) --pdf --batch +@@ -241,3 +241,3 @@ + fi +-$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) ++$(srcdir)/autoconf-2.61.info: autoconf-2.61.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.61.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.61.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/autoconf261/files/patch-standards.texi b/devel/autoconf261/files/patch-standards.texi deleted file mode 100644 index 7ecda7e79ef4..000000000000 --- a/devel/autoconf261/files/patch-standards.texi +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 -+++ doc/standards.texi Sun Mar 14 16:47:41 2004 -@@ -2,3 +2,3 @@ - @c %**start of header --@setfilename standards.info -+@setfilename standards261.info - @settitle GNU Coding Standards -@@ -10,3 +10,3 @@ - @direntry --* Standards: (standards). GNU coding standards. -+* Standards261: (standards261). GNU coding standards. - @end direntry diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist index cb89cfdb2c54..b9ef638c9691 100644 --- a/devel/autoconf261/pkg-plist +++ b/devel/autoconf261/pkg-plist @@ -1,65 +1,58 @@ -bin/autoconf%%BUILD_VERSION%% -bin/autoheader%%BUILD_VERSION%% -bin/autom4te%%BUILD_VERSION%% -bin/autoreconf%%BUILD_VERSION%% -bin/autoscan%%BUILD_VERSION%% -bin/autoupdate%%BUILD_VERSION%% -bin/ifnames%%BUILD_VERSION%% -libexec/autoconf%%BUILD_VERSION%%/autoconf -libexec/autoconf%%BUILD_VERSION%%/autoheader -libexec/autoconf%%BUILD_VERSION%%/autoreconf -libexec/autoconf%%BUILD_VERSION%%/autoscan -libexec/autoconf%%BUILD_VERSION%%/autoupdate -libexec/autoconf%%BUILD_VERSION%%/ifnames -share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm -share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm -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/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 -share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f -share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/c.m4 -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/headers.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/status.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/types.m4 -share/autoconf%%BUILD_VERSION%%/autom4te.cfg -share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f -share/autoconf%%BUILD_VERSION%%/autotest/general.m4 -share/autoconf%%BUILD_VERSION%%/config.guess -share/autoconf%%BUILD_VERSION%%/config.sub -share/autoconf%%BUILD_VERSION%%/elisp-comp -share/autoconf%%BUILD_VERSION%%/install-sh -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4 -share/autoconf%%BUILD_VERSION%%/mdate-sh -share/autoconf%%BUILD_VERSION%%/missing -@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar -@dirrm share/autoconf%%BUILD_VERSION%%/autotest -@dirrm share/autoconf%%BUILD_VERSION%%/autoscan -@dirrm share/autoconf%%BUILD_VERSION%%/autoconf -@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te -@dirrm share/autoconf%%BUILD_VERSION%% -@dirrm libexec/autoconf%%BUILD_VERSION%% +bin/autoconf-%%BUILD_VERSION%% +bin/autoheader-%%BUILD_VERSION%% +bin/autom4te-%%BUILD_VERSION%% +bin/autoreconf-%%BUILD_VERSION%% +bin/autoscan-%%BUILD_VERSION%% +bin/autoupdate-%%BUILD_VERSION%% +bin/ifnames-%%BUILD_VERSION%% +share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +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/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 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f +share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoscan.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/c.m4 +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/headers.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4 +share/autoconf-%%BUILD_VERSION%%/autom4te.cfg +share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f +share/autoconf-%%BUILD_VERSION%%/autotest/general.m4 +share/autoconf-%%BUILD_VERSION%%/config.guess +share/autoconf-%%BUILD_VERSION%%/config.sub +share/autoconf-%%BUILD_VERSION%%/elisp-comp +share/autoconf-%%BUILD_VERSION%%/install-sh +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4 +share/autoconf-%%BUILD_VERSION%%/mdate-sh +share/autoconf-%%BUILD_VERSION%%/missing +@dirrm share/autoconf-%%BUILD_VERSION%%/m4sugar +@dirrm share/autoconf-%%BUILD_VERSION%%/autotest +@dirrm share/autoconf-%%BUILD_VERSION%%/autoscan +@dirrm share/autoconf-%%BUILD_VERSION%%/autoconf +@dirrm share/autoconf-%%BUILD_VERSION%%/Autom4te +@dirrm share/autoconf-%%BUILD_VERSION%% diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile index 4185285da65c..bbb91a356664 100644 --- a/devel/autoconf262/Makefile +++ b/devel/autoconf262/Makefile @@ -7,6 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.61 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -17,27 +18,28 @@ COMMENT= Automatically configure source code on many Un*x platforms (2.61) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man -RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 261 +BUILD_VERSION= 2.61 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf${BUILD_VERSION} +LATEST_LINK= autoconf261 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes -INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} +INFO= autoconf-${BUILD_VERSION} GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIG_SHELL=${SH} -CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 +CONFIGURE_ENV+= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing +GENERIC_LINKS= autoconf autoheader autom4te autoreconf autoscan autoupdate \ + ifnames -MAN1_PAGES= autoconf autoheader autom4te autoreconf autoscan \ - autoupdate config.guess config.sub ifnames -MAN1= ${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g} +MAN1_PAGES= ${GENERIC_LINKS} config.guess config.sub +MAN1= ${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g} post-patch: @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure) @@ -48,20 +50,13 @@ post-patch: done) @(cd ${WRKSRC}/doc && \ ${RM} -f *.info && \ - ${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \ - ${MV} standards.texi standards${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in) + ${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi) + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' post-install: .for FILE in ${GENERIC_TOOLS} - @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION} -.endfor - @-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION} -.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i} + @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION} .endfor .include <bsd.port.mk> diff --git a/devel/autoconf262/files/patch-autoconf.texi b/devel/autoconf262/files/patch-autoconf.texi index f561aee323f9..96b0ec210a63 100644 --- a/devel/autoconf262/files/patch-autoconf.texi +++ b/devel/autoconf262/files/patch-autoconf.texi @@ -1,14 +1,17 @@ ---- doc/autoconf.texi.orig Wed Nov 5 10:38:29 2003 -+++ doc/autoconf.texi Thu Oct 14 20:17:35 2004 +--- doc/autoconf.texi.orig Thu Nov 16 16:16:27 2006 ++++ doc/autoconf.texi Sat Apr 14 15:41:27 2007 @@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf261.info ++@setfilename autoconf-2.61.info @include version.texi -@settitle Autoconf -+@settitle Autoconf261 ++@settitle Autoconf-2.61 @setchapternewpage odd -@@ -212,23 +212,3 @@ +@@ -205,25 +205,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools @direntry -* Autoconf: (autoconf). Create source code configuration scripts. -@end direntry @@ -31,5 +34,5 @@ - Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. Recreating configurations. -* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite. -+* Autoconf261: (autoconf261). Create source code configuration scripts. ++* Autoconf-2.61: (autoconf-2.61). Create source code configuration scripts. @end direntry diff --git a/devel/autoconf262/files/patch-configure b/devel/autoconf262/files/patch-configure deleted file mode 100644 index 0d805971c245..000000000000 --- a/devel/autoconf262/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- configure.orig Fri Nov 17 11:05:17 2006 -+++ configure Sun Dec 3 16:58:50 2006 -@@ -2013,3 +2013,3 @@ - # Define the identity of the package. -- PACKAGE='autoconf' -+ PACKAGE='autoconf261' - VERSION='2.61' diff --git a/devel/autoconf262/files/patch-doc-Makefile.in b/devel/autoconf262/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..8597e60bd979 --- /dev/null +++ b/devel/autoconf262/files/patch-doc-Makefile.in @@ -0,0 +1,25 @@ +--- doc/Makefile.in.orig Mon Oct 16 13:58:44 2006 ++++ doc/Makefile.in Thu Apr 5 01:51:13 2007 +@@ -44,3 +44,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info ++INFO_DEPS = $(srcdir)/autoconf-2.61.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.61.texi + TEXI2PDF = $(TEXI2DVI) --pdf --batch +@@ -241,3 +241,3 @@ + fi +-$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) ++$(srcdir)/autoconf-2.61.info: autoconf-2.61.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.61.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.61.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/autoconf262/files/patch-standards.texi b/devel/autoconf262/files/patch-standards.texi deleted file mode 100644 index 7ecda7e79ef4..000000000000 --- a/devel/autoconf262/files/patch-standards.texi +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 -+++ doc/standards.texi Sun Mar 14 16:47:41 2004 -@@ -2,3 +2,3 @@ - @c %**start of header --@setfilename standards.info -+@setfilename standards261.info - @settitle GNU Coding Standards -@@ -10,3 +10,3 @@ - @direntry --* Standards: (standards). GNU coding standards. -+* Standards261: (standards261). GNU coding standards. - @end direntry diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist index cb89cfdb2c54..b9ef638c9691 100644 --- a/devel/autoconf262/pkg-plist +++ b/devel/autoconf262/pkg-plist @@ -1,65 +1,58 @@ -bin/autoconf%%BUILD_VERSION%% -bin/autoheader%%BUILD_VERSION%% -bin/autom4te%%BUILD_VERSION%% -bin/autoreconf%%BUILD_VERSION%% -bin/autoscan%%BUILD_VERSION%% -bin/autoupdate%%BUILD_VERSION%% -bin/ifnames%%BUILD_VERSION%% -libexec/autoconf%%BUILD_VERSION%%/autoconf -libexec/autoconf%%BUILD_VERSION%%/autoheader -libexec/autoconf%%BUILD_VERSION%%/autoreconf -libexec/autoconf%%BUILD_VERSION%%/autoscan -libexec/autoconf%%BUILD_VERSION%%/autoupdate -libexec/autoconf%%BUILD_VERSION%%/ifnames -share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm -share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm -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/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 -share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f -share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/c.m4 -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/headers.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/status.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/types.m4 -share/autoconf%%BUILD_VERSION%%/autom4te.cfg -share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f -share/autoconf%%BUILD_VERSION%%/autotest/general.m4 -share/autoconf%%BUILD_VERSION%%/config.guess -share/autoconf%%BUILD_VERSION%%/config.sub -share/autoconf%%BUILD_VERSION%%/elisp-comp -share/autoconf%%BUILD_VERSION%%/install-sh -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4 -share/autoconf%%BUILD_VERSION%%/mdate-sh -share/autoconf%%BUILD_VERSION%%/missing -@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar -@dirrm share/autoconf%%BUILD_VERSION%%/autotest -@dirrm share/autoconf%%BUILD_VERSION%%/autoscan -@dirrm share/autoconf%%BUILD_VERSION%%/autoconf -@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te -@dirrm share/autoconf%%BUILD_VERSION%% -@dirrm libexec/autoconf%%BUILD_VERSION%% +bin/autoconf-%%BUILD_VERSION%% +bin/autoheader-%%BUILD_VERSION%% +bin/autom4te-%%BUILD_VERSION%% +bin/autoreconf-%%BUILD_VERSION%% +bin/autoscan-%%BUILD_VERSION%% +bin/autoupdate-%%BUILD_VERSION%% +bin/ifnames-%%BUILD_VERSION%% +share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +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/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 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f +share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoscan.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/c.m4 +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/headers.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4 +share/autoconf-%%BUILD_VERSION%%/autom4te.cfg +share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f +share/autoconf-%%BUILD_VERSION%%/autotest/general.m4 +share/autoconf-%%BUILD_VERSION%%/config.guess +share/autoconf-%%BUILD_VERSION%%/config.sub +share/autoconf-%%BUILD_VERSION%%/elisp-comp +share/autoconf-%%BUILD_VERSION%%/install-sh +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4 +share/autoconf-%%BUILD_VERSION%%/mdate-sh +share/autoconf-%%BUILD_VERSION%%/missing +@dirrm share/autoconf-%%BUILD_VERSION%%/m4sugar +@dirrm share/autoconf-%%BUILD_VERSION%%/autotest +@dirrm share/autoconf-%%BUILD_VERSION%%/autoscan +@dirrm share/autoconf-%%BUILD_VERSION%%/autoconf +@dirrm share/autoconf-%%BUILD_VERSION%%/Autom4te +@dirrm share/autoconf-%%BUILD_VERSION%% diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile index 4185285da65c..bbb91a356664 100644 --- a/devel/autoconf267/Makefile +++ b/devel/autoconf267/Makefile @@ -7,6 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.61 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -17,27 +18,28 @@ COMMENT= Automatically configure source code on many Un*x platforms (2.61) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man -RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 261 +BUILD_VERSION= 2.61 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf${BUILD_VERSION} +LATEST_LINK= autoconf261 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes -INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} +INFO= autoconf-${BUILD_VERSION} GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIG_SHELL=${SH} -CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 +CONFIGURE_ENV+= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing +GENERIC_LINKS= autoconf autoheader autom4te autoreconf autoscan autoupdate \ + ifnames -MAN1_PAGES= autoconf autoheader autom4te autoreconf autoscan \ - autoupdate config.guess config.sub ifnames -MAN1= ${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g} +MAN1_PAGES= ${GENERIC_LINKS} config.guess config.sub +MAN1= ${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g} post-patch: @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure) @@ -48,20 +50,13 @@ post-patch: done) @(cd ${WRKSRC}/doc && \ ${RM} -f *.info && \ - ${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \ - ${MV} standards.texi standards${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in) + ${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi) + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' post-install: .for FILE in ${GENERIC_TOOLS} - @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION} -.endfor - @-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION} -.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i} + @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION} .endfor .include <bsd.port.mk> diff --git a/devel/autoconf267/files/patch-autoconf.texi b/devel/autoconf267/files/patch-autoconf.texi index f561aee323f9..96b0ec210a63 100644 --- a/devel/autoconf267/files/patch-autoconf.texi +++ b/devel/autoconf267/files/patch-autoconf.texi @@ -1,14 +1,17 @@ ---- doc/autoconf.texi.orig Wed Nov 5 10:38:29 2003 -+++ doc/autoconf.texi Thu Oct 14 20:17:35 2004 +--- doc/autoconf.texi.orig Thu Nov 16 16:16:27 2006 ++++ doc/autoconf.texi Sat Apr 14 15:41:27 2007 @@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf261.info ++@setfilename autoconf-2.61.info @include version.texi -@settitle Autoconf -+@settitle Autoconf261 ++@settitle Autoconf-2.61 @setchapternewpage odd -@@ -212,23 +212,3 @@ +@@ -205,25 +205,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools @direntry -* Autoconf: (autoconf). Create source code configuration scripts. -@end direntry @@ -31,5 +34,5 @@ - Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. Recreating configurations. -* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite. -+* Autoconf261: (autoconf261). Create source code configuration scripts. ++* Autoconf-2.61: (autoconf-2.61). Create source code configuration scripts. @end direntry diff --git a/devel/autoconf267/files/patch-configure b/devel/autoconf267/files/patch-configure deleted file mode 100644 index 0d805971c245..000000000000 --- a/devel/autoconf267/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- configure.orig Fri Nov 17 11:05:17 2006 -+++ configure Sun Dec 3 16:58:50 2006 -@@ -2013,3 +2013,3 @@ - # Define the identity of the package. -- PACKAGE='autoconf' -+ PACKAGE='autoconf261' - VERSION='2.61' diff --git a/devel/autoconf267/files/patch-doc-Makefile.in b/devel/autoconf267/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..8597e60bd979 --- /dev/null +++ b/devel/autoconf267/files/patch-doc-Makefile.in @@ -0,0 +1,25 @@ +--- doc/Makefile.in.orig Mon Oct 16 13:58:44 2006 ++++ doc/Makefile.in Thu Apr 5 01:51:13 2007 +@@ -44,3 +44,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info ++INFO_DEPS = $(srcdir)/autoconf-2.61.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.61.texi + TEXI2PDF = $(TEXI2DVI) --pdf --batch +@@ -241,3 +241,3 @@ + fi +-$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) ++$(srcdir)/autoconf-2.61.info: autoconf-2.61.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.61.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.61.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/autoconf267/files/patch-standards.texi b/devel/autoconf267/files/patch-standards.texi deleted file mode 100644 index 7ecda7e79ef4..000000000000 --- a/devel/autoconf267/files/patch-standards.texi +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 -+++ doc/standards.texi Sun Mar 14 16:47:41 2004 -@@ -2,3 +2,3 @@ - @c %**start of header --@setfilename standards.info -+@setfilename standards261.info - @settitle GNU Coding Standards -@@ -10,3 +10,3 @@ - @direntry --* Standards: (standards). GNU coding standards. -+* Standards261: (standards261). GNU coding standards. - @end direntry diff --git a/devel/autoconf267/pkg-plist b/devel/autoconf267/pkg-plist index cb89cfdb2c54..b9ef638c9691 100644 --- a/devel/autoconf267/pkg-plist +++ b/devel/autoconf267/pkg-plist @@ -1,65 +1,58 @@ -bin/autoconf%%BUILD_VERSION%% -bin/autoheader%%BUILD_VERSION%% -bin/autom4te%%BUILD_VERSION%% -bin/autoreconf%%BUILD_VERSION%% -bin/autoscan%%BUILD_VERSION%% -bin/autoupdate%%BUILD_VERSION%% -bin/ifnames%%BUILD_VERSION%% -libexec/autoconf%%BUILD_VERSION%%/autoconf -libexec/autoconf%%BUILD_VERSION%%/autoheader -libexec/autoconf%%BUILD_VERSION%%/autoreconf -libexec/autoconf%%BUILD_VERSION%%/autoscan -libexec/autoconf%%BUILD_VERSION%%/autoupdate -libexec/autoconf%%BUILD_VERSION%%/ifnames -share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm -share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm -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/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 -share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f -share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/c.m4 -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/headers.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/status.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/types.m4 -share/autoconf%%BUILD_VERSION%%/autom4te.cfg -share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f -share/autoconf%%BUILD_VERSION%%/autotest/general.m4 -share/autoconf%%BUILD_VERSION%%/config.guess -share/autoconf%%BUILD_VERSION%%/config.sub -share/autoconf%%BUILD_VERSION%%/elisp-comp -share/autoconf%%BUILD_VERSION%%/install-sh -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4 -share/autoconf%%BUILD_VERSION%%/mdate-sh -share/autoconf%%BUILD_VERSION%%/missing -@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar -@dirrm share/autoconf%%BUILD_VERSION%%/autotest -@dirrm share/autoconf%%BUILD_VERSION%%/autoscan -@dirrm share/autoconf%%BUILD_VERSION%%/autoconf -@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te -@dirrm share/autoconf%%BUILD_VERSION%% -@dirrm libexec/autoconf%%BUILD_VERSION%% +bin/autoconf-%%BUILD_VERSION%% +bin/autoheader-%%BUILD_VERSION%% +bin/autom4te-%%BUILD_VERSION%% +bin/autoreconf-%%BUILD_VERSION%% +bin/autoscan-%%BUILD_VERSION%% +bin/autoupdate-%%BUILD_VERSION%% +bin/ifnames-%%BUILD_VERSION%% +share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +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/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 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f +share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoscan.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/c.m4 +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/headers.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4 +share/autoconf-%%BUILD_VERSION%%/autom4te.cfg +share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f +share/autoconf-%%BUILD_VERSION%%/autotest/general.m4 +share/autoconf-%%BUILD_VERSION%%/config.guess +share/autoconf-%%BUILD_VERSION%%/config.sub +share/autoconf-%%BUILD_VERSION%%/elisp-comp +share/autoconf-%%BUILD_VERSION%%/install-sh +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4 +share/autoconf-%%BUILD_VERSION%%/mdate-sh +share/autoconf-%%BUILD_VERSION%%/missing +@dirrm share/autoconf-%%BUILD_VERSION%%/m4sugar +@dirrm share/autoconf-%%BUILD_VERSION%%/autotest +@dirrm share/autoconf-%%BUILD_VERSION%%/autoscan +@dirrm share/autoconf-%%BUILD_VERSION%%/autoconf +@dirrm share/autoconf-%%BUILD_VERSION%%/Autom4te +@dirrm share/autoconf-%%BUILD_VERSION%% diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile index 4185285da65c..bbb91a356664 100644 --- a/devel/autoconf268/Makefile +++ b/devel/autoconf268/Makefile @@ -7,6 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.61 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -17,27 +18,28 @@ COMMENT= Automatically configure source code on many Un*x platforms (2.61) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man -RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 +RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ + autoconf-wrapper:${PORTSDIR}/devel/autoconf-wrapper -BUILD_VERSION= 261 +BUILD_VERSION= 2.61 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= autoconf${BUILD_VERSION} +LATEST_LINK= autoconf261 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes -INFO= autoconf${BUILD_VERSION} standards${BUILD_VERSION} +INFO= autoconf-${BUILD_VERSION} GNU_CONFIGURE= yes -CONFIGURE_ENV+= CONFIG_SHELL=${SH} -CONFIGURE_ENV+= M4=${LOCALBASE}/bin/gm4 +CONFIGURE_ENV+= CONFIG_SHELL=${SH} M4=${LOCALBASE}/bin/gm4 CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} --without-lispdir CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} GENERIC_TOOLS= config.guess config.sub elisp-comp install-sh mdate-sh missing +GENERIC_LINKS= autoconf autoheader autom4te autoreconf autoscan autoupdate \ + ifnames -MAN1_PAGES= autoconf autoheader autom4te autoreconf autoscan \ - autoupdate config.guess config.sub ifnames -MAN1= ${MAN1_PAGES:S/$/${BUILD_VERSION}.1/g} +MAN1_PAGES= ${GENERIC_LINKS} config.guess config.sub +MAN1= ${MAN1_PAGES:S/$/-${BUILD_VERSION}.1/g} post-patch: @(cd ${WRKSRC} && ${REINPLACE_CMD} -E 's,(PACKAGE=autoconf),\1${BUILD_VERSION},' configure) @@ -48,20 +50,13 @@ post-patch: done) @(cd ${WRKSRC}/doc && \ ${RM} -f *.info && \ - ${MV} autoconf.texi autoconf${BUILD_VERSION}.texi && \ - ${MV} standards.texi standards${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf)\),\1${BUILD_VERSION}\),g' autoconf${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(autoconf|standards)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in) + ${MV} autoconf.texi autoconf-${BUILD_VERSION}.texi) + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' post-install: .for FILE in ${GENERIC_TOOLS} - @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf${BUILD_VERSION} -.endfor - @-${RM} -fr ${PREFIX}/libexec/autoconf${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/autoconf${BUILD_VERSION} -.for i in autoconf autoheader autoreconf autoscan autoupdate ifnames - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/autoconf${BUILD_VERSION}/${i} + @${INSTALL_SCRIPT} ${WRKSRC}/build-aux/${FILE} ${PREFIX}/share/autoconf-${BUILD_VERSION} .endfor .include <bsd.port.mk> diff --git a/devel/autoconf268/files/patch-autoconf.texi b/devel/autoconf268/files/patch-autoconf.texi index f561aee323f9..96b0ec210a63 100644 --- a/devel/autoconf268/files/patch-autoconf.texi +++ b/devel/autoconf268/files/patch-autoconf.texi @@ -1,14 +1,17 @@ ---- doc/autoconf.texi.orig Wed Nov 5 10:38:29 2003 -+++ doc/autoconf.texi Thu Oct 14 20:17:35 2004 +--- doc/autoconf.texi.orig Thu Nov 16 16:16:27 2006 ++++ doc/autoconf.texi Sat Apr 14 15:41:27 2007 @@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf261.info ++@setfilename autoconf-2.61.info @include version.texi -@settitle Autoconf -+@settitle Autoconf261 ++@settitle Autoconf-2.61 @setchapternewpage odd -@@ -212,23 +212,3 @@ +@@ -205,25 +205,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools @direntry -* Autoconf: (autoconf). Create source code configuration scripts. -@end direntry @@ -31,5 +34,5 @@ - Automatic update of @file{configure.ac} -* config.status: (autoconf)config.status Invocation. Recreating configurations. -* testsuite: (autoconf)testsuite Invocation. Running an Autotest test suite. -+* Autoconf261: (autoconf261). Create source code configuration scripts. ++* Autoconf-2.61: (autoconf-2.61). Create source code configuration scripts. @end direntry diff --git a/devel/autoconf268/files/patch-configure b/devel/autoconf268/files/patch-configure deleted file mode 100644 index 0d805971c245..000000000000 --- a/devel/autoconf268/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- configure.orig Fri Nov 17 11:05:17 2006 -+++ configure Sun Dec 3 16:58:50 2006 -@@ -2013,3 +2013,3 @@ - # Define the identity of the package. -- PACKAGE='autoconf' -+ PACKAGE='autoconf261' - VERSION='2.61' diff --git a/devel/autoconf268/files/patch-doc-Makefile.in b/devel/autoconf268/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..8597e60bd979 --- /dev/null +++ b/devel/autoconf268/files/patch-doc-Makefile.in @@ -0,0 +1,25 @@ +--- doc/Makefile.in.orig Mon Oct 16 13:58:44 2006 ++++ doc/Makefile.in Thu Apr 5 01:51:13 2007 +@@ -44,3 +44,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info ++INFO_DEPS = $(srcdir)/autoconf-2.61.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.61.texi + TEXI2PDF = $(TEXI2DVI) --pdf --batch +@@ -241,3 +241,3 @@ + fi +-$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS) ++$(srcdir)/autoconf-2.61.info: autoconf-2.61.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.61.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.61.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/autoconf268/files/patch-standards.texi b/devel/autoconf268/files/patch-standards.texi deleted file mode 100644 index 7ecda7e79ef4..000000000000 --- a/devel/autoconf268/files/patch-standards.texi +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 -+++ doc/standards.texi Sun Mar 14 16:47:41 2004 -@@ -2,3 +2,3 @@ - @c %**start of header --@setfilename standards.info -+@setfilename standards261.info - @settitle GNU Coding Standards -@@ -10,3 +10,3 @@ - @direntry --* Standards: (standards). GNU coding standards. -+* Standards261: (standards261). GNU coding standards. - @end direntry diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist index cb89cfdb2c54..b9ef638c9691 100644 --- a/devel/autoconf268/pkg-plist +++ b/devel/autoconf268/pkg-plist @@ -1,65 +1,58 @@ -bin/autoconf%%BUILD_VERSION%% -bin/autoheader%%BUILD_VERSION%% -bin/autom4te%%BUILD_VERSION%% -bin/autoreconf%%BUILD_VERSION%% -bin/autoscan%%BUILD_VERSION%% -bin/autoupdate%%BUILD_VERSION%% -bin/ifnames%%BUILD_VERSION%% -libexec/autoconf%%BUILD_VERSION%%/autoconf -libexec/autoconf%%BUILD_VERSION%%/autoheader -libexec/autoconf%%BUILD_VERSION%%/autoreconf -libexec/autoconf%%BUILD_VERSION%%/autoscan -libexec/autoconf%%BUILD_VERSION%%/autoupdate -libexec/autoconf%%BUILD_VERSION%%/ifnames -share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm -share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm -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/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 -share/autoconf%%BUILD_VERSION%%/autoconf/autoconf.m4f -share/autoconf%%BUILD_VERSION%%/autoconf/autoheader.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoscan.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/autoupdate.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/c.m4 -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/headers.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/lang.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/libs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/oldnames.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/programs.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/specific.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/status.m4 -share/autoconf%%BUILD_VERSION%%/autoconf/types.m4 -share/autoconf%%BUILD_VERSION%%/autom4te.cfg -share/autoconf%%BUILD_VERSION%%/autoscan/autoscan.list -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4 -share/autoconf%%BUILD_VERSION%%/autotest/autotest.m4f -share/autoconf%%BUILD_VERSION%%/autotest/general.m4 -share/autoconf%%BUILD_VERSION%%/config.guess -share/autoconf%%BUILD_VERSION%%/config.sub -share/autoconf%%BUILD_VERSION%%/elisp-comp -share/autoconf%%BUILD_VERSION%%/install-sh -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sh.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4 -share/autoconf%%BUILD_VERSION%%/m4sugar/m4sugar.m4f -share/autoconf%%BUILD_VERSION%%/m4sugar/version.m4 -share/autoconf%%BUILD_VERSION%%/mdate-sh -share/autoconf%%BUILD_VERSION%%/missing -@dirrm share/autoconf%%BUILD_VERSION%%/m4sugar -@dirrm share/autoconf%%BUILD_VERSION%%/autotest -@dirrm share/autoconf%%BUILD_VERSION%%/autoscan -@dirrm share/autoconf%%BUILD_VERSION%%/autoconf -@dirrm share/autoconf%%BUILD_VERSION%%/Autom4te -@dirrm share/autoconf%%BUILD_VERSION%% -@dirrm libexec/autoconf%%BUILD_VERSION%% +bin/autoconf-%%BUILD_VERSION%% +bin/autoheader-%%BUILD_VERSION%% +bin/autom4te-%%BUILD_VERSION%% +bin/autoreconf-%%BUILD_VERSION%% +bin/autoscan-%%BUILD_VERSION%% +bin/autoupdate-%%BUILD_VERSION%% +bin/ifnames-%%BUILD_VERSION%% +share/autoconf-%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf-%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +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/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 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoconf.m4f +share/autoconf-%%BUILD_VERSION%%/autoconf/autoheader.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoscan.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/autoupdate.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/c.m4 +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/headers.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/lang.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/libs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/oldnames.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/programs.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/specific.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/status.m4 +share/autoconf-%%BUILD_VERSION%%/autoconf/types.m4 +share/autoconf-%%BUILD_VERSION%%/autom4te.cfg +share/autoconf-%%BUILD_VERSION%%/autoscan/autoscan.list +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4 +share/autoconf-%%BUILD_VERSION%%/autotest/autotest.m4f +share/autoconf-%%BUILD_VERSION%%/autotest/general.m4 +share/autoconf-%%BUILD_VERSION%%/config.guess +share/autoconf-%%BUILD_VERSION%%/config.sub +share/autoconf-%%BUILD_VERSION%%/elisp-comp +share/autoconf-%%BUILD_VERSION%%/install-sh +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sh.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4 +share/autoconf-%%BUILD_VERSION%%/m4sugar/m4sugar.m4f +share/autoconf-%%BUILD_VERSION%%/m4sugar/version.m4 +share/autoconf-%%BUILD_VERSION%%/mdate-sh +share/autoconf-%%BUILD_VERSION%%/missing +@dirrm share/autoconf-%%BUILD_VERSION%%/m4sugar +@dirrm share/autoconf-%%BUILD_VERSION%%/autotest +@dirrm share/autoconf-%%BUILD_VERSION%%/autoscan +@dirrm share/autoconf-%%BUILD_VERSION%%/autoconf +@dirrm share/autoconf-%%BUILD_VERSION%%/Autom4te +@dirrm share/autoconf-%%BUILD_VERSION%% diff --git a/devel/automake-wrapper/Makefile b/devel/automake-wrapper/Makefile new file mode 100644 index 000000000000..1bde7c484214 --- /dev/null +++ b/devel/automake-wrapper/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: automake-wrapper +# Date created: 2007-04-04 +# Whom: des +# +# $FreeBSD$ +# + +PORTNAME= automake-wrapper + +COMMENT= Wrapper script for GNU automake + +MASTERDIR= ${.CURDIR}/../../devel/autoconf-wrapper +PKGDIR= ${.CURDIR} + +TOOL= AUTOMAKE +WRAPPED_TOOLS= aclocal automake + +.include "${MASTERDIR}/Makefile" diff --git a/devel/automake-wrapper/pkg-descr b/devel/automake-wrapper/pkg-descr new file mode 100644 index 000000000000..a624f236615f --- /dev/null +++ b/devel/automake-wrapper/pkg-descr @@ -0,0 +1,3 @@ +This port installs a wrapper script for automake, with symlinks to the +unversioned name of each tool included with automake. This allows the +correct version to be selected depending on the user's requirements. diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index 281a5d2d3c58..4211f9fbd379 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,18 +16,19 @@ DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator (1.10) -RUN_DEPENDS= ${AUTOCONF_DEPENDS} +RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ + automake-wrapper:${PORTSDIR}/devel/automake-wrapper USE_AUTOTOOLS= autoconf:261:env -BUILD_VERSION= 110 +BUILD_VERSION= 1.10 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= automake${BUILD_VERSION} +LATEST_LINK= automake110 USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INFO= automake${BUILD_VERSION} +INFO= automake-${BUILD_VERSION} .include <bsd.port.pre.mk> @@ -39,23 +40,13 @@ CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split" .endif post-patch: - @(cd ${WRKSRC}/doc && \ - ${RM} -f *.info && \ - ${MV} automake.texi automake${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \ - ) + @${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} - @${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION} - @${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION} - -post-install: -.for i in aclocal automake - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/automake${BUILD_VERSION}/${i} -.endfor + @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION} .include <bsd.port.post.mk> diff --git a/devel/automake110/files/patch-Makefile.in b/devel/automake110/files/patch-Makefile.in index f24ffdd88721..55d85c2ed5b9 100644 --- a/devel/automake110/files/patch-Makefile.in +++ b/devel/automake110/files/patch-Makefile.in @@ -1,27 +1,6 @@ ---- Makefile.in.orig Sun Mar 7 09:04:32 2004 -+++ Makefile.in Sun Mar 14 17:07:15 2004 -@@ -82,2 +82,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -154,2 +155,3 @@ - -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ -+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -@@ -590,16 +592,4 @@ - @$(POST_INSTALL) -- @for p in $(bin_SCRIPTS); do \ -- f="`echo $$p|sed '$(transform)'`"; \ -- fv="$$f-$(APIVERSION)"; \ -- rm -f $(DESTDIR)$(bindir)/$$fv; \ -- echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \ -- $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \ -- done - - uninstall-hook: -- @for p in $(bin_SCRIPTS); do \ -- f="`echo $$p|sed '$(transform)'`"; \ -- fv="$$f-$(APIVERSION)"; \ -- rm -f $(DESTDIR)$(bindir)/$$fv; \ -- done +--- Makefile.in.orig Sun Oct 15 10:25:23 2006 ++++ Makefile.in Sat Apr 14 16:04:04 2007 +@@ -591,3 +591,2 @@ + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook diff --git a/devel/automake110/files/patch-aclocal.in b/devel/automake110/files/patch-aclocal.in deleted file mode 100644 index 5a3af1e7f9d4..000000000000 --- a/devel/automake110/files/patch-aclocal.in +++ /dev/null @@ -1,17 +0,0 @@ ---- aclocal.in.orig Sun Oct 15 09:19:37 2006 -+++ aclocal.in Sun May 6 13:56:37 2007 -@@ -32,3 +32,3 @@ - { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); -@@ -58,3 +58,3 @@ - my @user_includes = (); --my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); -+my @automake_includes = ("@datadir@/aclocal$APIPVERSION"); - my @system_includes = ('@datadir@/aclocal'); -@@ -650,3 +650,3 @@ - -- my $traces = ($ENV{AUTOM4TE} || 'autom4te'); -+ my $traces = ($ENV{AUTOM4TE} || 'autom4te261'); - $traces .= " --language Autoconf-without-aclocal-m4 "; diff --git a/devel/automake110/files/patch-automake.in b/devel/automake110/files/patch-automake.in deleted file mode 100644 index 263e50d82978..000000000000 --- a/devel/automake110/files/patch-automake.in +++ /dev/null @@ -1,12 +0,0 @@ ---- automake.in.orig Sat Apr 10 10:15:32 2004 -+++ automake.in Wed May 26 14:34:15 2004 -@@ -33,3 +33,3 @@ - { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); -@@ -4440,3 +4440,3 @@ - -- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " "; -+ my $traces = ($ENV{AUTOCONF} || 'autoconf261') . " "; - diff --git a/devel/automake110/files/patch-configure b/devel/automake110/files/patch-configure deleted file mode 100644 index 8ef0709ff933..000000000000 --- a/devel/automake110/files/patch-configure +++ /dev/null @@ -1,42 +0,0 @@ ---- configure.orig Sun Oct 15 10:25:22 2006 -+++ configure Tue Dec 5 13:23:30 2006 -@@ -631,2 +631,3 @@ - APIVERSION -+APIPVERSION - pkgvdatadir -@@ -1736,2 +1737,3 @@ - am__api_version='1.10' -+am__apip_version='110' - -@@ -2055,3 +2057,3 @@ - --ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} -+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal${am__apip_version}"} - -@@ -2061,3 +2063,3 @@ - --AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} -+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake${am__apip_version}"} - -@@ -2196,6 +2198,6 @@ - APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'` -- -+APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'` - - # A versioned directory, defined here for convenience. --pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION" -+pkgvdatadir="\${datadir}/automake${APIPVERSION}" - -@@ -3232,2 +3234,3 @@ - APIVERSION=$APIVERSION -+APIPVERSION=$APIPVERSION - -@@ -3377,2 +3380,3 @@ - APIVERSION!$APIVERSION$ac_delim -+APIPVERSION!$APIPVERSION$ac_delim - pkgvdatadir!$pkgvdatadir$ac_delim -@@ -3389,3 +3393,3 @@ - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then - break diff --git a/devel/automake110/files/patch-doc::Makefile.in b/devel/automake110/files/patch-doc::Makefile.in index b3c320a7de74..17a9dc7f012c 100644 --- a/devel/automake110/files/patch-doc::Makefile.in +++ b/devel/automake110/files/patch-doc::Makefile.in @@ -3,33 +3,24 @@ @@ -53,3 +53,3 @@ DIST_SOURCES = -INFO_DEPS = $(srcdir)/automake.info -+INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info ++INFO_DEPS = $(srcdir)/automake-@APIVERSION@.info TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex -@@ -73,2 +73,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -93,3 +94,3 @@ - LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - MODIFICATION_DELAY = @MODIFICATION_DELAY@ @@ -135,3 +136,3 @@ target_alias = @target_alias@ -info_TEXINFOS = automake.texi -+info_TEXINFOS = automake${APIPVERSION}.texi ++info_TEXINFOS = automake-@APIVERSION@.texi automake_TEXINFOS = fdl.texi @@ -142,3 +143,3 @@ -TAGS_DEPENDENCIES = automake.texi -+TAGS_DEPENDENCIES = automake${APIPVERSION}.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${APIPVERSION}.texi $(top_srcdir)/configure -+ @(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \ -+ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.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/automake110/files/patch-doc::automake.texi b/devel/automake110/files/patch-doc::automake.texi index 882a8642d75e..d5ebb1253d29 100644 --- a/devel/automake110/files/patch-doc::automake.texi +++ b/devel/automake110/files/patch-doc::automake.texi @@ -1,13 +1,19 @@ --- doc/automake.texi.orig Sun Oct 15 10:41:24 2006 -+++ doc/automake.texi Tue Dec 5 13:25:18 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 automake19.info -+@settitle automake19 ++@setfilename automake-1.10.info ++@settitle Automake-1.10 @setchapternewpage off -@@ -39,9 +39,4 @@ +@@ -34,14 +34,5 @@ + +-@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 @direntry -* Automake: (automake). Making GNU standards-compliant Makefiles. -@end direntry @@ -16,11 +22,5 @@ -@direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -* automake: (automake)Invoking Automake. Generating Makefile.in. -+* aclocal110: (automake110)Invoking aclocal. Generating aclocal.m4. -+* automake110: (automake110)Invoking Automake. Generating Makefile.in. ++* Automake-1.10: (automake-1.10). Making Makefile.in's. @end direntry -@@ -11894,3 +11889,3 @@ - @multitable {8888-88-88} {8.8-p8} {8888} {8888} {8888} {8888 (88)} {8888 (88)} {888} {888} --@headitem Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t -+@item Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t - @item 1994-09-19 @tab CVS @tab 141 @tab @tab @tab 299 (24) @tab @tab @tab diff --git a/devel/automake110/files/patch-lib::Automake::Config.in b/devel/automake110/files/patch-lib::Automake::Config.in deleted file mode 100644 index ec1f5a62449b..000000000000 --- a/devel/automake110/files/patch-lib::Automake::Config.in +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/Automake/Config.in.orig Sat May 14 12:52:09 2005 -+++ lib/Automake/Config.in Tue Dec 5 13:27:08 2006 -@@ -25,3 +25,3 @@ - our @ISA = qw (Exporter); --our @EXPORT = qw ($APIVERSION $PACKAGE $VERSION $libdir); -+our @EXPORT = qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir); - -@@ -30,5 +30,6 @@ - our $APIVERSION = '@APIVERSION@'; -+our $APIPVERSION = '@APIPVERSION@'; - our $PACKAGE = '@PACKAGE@'; - our $VERSION = '@VERSION@'; --our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; -+our $libdir = '@datadir@/@PACKAGE@@APIPVERSION@'; - diff --git a/devel/automake110/files/patch-lib::Automake::Makefile.in b/devel/automake110/files/patch-lib::Automake::Makefile.in deleted file mode 100644 index a1ae8ffe243e..000000000000 --- a/devel/automake110/files/patch-lib::Automake::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/Automake/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ lib/Automake/Makefile.in Mon Mar 29 20:22:26 2004 -@@ -70,2 +70,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -161,2 +162,3 @@ - -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ -+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ diff --git a/devel/automake110/files/patch-m4-Makefile.in b/devel/automake110/files/patch-m4-Makefile.in deleted file mode 100644 index 5125e696ab2c..000000000000 --- a/devel/automake110/files/patch-m4-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ m4/Makefile.in Sun Mar 14 17:09:37 2004 -@@ -60,2 +60,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -122,3 +123,3 @@ - target_alias = @target_alias@ --m4datadir = $(datadir)/aclocal-$(APIVERSION) -+m4datadir = $(datadir)/aclocal$(APIPVERSION) - dist_m4data_DATA = \ diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist index 4c167efd428c..3c226e808f6b 100644 --- a/devel/automake110/pkg-plist +++ b/devel/automake110/pkg-plist @@ -1,123 +1,120 @@ -bin/aclocal%%BUILD_VERSION%% -bin/automake%%BUILD_VERSION%% -libexec/automake%%BUILD_VERSION%%/aclocal -libexec/automake%%BUILD_VERSION%%/automake -share/aclocal%%BUILD_VERSION%%/amversion.m4 -share/aclocal%%BUILD_VERSION%%/as.m4 -share/aclocal%%BUILD_VERSION%%/auxdir.m4 -share/aclocal%%BUILD_VERSION%%/ccstdc.m4 -share/aclocal%%BUILD_VERSION%%/cond.m4 -share/aclocal%%BUILD_VERSION%%/depend.m4 -share/aclocal%%BUILD_VERSION%%/depout.m4 -share/aclocal%%BUILD_VERSION%%/dmalloc.m4 -share/aclocal%%BUILD_VERSION%%/gcj.m4 -share/aclocal%%BUILD_VERSION%%/header.m4 -share/aclocal%%BUILD_VERSION%%/init.m4 -share/aclocal%%BUILD_VERSION%%/install-sh.m4 -share/aclocal%%BUILD_VERSION%%/lead-dot.m4 -share/aclocal%%BUILD_VERSION%%/lex.m4 -share/aclocal%%BUILD_VERSION%%/lispdir.m4 -share/aclocal%%BUILD_VERSION%%/maintainer.m4 -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%%/strip.m4 -share/aclocal%%BUILD_VERSION%%/substnot.m4 -share/aclocal%%BUILD_VERSION%%/tar.m4 -share/aclocal%%BUILD_VERSION%%/upc.m4 -share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm -share/automake%%BUILD_VERSION%%/Automake/Channels.pm -share/automake%%BUILD_VERSION%%/Automake/Condition.pm -share/automake%%BUILD_VERSION%%/Automake/Config.pm -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/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 -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/clean-hdr.am -share/automake%%BUILD_VERSION%%/am/clean.am -share/automake%%BUILD_VERSION%%/am/compile.am -share/automake%%BUILD_VERSION%%/am/configure.am -share/automake%%BUILD_VERSION%%/am/data.am -share/automake%%BUILD_VERSION%%/am/dejagnu.am -share/automake%%BUILD_VERSION%%/am/depend.am -share/automake%%BUILD_VERSION%%/am/depend2.am -share/automake%%BUILD_VERSION%%/am/distdir.am -share/automake%%BUILD_VERSION%%/am/footer.am -share/automake%%BUILD_VERSION%%/am/header-vars.am -share/automake%%BUILD_VERSION%%/am/header.am -share/automake%%BUILD_VERSION%%/am/install.am -share/automake%%BUILD_VERSION%%/am/inst-vars.am -share/automake%%BUILD_VERSION%%/am/java.am -share/automake%%BUILD_VERSION%%/am/lang-compile.am -share/automake%%BUILD_VERSION%%/am/lex.am -share/automake%%BUILD_VERSION%%/am/library.am -share/automake%%BUILD_VERSION%%/am/libs.am -share/automake%%BUILD_VERSION%%/am/libtool.am -share/automake%%BUILD_VERSION%%/am/lisp.am -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 -share/automake%%BUILD_VERSION%%/am/remake-hdr.am -share/automake%%BUILD_VERSION%%/am/scripts.am -share/automake%%BUILD_VERSION%%/am/subdirs.am -share/automake%%BUILD_VERSION%%/am/tags.am -share/automake%%BUILD_VERSION%%/am/texi-vers.am -share/automake%%BUILD_VERSION%%/am/texibuild.am -share/automake%%BUILD_VERSION%%/am/texinfos.am -share/automake%%BUILD_VERSION%%/am/yacc.am -share/automake%%BUILD_VERSION%%/ansi2knr.1 -share/automake%%BUILD_VERSION%%/ansi2knr.c -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 -share/automake%%BUILD_VERSION%%/elisp-comp -share/automake%%BUILD_VERSION%%/install-sh -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%%/texinfo.tex -share/automake%%BUILD_VERSION%%/ylwrap +bin/aclocal-%%BUILD_VERSION%% +bin/automake-%%BUILD_VERSION%% +share/aclocal-%%BUILD_VERSION%%/amversion.m4 +share/aclocal-%%BUILD_VERSION%%/as.m4 +share/aclocal-%%BUILD_VERSION%%/auxdir.m4 +share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal-%%BUILD_VERSION%%/cond.m4 +share/aclocal-%%BUILD_VERSION%%/depend.m4 +share/aclocal-%%BUILD_VERSION%%/depout.m4 +share/aclocal-%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal-%%BUILD_VERSION%%/gcj.m4 +share/aclocal-%%BUILD_VERSION%%/header.m4 +share/aclocal-%%BUILD_VERSION%%/init.m4 +share/aclocal-%%BUILD_VERSION%%/install-sh.m4 +share/aclocal-%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal-%%BUILD_VERSION%%/lex.m4 +share/aclocal-%%BUILD_VERSION%%/lispdir.m4 +share/aclocal-%%BUILD_VERSION%%/maintainer.m4 +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%%/strip.m4 +share/aclocal-%%BUILD_VERSION%%/substnot.m4 +share/aclocal-%%BUILD_VERSION%%/tar.m4 +share/aclocal-%%BUILD_VERSION%%/upc.m4 +share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm +share/automake-%%BUILD_VERSION%%/Automake/Channels.pm +share/automake-%%BUILD_VERSION%%/Automake/Condition.pm +share/automake-%%BUILD_VERSION%%/Automake/Config.pm +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/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 +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/clean-hdr.am +share/automake-%%BUILD_VERSION%%/am/clean.am +share/automake-%%BUILD_VERSION%%/am/compile.am +share/automake-%%BUILD_VERSION%%/am/configure.am +share/automake-%%BUILD_VERSION%%/am/data.am +share/automake-%%BUILD_VERSION%%/am/dejagnu.am +share/automake-%%BUILD_VERSION%%/am/depend.am +share/automake-%%BUILD_VERSION%%/am/depend2.am +share/automake-%%BUILD_VERSION%%/am/distdir.am +share/automake-%%BUILD_VERSION%%/am/footer.am +share/automake-%%BUILD_VERSION%%/am/header-vars.am +share/automake-%%BUILD_VERSION%%/am/header.am +share/automake-%%BUILD_VERSION%%/am/install.am +share/automake-%%BUILD_VERSION%%/am/inst-vars.am +share/automake-%%BUILD_VERSION%%/am/java.am +share/automake-%%BUILD_VERSION%%/am/lang-compile.am +share/automake-%%BUILD_VERSION%%/am/lex.am +share/automake-%%BUILD_VERSION%%/am/library.am +share/automake-%%BUILD_VERSION%%/am/libs.am +share/automake-%%BUILD_VERSION%%/am/libtool.am +share/automake-%%BUILD_VERSION%%/am/lisp.am +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 +share/automake-%%BUILD_VERSION%%/am/remake-hdr.am +share/automake-%%BUILD_VERSION%%/am/scripts.am +share/automake-%%BUILD_VERSION%%/am/subdirs.am +share/automake-%%BUILD_VERSION%%/am/tags.am +share/automake-%%BUILD_VERSION%%/am/texi-vers.am +share/automake-%%BUILD_VERSION%%/am/texibuild.am +share/automake-%%BUILD_VERSION%%/am/texinfos.am +share/automake-%%BUILD_VERSION%%/am/yacc.am +share/automake-%%BUILD_VERSION%%/ansi2knr.1 +share/automake-%%BUILD_VERSION%%/ansi2knr.c +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 +share/automake-%%BUILD_VERSION%%/elisp-comp +share/automake-%%BUILD_VERSION%%/install-sh +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%%/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 -@dirrm share/automake%%BUILD_VERSION%% -@dirrm libexec/automake%%BUILD_VERSION%% +@dirrm share/aclocal-%%BUILD_VERSION%% +@dirrm share/automake-%%BUILD_VERSION%%/Automake +@dirrm share/automake-%%BUILD_VERSION%%/am +@dirrm share/automake-%%BUILD_VERSION%% diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index fda87bb524d2..4a1517cb4420 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.4.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,34 +16,29 @@ DISTNAME= automake-1.4-p6 MAINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator (1.4) -RUN_DEPENDS= ${AUTOCONF_DEPENDS} +RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ + automake-wrapper:${PORTSDIR}/devel/automake-wrapper -USE_AUTOTOOLS= autoconf:213:env -BUILD_VERSION= 14 +USE_AUTOTOOLS= autoconf:261:env +BUILD_VERSION= 1.4 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= automake${BUILD_VERSION} -GNU_CONFIGURE= yes -CONFIGURE_ENV= PERL=${PERL} -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +LATEST_LINK= automake14 USE_PERL5= yes -INFO= automake${BUILD_VERSION} +GNU_CONFIGURE= yes +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +INFO= automake-${BUILD_VERSION} STRIP= # none post-patch: - @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake${BUILD_VERSION}.texi - @${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true + @${RM} ${WRKSRC}/*.info* + @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake-${BUILD_VERSION}.texi pre-su-install: - @${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION} - @${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION} - @${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION} - -post-install: -.for i in aclocal automake - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/automake${BUILD_VERSION}/${i} -.endfor + @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION} .include <bsd.port.mk> diff --git a/devel/automake14/files/patch-Makefile.in b/devel/automake14/files/patch-Makefile.in index 5008a3dc1339..7cd1eac67043 100644 --- a/devel/automake14/files/patch-Makefile.in +++ b/devel/automake14/files/patch-Makefile.in @@ -1,52 +1,39 @@ --- Makefile.in.orig Sat Jul 27 14:09:40 2002 -+++ Makefile.in Thu May 13 13:44:45 2004 ++++ Makefile.in Thu Apr 5 02:20:54 2007 @@ -36,5 +36,5 @@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -+pkgdatadir = $(datadir)/@PACKAGE@14 -+pkglibdir = $(libdir)/@PACKAGE@14 -+pkgincludedir = $(includedir)/@PACKAGE@14 ++pkgdatadir = $(datadir)/@PACKAGE@-@APIVERSION@ ++pkglibdir = $(libdir)/@PACKAGE@-@APIVERSION@ ++pkgincludedir = $(includedir)/@PACKAGE@-@APIVERSION@ @@ -74,3 +74,3 @@ bin_SCRIPTS = automake aclocal -info_TEXINFOS = automake.texi -+info_TEXINFOS = automake14.texi ++info_TEXINFOS = automake-@APIVERSION@.texi @@ -97,5 +97,5 @@ TEXI2DVI = texi2dvi -INFO_DEPS = automake.info --DVIS = automake.dvi ++INFO_DEPS = automake-@APIVERSION@.info + DVIS = automake.dvi -TEXINFOS = automake.texi -+INFO_DEPS = automake14.info -+DVIS = automake14.dvi -+TEXINFOS = automake14.texi ++TEXINFOS = automake-@APIVERSION@.texi DATA = $(pkgvdata_DATA) $(script_DATA) @@ -156,4 +156,4 @@ -$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in - @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`" > vti.tmp -+$(srcdir)/stamp-vti: automake14.texi $(top_srcdir)/configure.in -+ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake14.texi`" > vti.tmp ++$(srcdir)/stamp-vti: automake-@APIVERSION@.texi $(top_srcdir)/configure.in ++ @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake-@APIVERSION@.texi`" > vti.tmp @echo "@set EDITION $(VERSION)" >> vti.tmp -@@ -176,4 +176,4 @@ +@@ -176,3 +176,3 @@ -automake.info: automake.texi version.texi --automake.dvi: automake.texi version.texi -+automake14.info: automake14.texi version.texi -+automake14.dvi: automake14.texi version.texi - -@@ -185,3 +185,3 @@ - cd $(srcdir) \ -- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` -+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` - -@@ -276,3 +276,3 @@ - mostlyclean-aminfo: -- -rm -f automake.aux automake.cp automake.cps automake.dvi automake.fn \ -+ -rm -f automake.aux automake.cp automake.cps automake14.dvi automake.fn \ - automake.fns automake.ky automake.kys automake.ps \ ++automake-@APIVERSION@.info: automake-@APIVERSION@.texi version.texi + automake.dvi: automake.texi version.texi @@ -490,3 +490,3 @@ @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook diff --git a/devel/automake14/files/patch-aclocal.in b/devel/automake14/files/patch-aclocal.in deleted file mode 100644 index 49c6f2251c52..000000000000 --- a/devel/automake14/files/patch-aclocal.in +++ /dev/null @@ -1,34 +0,0 @@ ---- aclocal.in.orig Thu Jul 25 09:51:42 2002 -+++ aclocal.in Sun May 6 13:50:18 2007 -@@ -36,3 +36,3 @@ - # Note also that the versioned directory is handled later. --$acdir = "@datadir@/aclocal"; -+$acdir = "@datadir@/aclocal14"; - $default_acdir = $acdir; -@@ -200,8 +200,2 @@ - -- # Search the versioned directory near the end, and then the -- # unversioned directory last. Only do this if the user didn't -- # override acdir. -- push (@dirlist, "$acdir-$APIVERSION") -- if $acdir eq $default_acdir; -- - # By default $(datadir)/aclocal doesn't exist. We don't want to -@@ -296,2 +290,3 @@ - -+ local (@skipinolist) = (); - local ($m4dir); -@@ -301,3 +296,3 @@ - || die "aclocal: couldn't open directory \`$m4dir': $!\n"; -- local ($file, $fullfile, $expr); -+ local ($file, $fullfile, $ino, $expr); - foreach $file (sort grep (! /^\./, readdir (DIR))) -@@ -311,2 +306,8 @@ - $fullfile = $m4dir . '/' . $file; -+ -+ # Do not scan a file more than once. -+ $ino = (stat($fullfile))[1]; -+ next if grep($ino eq $_, @skipinolist); -+ push @skipinolist, $ino; -+ - $file_contents{$fullfile} = &scan_file ($fullfile); diff --git a/devel/automake14/files/patch-automake.in b/devel/automake14/files/patch-automake.in deleted file mode 100644 index f4111d489de3..000000000000 --- a/devel/automake14/files/patch-automake.in +++ /dev/null @@ -1,7 +0,0 @@ ---- automake.in.orig Sat Jul 27 13:55:58 2002 -+++ automake.in Thu May 13 13:34:28 2004 -@@ -34,3 +34,3 @@ - $prefix = "@prefix@"; --$am_dir = "@datadir@/@PACKAGE@-@APIVERSION@"; -+$am_dir = "@datadir@/@PACKAGE@14"; - $TAR = "@TAR@"; diff --git a/devel/automake14/files/patch-automake.texi b/devel/automake14/files/patch-automake.texi index 6ef38d01c313..3b51ede84310 100644 --- a/devel/automake14/files/patch-automake.texi +++ b/devel/automake14/files/patch-automake.texi @@ -1,20 +1,23 @@ ---- automake.texi.orig Wed Jan 6 13:01:26 1999 -+++ automake.texi Thu Oct 14 20:28:26 2004 -@@ -2,4 +2,5 @@ +--- automake.texi.orig Wed Jan 6 05:01:26 1999 ++++ automake.texi Sat Apr 14 15:26:06 2007 +@@ -2,4 +2,4 @@ @c %**start of header -@setfilename automake.info -@settitle automake -+@setfilename automake14.info -+@dircategory Programming & development tools -+@settitle Automake14 ++@setfilename automake-1.4.info ++@settitle Automake-1.4 @setchapternewpage off -@@ -11,8 +12,3 @@ - @direntry +@@ -9,10 +9,5 @@ + +-@dircategory GNU admin +-@direntry -* automake: (automake). Making Makefile.in's -@end direntry - -@dircategory Individual utilities -@direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 -+* Automake14: (automake14). Making Makefile.in's ++@dircategory Programming & development tools ++@direntry ++* Automake-1.4: (automake-1.4). Making Makefile.in's. @end direntry diff --git a/devel/automake14/files/patch-configure b/devel/automake14/files/patch-configure deleted file mode 100644 index 57dfa68f13c4..000000000000 --- a/devel/automake14/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- configure.orig Sat Jul 27 13:43:07 2002 -+++ configure Thu May 13 13:39:30 2004 -@@ -867,3 +867,3 @@ - # A versioned directory, defined here for convenience. --pkgvdatadir="\${datadir}/automake-${APIVERSION}" -+pkgvdatadir="\${datadir}/automake14" - diff --git a/devel/automake14/files/patch-m4-Makefile.in b/devel/automake14/files/patch-m4-Makefile.in deleted file mode 100644 index ef2f10aaef08..000000000000 --- a/devel/automake14/files/patch-m4-Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ ---- m4/Makefile.in.orig Sat Jul 27 14:09:41 2002 -+++ m4/Makefile.in Thu May 13 13:35:28 2004 -@@ -70,3 +70,3 @@ - --m4datadir = $(datadir)/aclocal-$(APIVERSION) -+m4datadir = $(datadir)/aclocal14 - m4data_DATA = amversion.m4 ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4 diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist index ab759af96a04..61c001c95a95 100644 --- a/devel/automake14/pkg-plist +++ b/devel/automake14/pkg-plist @@ -1,82 +1,79 @@ -bin/aclocal%%BUILD_VERSION%% -bin/automake%%BUILD_VERSION%% -libexec/automake%%BUILD_VERSION%%/aclocal -libexec/automake%%BUILD_VERSION%%/automake -share/aclocal%%BUILD_VERSION%%/amversion.m4 -share/aclocal%%BUILD_VERSION%%/ccstdc.m4 -share/aclocal%%BUILD_VERSION%%/cond.m4 -share/aclocal%%BUILD_VERSION%%/dmalloc.m4 -share/aclocal%%BUILD_VERSION%%/error.m4 -share/aclocal%%BUILD_VERSION%%/header.m4 -share/aclocal%%BUILD_VERSION%%/init.m4 -share/aclocal%%BUILD_VERSION%%/lex.m4 -share/aclocal%%BUILD_VERSION%%/lispdir.m4 -share/aclocal%%BUILD_VERSION%%/maintainer.m4 -share/aclocal%%BUILD_VERSION%%/missing.m4 -share/aclocal%%BUILD_VERSION%%/mktime.m4 -share/aclocal%%BUILD_VERSION%%/multi.m4 -share/aclocal%%BUILD_VERSION%%/obstack.m4 -share/aclocal%%BUILD_VERSION%%/protos.m4 -share/aclocal%%BUILD_VERSION%%/ptrdiff.m4 -share/aclocal%%BUILD_VERSION%%/regex.m4 -share/aclocal%%BUILD_VERSION%%/sanity.m4 -share/aclocal%%BUILD_VERSION%%/strtod.m4 -share/aclocal%%BUILD_VERSION%%/termios.m4 -share/aclocal%%BUILD_VERSION%%/winsz.m4 -share/automake%%BUILD_VERSION%%/COPYING -share/automake%%BUILD_VERSION%%/INSTALL -share/automake%%BUILD_VERSION%%/acinstall -share/automake%%BUILD_VERSION%%/ansi2knr.1 -share/automake%%BUILD_VERSION%%/ansi2knr.c -share/automake%%BUILD_VERSION%%/clean-hdr.am -share/automake%%BUILD_VERSION%%/clean-kr.am -share/automake%%BUILD_VERSION%%/clean.am -share/automake%%BUILD_VERSION%%/comp-vars.am -share/automake%%BUILD_VERSION%%/compile.am -share/automake%%BUILD_VERSION%%/config.guess -share/automake%%BUILD_VERSION%%/config.sub -share/automake%%BUILD_VERSION%%/data-clean.am -share/automake%%BUILD_VERSION%%/data.am -share/automake%%BUILD_VERSION%%/dejagnu.am -share/automake%%BUILD_VERSION%%/depend.am -share/automake%%BUILD_VERSION%%/depend2.am -share/automake%%BUILD_VERSION%%/dist-vars.am -share/automake%%BUILD_VERSION%%/elisp-comp -share/automake%%BUILD_VERSION%%/footer.am -share/automake%%BUILD_VERSION%%/header-vars.am -share/automake%%BUILD_VERSION%%/header.am -share/automake%%BUILD_VERSION%%/install-sh -share/automake%%BUILD_VERSION%%/java-clean.am -share/automake%%BUILD_VERSION%%/java.am -share/automake%%BUILD_VERSION%%/kr-extra.am -share/automake%%BUILD_VERSION%%/library.am -share/automake%%BUILD_VERSION%%/libs-clean.am -share/automake%%BUILD_VERSION%%/libs.am -share/automake%%BUILD_VERSION%%/libtool.am -share/automake%%BUILD_VERSION%%/lisp-clean.am -share/automake%%BUILD_VERSION%%/lisp.am -share/automake%%BUILD_VERSION%%/ltlib-clean.am -share/automake%%BUILD_VERSION%%/ltlib.am -share/automake%%BUILD_VERSION%%/ltlibrary.am -share/automake%%BUILD_VERSION%%/mans-vars.am -share/automake%%BUILD_VERSION%%/mans.am -share/automake%%BUILD_VERSION%%/mdate-sh -share/automake%%BUILD_VERSION%%/missing -share/automake%%BUILD_VERSION%%/mkinstalldirs -share/automake%%BUILD_VERSION%%/multilib.am -share/automake%%BUILD_VERSION%%/program.am -share/automake%%BUILD_VERSION%%/progs-clean.am -share/automake%%BUILD_VERSION%%/progs.am -share/automake%%BUILD_VERSION%%/remake-hdr.am -share/automake%%BUILD_VERSION%%/remake.am -share/automake%%BUILD_VERSION%%/scripts.am -share/automake%%BUILD_VERSION%%/subdirs.am -share/automake%%BUILD_VERSION%%/tags-clean.am -share/automake%%BUILD_VERSION%%/tags.am -share/automake%%BUILD_VERSION%%/texi-vers.am -share/automake%%BUILD_VERSION%%/texinfo.tex -share/automake%%BUILD_VERSION%%/texinfos.am -share/automake%%BUILD_VERSION%%/ylwrap -@dirrm libexec/automake%%BUILD_VERSION%% -@dirrm share/aclocal%%BUILD_VERSION%% -@dirrm share/automake%%BUILD_VERSION%% +bin/aclocal-%%BUILD_VERSION%% +bin/automake-%%BUILD_VERSION%% +share/aclocal-%%BUILD_VERSION%%/amversion.m4 +share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal-%%BUILD_VERSION%%/cond.m4 +share/aclocal-%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal-%%BUILD_VERSION%%/error.m4 +share/aclocal-%%BUILD_VERSION%%/header.m4 +share/aclocal-%%BUILD_VERSION%%/init.m4 +share/aclocal-%%BUILD_VERSION%%/lex.m4 +share/aclocal-%%BUILD_VERSION%%/lispdir.m4 +share/aclocal-%%BUILD_VERSION%%/maintainer.m4 +share/aclocal-%%BUILD_VERSION%%/missing.m4 +share/aclocal-%%BUILD_VERSION%%/mktime.m4 +share/aclocal-%%BUILD_VERSION%%/multi.m4 +share/aclocal-%%BUILD_VERSION%%/obstack.m4 +share/aclocal-%%BUILD_VERSION%%/protos.m4 +share/aclocal-%%BUILD_VERSION%%/ptrdiff.m4 +share/aclocal-%%BUILD_VERSION%%/regex.m4 +share/aclocal-%%BUILD_VERSION%%/sanity.m4 +share/aclocal-%%BUILD_VERSION%%/strtod.m4 +share/aclocal-%%BUILD_VERSION%%/termios.m4 +share/aclocal-%%BUILD_VERSION%%/winsz.m4 +share/automake-%%BUILD_VERSION%%/COPYING +share/automake-%%BUILD_VERSION%%/INSTALL +share/automake-%%BUILD_VERSION%%/acinstall +share/automake-%%BUILD_VERSION%%/ansi2knr.1 +share/automake-%%BUILD_VERSION%%/ansi2knr.c +share/automake-%%BUILD_VERSION%%/clean-hdr.am +share/automake-%%BUILD_VERSION%%/clean-kr.am +share/automake-%%BUILD_VERSION%%/clean.am +share/automake-%%BUILD_VERSION%%/comp-vars.am +share/automake-%%BUILD_VERSION%%/compile.am +share/automake-%%BUILD_VERSION%%/config.guess +share/automake-%%BUILD_VERSION%%/config.sub +share/automake-%%BUILD_VERSION%%/data-clean.am +share/automake-%%BUILD_VERSION%%/data.am +share/automake-%%BUILD_VERSION%%/dejagnu.am +share/automake-%%BUILD_VERSION%%/depend.am +share/automake-%%BUILD_VERSION%%/depend2.am +share/automake-%%BUILD_VERSION%%/dist-vars.am +share/automake-%%BUILD_VERSION%%/elisp-comp +share/automake-%%BUILD_VERSION%%/footer.am +share/automake-%%BUILD_VERSION%%/header-vars.am +share/automake-%%BUILD_VERSION%%/header.am +share/automake-%%BUILD_VERSION%%/install-sh +share/automake-%%BUILD_VERSION%%/java-clean.am +share/automake-%%BUILD_VERSION%%/java.am +share/automake-%%BUILD_VERSION%%/kr-extra.am +share/automake-%%BUILD_VERSION%%/library.am +share/automake-%%BUILD_VERSION%%/libs-clean.am +share/automake-%%BUILD_VERSION%%/libs.am +share/automake-%%BUILD_VERSION%%/libtool.am +share/automake-%%BUILD_VERSION%%/lisp-clean.am +share/automake-%%BUILD_VERSION%%/lisp.am +share/automake-%%BUILD_VERSION%%/ltlib-clean.am +share/automake-%%BUILD_VERSION%%/ltlib.am +share/automake-%%BUILD_VERSION%%/ltlibrary.am +share/automake-%%BUILD_VERSION%%/mans-vars.am +share/automake-%%BUILD_VERSION%%/mans.am +share/automake-%%BUILD_VERSION%%/mdate-sh +share/automake-%%BUILD_VERSION%%/missing +share/automake-%%BUILD_VERSION%%/mkinstalldirs +share/automake-%%BUILD_VERSION%%/multilib.am +share/automake-%%BUILD_VERSION%%/program.am +share/automake-%%BUILD_VERSION%%/progs-clean.am +share/automake-%%BUILD_VERSION%%/progs.am +share/automake-%%BUILD_VERSION%%/remake-hdr.am +share/automake-%%BUILD_VERSION%%/remake.am +share/automake-%%BUILD_VERSION%%/scripts.am +share/automake-%%BUILD_VERSION%%/subdirs.am +share/automake-%%BUILD_VERSION%%/tags-clean.am +share/automake-%%BUILD_VERSION%%/tags.am +share/automake-%%BUILD_VERSION%%/texi-vers.am +share/automake-%%BUILD_VERSION%%/texinfo.tex +share/automake-%%BUILD_VERSION%%/texinfos.am +share/automake-%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal-%%BUILD_VERSION%% +@dirrm share/automake-%%BUILD_VERSION%% diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile index 804ef0a8c32a..29f3f6c9ebf9 100644 --- a/devel/automake15/Makefile +++ b/devel/automake15/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} @@ -16,38 +16,33 @@ MASTER_SITE_SUBDIR= automake MAINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator (1.5) -RUN_DEPENDS= ${AUTOCONF_DEPENDS} +RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ + automake-wrapper:${PORTSDIR}/devel/automake-wrapper -USE_AUTOTOOLS= autoconf:253:env -BUILD_VERSION= 15 +USE_AUTOTOOLS= autoconf:261:env +BUILD_VERSION= 1.5 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= automake${BUILD_VERSION} +LATEST_LINK= automake15 USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= AUTOCONF=autoconf253 AUTOHEADER=autoheader253 MAKEINFO=makeinfo -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INFO= automake${BUILD_VERSION} +INFO= automake-${BUILD_VERSION} post-patch: - @(cd ${WRKSRC} && \ - ${RM} -f *.info && \ - ${MV} automake.texi automake${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in && \ - ${REINPLACE_CMD} -e 's,%%BUILD_VERSION%%,${BUILD_VERSION},g' aclocal.in \ - ) + @${RM} ${WRKSRC}/*.info + @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake-${BUILD_VERSION}.texi + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + 's|@PACKAGE@$$|@PACKAGE@-@VERSION@|' + @${REINPLACE_CMD} -e 's|aclocal$$|aclocal-@VERSION@|' \ + ${WRKSRC}/m4/Makefile.in + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/aclocal.in pre-su-install: - @${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION} - @${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION} - @${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION} - -post-install: -.for i in aclocal automake - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/automake${BUILD_VERSION}/${i} -.endfor + @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION} .include <bsd.port.mk> diff --git a/devel/automake15/files/patch-Makefile.in b/devel/automake15/files/patch-Makefile.in index 5f1a7a86a4c2..7e3d1c21d01e 100644 --- a/devel/automake15/files/patch-Makefile.in +++ b/devel/automake15/files/patch-Makefile.in @@ -1,11 +1,17 @@ ---- Makefile.in.orig Sun Sep 9 11:42:15 2001 -+++ Makefile.in Sun Sep 9 11:42:51 2001 -@@ -180,7 +180,7 @@ - .texi.info: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) \ -- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \ - `echo $< | sed 's,.*/,,'` +--- Makefile.in.orig Wed Aug 22 22:49:54 2001 ++++ Makefile.in Thu Apr 5 02:38:15 2007 +@@ -98,5 +98,5 @@ + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +-INFO_DEPS = automake.info ++INFO_DEPS = automake-@VERSION@.info + DVIS = automake.dvi +-TEXINFOS = automake.texi ++TEXINFOS = automake-@VERSION@.texi - .texi.dvi: +@@ -158,4 +158,4 @@ + @: +-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in +- @(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake.texi`; \ ++$(srcdir)/stamp-vti: automake-@VERSION@.texi $(top_srcdir)/configure.in ++ @(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake-@VERSION@.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in index d72fe290f094..947ba7e01f19 100644 --- a/devel/automake15/files/patch-aclocal.in +++ b/devel/automake15/files/patch-aclocal.in @@ -1,10 +1,15 @@ --- aclocal.in.orig Mon Jul 16 22:36:23 2001 -+++ aclocal.in Sun May 6 13:52:34 2007 -@@ -35,2 +35,3 @@ - $acdir = "@datadir@/aclocal"; -+$acdir_ver = "@datadir@/aclocal%%BUILD_VERSION%%"; - -@@ -210,2 +211,3 @@ - push (@dirlist, $acdir); -+ push (@dirlist, $acdir_ver) if (-d "$acdir_ver/."); ++++ aclocal.in Thu Apr 5 03:19:44 2007 +@@ -34,3 +34,3 @@ + # Note that this isn't pkgdatadir, but a separate directory. +-$acdir = "@datadir@/aclocal"; ++$acdir = "@datadir@/aclocal-@VERSION@"; +@@ -117,2 +117,3 @@ + local (@dirlist) = &parse_arguments (@ARGV); ++push (@dirlist, "%%LOCALBASE%%/share/aclocal") if (!grep(/^--acdir/, @ARGV)); + &scan_m4_files (@dirlist); +@@ -205,2 +206,3 @@ + print $acdir, "\n"; ++ print "%%LOCALBASE%%/share/aclocal", "\n"; + exit 0; diff --git a/devel/automake15/files/patch-automake.in b/devel/automake15/files/patch-automake.in new file mode 100644 index 000000000000..1890b826646f --- /dev/null +++ b/devel/automake15/files/patch-automake.in @@ -0,0 +1,12 @@ +--- automake.in.orig Wed Aug 22 22:26:53 2001 ++++ automake.in Thu Apr 5 03:21:22 2007 +@@ -34,3 +34,3 @@ + my $prefix = "@prefix@"; +- my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@"; ++ my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@VERSION@"; + unshift @INC, "$perllibdir"; +@@ -129,3 +129,3 @@ + my $prefix = "@prefix@"; +-my $libdir = "@datadir@/@PACKAGE@"; ++my $libdir = "@datadir@/@PACKAGE@-@VERSION@"; + diff --git a/devel/automake15/files/patch-automake.texi b/devel/automake15/files/patch-automake.texi index ab8cc6955ff3..f5ff8df3d272 100644 --- a/devel/automake15/files/patch-automake.texi +++ b/devel/automake15/files/patch-automake.texi @@ -1,14 +1,16 @@ ---- automake.texi.orig Thu Aug 23 05:40:36 2001 -+++ automake.texi Thu Oct 14 20:29:56 2004 -@@ -2,4 +2,5 @@ +--- automake.texi.orig Wed Aug 22 22:40:36 2001 ++++ automake.texi Sat Apr 14 15:49:21 2007 +@@ -2,4 +2,4 @@ @c %**start of header -@setfilename automake.info -@settitle automake -+@setfilename automake15.info -+@dircategory Programming & development tools -+@settitle Automake15 ++@setfilename automake-1.5.info ++@settitle Automake-1.5 @setchapternewpage off -@@ -11,8 +12,3 @@ +@@ -9,10 +9,5 @@ + +-@dircategory GNU programming tools ++@dircategory Programming & development tools @direntry -* automake: (automake). Making Makefile.in's -@end direntry @@ -16,5 +18,5 @@ -@dircategory Individual utilities -@direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 -+* Automake15: (automake15). Making Makefile.in's ++* Automake-1.5: (automake-1.5). Making Makefile.in's. @end direntry diff --git a/devel/automake15/files/patch-configure b/devel/automake15/files/patch-configure deleted file mode 100644 index 8161cf88af18..000000000000 --- a/devel/automake15/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- configure.orig Wed Aug 22 22:49:52 2001 -+++ configure Wed Feb 11 01:01:24 2004 -@@ -795,3 +795,3 @@ - # Define the identity of the package. --PACKAGE=automake -+PACKAGE=automake15 - VERSION=1.5 diff --git a/devel/automake15/files/patch-m4::Makefile.in b/devel/automake15/files/patch-m4::Makefile.in deleted file mode 100644 index 0c0642b1da66..000000000000 --- a/devel/automake15/files/patch-m4::Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ ---- m4/Makefile.in.orig Wed Aug 22 22:49:56 2001 -+++ m4/Makefile.in Wed Feb 11 01:05:11 2004 -@@ -70,3 +70,3 @@ - --m4datadir = $(datadir)/aclocal -+m4datadir = $(datadir)/aclocal15 - m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \ diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist index b845d47dd764..283ab31c8d61 100644 --- a/devel/automake15/pkg-plist +++ b/devel/automake15/pkg-plist @@ -1,94 +1,91 @@ -bin/aclocal%%BUILD_VERSION%% -bin/automake%%BUILD_VERSION%% -libexec/automake%%BUILD_VERSION%%/aclocal -libexec/automake%%BUILD_VERSION%%/automake -share/aclocal%%BUILD_VERSION%%/as.m4 -share/aclocal%%BUILD_VERSION%%/auxdir.m4 -share/aclocal%%BUILD_VERSION%%/ccstdc.m4 -share/aclocal%%BUILD_VERSION%%/cond.m4 -share/aclocal%%BUILD_VERSION%%/depend.m4 -share/aclocal%%BUILD_VERSION%%/depout.m4 -share/aclocal%%BUILD_VERSION%%/dmalloc.m4 -share/aclocal%%BUILD_VERSION%%/error.m4 -share/aclocal%%BUILD_VERSION%%/gcj.m4 -share/aclocal%%BUILD_VERSION%%/header.m4 -share/aclocal%%BUILD_VERSION%%/init.m4 -share/aclocal%%BUILD_VERSION%%/install-sh.m4 -share/aclocal%%BUILD_VERSION%%/lex.m4 -share/aclocal%%BUILD_VERSION%%/lispdir.m4 -share/aclocal%%BUILD_VERSION%%/maintainer.m4 -share/aclocal%%BUILD_VERSION%%/make.m4 -share/aclocal%%BUILD_VERSION%%/minuso.m4 -share/aclocal%%BUILD_VERSION%%/missing.m4 -share/aclocal%%BUILD_VERSION%%/multi.m4 -share/aclocal%%BUILD_VERSION%%/obstack.m4 -share/aclocal%%BUILD_VERSION%%/protos.m4 -share/aclocal%%BUILD_VERSION%%/ptrdiff.m4 -share/aclocal%%BUILD_VERSION%%/python.m4 -share/aclocal%%BUILD_VERSION%%/regex.m4 -share/aclocal%%BUILD_VERSION%%/sanity.m4 -share/aclocal%%BUILD_VERSION%%/strip.m4 -share/aclocal%%BUILD_VERSION%%/strtod.m4 -share/aclocal%%BUILD_VERSION%%/termios.m4 -share/aclocal%%BUILD_VERSION%%/winsz.m4 -share/automake%%BUILD_VERSION%%/Automake/Struct.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/clean-hdr.am -share/automake%%BUILD_VERSION%%/am/clean.am -share/automake%%BUILD_VERSION%%/am/compile.am -share/automake%%BUILD_VERSION%%/am/configure.am -share/automake%%BUILD_VERSION%%/am/data.am -share/automake%%BUILD_VERSION%%/am/dejagnu.am -share/automake%%BUILD_VERSION%%/am/depend.am -share/automake%%BUILD_VERSION%%/am/depend2.am -share/automake%%BUILD_VERSION%%/am/distdir.am -share/automake%%BUILD_VERSION%%/am/footer.am -share/automake%%BUILD_VERSION%%/am/header-vars.am -share/automake%%BUILD_VERSION%%/am/header.am -share/automake%%BUILD_VERSION%%/am/install.am -share/automake%%BUILD_VERSION%%/am/java.am -share/automake%%BUILD_VERSION%%/am/lang-compile.am -share/automake%%BUILD_VERSION%%/am/lex.am -share/automake%%BUILD_VERSION%%/am/library.am -share/automake%%BUILD_VERSION%%/am/libs.am -share/automake%%BUILD_VERSION%%/am/libtool.am -share/automake%%BUILD_VERSION%%/am/lisp.am -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 -share/automake%%BUILD_VERSION%%/am/remake-hdr.am -share/automake%%BUILD_VERSION%%/am/scripts.am -share/automake%%BUILD_VERSION%%/am/subdirs.am -share/automake%%BUILD_VERSION%%/am/tags.am -share/automake%%BUILD_VERSION%%/am/texi-vers.am -share/automake%%BUILD_VERSION%%/am/texibuild.am -share/automake%%BUILD_VERSION%%/am/texinfos.am -share/automake%%BUILD_VERSION%%/am/yacc.am -share/automake%%BUILD_VERSION%%/ansi2knr.1 -share/automake%%BUILD_VERSION%%/ansi2knr.c -share/automake%%BUILD_VERSION%%/compile -share/automake%%BUILD_VERSION%%/config.guess -share/automake%%BUILD_VERSION%%/config.sub -share/automake%%BUILD_VERSION%%/depcomp -share/automake%%BUILD_VERSION%%/elisp-comp -share/automake%%BUILD_VERSION%%/install-sh -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%%/texinfo.tex -share/automake%%BUILD_VERSION%%/ylwrap -@dirrm share/aclocal%%BUILD_VERSION%% -@dirrm share/automake%%BUILD_VERSION%%/Automake -@dirrm share/automake%%BUILD_VERSION%%/am -@dirrm share/automake%%BUILD_VERSION%% -@dirrm libexec/automake%%BUILD_VERSION%% +bin/aclocal-%%BUILD_VERSION%% +bin/automake-%%BUILD_VERSION%% +share/aclocal-%%BUILD_VERSION%%/as.m4 +share/aclocal-%%BUILD_VERSION%%/auxdir.m4 +share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal-%%BUILD_VERSION%%/cond.m4 +share/aclocal-%%BUILD_VERSION%%/depend.m4 +share/aclocal-%%BUILD_VERSION%%/depout.m4 +share/aclocal-%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal-%%BUILD_VERSION%%/error.m4 +share/aclocal-%%BUILD_VERSION%%/gcj.m4 +share/aclocal-%%BUILD_VERSION%%/header.m4 +share/aclocal-%%BUILD_VERSION%%/init.m4 +share/aclocal-%%BUILD_VERSION%%/install-sh.m4 +share/aclocal-%%BUILD_VERSION%%/lex.m4 +share/aclocal-%%BUILD_VERSION%%/lispdir.m4 +share/aclocal-%%BUILD_VERSION%%/maintainer.m4 +share/aclocal-%%BUILD_VERSION%%/make.m4 +share/aclocal-%%BUILD_VERSION%%/minuso.m4 +share/aclocal-%%BUILD_VERSION%%/missing.m4 +share/aclocal-%%BUILD_VERSION%%/multi.m4 +share/aclocal-%%BUILD_VERSION%%/obstack.m4 +share/aclocal-%%BUILD_VERSION%%/protos.m4 +share/aclocal-%%BUILD_VERSION%%/ptrdiff.m4 +share/aclocal-%%BUILD_VERSION%%/python.m4 +share/aclocal-%%BUILD_VERSION%%/regex.m4 +share/aclocal-%%BUILD_VERSION%%/sanity.m4 +share/aclocal-%%BUILD_VERSION%%/strip.m4 +share/aclocal-%%BUILD_VERSION%%/strtod.m4 +share/aclocal-%%BUILD_VERSION%%/termios.m4 +share/aclocal-%%BUILD_VERSION%%/winsz.m4 +share/automake-%%BUILD_VERSION%%/Automake/Struct.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/clean-hdr.am +share/automake-%%BUILD_VERSION%%/am/clean.am +share/automake-%%BUILD_VERSION%%/am/compile.am +share/automake-%%BUILD_VERSION%%/am/configure.am +share/automake-%%BUILD_VERSION%%/am/data.am +share/automake-%%BUILD_VERSION%%/am/dejagnu.am +share/automake-%%BUILD_VERSION%%/am/depend.am +share/automake-%%BUILD_VERSION%%/am/depend2.am +share/automake-%%BUILD_VERSION%%/am/distdir.am +share/automake-%%BUILD_VERSION%%/am/footer.am +share/automake-%%BUILD_VERSION%%/am/header-vars.am +share/automake-%%BUILD_VERSION%%/am/header.am +share/automake-%%BUILD_VERSION%%/am/install.am +share/automake-%%BUILD_VERSION%%/am/java.am +share/automake-%%BUILD_VERSION%%/am/lang-compile.am +share/automake-%%BUILD_VERSION%%/am/lex.am +share/automake-%%BUILD_VERSION%%/am/library.am +share/automake-%%BUILD_VERSION%%/am/libs.am +share/automake-%%BUILD_VERSION%%/am/libtool.am +share/automake-%%BUILD_VERSION%%/am/lisp.am +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 +share/automake-%%BUILD_VERSION%%/am/remake-hdr.am +share/automake-%%BUILD_VERSION%%/am/scripts.am +share/automake-%%BUILD_VERSION%%/am/subdirs.am +share/automake-%%BUILD_VERSION%%/am/tags.am +share/automake-%%BUILD_VERSION%%/am/texi-vers.am +share/automake-%%BUILD_VERSION%%/am/texibuild.am +share/automake-%%BUILD_VERSION%%/am/texinfos.am +share/automake-%%BUILD_VERSION%%/am/yacc.am +share/automake-%%BUILD_VERSION%%/ansi2knr.1 +share/automake-%%BUILD_VERSION%%/ansi2knr.c +share/automake-%%BUILD_VERSION%%/compile +share/automake-%%BUILD_VERSION%%/config.guess +share/automake-%%BUILD_VERSION%%/config.sub +share/automake-%%BUILD_VERSION%%/depcomp +share/automake-%%BUILD_VERSION%%/elisp-comp +share/automake-%%BUILD_VERSION%%/install-sh +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%%/texinfo.tex +share/automake-%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal-%%BUILD_VERSION%% +@dirrm share/automake-%%BUILD_VERSION%%/Automake +@dirrm share/automake-%%BUILD_VERSION%%/am +@dirrm share/automake-%%BUILD_VERSION%% diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile new file mode 100644 index 000000000000..07b1c5877e18 --- /dev/null +++ b/devel/automake16/Makefile @@ -0,0 +1,41 @@ +# New ports collection makefile for: automake +# Date created: 14th April 2007 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= automake +PORTVERSION= 1.6.3 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= automake + +MAINTAINER= ade@FreeBSD.org +COMMENT= GNU Standards-compliant Makefile generator (1.6) + +RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ + automake-wrapper:${PORTSDIR}/devel/automake-wrapper + +USE_AUTOTOOLS= autoconf:261:env +BUILD_VERSION= 1.6 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake16 +USE_PERL5= yes +USE_BZIP2= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +INFO= automake-${BUILD_VERSION} + +post-patch: + @${RM} ${WRKSRC}/*.info + @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake-${BUILD_VERSION}.texi + +pre-su-install: + @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION} + +.include <bsd.port.mk> diff --git a/devel/automake16/distinfo b/devel/automake16/distinfo new file mode 100644 index 000000000000..cab81ddcb0de --- /dev/null +++ b/devel/automake16/distinfo @@ -0,0 +1,3 @@ +MD5 (automake-1.6.3.tar.bz2) = 2e8053609e9d318f80db0fce29dca7e9 +SHA256 (automake-1.6.3.tar.bz2) = 0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81 +SIZE (automake-1.6.3.tar.bz2) = 476275 diff --git a/devel/automake16/files/patch-Makefile.in b/devel/automake16/files/patch-Makefile.in new file mode 100644 index 000000000000..be2ed9f7fe31 --- /dev/null +++ b/devel/automake16/files/patch-Makefile.in @@ -0,0 +1,21 @@ +--- Makefile.in.orig Sun Jul 28 10:18:28 2002 ++++ Makefile.in Sat Apr 14 15:01:18 2007 +@@ -108,5 +108,5 @@ + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +-INFO_DEPS = automake.info ++INFO_DEPS = automake-@APIVERSION@.info + DVIS = automake.dvi +-TEXINFOS = automake.texi ++TEXINFOS = automake-@APIVERSION@.texi + +@@ -168,4 +168,4 @@ + @: +-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in +- @(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake.texi`; \ ++$(srcdir)/stamp-vti: automake-@APIVERSION@.texi $(top_srcdir)/configure.in ++ @(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake-@APIVERSION@.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ +@@ -513,3 +513,2 @@ + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + diff --git a/devel/automake16/files/patch-automake.texi b/devel/automake16/files/patch-automake.texi new file mode 100644 index 000000000000..5a23d3b0b243 --- /dev/null +++ b/devel/automake16/files/patch-automake.texi @@ -0,0 +1,22 @@ +--- automake.texi.orig Tue Jul 16 14:14:57 2002 ++++ automake.texi Sat Apr 14 14:55:33 2007 +@@ -2,4 +2,4 @@ + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake-1.6.info ++@settitle Automake-1.6 + @setchapternewpage off +@@ -9,10 +9,5 @@ + +-@dircategory GNU programming tools ++@dircategory Programming & development tools + @direntry +-* automake: (automake). Making Makefile.in's +-@end direntry +- +-@dircategory Individual utilities +-@direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 ++* Automake-1.6: (automake-1.6). Making Makefile.in's. + @end direntry diff --git a/devel/automake16/pkg-descr b/devel/automake16/pkg-descr new file mode 100644 index 000000000000..eeb8b96a2128 --- /dev/null +++ b/devel/automake16/pkg-descr @@ -0,0 +1,8 @@ +Automake is an experimental Makefile generator. It was inspired by +the 4.4BSD make and include files, but aims to be portable and to +conform to the GNU standards for Makefile variables and targets. + +Automake assumes the project uses autoconf. If you want automatic +dependency tracking support, the use of GNU make is also required. + +WWW: http://sources.redhat.com/automake/ diff --git a/devel/automake16/pkg-plist b/devel/automake16/pkg-plist new file mode 100644 index 000000000000..1d7006e64b86 --- /dev/null +++ b/devel/automake16/pkg-plist @@ -0,0 +1,92 @@ +bin/aclocal-%%BUILD_VERSION%% +bin/automake-%%BUILD_VERSION%% +share/aclocal-%%BUILD_VERSION%%/amversion.m4 +share/aclocal-%%BUILD_VERSION%%/as.m4 +share/aclocal-%%BUILD_VERSION%%/auxdir.m4 +share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal-%%BUILD_VERSION%%/cond.m4 +share/aclocal-%%BUILD_VERSION%%/depend.m4 +share/aclocal-%%BUILD_VERSION%%/depout.m4 +share/aclocal-%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal-%%BUILD_VERSION%%/gcj.m4 +share/aclocal-%%BUILD_VERSION%%/header.m4 +share/aclocal-%%BUILD_VERSION%%/init.m4 +share/aclocal-%%BUILD_VERSION%%/install-sh.m4 +share/aclocal-%%BUILD_VERSION%%/lex.m4 +share/aclocal-%%BUILD_VERSION%%/lispdir.m4 +share/aclocal-%%BUILD_VERSION%%/maintainer.m4 +share/aclocal-%%BUILD_VERSION%%/make.m4 +share/aclocal-%%BUILD_VERSION%%/minuso.m4 +share/aclocal-%%BUILD_VERSION%%/missing.m4 +share/aclocal-%%BUILD_VERSION%%/multi.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%%/strip.m4 +share/aclocal-%%BUILD_VERSION%%/termios.m4 +share/aclocal-%%BUILD_VERSION%%/winsz.m4 +share/automake-%%BUILD_VERSION%%/Automake/General.pm +share/automake-%%BUILD_VERSION%%/Automake/Struct.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/clean-hdr.am +share/automake-%%BUILD_VERSION%%/am/clean.am +share/automake-%%BUILD_VERSION%%/am/compile.am +share/automake-%%BUILD_VERSION%%/am/configure.am +share/automake-%%BUILD_VERSION%%/am/data.am +share/automake-%%BUILD_VERSION%%/am/dejagnu.am +share/automake-%%BUILD_VERSION%%/am/depend.am +share/automake-%%BUILD_VERSION%%/am/depend2.am +share/automake-%%BUILD_VERSION%%/am/distdir.am +share/automake-%%BUILD_VERSION%%/am/footer.am +share/automake-%%BUILD_VERSION%%/am/header-vars.am +share/automake-%%BUILD_VERSION%%/am/header.am +share/automake-%%BUILD_VERSION%%/am/install.am +share/automake-%%BUILD_VERSION%%/am/java.am +share/automake-%%BUILD_VERSION%%/am/lang-compile.am +share/automake-%%BUILD_VERSION%%/am/lex.am +share/automake-%%BUILD_VERSION%%/am/library.am +share/automake-%%BUILD_VERSION%%/am/libs.am +share/automake-%%BUILD_VERSION%%/am/libtool.am +share/automake-%%BUILD_VERSION%%/am/lisp.am +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 +share/automake-%%BUILD_VERSION%%/am/remake-hdr.am +share/automake-%%BUILD_VERSION%%/am/scripts.am +share/automake-%%BUILD_VERSION%%/am/subdirs.am +share/automake-%%BUILD_VERSION%%/am/tags.am +share/automake-%%BUILD_VERSION%%/am/texi-vers.am +share/automake-%%BUILD_VERSION%%/am/texibuild.am +share/automake-%%BUILD_VERSION%%/am/texinfos.am +share/automake-%%BUILD_VERSION%%/am/yacc.am +share/automake-%%BUILD_VERSION%%/ansi2knr.1 +share/automake-%%BUILD_VERSION%%/ansi2knr.c +share/automake-%%BUILD_VERSION%%/compile +share/automake-%%BUILD_VERSION%%/config.guess +share/automake-%%BUILD_VERSION%%/config.sub +share/automake-%%BUILD_VERSION%%/depcomp +share/automake-%%BUILD_VERSION%%/elisp-comp +share/automake-%%BUILD_VERSION%%/install-sh +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%%/texinfo.tex +share/automake-%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal-%%BUILD_VERSION%% +@dirrm share/automake-%%BUILD_VERSION%%/Automake +@dirrm share/automake-%%BUILD_VERSION%%/am +@dirrm share/automake-%%BUILD_VERSION%% diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile new file mode 100644 index 000000000000..5ebe15beec46 --- /dev/null +++ b/devel/automake17/Makefile @@ -0,0 +1,41 @@ +# New ports collection makefile for: automake +# Date created: 14th April 2007 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= automake +PORTVERSION= 1.7.9 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= automake + +MAINTAINER= ade@FreeBSD.org +COMMENT= GNU Standards-compliant Makefile generator (1.7) + +RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ + automake-wrapper:${PORTSDIR}/devel/automake-wrapper + +USE_AUTOTOOLS= autoconf:261:env +BUILD_VERSION= 1.7 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake17 +USE_PERL5= yes +USE_BZIP2= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +INFO= automake-${BUILD_VERSION} + +post-patch: + @${RM} ${WRKSRC}/*.info + @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake-${BUILD_VERSION}.texi + +pre-su-install: + @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION} + +.include <bsd.port.mk> diff --git a/devel/automake17/distinfo b/devel/automake17/distinfo new file mode 100644 index 000000000000..c1aaccb7ddce --- /dev/null +++ b/devel/automake17/distinfo @@ -0,0 +1,3 @@ +MD5 (automake-1.7.9.tar.bz2) = 571fd0b0598eb2a27dcf68adcfddfacb +SHA256 (automake-1.7.9.tar.bz2) = 32c13b6ad38ed5e7bfd1756cbc19cf5efd67b7ade2d06000a4c99b0ce94bd46d +SIZE (automake-1.7.9.tar.bz2) = 577705 diff --git a/devel/automake17/files/patch-Makefile.in b/devel/automake17/files/patch-Makefile.in new file mode 100644 index 000000000000..d0f8d12b895f --- /dev/null +++ b/devel/automake17/files/patch-Makefile.in @@ -0,0 +1,30 @@ +--- Makefile.in.orig Sun Nov 9 11:29:57 2003 ++++ Makefile.in Sat Apr 14 15:10:56 2007 +@@ -99,3 +99,3 @@ + bin_SCRIPTS = automake aclocal +-info_TEXINFOS = automake.texi ++info_TEXINFOS = automake-@APIVERSION@.texi + +@@ -145,3 +145,3 @@ + am__TEXINFO_TEX_DIR = $(top_srcdir)/lib +-INFO_DEPS = automake.info ++INFO_DEPS = automake-@APIVERSION@.info + DVIS = automake.dvi +@@ -149,3 +149,3 @@ + PSS = automake.ps +-TEXINFOS = automake.texi ++TEXINFOS = automake-@APIVERSION@.texi + +@@ -219,5 +219,5 @@ + version.texi: stamp-vti +-stamp-vti: automake.texi $(top_srcdir)/configure +- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ +- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ ++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"; \ +@@ -601,3 +601,2 @@ + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + diff --git a/devel/automake17/files/patch-automake.texi b/devel/automake17/files/patch-automake.texi new file mode 100644 index 000000000000..2e4c58f48d1a --- /dev/null +++ b/devel/automake17/files/patch-automake.texi @@ -0,0 +1,22 @@ +--- automake.texi.orig Sun Nov 9 10:57:13 2003 ++++ automake.texi Sat Apr 14 15:12:09 2007 +@@ -2,4 +2,4 @@ + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake-1.7.info ++@settitle Automake-1.7 + @setchapternewpage off +@@ -9,10 +9,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools + @direntry +-* automake: (automake). Making Makefile.in's. +-@end direntry +- +-@dircategory Individual utilities +-@direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* Automake-1.7: (automake-1.7). Making Makefile.in's. + @end direntry diff --git a/devel/automake17/pkg-descr b/devel/automake17/pkg-descr new file mode 100644 index 000000000000..eeb8b96a2128 --- /dev/null +++ b/devel/automake17/pkg-descr @@ -0,0 +1,8 @@ +Automake is an experimental Makefile generator. It was inspired by +the 4.4BSD make and include files, but aims to be portable and to +conform to the GNU standards for Makefile variables and targets. + +Automake assumes the project uses autoconf. If you want automatic +dependency tracking support, the use of GNU make is also required. + +WWW: http://sources.redhat.com/automake/ diff --git a/devel/automake17/pkg-plist b/devel/automake17/pkg-plist new file mode 100644 index 000000000000..7776b2be1b50 --- /dev/null +++ b/devel/automake17/pkg-plist @@ -0,0 +1,97 @@ +bin/aclocal-%%BUILD_VERSION%% +bin/automake-%%BUILD_VERSION%% +share/aclocal-%%BUILD_VERSION%%/amversion.m4 +share/aclocal-%%BUILD_VERSION%%/as.m4 +share/aclocal-%%BUILD_VERSION%%/auxdir.m4 +share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal-%%BUILD_VERSION%%/cond.m4 +share/aclocal-%%BUILD_VERSION%%/depend.m4 +share/aclocal-%%BUILD_VERSION%%/depout.m4 +share/aclocal-%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal-%%BUILD_VERSION%%/gcj.m4 +share/aclocal-%%BUILD_VERSION%%/header.m4 +share/aclocal-%%BUILD_VERSION%%/init.m4 +share/aclocal-%%BUILD_VERSION%%/install-sh.m4 +share/aclocal-%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal-%%BUILD_VERSION%%/lex.m4 +share/aclocal-%%BUILD_VERSION%%/lispdir.m4 +share/aclocal-%%BUILD_VERSION%%/maintainer.m4 +share/aclocal-%%BUILD_VERSION%%/make.m4 +share/aclocal-%%BUILD_VERSION%%/minuso.m4 +share/aclocal-%%BUILD_VERSION%%/missing.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%%/strip.m4 +share/automake-%%BUILD_VERSION%%/Automake/Channels.pm +share/automake-%%BUILD_VERSION%%/Automake/General.pm +share/automake-%%BUILD_VERSION%%/Automake/Struct.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/clean-hdr.am +share/automake-%%BUILD_VERSION%%/am/clean.am +share/automake-%%BUILD_VERSION%%/am/compile.am +share/automake-%%BUILD_VERSION%%/am/configure.am +share/automake-%%BUILD_VERSION%%/am/data.am +share/automake-%%BUILD_VERSION%%/am/dejagnu.am +share/automake-%%BUILD_VERSION%%/am/depend.am +share/automake-%%BUILD_VERSION%%/am/depend2.am +share/automake-%%BUILD_VERSION%%/am/distdir.am +share/automake-%%BUILD_VERSION%%/am/footer.am +share/automake-%%BUILD_VERSION%%/am/header-vars.am +share/automake-%%BUILD_VERSION%%/am/header.am +share/automake-%%BUILD_VERSION%%/am/install.am +share/automake-%%BUILD_VERSION%%/am/java.am +share/automake-%%BUILD_VERSION%%/am/lang-compile.am +share/automake-%%BUILD_VERSION%%/am/lex.am +share/automake-%%BUILD_VERSION%%/am/library.am +share/automake-%%BUILD_VERSION%%/am/libs.am +share/automake-%%BUILD_VERSION%%/am/libtool.am +share/automake-%%BUILD_VERSION%%/am/lisp.am +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 +share/automake-%%BUILD_VERSION%%/am/remake-hdr.am +share/automake-%%BUILD_VERSION%%/am/scripts.am +share/automake-%%BUILD_VERSION%%/am/subdirs.am +share/automake-%%BUILD_VERSION%%/am/tags.am +share/automake-%%BUILD_VERSION%%/am/texi-vers.am +share/automake-%%BUILD_VERSION%%/am/texibuild.am +share/automake-%%BUILD_VERSION%%/am/texinfos.am +share/automake-%%BUILD_VERSION%%/am/yacc.am +share/automake-%%BUILD_VERSION%%/ansi2knr.1 +share/automake-%%BUILD_VERSION%%/ansi2knr.c +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 +share/automake-%%BUILD_VERSION%%/elisp-comp +share/automake-%%BUILD_VERSION%%/install-sh +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%%/texinfo.tex +share/automake-%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal-%%BUILD_VERSION%% +@dirrm share/automake-%%BUILD_VERSION%%/Automake +@dirrm share/automake-%%BUILD_VERSION%%/am +@dirrm share/automake-%%BUILD_VERSION%% diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile new file mode 100644 index 000000000000..0880c0a59873 --- /dev/null +++ b/devel/automake18/Makefile @@ -0,0 +1,42 @@ +# New ports collection makefile for: automake +# Date created: 14th April 2007 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= automake +PORTVERSION= 1.8.5 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= automake + +MAINTAINER= ade@FreeBSD.org +COMMENT= GNU Standards-compliant Makefile generator (1.8) + +RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ + automake-wrapper:${PORTSDIR}/devel/automake-wrapper + +USE_AUTOTOOLS= autoconf:261:env +BUILD_VERSION= 1.8 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake18 +USE_PERL5= yes +USE_BZIP2= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +INFO= automake-${BUILD_VERSION} + +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} + @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION} + +.include <bsd.port.mk> diff --git a/devel/automake18/distinfo b/devel/automake18/distinfo new file mode 100644 index 000000000000..2de6c2bd4577 --- /dev/null +++ b/devel/automake18/distinfo @@ -0,0 +1,3 @@ +MD5 (automake-1.8.5.tar.bz2) = 0114aa6d7dc32112834b68105fb8d7e2 +SHA256 (automake-1.8.5.tar.bz2) = 84c93aaa3c3651a9e7474b721b0e6788318592509e7de604bafe4ea8049dc410 +SIZE (automake-1.8.5.tar.bz2) = 663182 diff --git a/devel/automake18/files/patch-Makefile.in b/devel/automake18/files/patch-Makefile.in new file mode 100644 index 000000000000..5e589e9c1da9 --- /dev/null +++ b/devel/automake18/files/patch-Makefile.in @@ -0,0 +1,6 @@ +--- Makefile.in.orig Sun May 16 14:05:23 2004 ++++ Makefile.in Sat Apr 14 15:56:53 2007 +@@ -544,3 +544,2 @@ + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + diff --git a/devel/automake18/files/patch-doc-Makefile.in b/devel/automake18/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..248932363432 --- /dev/null +++ b/devel/automake18/files/patch-doc-Makefile.in @@ -0,0 +1,26 @@ +--- doc/Makefile.in.orig Sun Jul 10 11:14:53 2005 ++++ doc/Makefile.in Thu Apr 5 03:30:20 2007 +@@ -54,3 +54,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/automake.info ++INFO_DEPS = $(srcdir)/automake-@APIVERSION@.info + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +@@ -146,3 +146,3 @@ + target_alias = @target_alias@ +-info_TEXINFOS = automake.texi ++info_TEXINFOS = automake-@APIVERSION@.texi + automake_TEXINFOS = fdl.texi +@@ -153,3 +153,3 @@ + +-TAGS_DEPENDENCIES = automake.texi ++TAGS_DEPENDENCIES = automake-@APIVERSION@.texi + all: all-am +@@ -238,5 +238,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/automake18/files/patch-doc-automake.texi b/devel/automake18/files/patch-doc-automake.texi new file mode 100644 index 000000000000..b08baefef5bb --- /dev/null +++ b/devel/automake18/files/patch-doc-automake.texi @@ -0,0 +1,22 @@ +--- doc/automake.texi.orig Sun Nov 9 10:57:13 2003 ++++ doc/automake.texi Sat Apr 14 15:12:09 2007 +@@ -2,4 +2,4 @@ + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake-1.8.info ++@settitle Automake-1.8 + @setchapternewpage off +@@ -9,10 +9,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools + @direntry +-* automake: (automake). Making Makefile.in's. +-@end direntry +- +-@dircategory Individual utilities +-@direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* Automake-1.8: (automake-1.8). Making Makefile.in's. + @end direntry diff --git a/devel/automake18/pkg-descr b/devel/automake18/pkg-descr new file mode 100644 index 000000000000..eeb8b96a2128 --- /dev/null +++ b/devel/automake18/pkg-descr @@ -0,0 +1,8 @@ +Automake is an experimental Makefile generator. It was inspired by +the 4.4BSD make and include files, but aims to be portable and to +conform to the GNU standards for Makefile variables and targets. + +Automake assumes the project uses autoconf. If you want automatic +dependency tracking support, the use of GNU make is also required. + +WWW: http://sources.redhat.com/automake/ diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist new file mode 100644 index 000000000000..891d5ba4c29b --- /dev/null +++ b/devel/automake18/pkg-plist @@ -0,0 +1,114 @@ +bin/aclocal-%%BUILD_VERSION%% +bin/automake-%%BUILD_VERSION%% +share/aclocal-%%BUILD_VERSION%%/amversion.m4 +share/aclocal-%%BUILD_VERSION%%/as.m4 +share/aclocal-%%BUILD_VERSION%%/auxdir.m4 +share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal-%%BUILD_VERSION%%/cond.m4 +share/aclocal-%%BUILD_VERSION%%/depend.m4 +share/aclocal-%%BUILD_VERSION%%/depout.m4 +share/aclocal-%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal-%%BUILD_VERSION%%/gcj.m4 +share/aclocal-%%BUILD_VERSION%%/header.m4 +share/aclocal-%%BUILD_VERSION%%/init.m4 +share/aclocal-%%BUILD_VERSION%%/install-sh.m4 +share/aclocal-%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal-%%BUILD_VERSION%%/lex.m4 +share/aclocal-%%BUILD_VERSION%%/lispdir.m4 +share/aclocal-%%BUILD_VERSION%%/maintainer.m4 +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%%/strip.m4 +share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm +share/automake-%%BUILD_VERSION%%/Automake/Channels.pm +share/automake-%%BUILD_VERSION%%/Automake/Condition.pm +share/automake-%%BUILD_VERSION%%/Automake/Config.pm +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/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 +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/clean-hdr.am +share/automake-%%BUILD_VERSION%%/am/clean.am +share/automake-%%BUILD_VERSION%%/am/compile.am +share/automake-%%BUILD_VERSION%%/am/configure.am +share/automake-%%BUILD_VERSION%%/am/data.am +share/automake-%%BUILD_VERSION%%/am/dejagnu.am +share/automake-%%BUILD_VERSION%%/am/depend.am +share/automake-%%BUILD_VERSION%%/am/depend2.am +share/automake-%%BUILD_VERSION%%/am/distdir.am +share/automake-%%BUILD_VERSION%%/am/footer.am +share/automake-%%BUILD_VERSION%%/am/header-vars.am +share/automake-%%BUILD_VERSION%%/am/header.am +share/automake-%%BUILD_VERSION%%/am/install.am +share/automake-%%BUILD_VERSION%%/am/java.am +share/automake-%%BUILD_VERSION%%/am/lang-compile.am +share/automake-%%BUILD_VERSION%%/am/lex.am +share/automake-%%BUILD_VERSION%%/am/library.am +share/automake-%%BUILD_VERSION%%/am/libs.am +share/automake-%%BUILD_VERSION%%/am/libtool.am +share/automake-%%BUILD_VERSION%%/am/lisp.am +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 +share/automake-%%BUILD_VERSION%%/am/remake-hdr.am +share/automake-%%BUILD_VERSION%%/am/scripts.am +share/automake-%%BUILD_VERSION%%/am/subdirs.am +share/automake-%%BUILD_VERSION%%/am/tags.am +share/automake-%%BUILD_VERSION%%/am/texi-vers.am +share/automake-%%BUILD_VERSION%%/am/texibuild.am +share/automake-%%BUILD_VERSION%%/am/texinfos.am +share/automake-%%BUILD_VERSION%%/am/yacc.am +share/automake-%%BUILD_VERSION%%/ansi2knr.1 +share/automake-%%BUILD_VERSION%%/ansi2knr.c +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 +share/automake-%%BUILD_VERSION%%/elisp-comp +share/automake-%%BUILD_VERSION%%/install-sh +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%%/texinfo.tex +share/automake-%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal-%%BUILD_VERSION%% +@dirrm share/automake-%%BUILD_VERSION%%/Automake +@dirrm share/automake-%%BUILD_VERSION%%/am +@dirrm share/automake-%%BUILD_VERSION%% diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index 1bf11a36f33d..1e9c1e62fc06 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,38 +16,29 @@ DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator (1.9) -RUN_DEPENDS= ${AUTOCONF_DEPENDS} +RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ + automake-wrapper:${PORTSDIR}/devel/automake-wrapper -USE_AUTOTOOLS= autoconf:259:env -BUILD_VERSION= 19 +USE_AUTOTOOLS= autoconf:261:env +BUILD_VERSION= 1.9 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} -LATEST_LINK= automake${BUILD_VERSION} +LATEST_LINK= automake19 USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo -CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_ENV= MAKEINFO"=makeinfo --no-split" +CONFIGURE_ARGS= --program-suffix=-${BUILD_VERSION} CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INFO= automake${BUILD_VERSION} +INFO= automake-${BUILD_VERSION} post-patch: - @(cd ${WRKSRC}/doc && \ - ${RM} -f *.info && \ - ${MV} automake.texi automake${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ - ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \ - ) + @${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} - @${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION} - @${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION} - @${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION} - -post-install: -.for i in aclocal automake - @${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ - ${PREFIX}/libexec/automake${BUILD_VERSION}/${i} -.endfor + @${RM} -fr ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/automake-${BUILD_VERSION} + @${MKDIR} ${PREFIX}/share/aclocal-${BUILD_VERSION} .include <bsd.port.mk> diff --git a/devel/automake19/files/patch-Makefile.in b/devel/automake19/files/patch-Makefile.in index f24ffdd88721..1c6577a25247 100644 --- a/devel/automake19/files/patch-Makefile.in +++ b/devel/automake19/files/patch-Makefile.in @@ -1,27 +1,6 @@ ---- Makefile.in.orig Sun Mar 7 09:04:32 2004 -+++ Makefile.in Sun Mar 14 17:07:15 2004 -@@ -82,2 +82,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -154,2 +155,3 @@ - -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ -+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -@@ -590,16 +592,4 @@ - @$(POST_INSTALL) -- @for p in $(bin_SCRIPTS); do \ -- f="`echo $$p|sed '$(transform)'`"; \ -- fv="$$f-$(APIVERSION)"; \ -- rm -f $(DESTDIR)$(bindir)/$$fv; \ -- echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \ -- $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \ -- done - - uninstall-hook: -- @for p in $(bin_SCRIPTS); do \ -- f="`echo $$p|sed '$(transform)'`"; \ -- fv="$$f-$(APIVERSION)"; \ -- rm -f $(DESTDIR)$(bindir)/$$fv; \ -- done +--- Makefile.in.orig Sun Jul 10 11:14:52 2005 ++++ Makefile.in Sat Apr 14 16:02:48 2007 +@@ -575,3 +575,2 @@ + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook diff --git a/devel/automake19/files/patch-aclocal.in b/devel/automake19/files/patch-aclocal.in deleted file mode 100644 index a9df0ac85c20..000000000000 --- a/devel/automake19/files/patch-aclocal.in +++ /dev/null @@ -1,26 +0,0 @@ ---- aclocal.in.orig Sat Jul 9 02:28:44 2005 -+++ aclocal.in Sun May 6 13:54:43 2007 -@@ -31,3 +31,3 @@ - { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); -@@ -47,3 +47,3 @@ - # Note also that the versioned directory is handled later. --$acdir = '@datadir@/aclocal'; -+$acdir = '@datadir@/aclocal@APIPVERSION@'; - $default_acdir = $acdir; -@@ -406,3 +406,3 @@ - -- my $traces = ($ENV{AUTOM4TE} || 'autom4te'); -+ my $traces = ($ENV{AUTOM4TE} || 'autom4te259'); - $traces .= " --language Autoconf-without-aclocal-m4 "; -@@ -634,8 +634,2 @@ - if $acdir ne $default_acdir; -- -- # Search the versioned directory near the end, and then the -- # unversioned directory last. Only do this if the user didn't -- # override acdir. -- push (@dirlist, "$acdir-$APIVERSION") -- if $acdir eq $default_acdir; - diff --git a/devel/automake19/files/patch-automake.in b/devel/automake19/files/patch-automake.in deleted file mode 100644 index de0b9c2f2026..000000000000 --- a/devel/automake19/files/patch-automake.in +++ /dev/null @@ -1,12 +0,0 @@ ---- automake.in.orig Sat Apr 10 10:15:32 2004 -+++ automake.in Wed May 26 14:34:15 2004 -@@ -33,3 +33,3 @@ - { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); -@@ -4440,3 +4440,3 @@ - -- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " "; -+ my $traces = ($ENV{AUTOCONF} || 'autoconf259') . " "; - diff --git a/devel/automake19/files/patch-configure b/devel/automake19/files/patch-configure deleted file mode 100644 index 6ce0b38a23b1..000000000000 --- a/devel/automake19/files/patch-configure +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.orig Sun Jul 10 11:14:51 2005 -+++ configure Thu Jul 28 14:28:34 2005 -@@ -602,2 +602,3 @@ - APIVERSION -+APIPVERSION - pkgvdatadir -@@ -2098,6 +2099,6 @@ - APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'` -- -+APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'` - - # A versioned directory, defined here for convenience. --pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION" -+pkgvdatadir="\${datadir}/automake${APIPVERSION}" - -@@ -3102,2 +3103,3 @@ - APIVERSION=$APIVERSION -+APIPVERSION=$APIPVERSION - -@@ -3244,2 +3246,3 @@ - APIVERSION!$APIVERSION$ac_delim -+APIPVERSION!$APIPVERSION$ac_delim - pkgvdatadir!$pkgvdatadir$ac_delim -@@ -3256,3 +3259,3 @@ - -- if test `grep -c "$ac_delim\$" conf$$subs.sed` = 75; then -+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 76; then - break diff --git a/devel/automake19/files/patch-doc::Makefile.in b/devel/automake19/files/patch-doc::Makefile.in index b3c320a7de74..248932363432 100644 --- a/devel/automake19/files/patch-doc::Makefile.in +++ b/devel/automake19/files/patch-doc::Makefile.in @@ -1,35 +1,26 @@ ---- 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 @@ +--- doc/Makefile.in.orig Sun Jul 10 11:14:53 2005 ++++ doc/Makefile.in Thu Apr 5 03:30:20 2007 +@@ -54,3 +54,3 @@ DIST_SOURCES = -INFO_DEPS = $(srcdir)/automake.info -+INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info ++INFO_DEPS = $(srcdir)/automake-@APIVERSION@.info TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex -@@ -73,2 +73,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -93,3 +94,3 @@ - LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - MODIFICATION_DELAY = @MODIFICATION_DELAY@ -@@ -135,3 +136,3 @@ +@@ -146,3 +146,3 @@ target_alias = @target_alias@ -info_TEXINFOS = automake.texi -+info_TEXINFOS = automake${APIPVERSION}.texi ++info_TEXINFOS = automake-@APIVERSION@.texi automake_TEXINFOS = fdl.texi -@@ -142,3 +143,3 @@ +@@ -153,3 +153,3 @@ -TAGS_DEPENDENCIES = automake.texi -+TAGS_DEPENDENCIES = automake${APIPVERSION}.texi ++TAGS_DEPENDENCIES = automake-@APIVERSION@.texi all: all-am -@@ -222,5 +223,5 @@ +@@ -238,5 +238,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${APIPVERSION}.texi $(top_srcdir)/configure -+ @(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \ -+ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.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/automake19/files/patch-doc::automake.texi b/devel/automake19/files/patch-doc::automake.texi index 54f71944163d..8d4cd99240cc 100644 --- a/devel/automake19/files/patch-doc::automake.texi +++ b/devel/automake19/files/patch-doc::automake.texi @@ -1,13 +1,16 @@ ---- doc/automake.texi.orig Mon Nov 1 01:50:48 2004 -+++ doc/automake.texi Mon Nov 8 15:28:40 2004 +--- doc/automake.texi.orig Sat Jul 9 02:28:44 2005 ++++ doc/automake.texi Sat Apr 14 15:29:13 2007 @@ -2,4 +2,4 @@ @c %**start of header -@setfilename automake.info -@settitle automake -+@setfilename automake19.info -+@settitle automake19 ++@setfilename automake-1.9.info ++@settitle Automake-1.9 @setchapternewpage off -@@ -36,8 +36,3 @@ +@@ -34,10 +34,5 @@ + +-@dircategory Software development ++@dircategory Programming & development tools @direntry -* automake: (automake). Making Makefile.in's. -@end direntry @@ -15,10 +18,5 @@ -@dircategory Individual utilities -@direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -+* automake19: (automake19). Making Makefile.in's. ++* Automake-1.9: (automake-1.9). Making Makefile.in's. @end direntry -@@ -9090,3 +9085,3 @@ - @multitable {8888-88-88} {8.8-p8} {8888} {888} {8888} {8888 (88)} {8888 (88)} {888} {888} --@headitem Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t -+@item Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t - @item 1994-09-19 @tab CVS @tab 141 @tab @tab @tab 299 (24) @tab @tab @tab diff --git a/devel/automake19/files/patch-lib::Automake::Config.in b/devel/automake19/files/patch-lib::Automake::Config.in deleted file mode 100644 index c9c17688d004..000000000000 --- a/devel/automake19/files/patch-lib::Automake::Config.in +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/Automake/Config.in.orig Thu Dec 25 10:00:29 2003 -+++ lib/Automake/Config.in Mon Mar 29 20:23:13 2004 -@@ -25,5 +25,5 @@ - @ISA = qw (Exporter); --@EXPORT = qw ($APIVERSION $PACKAGE $VERSION $libdir); -+@EXPORT = qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir); - --use vars qw ($APIVERSION $PACKAGE $VERSION $libdir); -+use vars qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir); - -@@ -32,5 +32,6 @@ - $APIVERSION = '@APIVERSION@'; -+$APIPVERSION = '@APIPVERSION@'; - $PACKAGE = '@PACKAGE@'; - $VERSION = '@VERSION@'; --$libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; -+$libdir = '@datadir@/@PACKAGE@@APIPVERSION@'; - diff --git a/devel/automake19/files/patch-lib::Automake::Makefile.in b/devel/automake19/files/patch-lib::Automake::Makefile.in deleted file mode 100644 index a1ae8ffe243e..000000000000 --- a/devel/automake19/files/patch-lib::Automake::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/Automake/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ lib/Automake/Makefile.in Mon Mar 29 20:22:26 2004 -@@ -70,2 +70,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -161,2 +162,3 @@ - -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ -+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ diff --git a/devel/automake19/files/patch-m4-Makefile.in b/devel/automake19/files/patch-m4-Makefile.in deleted file mode 100644 index 5125e696ab2c..000000000000 --- a/devel/automake19/files/patch-m4-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ m4/Makefile.in Sun Mar 14 17:09:37 2004 -@@ -60,2 +60,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -122,3 +123,3 @@ - target_alias = @target_alias@ --m4datadir = $(datadir)/aclocal-$(APIVERSION) -+m4datadir = $(datadir)/aclocal$(APIPVERSION) - dist_m4data_DATA = \ diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist index c2a9c06f7644..d56ad0b1f647 100644 --- a/devel/automake19/pkg-plist +++ b/devel/automake19/pkg-plist @@ -1,119 +1,116 @@ -bin/aclocal%%BUILD_VERSION%% -bin/automake%%BUILD_VERSION%% -libexec/automake%%BUILD_VERSION%%/aclocal -libexec/automake%%BUILD_VERSION%%/automake -share/aclocal%%BUILD_VERSION%%/amversion.m4 -share/aclocal%%BUILD_VERSION%%/as.m4 -share/aclocal%%BUILD_VERSION%%/auxdir.m4 -share/aclocal%%BUILD_VERSION%%/ccstdc.m4 -share/aclocal%%BUILD_VERSION%%/cond.m4 -share/aclocal%%BUILD_VERSION%%/depend.m4 -share/aclocal%%BUILD_VERSION%%/depout.m4 -share/aclocal%%BUILD_VERSION%%/dmalloc.m4 -share/aclocal%%BUILD_VERSION%%/gcj.m4 -share/aclocal%%BUILD_VERSION%%/header.m4 -share/aclocal%%BUILD_VERSION%%/init.m4 -share/aclocal%%BUILD_VERSION%%/install-sh.m4 -share/aclocal%%BUILD_VERSION%%/lead-dot.m4 -share/aclocal%%BUILD_VERSION%%/lex.m4 -share/aclocal%%BUILD_VERSION%%/lispdir.m4 -share/aclocal%%BUILD_VERSION%%/maintainer.m4 -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%%/strip.m4 -share/aclocal%%BUILD_VERSION%%/tar.m4 -share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm -share/automake%%BUILD_VERSION%%/Automake/Channels.pm -share/automake%%BUILD_VERSION%%/Automake/Condition.pm -share/automake%%BUILD_VERSION%%/Automake/Config.pm -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/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 -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/clean-hdr.am -share/automake%%BUILD_VERSION%%/am/clean.am -share/automake%%BUILD_VERSION%%/am/compile.am -share/automake%%BUILD_VERSION%%/am/configure.am -share/automake%%BUILD_VERSION%%/am/data.am -share/automake%%BUILD_VERSION%%/am/dejagnu.am -share/automake%%BUILD_VERSION%%/am/depend.am -share/automake%%BUILD_VERSION%%/am/depend2.am -share/automake%%BUILD_VERSION%%/am/distdir.am -share/automake%%BUILD_VERSION%%/am/footer.am -share/automake%%BUILD_VERSION%%/am/header-vars.am -share/automake%%BUILD_VERSION%%/am/header.am -share/automake%%BUILD_VERSION%%/am/install.am -share/automake%%BUILD_VERSION%%/am/inst-vars.am -share/automake%%BUILD_VERSION%%/am/java.am -share/automake%%BUILD_VERSION%%/am/lang-compile.am -share/automake%%BUILD_VERSION%%/am/lex.am -share/automake%%BUILD_VERSION%%/am/library.am -share/automake%%BUILD_VERSION%%/am/libs.am -share/automake%%BUILD_VERSION%%/am/libtool.am -share/automake%%BUILD_VERSION%%/am/lisp.am -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 -share/automake%%BUILD_VERSION%%/am/remake-hdr.am -share/automake%%BUILD_VERSION%%/am/scripts.am -share/automake%%BUILD_VERSION%%/am/subdirs.am -share/automake%%BUILD_VERSION%%/am/tags.am -share/automake%%BUILD_VERSION%%/am/texi-vers.am -share/automake%%BUILD_VERSION%%/am/texibuild.am -share/automake%%BUILD_VERSION%%/am/texinfos.am -share/automake%%BUILD_VERSION%%/am/yacc.am -share/automake%%BUILD_VERSION%%/ansi2knr.1 -share/automake%%BUILD_VERSION%%/ansi2knr.c -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 -share/automake%%BUILD_VERSION%%/elisp-comp -share/automake%%BUILD_VERSION%%/install-sh -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%%/texinfo.tex -share/automake%%BUILD_VERSION%%/ylwrap -@dirrm share/aclocal%%BUILD_VERSION%% -@dirrm share/automake%%BUILD_VERSION%%/Automake -@dirrm share/automake%%BUILD_VERSION%%/am -@dirrm share/automake%%BUILD_VERSION%% -@dirrm libexec/automake%%BUILD_VERSION%% +bin/aclocal-%%BUILD_VERSION%% +bin/automake-%%BUILD_VERSION%% +share/aclocal-%%BUILD_VERSION%%/amversion.m4 +share/aclocal-%%BUILD_VERSION%%/as.m4 +share/aclocal-%%BUILD_VERSION%%/auxdir.m4 +share/aclocal-%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal-%%BUILD_VERSION%%/cond.m4 +share/aclocal-%%BUILD_VERSION%%/depend.m4 +share/aclocal-%%BUILD_VERSION%%/depout.m4 +share/aclocal-%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal-%%BUILD_VERSION%%/gcj.m4 +share/aclocal-%%BUILD_VERSION%%/header.m4 +share/aclocal-%%BUILD_VERSION%%/init.m4 +share/aclocal-%%BUILD_VERSION%%/install-sh.m4 +share/aclocal-%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal-%%BUILD_VERSION%%/lex.m4 +share/aclocal-%%BUILD_VERSION%%/lispdir.m4 +share/aclocal-%%BUILD_VERSION%%/maintainer.m4 +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%%/strip.m4 +share/aclocal-%%BUILD_VERSION%%/tar.m4 +share/automake-%%BUILD_VERSION%%/Automake/ChannelDefs.pm +share/automake-%%BUILD_VERSION%%/Automake/Channels.pm +share/automake-%%BUILD_VERSION%%/Automake/Condition.pm +share/automake-%%BUILD_VERSION%%/Automake/Config.pm +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/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 +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/clean-hdr.am +share/automake-%%BUILD_VERSION%%/am/clean.am +share/automake-%%BUILD_VERSION%%/am/compile.am +share/automake-%%BUILD_VERSION%%/am/configure.am +share/automake-%%BUILD_VERSION%%/am/data.am +share/automake-%%BUILD_VERSION%%/am/dejagnu.am +share/automake-%%BUILD_VERSION%%/am/depend.am +share/automake-%%BUILD_VERSION%%/am/depend2.am +share/automake-%%BUILD_VERSION%%/am/distdir.am +share/automake-%%BUILD_VERSION%%/am/footer.am +share/automake-%%BUILD_VERSION%%/am/header-vars.am +share/automake-%%BUILD_VERSION%%/am/header.am +share/automake-%%BUILD_VERSION%%/am/install.am +share/automake-%%BUILD_VERSION%%/am/inst-vars.am +share/automake-%%BUILD_VERSION%%/am/java.am +share/automake-%%BUILD_VERSION%%/am/lang-compile.am +share/automake-%%BUILD_VERSION%%/am/lex.am +share/automake-%%BUILD_VERSION%%/am/library.am +share/automake-%%BUILD_VERSION%%/am/libs.am +share/automake-%%BUILD_VERSION%%/am/libtool.am +share/automake-%%BUILD_VERSION%%/am/lisp.am +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 +share/automake-%%BUILD_VERSION%%/am/remake-hdr.am +share/automake-%%BUILD_VERSION%%/am/scripts.am +share/automake-%%BUILD_VERSION%%/am/subdirs.am +share/automake-%%BUILD_VERSION%%/am/tags.am +share/automake-%%BUILD_VERSION%%/am/texi-vers.am +share/automake-%%BUILD_VERSION%%/am/texibuild.am +share/automake-%%BUILD_VERSION%%/am/texinfos.am +share/automake-%%BUILD_VERSION%%/am/yacc.am +share/automake-%%BUILD_VERSION%%/ansi2knr.1 +share/automake-%%BUILD_VERSION%%/ansi2knr.c +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 +share/automake-%%BUILD_VERSION%%/elisp-comp +share/automake-%%BUILD_VERSION%%/install-sh +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%%/texinfo.tex +share/automake-%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal-%%BUILD_VERSION%% +@dirrm share/automake-%%BUILD_VERSION%%/Automake +@dirrm share/automake-%%BUILD_VERSION%%/am +@dirrm share/automake-%%BUILD_VERSION%% diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile new file mode 100644 index 000000000000..748ec7da18c7 --- /dev/null +++ b/devel/autotools/Makefile @@ -0,0 +1,36 @@ +# New ports collection makefile for: autotools +# Date created: 14th April 2007 +# Whom: Ade Lovett <ade@FreeBSD.org> +# +# $FreeBSD$ + +PORTNAME= autotools +PORTVERSION= 20070417 +CATEGORIES= devel +MASTER_SITES= # none +DISTFILES= # none + +MAINTAINER= ade@FreeBSD.org +COMMENT= Autotools meta-port + +RUN_DEPENDS= libtool:${PORTSDIR}/devel/libtool15 + +PLIST_FILES= share/${PORTNAME} +NO_BUILD= yes +NO_FETCH= yes + +AVAIL_AUTOCONF= 2.13 2.53 2.59 2.61 +AVAIL_AUTOMAKE= 1.4 1.5 1.6 1.7 1.8 1.9 1.10 + +.for VER in ${AVAIL_AUTOCONF} +RUN_DEPENDS+= autoconf-${VER}:${PORTSDIR}/devel/autoconf${VER:C/\.//} +.endfor + +.for VER in ${AVAIL_AUTOMAKE} +RUN_DEPENDS+= automake-${VER}:${PORTSDIR}/devel/automake${VER:C/\.//} +.endfor + +do-install: + @${ECHO_CMD} "Placeholder file" > ${PREFIX}/${PLIST_FILES} + +.include <bsd.port.mk> diff --git a/devel/autotools/pkg-descr b/devel/autotools/pkg-descr new file mode 100644 index 000000000000..16e941a123dc --- /dev/null +++ b/devel/autotools/pkg-descr @@ -0,0 +1,2 @@ +Simple metaport that brings in all available versions of autoconf, +automake, and libtool. diff --git a/devel/configgen/Makefile b/devel/configgen/Makefile index a3a72623067e..ed31c90bed96 100644 --- a/devel/configgen/Makefile +++ b/devel/configgen/Makefile @@ -7,6 +7,7 @@ PORTNAME= configgen PORTVERSION= 1.20 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi/portstools/ DISTNAME= ${PORTNAME}.sh?rev=${PORTVERSION} @@ -23,10 +24,7 @@ WANT_GNOME= yes .if !defined(WITHOUT_GNUTOOLS) USE_GNOME= glib20 -.for tool in autoconf213 autoconf253 autoconf259 automake14 automake15 automake19 -RUN_DEPENDS+= ${tool}:${PORTSDIR}/devel/${tool} -.endfor -RUN_DEPENDS+= libtool:${PORTSDIR}/devel/libtool15 +USE_AUTOTOOLS= autotools:run .for tool in autoconf automake RUN_DEPENDS+= ${LOCALBASE}/gnu-autotools/bin/${tool}:${PORTSDIR}/devel/gnu-${tool} .endfor diff --git a/devel/configgen/files/patch-autotools-fix b/devel/configgen/files/patch-autotools-fix new file mode 100644 index 000000000000..1ee8b7603503 --- /dev/null +++ b/devel/configgen/files/patch-autotools-fix @@ -0,0 +1,65 @@ +--- configgen.sh.orig Fri Apr 13 17:42:35 2007 ++++ configgen.sh Fri Apr 13 17:47:09 2007 +@@ -44,21 +44,24 @@ + x-bsd) +- ACLOCAL_SUFX=${ACLOCAL_SUFX:=15} +- AUTOCONF_SUFX=${AUTOCONF_SUFX:=253} +- AUTOHEADER_SUFX=${AUTOHEADER_SUFX:=253} +- AUTOMAKE_SUFX=${AUTOMAKE_SUFX:=15} +- LIBTOOLIZE_SUFX=${LIBTOOLIZE_SUFX} ++ ACLOCAL_SUFX=${ACLOCAL_SUFX:=-1.5} ++ AUTOCONF_SUFX=${AUTOCONF_SUFX:=-2.53} ++ AUTOHEADER_SUFX=${AUTOHEADER_SUFX:=-2.53} ++ AUTOMAKE_SUFX=${AUTOMAKE_SUFX:=-1.5} ++ ;; ++ x-bsd110) ++ ACLOCAL_SUFX=${ACLOCAL_SUFX:=-1.10} ++ AUTOCONF_SUFX=${AUTOCONF_SUFX:=-2.61} ++ AUTOHEADER_SUFX=${AUTOHEADER_SUFX:=-2.61} ++ AUTOMAKE_SUFX=${AUTOMAKE_SUFX:=-1.10} + ;; + x-bsd19) +- ACLOCAL_SUFX=${ACLOCAL_SUFX:=19} +- AUTOCONF_SUFX=${AUTOCONF_SUFX:=259} +- AUTOHEADER_SUFX=${AUTOHEADER_SUFX:=259} +- AUTOMAKE_SUFX=${AUTOMAKE_SUFX:=19} +- LIBTOOLIZE_SUFX=${LIBTOOLIZE_SUFX} ++ ACLOCAL_SUFX=${ACLOCAL_SUFX:=-1.9} ++ AUTOCONF_SUFX=${AUTOCONF_SUFX:=-2.59} ++ AUTOHEADER_SUFX=${AUTOHEADER_SUFX:=-2.59} ++ AUTOMAKE_SUFX=${AUTOMAKE_SUFX:=-1.9} + ;; + x-bsd14) +- ACLOCAL_SUFX=${ACLOCAL_SUFX:=14} +- AUTOCONF_SUFX=${AUTOCONF_SUFX:=213} +- AUTOHEADER_SUFX=${AUTOHEADER_SUFX:=213} +- AUTOMAKE_SUFX=${AUTOMAKE_SUFX:=14} +- LIBTOOLIZE_SUFX=${LIBTOOLIZE_SUFX} ++ ACLOCAL_SUFX=${ACLOCAL_SUFX:=-1.4} ++ AUTOCONF_SUFX=${AUTOCONF_SUFX:=-2.13} ++ AUTOHEADER_SUFX=${AUTOHEADER_SUFX:=-2.13} ++ AUTOMAKE_SUFX=${AUTOMAKE_SUFX:=-1.4} + ;; +@@ -78,3 +81,3 @@ + AUTOMAKE=${AUTOMAKE:=automake}${AUTOMAKE_SUFX} +-LIBTOOLIZE=${LIBTOOLIZE:=libtoolize}${LIBTOOLIZE_SUFX} ++LIBTOOLIZE=${LIBTOOLIZE:=libtoolize} + AUTOCONF=${AUTOCONF:=autoconf}${AUTOCONF_SUFX} +@@ -103,3 +106,3 @@ + echo "usage: Run `basename $0` in directory to create configure script" +- echo "[-gnu] [-gnome] [-f] [-help] [-bsd] [-bsd14|19] [<config>] [config args...]" ++ echo "[-gnu] [-gnome] [-f] [-help] [-bsd] [-bsd14|19|110] [<config>] [config args...]" + +@@ -113,7 +116,9 @@ + echo " -bsd Use FreeBSD auto-tools" +- echo " (versions: libtool15, automake15, autoconf253)" ++ echo " (versions: libtool, automake-1.5, autoconf-2.53)" + echo " -bsd14 Use FreeBSD auto-tools" +- echo " (versions: libtool15, automake14, autoconf213)" ++ echo " (versions: libtool, automake-1.4, autoconf-2.13)" + echo " -bsd19 Use FreeBSD auto-tools" +- echo " (versions: libtool15, automake19, autoconf259)" ++ echo " (versions: libtool, automake-1.9, autoconf-2.59)" ++ echo " -bsd110 Use FreeBSD auto-tools" ++ echo " (versions: libtool, automake-1.10, autoconf-2.61)" + echo " -f Find config (fall back on generic gnu)" diff --git a/devel/configgen/pkg-descr b/devel/configgen/pkg-descr index 7dc0e4710b45..efb87b6a5e46 100644 --- a/devel/configgen/pkg-descr +++ b/devel/configgen/pkg-descr @@ -8,10 +8,12 @@ or you can specify a command below. -gnu Create generic gnu configure script -gnome Create gnome specific configure script -bsd Use FreeBSD auto-tools - (versions: libtool15, automake15, autoconf253) + (versions: libtool, automake-1.5, autoconf-2.53) -bsd14 Use FreeBSD auto-tools - (versions: libtool15, automake14, autoconf213) + (versions: libtool, automake-1.4, autoconf-2.13) -bsd19 Use FreeBSD auto-tools - (versions: libtool15, automake19, autoconf259) + (versions: libtool, automake-1.9, autoconf-2.59) + -bsd110 Use FreeBSD auto-tools + (versions: libtool, automake-1.10, autoconf-2.61) -f Find config (fall back on generic gnu) <config> Specify a auto-gen configure script diff --git a/devel/djgpp-gcc/Makefile b/devel/djgpp-gcc/Makefile index e58bc2b93211..29fb2817d84e 100644 --- a/devel/djgpp-gcc/Makefile +++ b/devel/djgpp-gcc/Makefile @@ -7,6 +7,7 @@ PORTNAME= gcc PORTVERSION= ${GCCVERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/:djsource \ ftp://ftp.mirror.ac.uk/sites/www.delorie.com/current/v2gnu/:djsource \ @@ -27,9 +28,9 @@ COMMENT= FSF gcc-4.1 for DJGPP cross-development BUILD_DEPENDS= ${TARGET}-as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \ ${LOCALBASE}/${TARGET}/bin/stubify:${PORTSDIR}/devel/${PKGNAMEPREFIX}crx \ - autoconf213:${PORTSDIR}/devel/autoconf213 \ - autoconf259:${PORTSDIR}/devel/autoconf259 \ - aclocal19:${PORTSDIR}/devel/automake19 + autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ + autoconf-2.59:${PORTSDIR}/devel/autoconf259 \ + aclocal-1.9:${PORTSDIR}/devel/automake19 .if defined(WITH_FORTRAN) LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \ mpfr.1:${PORTSDIR}/math/mpfr diff --git a/devel/djgpp-gcc/scripts/pre-configure b/devel/djgpp-gcc/scripts/pre-configure index fd75b3c1c1a7..9aa1256537a9 100644 --- a/devel/djgpp-gcc/scripts/pre-configure +++ b/devel/djgpp-gcc/scripts/pre-configure @@ -1,9 +1,11 @@ #! /bin/sh -AUTOCONF_OLD=autoconf213 -AUTOHEADER_OLD=autoheader213 -AUTOCONF=autoconf259 -AUTOHEADER=autoheader259 +AUTOCONF_OLD=autoconf-2.13 +AUTOHEADER_OLD=autoheader-2.13 +AUTOCONF=autoconf-2.59 +AUTOHEADER=autoheader-2.59 +ACLOCAL=aclocal-1.9 +AUTOMAKE=automake-1.9 # # List of directories in which we should run autoconf or/and automake @@ -52,8 +54,8 @@ done # # Run aclocal where needed # -( cd $gcc_dir/libgfortran && aclocal19 -I ../config || exit 1) -( cd $gcc_dir/libstdc++-v3 && aclocal19 -I . -I .. -I ../config || exit 1) +( cd $gcc_dir/libgfortran && ${ACLOCAL} -I ../config || exit 1) +( cd $gcc_dir/libstdc++-v3 && ${ACLOCAL} -I . -I .. -I ../config || exit 1) #for dir in $aclocal_list ; do # if cd $dir ; then @@ -85,7 +87,7 @@ for dir in $automake_list; do fi fi echo "Running automake..." - if ! automake19; then + if ! ${AUTOMAKE}; then echo "automake failed in directory `pwd`" cd $top exit 1 diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile index 94f4d792bab4..9e130e76deab 100644 --- a/devel/gcvs/Makefile +++ b/devel/gcvs/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcvs PORTVERSION= 1.0 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= devel tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/devel/gcvs/files/patch-make_configure b/devel/gcvs/files/patch-make_configure index 2a98a042a807..25031599ecc1 100644 --- a/devel/gcvs/files/patch-make_configure +++ b/devel/gcvs/files/patch-make_configure @@ -13,7 +13,7 @@ -done - -autoconf -+cd cvsunix && autoreconf259 ++cd cvsunix && autoreconf-2.59 +cd .. ./configure $* diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile index 155ef3586451..4647b4933ccd 100644 --- a/devel/glademm/Makefile +++ b/devel/glademm/Makefile @@ -7,7 +7,7 @@ PORTNAME= glademm PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel gnome MASTER_SITES= http://home.wtal.de/petig/Gtk/ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} @@ -31,11 +31,5 @@ post-patch: -Ee '/^@AMDEP/!s|getopt([^[:space:]])+||g' \ -Ee '/^@AMDEP(.)+getopt/d' \ ${WRKSRC}/src/Makefile.in - @${REINPLACE_CMD} \ - -Ee 's|automake-([[:digit:]]+)\.([[:digit:]]+)|automake\1\2|g' \ - -e 's|autoconf2\.50|autoconf259|g' \ - -e 's|autoconf2\.13|autoconf213|g' \ - ${WRKSRC}/src/glade--.cc \ - ${WRKSRC}/src/Cxx.cc .include <bsd.port.post.mk> diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile index 8a28c603050d..c34f3a80a8dd 100644 --- a/devel/libthai/Makefile +++ b/devel/libthai/Makefile @@ -7,7 +7,7 @@ PORTNAME= libthai PORTVERSION= 0.1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://www.usablelabs.com/download/ @@ -23,11 +23,13 @@ ALL_TARGET= all check MAN3= libthai.3 thctype.3 wtt.3 -pre-configure: - ${SH} ${WRKSRC}/autogen.sh - post-patch: @${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,' \ ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -e 's,15,-1.5,' -e 's,259,-2.59,' \ + ${WRKSRC}/autogen.sh + +pre-configure: + @${SH} ${WRKSRC}/autogen.sh .include <bsd.port.mk> diff --git a/devel/sysconftool/Makefile b/devel/sysconftool/Makefile index b7cc4b7aca7e..e14d932e3934 100644 --- a/devel/sysconftool/Makefile +++ b/devel/sysconftool/Makefile @@ -7,6 +7,7 @@ PORTNAME= sysconftool PORTVERSION= 0.15 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier diff --git a/devel/sysconftool/pkg-plist b/devel/sysconftool/pkg-plist index 15f677bc5d36..299a76337cba 100644 --- a/devel/sysconftool/pkg-plist +++ b/devel/sysconftool/pkg-plist @@ -1,9 +1,8 @@ bin/sysconftoolize bin/sysconftoolcheck -share/aclocal19/sysconftool.m4 +share/aclocal/sysconftool.m4 %%DATADIR%%/sysconftool %%DATADIR%%/sysconftoolize.pl %%DATADIR%%/sysconftoolcheck %%DATADIR%%/sysconftoolize.am @dirrm %%DATADIR%% -@dirrmtry share/aclocal19 diff --git a/french/dico/Makefile b/french/dico/Makefile index e0aa0e152144..eb0d2d1bffae 100644 --- a/french/dico/Makefile +++ b/french/dico/Makefile @@ -7,7 +7,7 @@ PORTNAME= dico PORTVERSION= 1.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= french MASTER_SITES= ftp://ftp.supelec.fr/lsi/pub/security/ DISTNAME= le_dico @@ -21,7 +21,8 @@ BROKEN_WWW= http://www.montefiore.ulg.ac.be/cgi-bin-ulg/DICO.html # WRKSRC= ${WRKDIR}/${PORTNAME} -USE_AUTOTOOLS= automake:14 autoconf:253 +USE_AUTOTOOLS= automake:14 autoconf:261 +CONFIGURE_ARGS= --mandir=${PREFIX}/man USE_GMAKE= true AUTOMAKE_ARGS= --add-missing --foreign --include-deps MAKE_ARGS= prefix=${PREFIX} diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile index ad6eb51d3845..ba41e7b33054 100644 --- a/games/etuxracer/Makefile +++ b/games/etuxracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=tuxracer @@ -22,7 +22,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_SDL= mixer sdl USE_GL= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:14 autoconf:253 +USE_AUTOTOOLS= automake:14 autoconf:261 AUTOMAKE_ARGS= -a CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}" MAKE_ENV= ${CONFIGURE_ENV} @@ -36,11 +36,11 @@ WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION} COURSEDIRS= 1 2 3 4 5 6 7 8 9 10 11 post-extract: - ${RM} ${WRKSRC}/missing + @${RM} ${WRKSRC}/missing post-install: - ${MKDIR} ${DATADIR} - (${CHMOD} -R o+r ${WORKDATA} && cd ${WORKDATA} && ${TAR} -c -f - *) | \ + @${MKDIR} ${DATADIR} + @(${CHMOD} -R o+r ${WORKDATA} && cd ${WORKDATA} && ${TAR} -c -f - *) | \ (cd ${DATADIR} && ${TAR} -x -f - ) .include <bsd.port.mk> diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile index e1661e46949f..0296125e550e 100644 --- a/games/kpicframer/Makefile +++ b/games/kpicframer/Makefile @@ -6,7 +6,7 @@ PORTNAME= kpicframer PORTVERSION= 0.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= games kde MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= arved diff --git a/games/kpicframer/files/patch-detect-autoconf.sh b/games/kpicframer/files/patch-detect-autoconf.sh index 479a0693a838..721c9180dcea 100644 --- a/games/kpicframer/files/patch-detect-autoconf.sh +++ b/games/kpicframer/files/patch-detect-autoconf.sh @@ -9,8 +9,8 @@ diff -u -r1.6 detect-autoconf.sh AUTOCONF="`$WHICH autoconf-2.52`" elif test -x "`$WHICH autoconf2.50`" ; then AUTOCONF="`$WHICH autoconf2.50`" -+ elif test -x "`$WHICH autoconf257`" ; then -+ AUTOCONF="`$WHICH autoconf257`" ++ elif test -x "`$WHICH autoconf-2.59`" ; then ++ AUTOCONF="`$WHICH autoconf-2.59`" fi } @@ -18,19 +18,9 @@ diff -u -r1.6 detect-autoconf.sh AUTOHEADER="`$WHICH autoheader-2.52`" elif test -x "`$WHICH autoheader2.50`" ; then AUTOHEADER="`$WHICH autoheader2.50`" -+ elif test -x "`$WHICH autoheader257`" ; then -+ AUTOHEADER="`$WHICH autoheader257`" -+ AUTOM4TE="`$WHICH autom4te257`" ++ elif test -x "`$WHICH autoheader-2.59`" ; then ++ AUTOHEADER="`$WHICH autoheader-2.59`" ++ AUTOM4TE="`$WHICH autom4te-2.59`" fi } -@@ -58,6 +63,9 @@ - elif test -x "`$WHICH automake-1.7`" ; then - AUTOMAKE="`$WHICH automake-1.7`" - ACLOCAL="`$WHICH aclocal-1.7`" -+ elif test -x "`$WHICH automake17`" ; then -+ AUTOMAKE="`$WHICH automake17`" -+ ACLOCAL="`$WHICH aclocal17`" - fi - else - AUTOMAKE="$UNSERMAKE" diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile index ad6eb51d3845..ba41e7b33054 100644 --- a/games/tuxracer/Makefile +++ b/games/tuxracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= tuxracer PORTVERSION= 0.61 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=tuxracer @@ -22,7 +22,7 @@ LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83 USE_SDL= mixer sdl USE_GL= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:14 autoconf:253 +USE_AUTOTOOLS= automake:14 autoconf:261 AUTOMAKE_ARGS= -a CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}" MAKE_ENV= ${CONFIGURE_ENV} @@ -36,11 +36,11 @@ WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION} COURSEDIRS= 1 2 3 4 5 6 7 8 9 10 11 post-extract: - ${RM} ${WRKSRC}/missing + @${RM} ${WRKSRC}/missing post-install: - ${MKDIR} ${DATADIR} - (${CHMOD} -R o+r ${WORKDATA} && cd ${WORKDATA} && ${TAR} -c -f - *) | \ + @${MKDIR} ${DATADIR} + @(${CHMOD} -R o+r ${WORKDATA} && cd ${WORKDATA} && ${TAR} -c -f - *) | \ (cd ${DATADIR} && ${TAR} -x -f - ) .include <bsd.port.mk> diff --git a/games/zangband/Makefile b/games/zangband/Makefile index 75c93e39158b..0813b7394314 100644 --- a/games/zangband/Makefile +++ b/games/zangband/Makefile @@ -7,7 +7,7 @@ PORTNAME= zangband PORTVERSION= 2.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES+= games MASTER_SITES= ftp://clockwork.dementia.org/angband/Variant/ZAngband/ \ ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/ @@ -18,9 +18,9 @@ COMMENT= Zangband (Zelazny Angband) with color, X11 support USE_XLIB= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:14 autoconf:213 +USE_AUTOTOOLS= automake:14 autoconf:261 USE_PERL5_BUILD=yes -CONFIGURE_ARGS= --datadir=${PREFIX}/lib \ +CONFIGURE_ARGS= --datadir=${PREFIX}/lib --mandir=${PREFIX}/man \ --with-setgid=${SHAREGRP} NO_CDROM= Possible copyright infringement diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile index 473ec5973334..adf77d5bf131 100644 --- a/graphics/divxcalc/Makefile +++ b/graphics/divxcalc/Makefile @@ -8,7 +8,7 @@ PORTNAME= divxcalc PORTVERSION= 0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://imagef1.net.nz/divxcalc/ diff --git a/graphics/divxcalc/files/patch-admin::detect-autoconf.sh b/graphics/divxcalc/files/patch-admin::detect-autoconf.sh index e4bb5b9ca368..2722804ad60a 100644 --- a/graphics/divxcalc/files/patch-admin::detect-autoconf.sh +++ b/graphics/divxcalc/files/patch-admin::detect-autoconf.sh @@ -7,9 +7,9 @@ -AUTOM4TE="autom4te" -AUTOMAKE="automake" -ACLOCAL="aclocal" -+AUTOCONF="autoconf253" -+AUTOHEADER="autoheader253" -+AUTOM4TE="autom4te253" -+AUTOMAKE="automake15" -+ACLOCAL="aclocal15" ++AUTOCONF="autoconf-2.53" ++AUTOHEADER="autoheader-2.53" ++AUTOM4TE="autom4te-2.53" ++AUTOMAKE="automake-1.5" ++ACLOCAL="aclocal-1.5" diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile index 30383f9bf93f..03af386f5014 100644 --- a/graphics/guilib/Makefile +++ b/graphics/guilib/Makefile @@ -7,7 +7,7 @@ PORTNAME= guilib PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/GUIlib/src/ DISTNAME= GUIlib-${PORTVERSION} @@ -25,7 +25,6 @@ USE_AUTOTOOLS= aclocal:19:env post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|-release $$(LT_RELEASE)||g' ${WRKSRC}/Makefile.in post-configure: @${REINPLACE_CMD} -e 's|^ACLOCAL =.*|ACLOCAL = ${ACLOCAL}|g' ${WRKSRC}/Makefile diff --git a/graphics/guilib/files/patch-Makefile.in b/graphics/guilib/files/patch-Makefile.in new file mode 100644 index 000000000000..a0cf6bd406ca --- /dev/null +++ b/graphics/guilib/files/patch-Makefile.in @@ -0,0 +1,9 @@ +--- Makefile.in.orig Mon May 1 00:45:18 2006 ++++ Makefile.in Fri Apr 13 17:28:19 2007 +@@ -288,5 +288,3 @@ + +-libGUI_la_LDFLAGS = \ +- -release $(LT_RELEASE) \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++libGUI_la_LDFLAGS = # empty + diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index f0f007830c2b..663d3b732cd7 100644 --- a/japanese/iiimf-le-canna/Makefile +++ b/japanese/iiimf-le-canna/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-canna PORTVERSION= 12.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -28,7 +28,6 @@ USE_GMAKE= yes USE_GNOME= gtk20 USE_XLIB= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/japanese/iiimf-le-canna/files/patch-Makefile b/japanese/iiimf-le-canna/files/patch-Makefile index c13173f534a8..a72a0f768306 100644 --- a/japanese/iiimf-le-canna/files/patch-Makefile +++ b/japanese/iiimf-le-canna/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile index f20b9530c32a..7b0c0f1b9e8f 100644 --- a/japanese/iiimf-le-freewnn/Makefile +++ b/japanese/iiimf-le-freewnn/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-freewnn PORTVERSION= 12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -27,7 +27,6 @@ USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/japanese/iiimf-le-freewnn/files/patch-Makefile b/japanese/iiimf-le-freewnn/files/patch-Makefile index c13173f534a8..a72a0f768306 100644 --- a/japanese/iiimf-le-freewnn/files/patch-Makefile +++ b/japanese/iiimf-le-freewnn/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile index 451539fd173a..f805c4a9e20f 100644 --- a/japanese/mutt-devel/Makefile +++ b/japanese/mutt-devel/Makefile @@ -9,7 +9,7 @@ PORTNAME= mutt-devel PORTVERSION= ${VERSION}.j${JP_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= japanese mail MASTER_SITES= http://www.emaillab.org/mutt/${VERSION}/ \ http://www.emaillab.org/mutt/1.5/doc/:ja_doc \ @@ -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:259 +USE_AUTOTOOLS= automake:19 autoconf:261 USE_OPENSSL= yes WRKSRC= ${WRKDIR}/mutt-${VERSION} LDFLAGS+= -L${LOCALBASE}/lib @@ -81,7 +81,7 @@ CONFIGURE_ARGS= --with-slang --enable-locales-fix \ --without-wc-funcs \ --enable-flock --disable-fcntl \ --with-ssl \ - --sysconfdir=${PREFIX}/etc \ + --sysconfdir=${PREFIX}/etc --mandir=${PREFIX}/man \ --with-docdir=${DOCSDIR} \ --enable-pop --enable-imap \ --enable-default-japanese diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile index 784d7d7bb0ea..6de2703c5e15 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:259 +USE_AUTOTOOLS= automake:19 autoconf:261 USE_OPENSSL= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${VERSION} LDFLAGS+= -L${LOCALBASE}/lib @@ -44,7 +44,7 @@ CONFIGURE_ARGS= --with-slang --enable-locales-fix \ --without-wc-funcs \ --enable-flock --disable-fcntl \ --with-ssl \ - --sysconfdir=${PREFIX}/etc \ + --sysconfdir=${PREFIX}/etc --mandir=${PREFIX}/man \ --with-docdir=${DOCSDIR} \ --enable-pop --enable-imap \ --enable-default-japanese diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile index 96ecf5d38b8f..4c93719d164d 100644 --- a/korean/iiimf-le-hangul/Makefile +++ b/korean/iiimf-le-hangul/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-hangul PORTVERSION= 12.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= korean textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -24,7 +24,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XLIB= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/korean/iiimf-le-hangul/files/patch-Makefile b/korean/iiimf-le-hangul/files/patch-Makefile index c13173f534a8..a72a0f768306 100644 --- a/korean/iiimf-le-hangul/files/patch-Makefile +++ b/korean/iiimf-le-hangul/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 69877cd132b6..fccd7395cb23 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -7,7 +7,7 @@ PORTNAME= php4 PORTVERSION= 4.4.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ diff --git a/lang/php4/files/patch-scripts::phpize.in b/lang/php4/files/patch-scripts::phpize.in index 9db65b6f616a..3a885fd91475 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=autoconf259 -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader259 ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.59 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.59 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <<EOF diff --git a/lang/php5/Makefile b/lang/php5/Makefile index be080c53aed4..1cb92d61ce21 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -7,7 +7,7 @@ PORTNAME= php5 PORTVERSION= 5.2.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php5/files/patch-scripts::phpize.in b/lang/php5/files/patch-scripts::phpize.in index 4f655b5ae454..198f1b397c71 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=autoconf259 -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader259 ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.59 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.59 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <<EOF diff --git a/lang/php53/Makefile b/lang/php53/Makefile index be080c53aed4..1cb92d61ce21 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -7,7 +7,7 @@ PORTNAME= php5 PORTVERSION= 5.2.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions diff --git a/lang/php53/files/patch-scripts::phpize.in b/lang/php53/files/patch-scripts::phpize.in index 4f655b5ae454..198f1b397c71 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=autoconf259 -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader259 ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf-2.59 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader-2.59 if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then cat <<EOF diff --git a/multimedia/shell-fm/Makefile b/multimedia/shell-fm/Makefile index 53fba75af844..2b16f3f4907a 100644 --- a/multimedia/shell-fm/Makefile +++ b/multimedia/shell-fm/Makefile @@ -7,6 +7,7 @@ PORTNAME= shell-fm PORTVERSION= 20061229 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://ntarmos.dyndns.org/Software/FreeBSD/ diff --git a/multimedia/shell-fm/files/patch-reconfig b/multimedia/shell-fm/files/patch-reconfig index a6c223feeb94..4e5da46e8b9f 100644 --- a/multimedia/shell-fm/files/patch-reconfig +++ b/multimedia/shell-fm/files/patch-reconfig @@ -9,10 +9,10 @@ diff -urNbB src/reconfig.orig src/reconfig -do_cmd autoheader -do_cmd automake --add-missing --copy -do_cmd autoconf -+do_cmd aclocal19 -I m4 -+do_cmd autoheader259 -+do_cmd automake19 --add-missing --copy -+do_cmd autoconf259 ++do_cmd aclocal-1.9 -I m4 ++do_cmd autoheader-2.59 ++do_cmd automake-1.9 --add-missing --copy ++do_cmd autoconf-2.59 diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile index 6cdffb1da7c7..e4be7d216d82 100644 --- a/net-im/gossip/Makefile +++ b/net-im/gossip/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --enable-libnotify=no .endif .if defined(WITH_TELEPATHY) -LIB_DEPENDS+= telepathy.3:${PORTSDIR}/net-im/libtelepathy +LIB_DEPENDS+= telepathy.5:${PORTSDIR}/net-im/libtelepathy CONFIGURE_ARGS+= --enable-telepathy=yes .else CONFIGURE_ARGS+= --enable-telepathy=no diff --git a/net/sipxportlib/files/patch-configure b/net/sipxportlib/files/patch-configure deleted file mode 100644 index e4b6812c10a9..000000000000 --- a/net/sipxportlib/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- ./configure.orig Mon Jan 8 10:53:10 2007 -+++ ./configure Mon Jan 8 10:53:31 2007 -@@ -2254,7 +2254,7 @@ - - echo "$as_me:$LINENO: checking for automake version >= 1.6" >&5 - echo $ECHO_N "checking for automake version >= 1.6... $ECHO_C" >&6 -- sf_am_version=`automake --version | head -n 1 | awk '/^automake/ {print $NF}'` -+ sf_am_version=`automake19 --version | head -n 1 | awk '/^automake/ {print $NF}'` - - # Used to indicate true or false condition - ax_compare_version=false -@@ -2333,7 +2333,7 @@ - echo "${ECHO_T}no" >&6 - fi - -- if test `autoconf --version | grep "2.58" | wc -c` -ne 0 ; then -+ if test `autoconf259 --version | grep "2.58" | wc -c` -ne 0 ; then - { echo "$as_me:$LINENO: WARNING: \"Autoconf 2.58 was found on system. If you are a maintainer of this library it has known incompatilities. If you are not a maintainer, 2.58 has serious bugs and you should consider upgrading autoconf\"" >&5 - echo "$as_me: WARNING: \"Autoconf 2.58 was found on system. If you are a maintainer of this library it has known incompatilities. If you are not a maintainer, 2.58 has serious bugs and you should consider upgrading autoconf\"" >&2;}; - fi diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips index 6e4f931562cd..6b9b1245b4e3 100644 --- a/print/pips800/Makefile.pips +++ b/print/pips800/Makefile.pips @@ -121,7 +121,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-2.6.2-common \ ${PRTYPE} != -spr800 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-2.6.2-ekpstm::main.c .endif -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf253:${PORTSDIR}/devel/autoconf253 +BUILD_DEPENDS+= ${LOCALBASE}/bin/autoconf-2.53:${PORTSDIR}/devel/autoconf253 LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base USE_ICONV= yes .endif @@ -281,7 +281,7 @@ post-patch: pre-configure: .if ${PIPS_LEVEL} >= 206 && ${DIST_TYPE} != lpr && ${DIST_TYPE} != cups - cd ${WRKSRC}/libltdl && ${LOCALBASE}/bin/autoconf253 + cd ${WRKSRC}/libltdl && ${LOCALBASE}/bin/autoconf-2.53 .endif post-configure: diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index da9b4fc115b1..e108552d7603 100644 --- a/textproc/iiimf-client-lib/Makefile +++ b/textproc/iiimf-client-lib/Makefile @@ -7,7 +7,7 @@ PORTNAME= client-lib PORTVERSION= 12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -25,7 +25,6 @@ INSTALLS_SHLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/lib/iiimcf diff --git a/textproc/iiimf-client-lib/files/patch-Makefile b/textproc/iiimf-client-lib/files/patch-Makefile index 93b6c7871efe..d7f7226f91e6 100644 --- a/textproc/iiimf-client-lib/files/patch-Makefile +++ b/textproc/iiimf-client-lib/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile index 0d7007b93f7e..daadf77139e6 100644 --- a/textproc/iiimf-csconv/Makefile +++ b/textproc/iiimf-csconv/Makefile @@ -7,7 +7,7 @@ PORTNAME= csconv PORTVERSION= 12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -23,7 +23,6 @@ USE_ICONV= yes USE_GETTEXT= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/lib/CSConv diff --git a/textproc/iiimf-csconv/files/patch-Makefile b/textproc/iiimf-csconv/files/patch-Makefile index 78d014fc08d2..a610aed43a09 100644 --- a/textproc/iiimf-csconv/files/patch-Makefile +++ b/textproc/iiimf-csconv/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile index a1384c5bfc8a..3ca40c22f8c5 100644 --- a/textproc/iiimf-gnome-im-switcher/Makefile +++ b/textproc/iiimf-gnome-im-switcher/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-im-switcher PORTVERSION= 12.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -27,7 +27,6 @@ USE_GNOME= intltool gconf2 libglade2 libgnomeui \ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 GCONF_SCHEMAS= gnome-im-properties.schemas gnome-im-switcher.schemas diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile index 3efdd256befb..da0154fa72c1 100644 --- a/textproc/iiimf-gnome-im-switcher/files/patch-Makefile +++ b/textproc/iiimf-gnome-im-switcher/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile index 493861e39f6e..28f0156db7d1 100644 --- a/textproc/iiimf-gtk/Makefile +++ b/textproc/iiimf-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtk PORTVERSION= 12.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -28,7 +28,6 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= intltool gtk20 USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimgcf diff --git a/textproc/iiimf-gtk/files/patch-Makefile b/textproc/iiimf-gtk/files/patch-Makefile index 4942c07fafd7..d3c5ac697408 100644 --- a/textproc/iiimf-gtk/files/patch-Makefile +++ b/textproc/iiimf-gtk/files/patch-Makefile @@ -7,16 +7,16 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy +LIBTOOLIZE = libtoolize --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ @@ -12,3 +12,3 @@ -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force @@ -16,12 +16,14 @@ diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index dd182635708a..84037df4cb60 100644 --- a/textproc/iiimf-le-unit/Makefile +++ b/textproc/iiimf-le-unit/Makefile @@ -7,7 +7,7 @@ PORTNAME= le-unit PORTVERSION= 12.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -28,7 +28,6 @@ USE_GMAKE= yes USE_GNOME= libxml2 USE_XLIB= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/textproc/iiimf-le-unit/files/patch-Makefile b/textproc/iiimf-le-unit/files/patch-Makefile index 687ccf0b6813..001d4a5432a2 100644 --- a/textproc/iiimf-le-unit/files/patch-Makefile +++ b/textproc/iiimf-le-unit/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index bcf16479ed7f..a62e396d7e8c 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -7,6 +7,7 @@ PORTNAME= protocol-lib PORTVERSION= 12.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -21,7 +22,6 @@ INSTALLS_SHLIB= yes USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/lib/iiimp diff --git a/textproc/iiimf-protocol-lib/files/patch-Makefile b/textproc/iiimf-protocol-lib/files/patch-Makefile index 3b1030c4343d..d1aae83781bb 100644 --- a/textproc/iiimf-protocol-lib/files/patch-Makefile +++ b/textproc/iiimf-protocol-lib/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile index 2a74379454e5..645d0fec4e3b 100644 --- a/textproc/iiimf-server/Makefile +++ b/textproc/iiimf-server/Makefile @@ -7,6 +7,7 @@ PORTNAME= server PORTVERSION= 12.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -26,7 +27,6 @@ USE_GMAKE= yes USE_GNOME= pkgconfig libxml2 USE_OPENSSL= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimsf diff --git a/textproc/iiimf-server/files/patch-Makefile b/textproc/iiimf-server/files/patch-Makefile index 3976fd7ed181..f0ede4220047 100644 --- a/textproc/iiimf-server/files/patch-Makefile +++ b/textproc/iiimf-server/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile index a076472c09c3..153c6500cb48 100644 --- a/textproc/iiimf-x-lib/Makefile +++ b/textproc/iiimf-x-lib/Makefile @@ -7,7 +7,7 @@ PORTNAME= x-lib PORTVERSION= 12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -28,7 +28,6 @@ USE_GMAKE= yes USE_MOTIF= yes USE_OPENSSL= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimxcf/xiiimp.so diff --git a/textproc/iiimf-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile index 24542b8ac6b9..c9f378ab6ff5 100644 --- a/textproc/iiimf-x-lib/files/patch-Makefile +++ b/textproc/iiimf-x-lib/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile index da34ff069664..6684a91156b1 100644 --- a/textproc/iiimf-x/Makefile +++ b/textproc/iiimf-x/Makefile @@ -7,7 +7,7 @@ PORTNAME= x PORTVERSION= 12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/ PKGNAMEPREFIX= iiimf- @@ -26,7 +26,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XLIB= yes USE_AUTOTOOLS= automake:19:env autoconf:259:env libtool:15:env -WANT_AUTOHEADER_VER= 259 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimxcf/htt_xbe diff --git a/textproc/iiimf-x/files/patch-Makefile b/textproc/iiimf-x/files/patch-Makefile index 84f3d2261920..366fcede6ca2 100644 --- a/textproc/iiimf-x/files/patch-Makefile +++ b/textproc/iiimf-x/files/patch-Makefile @@ -7,11 +7,11 @@ -#LIBTOOLIZE = libtoolize --force --copy -#AUTOHEADER = autoheader -#AUTOCONF = autoconf -+ACLOCAL = aclocal19 -+AUTOMAKE = automake19 --add-missing --copy -+LIBTOOLIZE = libtoolize15 --force --copy -+AUTOHEADER = autoheader259 -+AUTOCONF = autoconf259 ++ACLOCAL = aclocal-1.9 ++AUTOMAKE = automake-1.9 --add-missing --copy ++LIBTOOLIZE = libtoolize --force --copy ++AUTOHEADER = autoheader-2.59 ++AUTOCONF = autoconf-2.59 #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \ # $(LIBTOOLIZE) && \ # $(AUTOHEADER) && \ @@ -19,7 +19,7 @@ # $(AUTOCONF) -AUTORECONF = autoreconf -+AUTORECONF = autoreconf259 ++AUTORECONF = autoreconf-2.59 BOOTSTRAP = $(AUTORECONF) --install --force INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake diff --git a/textproc/ssddiff/Makefile b/textproc/ssddiff/Makefile index 576aaac55727..450ed406afb1 100644 --- a/textproc/ssddiff/Makefile +++ b/textproc/ssddiff/Makefile @@ -7,6 +7,7 @@ PORTNAME= ssddiff PORTVERSION= 0.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://alioth.debian.org/frs/download.php/1469/ @@ -24,7 +25,7 @@ PLIST_FILES= bin/xmldiff post-extract: .for f in config.guess config.sub install-sh missing mkinstalldirs - @${LN} -sf ${LOCALBASE}/share/automake14/${f} ${WRKSRC}/${f} + @${LN} -sf ${AUTOMAKE_DIR}/${f} ${WRKSRC}/${f} .endfor @${REINPLACE_CMD} -e 's,"getopt\.h",<unistd.h>,' \ ${WRKSRC}/src/main.cc diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile index 2085af006328..97dc2a144e9c 100644 --- a/textproc/xlhtml/Makefile +++ b/textproc/xlhtml/Makefile @@ -7,7 +7,7 @@ PORTNAME= xlhtml PORTVERSION= 0.5 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -18,7 +18,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Convert Excel and PowerPoint files to HTML and text USE_GMAKE= yes -USE_AUTOTOOLS= automake:14 autoconf:253 +USE_AUTOTOOLS= automake:14 autoconf:261 +CONFIGURE_ARGS= --mandir=${PREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} MAN1= ppthtml.1 xlhtml.1 diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile index 1429df8a3213..7be828dcee2b 100644 --- a/www/mod_cplusplus/Makefile +++ b/www/mod_cplusplus/Makefile @@ -16,9 +16,6 @@ COMMENT= Apache module for loading C++ objects as handlers USE_APACHE= 2.0+ USE_AUTOTOOLS= autoconf:259 autoheader:259 libtool:15 automake:19 aclocal:19 -# ${LOCALBASE}/share/aclocal19 does not contain libtool.m4 and that causes -# problems. Explicitly include ${LOCALBASE}/share/aclocal in the search -# patch since that directory does contain libtool.m4 ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS+= -a GNU_CONFIGURE= yes diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile index 4bf8fa2918c9..0c1039af9ad7 100644 --- a/x11-toolkits/lesstif/Makefile +++ b/x11-toolkits/lesstif/Makefile @@ -7,7 +7,7 @@ PORTNAME= lesstif PORTVERSION= 0.95.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -73,12 +73,8 @@ pre-extract: .endif post-install: - ${RM} -f ${PREFIX}/lib/libXm.la - ${RM} -f ${PREFIX}/lib/libMrm.la - ${RM} -f ${PREFIX}/lib/libDtPrint.la - ${RM} -f ${PREFIX}/lib/libUil.la - ${INSTALL_DATA} ${WRKSRC}/scripts/autoconf/ac_find_motif.m4 \ - ${LOCALBASE}/share/aclocal + @${INSTALL_DATA} ${WRKSRC}/scripts/autoconf/ac_find_motif.m4 \ + ${PREFIX}/share/aclocal @${CAT} ${PKGMESSAGE} .include <bsd.port.pre.mk> diff --git a/x11-toolkits/lesstif/pkg-plist b/x11-toolkits/lesstif/pkg-plist index 26736104e573..3f49d7c75527 100644 --- a/x11-toolkits/lesstif/pkg-plist +++ b/x11-toolkits/lesstif/pkg-plist @@ -331,17 +331,22 @@ lib/X11/mwm/README lib/X11/mwm/alt.map lib/X11/mwm/system.mwmrc lib/libDtPrint.a +lib/libDtPrint.la lib/libDtPrint.so lib/libDtPrint.so.1 lib/libUil.a +lib/libUil.la lib/libUil.so lib/libUil.so.2 lib/libMrm.a +lib/libMrm.la lib/libMrm.so lib/libMrm.so.2 lib/libXm.a +lib/libXm.la lib/libXm.so lib/libXm.so.2 +share/aclocal/ac_find_motif.m4 @unexec rm -f %D/LessTif/doc/Lessdox @dirrm LessTif/doc/images @dirrm LessTif/doc/html @@ -354,7 +359,3 @@ lib/libXm.so.2 @dirrm lib/LessTif/config @dirrm lib/LessTif @dirrm lib/X11/mwm -@cwd %%LOCALBASE%% -share/aclocal/ac_find_motif.m4 -share/aclocal19/ac_find_motif.m4 -@dirrmtry share/aclocal19 diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile index 14ac79ec00e0..ffe40e662c37 100644 --- a/x11-toolkits/php-gtk/Makefile +++ b/x11-toolkits/php-gtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= php-gtk PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= http://gtk.php.net/distributions/ \ http://document-root.de/mirror/php-gtk/ @@ -88,7 +88,7 @@ EXAMPLES= combobutton.php fileselection.php gtk.php hello.php list.php \ pre-configure: @${ECHO_MSG} "===> Building configuration files for ${PKGNAME}" - @(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=autoconf259 PHP_AUTOHEADER=autoheader259 ./buildconf) + @(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=${AUTOCONF} PHP_AUTOHEADER=${AUTOHEADER} ./buildconf) .for FILE in ${PIC2FIX} @${REINPLACE_CMD} -e "s|-prefer-pic|${CFLAGS}|g" ${WRKSRC}/${FILE} .endfor diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile index 14ac79ec00e0..ffe40e662c37 100644 --- a/x11-toolkits/php-gtk2/Makefile +++ b/x11-toolkits/php-gtk2/Makefile @@ -7,7 +7,7 @@ PORTNAME= php-gtk PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-toolkits MASTER_SITES= http://gtk.php.net/distributions/ \ http://document-root.de/mirror/php-gtk/ @@ -88,7 +88,7 @@ EXAMPLES= combobutton.php fileselection.php gtk.php hello.php list.php \ pre-configure: @${ECHO_MSG} "===> Building configuration files for ${PKGNAME}" - @(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=autoconf259 PHP_AUTOHEADER=autoheader259 ./buildconf) + @(cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} PHP_AUTOCONF=${AUTOCONF} PHP_AUTOHEADER=${AUTOHEADER} ./buildconf) .for FILE in ${PIC2FIX} @${REINPLACE_CMD} -e "s|-prefer-pic|${CFLAGS}|g" ${WRKSRC}/${FILE} .endfor |