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/automake14 | |
| parent | e82affd309fc2d8e5ea19b2e003f1296920bd825 (diff) | |
| download | ports-d4f0d0048a8755106a4b0445221a19761e746984.tar.gz ports-d4f0d0048a8755106a4b0445221a19761e746984.zip | |
- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.
Notes
Notes:
svn path=/head/; revision=191544
Diffstat (limited to 'devel/automake14')
| -rw-r--r-- | devel/automake14/Makefile | 6 | ||||
| -rw-r--r-- | devel/automake14/files/patch-aclocal.in | 17 |
2 files changed, 7 insertions, 16 deletions
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index a9b8bb00a4d6..fda87bb524d2 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.4.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -34,10 +34,6 @@ post-patch: @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake${BUILD_VERSION}.texi @${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true -pre-configure: - @${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \ - ${WRKSRC}/aclocal.in - pre-su-install: @${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION} @${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION} diff --git a/devel/automake14/files/patch-aclocal.in b/devel/automake14/files/patch-aclocal.in index 0e2c5263bc0e..49c6f2251c52 100644 --- a/devel/automake14/files/patch-aclocal.in +++ b/devel/automake14/files/patch-aclocal.in @@ -1,16 +1,11 @@ --- aclocal.in.orig Thu Jul 25 09:51:42 2002 -+++ aclocal.in Fri May 14 09:40:13 2004 -@@ -36,3 +36,4 @@ ++++ 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"; -+$acdir_x11 = '%%X11BASE%%/share/aclocal'; $default_acdir = $acdir; -@@ -111,2 +112,3 @@ - local (@dirlist) = &parse_arguments (@ARGV); -+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; - &scan_m4_files (@dirlist); -@@ -200,8 +202,2 @@ +@@ -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 @@ -19,16 +14,16 @@ - if $acdir eq $default_acdir; - # By default $(datadir)/aclocal doesn't exist. We don't want to -@@ -296,2 +292,3 @@ +@@ -296,2 +290,3 @@ + local (@skipinolist) = (); local ($m4dir); -@@ -301,3 +298,3 @@ +@@ -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 +308,8 @@ +@@ -311,2 +306,8 @@ $fullfile = $m4dir . '/' . $file; + + # Do not scan a file more than once. |