diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
| commit | d4f0d0048a8755106a4b0445221a19761e746984 (patch) | |
| tree | c87184c5bfeaf942c827c5f706186ce9786a2588 /devel/automake19 | |
| parent | e82affd309fc2d8e5ea19b2e003f1296920bd825 (diff) | |
| download | ports-d4f0d0048a8755106a4b0445221a19761e746984.tar.gz ports-d4f0d0048a8755106a4b0445221a19761e746984.zip | |
Notes
Diffstat (limited to 'devel/automake19')
| -rw-r--r-- | devel/automake19/Makefile | 2 | ||||
| -rw-r--r-- | devel/automake19/files/patch-aclocal.in | 16 |
2 files changed, 8 insertions, 10 deletions
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index 6353e032bee0..87241d34df47 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -7,6 +7,7 @@ PORTNAME= automake PORTVERSION= 1.9.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -37,7 +38,6 @@ post-patch: ${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,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in pre-su-install: @${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION} diff --git a/devel/automake19/files/patch-aclocal.in b/devel/automake19/files/patch-aclocal.in index 0745a4e187a7..a9df0ac85c20 100644 --- a/devel/automake19/files/patch-aclocal.in +++ b/devel/automake19/files/patch-aclocal.in @@ -1,28 +1,26 @@ ---- aclocal.in.orig Sat Apr 10 10:15:32 2004 -+++ aclocal.in Wed May 26 14:33:27 2004 +--- 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,4 +47,5 @@ +@@ -47,3 +47,3 @@ # 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 @@ +@@ -406,3 +406,3 @@ - my $traces = ($ENV{AUTOM4TE} || 'autom4te'); + my $traces = ($ENV{AUTOM4TE} || 'autom4te259'); $traces .= " --language Autoconf-without-aclocal-m4 "; -@@ -622,7 +623,3 @@ - +@@ -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; -+ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; |