diff options
author | Ade Lovett <ade@FreeBSD.org> | 2006-12-07 10:57:12 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2006-12-07 10:57:12 +0000 |
commit | 26e1e82aa2299d74c8648259faf7632342381b55 (patch) | |
tree | bd0c4bcbe2db06e97841c7cbf3b392db14a6f249 /devel/automake110 | |
parent | 781b45454c18b6174ceacb2c28253913ee2b7db7 (diff) | |
download | ports-26e1e82aa2299d74c8648259faf7632342381b55.tar.gz ports-26e1e82aa2299d74c8648259faf7632342381b55.zip |
Notes
Diffstat (limited to 'devel/automake110')
-rw-r--r-- | devel/automake110/Makefile | 18 | ||||
-rw-r--r-- | devel/automake110/distinfo | 6 | ||||
-rw-r--r-- | devel/automake110/files/patch-aclocal.in | 31 | ||||
-rw-r--r-- | devel/automake110/files/patch-configure | 32 | ||||
-rw-r--r-- | devel/automake110/files/patch-doc::automake.texi | 16 | ||||
-rw-r--r-- | devel/automake110/files/patch-lib::Automake::Config.in | 29 | ||||
-rw-r--r-- | devel/automake110/pkg-plist | 4 |
7 files changed, 72 insertions, 64 deletions
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index 6353e032bee0..deb22ee6c9ae 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -1,32 +1,32 @@ -# New ports collection makefile for: automake19 -# Date created: 15 Feb 2003 -# Whom: Udo Schweigert +# New ports collection makefile for: automake110 +# Date created: 5th December 2006 +# Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ # PORTNAME= automake -PORTVERSION= 1.9.6 +PORTVERSION= 1.10 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (1.9) +COMMENT= GNU Standards-compliant Makefile generator (1.10) RUN_DEPENDS= ${AUTOCONF_DEPENDS} -USE_AUTOTOOLS= autoconf:259:env -BUILD_VERSION= 19 +USE_AUTOTOOLS= autoconf:261:env +BUILD_VERSION= 110 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= automake${BUILD_VERSION} USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo +#CONFIGURE_ENV= AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} \ - --infodir=${PREFIX}/info + --infodir=${PREFIX}/info --mandir=${PREFIX}/man CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} INFO= automake${BUILD_VERSION} diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo index 739f4985d6be..01eab3d20e98 100644 --- a/devel/automake110/distinfo +++ b/devel/automake110/distinfo @@ -1,3 +1,3 @@ -MD5 (automake-1.9.6.tar.bz2) = c11b8100bb311492d8220378fd8bf9e0 -SHA256 (automake-1.9.6.tar.bz2) = 8eccaa98e1863d10e4a5f861d8e2ec349a23e88cb12ad10f6b6f79022ad2bb8d -SIZE (automake-1.9.6.tar.bz2) = 765505 +MD5 (automake-1.10.tar.bz2) = 0e2e0f757f9e1e89b66033905860fded +SHA256 (automake-1.10.tar.bz2) = 2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697 +SIZE (automake-1.10.tar.bz2) = 893866 diff --git a/devel/automake110/files/patch-aclocal.in b/devel/automake110/files/patch-aclocal.in index 0745a4e187a7..84e0108dd999 100644 --- a/devel/automake110/files/patch-aclocal.in +++ b/devel/automake110/files/patch-aclocal.in @@ -1,28 +1,19 @@ ---- aclocal.in.orig Sat Apr 10 10:15:32 2004 -+++ aclocal.in Wed May 26 14:33:27 2004 -@@ -31,3 +31,3 @@ +--- aclocal.in.orig Sun Oct 15 09:19:37 2006 ++++ aclocal.in Tue Dec 5 13:19:21 2006 +@@ -32,3 +32,3 @@ { - my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; + my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); -@@ -47,4 +47,5 @@ - # Note also that the versioned directory is handled later. --$acdir = '@datadir@/aclocal'; -+$acdir = '@datadir@/aclocal@APIPVERSION@'; - $default_acdir = $acdir; -+$acdir_x11 = '%%X11BASE%%/share/aclocal'; - # contains a list of directories, one per line, to be added -@@ -411,3 +412,3 @@ +@@ -58,4 +58,4 @@ + my @user_includes = (); +-my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); +-my @system_includes = ('@datadir@/aclocal'); ++my @automake_includes = ("@datadir@/aclocal$APIPVERSION"); ++my @system_includes = ('@datadir@/aclocal', '%%X11BASE%%/share/aclocal'); + +@@ -650,3 +650,3 @@ - my $traces = ($ENV{AUTOM4TE} || 'autom4te'); + my $traces = ($ENV{AUTOM4TE} || 'autom4te259'); $traces .= " --language Autoconf-without-aclocal-m4 "; -@@ -622,7 +623,3 @@ - -- # 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; -+ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; - diff --git a/devel/automake110/files/patch-configure b/devel/automake110/files/patch-configure index 6ce0b38a23b1..8ef0709ff933 100644 --- a/devel/automake110/files/patch-configure +++ b/devel/automake110/files/patch-configure @@ -1,10 +1,24 @@ ---- configure.orig Sun Jul 10 11:14:51 2005 -+++ configure Thu Jul 28 14:28:34 2005 -@@ -602,2 +602,3 @@ +--- configure.orig Sun Oct 15 10:25:22 2006 ++++ configure Tue Dec 5 13:23:30 2006 +@@ -631,2 +631,3 @@ APIVERSION +APIPVERSION pkgvdatadir -@@ -2098,6 +2099,6 @@ +@@ -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/'` @@ -13,16 +27,16 @@ -pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION" +pkgvdatadir="\${datadir}/automake${APIPVERSION}" -@@ -3102,2 +3103,3 @@ +@@ -3232,2 +3234,3 @@ APIVERSION=$APIVERSION +APIPVERSION=$APIPVERSION -@@ -3244,2 +3246,3 @@ +@@ -3377,2 +3380,3 @@ APIVERSION!$APIVERSION$ac_delim +APIPVERSION!$APIPVERSION$ac_delim pkgvdatadir!$pkgvdatadir$ac_delim -@@ -3256,3 +3259,3 @@ +@@ -3389,3 +3393,3 @@ -- if test `grep -c "$ac_delim\$" conf$$subs.sed` = 75; then -+ if test `grep -c "$ac_delim\$" conf$$subs.sed` = 76; then +- 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::automake.texi b/devel/automake110/files/patch-doc::automake.texi index 54f71944163d..882a8642d75e 100644 --- a/devel/automake110/files/patch-doc::automake.texi +++ b/devel/automake110/files/patch-doc::automake.texi @@ -1,5 +1,5 @@ ---- 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 Sun Oct 15 10:41:24 2006 ++++ doc/automake.texi Tue Dec 5 13:25:18 2006 @@ -2,4 +2,4 @@ @c %**start of header -@setfilename automake.info @@ -7,18 +7,20 @@ +@setfilename automake19.info +@settitle automake19 @setchapternewpage off -@@ -36,8 +36,3 @@ +@@ -39,9 +39,4 @@ @direntry --* automake: (automake). Making Makefile.in's. +-* Automake: (automake). Making GNU standards-compliant Makefiles. -@end direntry - -@dircategory Individual utilities -@direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -+* automake19: (automake19). Making Makefile.in's. +-* automake: (automake)Invoking Automake. Generating Makefile.in. ++* aclocal110: (automake110)Invoking aclocal. Generating aclocal.m4. ++* automake110: (automake110)Invoking Automake. Generating Makefile.in. @end direntry -@@ -9090,3 +9085,3 @@ - @multitable {8888-88-88} {8.8-p8} {8888} {888} {8888} {8888 (88)} {8888 (88)} {888} {888} +@@ -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 index c9c17688d004..ec1f5a62449b 100644 --- a/devel/automake110/files/patch-lib::Automake::Config.in +++ b/devel/automake110/files/patch-lib::Automake::Config.in @@ -1,18 +1,15 @@ ---- 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); +--- 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); --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@'; +@@ -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/pkg-plist b/devel/automake110/pkg-plist index c2a9c06f7644..4c167efd428c 100644 --- a/devel/automake110/pkg-plist +++ b/devel/automake110/pkg-plist @@ -33,7 +33,9 @@ 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 @@ -112,6 +114,8 @@ 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 |