diff options
| author | ade <ade@FreeBSD.org> | 2004-07-30 03:24:26 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2004-07-30 03:24:26 +0800 |
| commit | 596b07969b74806f485a032bced33ebf9c2b776c (patch) | |
| tree | 8b020ce4f377543ffe04258149bfb03de12082ab | |
| parent | c0e1255de2c93bbfa65f0b06c7ad5eb6a0a877bb (diff) | |
| download | freebsd-ports-gnome-596b07969b74806f485a032bced33ebf9c2b776c.tar.gz freebsd-ports-gnome-596b07969b74806f485a032bced33ebf9c2b776c.tar.zst freebsd-ports-gnome-596b07969b74806f485a032bced33ebf9c2b776c.zip | |
Actually put in relevant symlinks to the versioned files in
${PREFIX}/bin to non-versioned files in ${PREFIX}/libexec/<autotool><ver>
so that the PATH magic in bsd.autotools.mk works correctly.
26 files changed, 192 insertions, 13 deletions
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile index d0acbc386f6f..dd8682bda78c 100644 --- a/devel/autoconf253/Makefile +++ b/devel/autoconf253/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.53 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -70,5 +70,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/autoconf253/pkg-plist b/devel/autoconf253/pkg-plist index 7524c36872cf..f73365c680b2 100644 --- a/devel/autoconf253/pkg-plist +++ b/devel/autoconf253/pkg-plist @@ -5,6 +5,12 @@ 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 @unexec install-info --delete %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @unexec install-info --delete %D/info/standards%%BUILD_VERSION%%.info %D/info/dir info/autoconf%%BUILD_VERSION%%.info @@ -60,3 +66,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile index 59de6f3d2905..c0abfdc5c25a 100644 --- a/devel/autoconf259/Makefile +++ b/devel/autoconf259/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -69,5 +69,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/autoconf259/pkg-plist b/devel/autoconf259/pkg-plist index c672876e59c4..2e8fa133b5a8 100644 --- a/devel/autoconf259/pkg-plist +++ b/devel/autoconf259/pkg-plist @@ -11,6 +11,12 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +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 @@ -62,3 +68,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile index 59de6f3d2905..c0abfdc5c25a 100644 --- a/devel/autoconf26/Makefile +++ b/devel/autoconf26/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -69,5 +69,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/autoconf26/pkg-plist b/devel/autoconf26/pkg-plist index c672876e59c4..2e8fa133b5a8 100644 --- a/devel/autoconf26/pkg-plist +++ b/devel/autoconf26/pkg-plist @@ -11,6 +11,12 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +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 @@ -62,3 +68,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile index 59de6f3d2905..c0abfdc5c25a 100644 --- a/devel/autoconf261/Makefile +++ b/devel/autoconf261/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -69,5 +69,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist index c672876e59c4..2e8fa133b5a8 100644 --- a/devel/autoconf261/pkg-plist +++ b/devel/autoconf261/pkg-plist @@ -11,6 +11,12 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +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 @@ -62,3 +68,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile index 59de6f3d2905..c0abfdc5c25a 100644 --- a/devel/autoconf262/Makefile +++ b/devel/autoconf262/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -69,5 +69,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist index c672876e59c4..2e8fa133b5a8 100644 --- a/devel/autoconf262/pkg-plist +++ b/devel/autoconf262/pkg-plist @@ -11,6 +11,12 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +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 @@ -62,3 +68,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile index 59de6f3d2905..c0abfdc5c25a 100644 --- a/devel/autoconf267/Makefile +++ b/devel/autoconf267/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -69,5 +69,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/autoconf267/pkg-plist b/devel/autoconf267/pkg-plist index c672876e59c4..2e8fa133b5a8 100644 --- a/devel/autoconf267/pkg-plist +++ b/devel/autoconf267/pkg-plist @@ -11,6 +11,12 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +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 @@ -62,3 +68,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile index 59de6f3d2905..c0abfdc5c25a 100644 --- a/devel/autoconf268/Makefile +++ b/devel/autoconf268/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -69,5 +69,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist index c672876e59c4..2e8fa133b5a8 100644 --- a/devel/autoconf268/pkg-plist +++ b/devel/autoconf268/pkg-plist @@ -11,6 +11,12 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +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 @@ -62,3 +68,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index 83d3bda39144..5cd9d41e31cc 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -48,4 +48,16 @@ post-patch: ) @${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in +pre-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 + .include <bsd.port.mk> diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist index 3865ef48b0ab..2e307b872175 100644 --- a/devel/automake110/pkg-plist +++ b/devel/automake110/pkg-plist @@ -3,6 +3,8 @@ bin/automake%%BUILD_VERSION%% @unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir info/automake%%BUILD_VERSION%%.info @exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +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 @@ -115,3 +117,4 @@ share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/automake%%BUILD_VERSION%%/Automake @dirrm share/automake%%BUILD_VERSION%%/am @dirrm share/automake%%BUILD_VERSION%% +@dirrm libexec/automake%%BUILD_VERSION%% diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile index 2ffb5beb986b..50e041575bc8 100644 --- a/devel/automake15/Makefile +++ b/devel/automake15/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} @@ -51,4 +51,16 @@ post-patch: s,%%X11BASE%%,${X11BASE},g' aclocal.in \ ) +pre-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 + .include <bsd.port.mk> diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist index f32c3bc2c0e4..1b3d20dc7e46 100644 --- a/devel/automake15/pkg-plist +++ b/devel/automake15/pkg-plist @@ -3,6 +3,8 @@ bin/automake%%BUILD_VERSION%% @unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir info/automake%%BUILD_VERSION%%.info @exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +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 @@ -92,3 +94,4 @@ share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/automake%%BUILD_VERSION%%/Automake @dirrm share/automake%%BUILD_VERSION%%/am @dirrm share/automake%%BUILD_VERSION%% +@dirrm libexec/automake%%BUILD_VERSION%% diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile index 83d3bda39144..5cd9d41e31cc 100644 --- a/devel/automake18/Makefile +++ b/devel/automake18/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -48,4 +48,16 @@ post-patch: ) @${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in +pre-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 + .include <bsd.port.mk> diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist index 3865ef48b0ab..2e307b872175 100644 --- a/devel/automake18/pkg-plist +++ b/devel/automake18/pkg-plist @@ -3,6 +3,8 @@ bin/automake%%BUILD_VERSION%% @unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir info/automake%%BUILD_VERSION%%.info @exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +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 @@ -115,3 +117,4 @@ share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/automake%%BUILD_VERSION%%/Automake @dirrm share/automake%%BUILD_VERSION%%/am @dirrm share/automake%%BUILD_VERSION%% +@dirrm libexec/automake%%BUILD_VERSION%% diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index 83d3bda39144..5cd9d41e31cc 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -48,4 +48,16 @@ post-patch: ) @${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in +pre-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 + .include <bsd.port.mk> diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist index 3865ef48b0ab..2e307b872175 100644 --- a/devel/automake19/pkg-plist +++ b/devel/automake19/pkg-plist @@ -3,6 +3,8 @@ bin/automake%%BUILD_VERSION%% @unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir info/automake%%BUILD_VERSION%%.info @exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +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 @@ -115,3 +117,4 @@ share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/automake%%BUILD_VERSION%%/Automake @dirrm share/automake%%BUILD_VERSION%%/am @dirrm share/automake%%BUILD_VERSION%% +@dirrm libexec/automake%%BUILD_VERSION%% diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile index 59de6f3d2905..c0abfdc5c25a 100644 --- a/devel/gnu-autoconf/Makefile +++ b/devel/gnu-autoconf/Makefile @@ -7,7 +7,7 @@ PORTNAME= autoconf PORTVERSION= 2.59 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf @@ -69,5 +69,11 @@ 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} +.endfor .include <bsd.port.mk> diff --git a/devel/gnu-autoconf/pkg-plist b/devel/gnu-autoconf/pkg-plist index c672876e59c4..2e8fa133b5a8 100644 --- a/devel/gnu-autoconf/pkg-plist +++ b/devel/gnu-autoconf/pkg-plist @@ -11,6 +11,12 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +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 @@ -62,3 +68,4 @@ share/autoconf%%BUILD_VERSION%%/mkinstalldirs @dirrm share/autoconf%%BUILD_VERSION%%/autoconf @dirrm share/autoconf%%BUILD_VERSION%%/Autom4te @dirrm share/autoconf%%BUILD_VERSION%% +@dirrm libexec/autoconf%%BUILD_VERSION%% diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile index 83d3bda39144..5cd9d41e31cc 100644 --- a/devel/gnu-automake/Makefile +++ b/devel/gnu-automake/Makefile @@ -7,7 +7,7 @@ PORTNAME= automake PORTVERSION= 1.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -48,4 +48,16 @@ post-patch: ) @${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in +pre-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 + .include <bsd.port.mk> diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist index 3865ef48b0ab..2e307b872175 100644 --- a/devel/gnu-automake/pkg-plist +++ b/devel/gnu-automake/pkg-plist @@ -3,6 +3,8 @@ bin/automake%%BUILD_VERSION%% @unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir info/automake%%BUILD_VERSION%%.info @exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +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 @@ -115,3 +117,4 @@ share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/automake%%BUILD_VERSION%%/Automake @dirrm share/automake%%BUILD_VERSION%%/am @dirrm share/automake%%BUILD_VERSION%% +@dirrm libexec/automake%%BUILD_VERSION%% |