diff options
27 files changed, 91 insertions, 643 deletions
@@ -4594,3 +4594,6 @@ archivers/p5-IO-Compress-Base|archivers/p5-IO-Compress|2010-09-21|Replaced by ar archivers/p5-IO-Compress-Bzip2|archivers/p5-IO-Compress|2010-09-21|Replaced by archivers/p5-IO-Compress archivers/p5-IO-Compress-Zlib|archivers/p5-IO-Compress|2010-09-21|Replaced by archivers/p5-IO-Compress audio/linux-nerodigitalaudio|audio/linux-neroaaccodec|2010-09-22|Project was renamed +devel/automake16||2010-09-22|Outdated, no longer required by any port +devel/automake17||2010-09-22|Outdated, was not being used by any port +devel/automake18||2010-09-22|Outdated, ports (2) migrated to automake19 diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile index 6d4e716c3129..53bc62e25f79 100644 --- a/astro/boinc-setiathome-enhanced/Makefile +++ b/astro/boinc-setiathome-enhanced/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float USE_BZIP2= yes -USE_AUTOTOOLS= autoconf:267:env automake:18:env +USE_AUTOTOOLS= autoconf:267:env automake:19:env GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig diff --git a/devel/Makefile b/devel/Makefile index 33de9471a785..4a9b372ba3fd 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -73,9 +73,6 @@ SUBDIR += automake111 SUBDIR += automake14 SUBDIR += automake15 - SUBDIR += automake16 - SUBDIR += automake17 - SUBDIR += automake18 SUBDIR += automake19 SUBDIR += automoc4 SUBDIR += autotools diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile deleted file mode 100644 index 562810c81422..000000000000 --- a/devel/automake16/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# New ports collection makefile for: automake -# Date created: 14th April 2007 -# Whom: Ade Lovett <ade@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= automake -PORTVERSION= 1.6.3 -PORTREVISION= 2 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= automake - -# note: before committing to this port, contact portmgr to arrange for an -# experimental ports run. Untested commits may be backed out at portmgr's -# discretion. -MAINTAINER= autotools@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (1.6) - -RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ - automake-wrapper:${PORTSDIR}/devel/automake-wrapper - -USE_AUTOTOOLS= autoconf:267: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} -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 deleted file mode 100644 index cab81ddcb0de..000000000000 --- a/devel/automake16/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index be2ed9f7fe31..000000000000 --- a/devel/automake16/files/patch-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 deleted file mode 100644 index 5a23d3b0b243..000000000000 --- a/devel/automake16/files/patch-automake.texi +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index eeb8b96a2128..000000000000 --- a/devel/automake16/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 1d7006e64b86..000000000000 --- a/devel/automake16/pkg-plist +++ /dev/null @@ -1,92 +0,0 @@ -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 deleted file mode 100644 index 1d3c2884b4b7..000000000000 --- a/devel/automake17/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# New ports collection makefile for: automake -# Date created: 14th April 2007 -# Whom: Ade Lovett <ade@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= automake -PORTVERSION= 1.7.9 -PORTREVISION= 3 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= automake - -# note: before committing to this port, contact portmgr to arrange for an -# experimental ports run. Untested commits may be backed out at portmgr's -# discretion. -MAINTAINER= autotools@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (1.7) - -RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ - automake-wrapper:${PORTSDIR}/devel/automake-wrapper - -USE_AUTOTOOLS= autoconf:267: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} -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 deleted file mode 100644 index c1aaccb7ddce..000000000000 --- a/devel/automake17/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index d0f8d12b895f..000000000000 --- a/devel/automake17/files/patch-Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- 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 deleted file mode 100644 index 2e4c58f48d1a..000000000000 --- a/devel/automake17/files/patch-automake.texi +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index eeb8b96a2128..000000000000 --- a/devel/automake17/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 7776b2be1b50..000000000000 --- a/devel/automake17/pkg-plist +++ /dev/null @@ -1,97 +0,0 @@ -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 deleted file mode 100644 index 5c3c60807e2e..000000000000 --- a/devel/automake18/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# New ports collection makefile for: automake -# Date created: 14th April 2007 -# Whom: Ade Lovett <ade@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= automake -PORTVERSION= 1.8.5 -PORTREVISION= 4 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= automake - -# note: before committing to this port, contact portmgr to arrange for an -# experimental ports run. Untested commits may be backed out at portmgr's -# discretion. -MAINTAINER= autotools@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (1.8) - -RUN_DEPENDS= ${AUTOCONF_DEPENDS} \ - automake-wrapper:${PORTSDIR}/devel/automake-wrapper - -USE_AUTOTOOLS= autoconf:267: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} -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 deleted file mode 100644 index 2de6c2bd4577..000000000000 --- a/devel/automake18/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 5e589e9c1da9..000000000000 --- a/devel/automake18/files/patch-Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ ---- 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 deleted file mode 100644 index 248932363432..000000000000 --- a/devel/automake18/files/patch-doc-Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 deleted file mode 100644 index b08baefef5bb..000000000000 --- a/devel/automake18/files/patch-doc-automake.texi +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index eeb8b96a2128..000000000000 --- a/devel/automake18/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 891d5ba4c29b..000000000000 --- a/devel/automake18/pkg-plist +++ /dev/null @@ -1,114 +0,0 @@ -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/autotools/Makefile b/devel/autotools/Makefile index 704280ed4c78..ed6dc44a1c5d 100644 --- a/devel/autotools/Makefile +++ b/devel/autotools/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= autotools -PORTVERSION= 20100915 +PORTVERSION= 20100922 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none @@ -23,7 +23,7 @@ NO_BUILD= yes NO_FETCH= yes AVAIL_AUTOCONF= 2.13 2.67 -AVAIL_AUTOMAKE= 1.4 1.5 1.6 1.7 1.8 1.9 1.10 1.11 +AVAIL_AUTOMAKE= 1.4 1.5 1.9 1.10 1.11 .for VER in ${AVAIL_AUTOCONF} RUN_DEPENDS+= autoconf-${VER}:${PORTSDIR}/devel/autoconf${VER:C/\.//} diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile index c505bf8862bb..ed4c176c50cb 100644 --- a/multimedia/spook/Makefile +++ b/multimedia/spook/Makefile @@ -27,7 +27,7 @@ USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:267 aclocal:18 automake:18 +USE_AUTOTOOLS= autoconf:267 aclocal:19 automake:19 NOMAN= defined diff --git a/science/xmds/Makefile b/science/xmds/Makefile index b873bc3e7c2f..b10288c72c58 100644 --- a/science/xmds/Makefile +++ b/science/xmds/Makefile @@ -17,8 +17,8 @@ COMMENT= XMDS is a code generator that integrates equations; MAN1= loadxsil.1 xmds.1 xsil2graphics.1 OPTIONS= FFTW3 "Use fftw3 instead of fftw2" Off -HAS_CONFIGURE= YES -USE_AUTOTOOLS= automake:16 + +GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/science/xmds/files/patch-Makefile.am b/science/xmds/files/patch-Makefile.am deleted file mode 100644 index df9d50658cfd..000000000000 --- a/science/xmds/files/patch-Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 1829) -+++ Makefile.am (working copy) -@@ -55,8 +55,9 @@ - m4files = acx_mpi.m4 acx_pthread.m4 - - EXTRA_DIST = $(example_files) $(m4files) $(manfiles) MANIFEST README.Windows source/loadxsil.m --dist_doc_data = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m --doc_examplesdir = ${docdir}/examples -+xmdsdocdir = ${datadir}/doc/xmds-${VERSION} -+dist_xmdsdoc_DATA = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m -+doc_examplesdir = ${xmdsdocdir}/examples - dist_doc_examples_DATA = $(example_files) - - api: diff --git a/science/xmds/files/patch-Makefile.in b/science/xmds/files/patch-Makefile.in new file mode 100644 index 000000000000..04e7248ff066 --- /dev/null +++ b/science/xmds/files/patch-Makefile.in @@ -0,0 +1,82 @@ +--- Makefile.in.orig 2008-02-25 21:32:56.000000000 -0600 ++++ Makefile.in 2010-09-22 14:22:17.000000000 -0500 +@@ -150,4 +150,5 @@ + EXTRA_DIST = $(example_files) $(m4files) $(manfiles) MANIFEST README.Windows source/loadxsil.m +-dist_doc_data = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m +-doc_examplesdir = ${docdir}/examples ++xmdsdocdir = ${datadir}/doc/xmds-${VERSION} ++dist_xmdsdoc_DATA = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m ++doc_examplesdir = ${xmdsdocdir}/examples + dist_doc_examples_DATA = $(example_files) +@@ -162,3 +163,3 @@ + MANS = $(man1_MANS) +-DATA = $(dist_doc_examples_DATA) ++DATA = $(dist_doc_examples_DATA) $(dist_xmdsdoc_DATA) + +@@ -169,5 +170,5 @@ + uninstall-recursive check-recursive installcheck-recursive +-DIST_COMMON = README $(dist_doc_examples_DATA) AUTHORS COPYING \ +- ChangeLog INSTALL Makefile.am Makefile.in NEWS TODO \ +- acinclude.m4 aclocal.m4 config.guess config.sub configure \ ++DIST_COMMON = README $(dist_doc_examples_DATA) $(dist_xmdsdoc_DATA) \ ++ AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \ ++ TODO acinclude.m4 aclocal.m4 config.guess config.sub configure \ + configure.in depcomp install-sh ltmain.sh missing mkinstalldirs +@@ -255,2 +256,20 @@ + done ++dist_xmdsdocDATA_INSTALL = $(INSTALL_DATA) ++install-dist_xmdsdocDATA: $(dist_xmdsdoc_DATA) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(xmdsdocdir) ++ @list='$(dist_xmdsdoc_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(dist_xmdsdocDATA_INSTALL) $$d$$p $(DESTDIR)$(xmdsdocdir)/$$f"; \ ++ $(dist_xmdsdocDATA_INSTALL) $$d$$p $(DESTDIR)$(xmdsdocdir)/$$f; \ ++ done ++ ++uninstall-dist_xmdsdocDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(dist_xmdsdoc_DATA)'; for p in $$list; do \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(xmdsdocdir)/$$f"; \ ++ rm -f $(DESTDIR)$(xmdsdocdir)/$$f; \ ++ done + +@@ -458,3 +477,3 @@ + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(doc_examplesdir) ++ $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(doc_examplesdir) $(DESTDIR)$(xmdsdocdir) + +@@ -500,3 +519,4 @@ + +-install-data-am: install-dist_doc_examplesDATA install-man ++install-data-am: install-dist_doc_examplesDATA install-dist_xmdsdocDATA \ ++ install-man + +@@ -519,4 +539,4 @@ + +-uninstall-am: uninstall-dist_doc_examplesDATA uninstall-info-am \ +- uninstall-man ++uninstall-am: uninstall-dist_doc_examplesDATA uninstall-dist_xmdsdocDATA \ ++ uninstall-info-am uninstall-man + +@@ -532,10 +552,12 @@ + install-data-recursive install-dist_doc_examplesDATA \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-man1 install-recursive install-strip installcheck \ +- installcheck-am installdirs installdirs-am \ +- installdirs-recursive maintainer-clean maintainer-clean-generic \ ++ install-dist_xmdsdocDATA install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-man1 \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive tags tags-recursive uninstall \ +- uninstall-am uninstall-dist_doc_examplesDATA uninstall-info-am \ ++ uninstall-am uninstall-dist_doc_examplesDATA \ ++ uninstall-dist_xmdsdocDATA uninstall-info-am \ + uninstall-info-recursive uninstall-man uninstall-man1 \ |