Minor cosmetic changes to use a single BUILD_VERSION variable to

differentiate between versions in Makefile and PLIST

2 files changed, 42 insertions, 40 deletions

diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index dfb740c7ec71..d695e994da67 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -16,12 +16,14 @@ DISTNAME=	libtool-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 COMMENT?=	Generic shared library support script
 
-LATEST_LINK?=	libtool14
+BUILD_VERSION=	14
+LATEST_LINK?=	libtool${BUILD_VERSION}
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 GNU_CONFIGURE=	 yes
 CONFIGURE_ARGS?= --disable-ltdl-install
-CONFIGURE_ARGS+= --program-suffix=14
+CONFIGURE_ARGS+= --program-suffix=${BUILD_VERSION}
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool14
+CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
 USE_REINPLACE=	yes
 
 .if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
@@ -35,22 +37,22 @@ pre-everything:
 .endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
 
 post-extract:
-	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool14.m4
-	@${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl14.m4
-	@${REINPLACE_CMD} -e 's|libtool.m4|libtool14.m4|g' \
-			  -e 's|ltdl.m4|ltdl14.m4|g' ${WRKSRC}/Makefile.in
-	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool14.info
-	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool14.texi
+	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool${BUILD_VERSION}.m4
+	@${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl${BUILD_VERSION}.m4
+	@${REINPLACE_CMD} -e 's|libtool.m4|libtool${BUILD_VERSION}.m4|g' \
+			  -e 's|ltdl.m4|ltdl${BUILD_VERSION}.m4|g' ${WRKSRC}/Makefile.in
+	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool${BUILD_VERSION}.info
+	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool${BUILD_VERSION}.texi
 
 .if ${PORTNAME} == "libtool"
 post-install:
-	@-${RM} -fr ${PREFIX}/libexec/libtool14
-	${MKDIR} ${PREFIX}/libexec/libtool14
+	@-${RM} -fr ${PREFIX}/libexec/libtool${BUILD_VERSION}
+	${MKDIR} ${PREFIX}/libexec/libtool${BUILD_VERSION}
 .for i in libtool libtoolize
-	${LN} -sf ${PREFIX}/bin/${i}14 ${PREFIX}/libexec/libtool14/${i}
+	${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} ${PREFIX}/libexec/libtool${BUILD_VERSION}/${i}
 .endfor
 .for i in config.guess config.sub
-	${MV} ${PREFIX}/share/libtool14/${i}14 ${PREFIX}/share/libtool14/${i}
+	${MV} ${PREFIX}/share/libtool${BUILD_VERSION}/${i}${BUILD_VERSION} ${PREFIX}/share/libtool${BUILD_VERSION}/${i}
 .endfor
 .endif
 
diff --git a/devel/gnu-libtool/pkg-plist b/devel/gnu-libtool/pkg-plist
index c0510d95ad88..0c56408811f9 100644
--- a/devel/gnu-libtool/pkg-plist
+++ b/devel/gnu-libtool/pkg-plist
@@ -1,28 +1,28 @@
 @comment $FreeBSD$
-bin/libtool14
-bin/libtoolize14
-libexec/libtool14/libtool
-libexec/libtool14/libtoolize
-@unexec install-info --delete %D/info/libtool14.info %D/info/dir
-info/libtool14.info
-@exec install-info %D/info/libtool14.info %D/info/dir
-share/aclocal/libtool14.m4
-share/aclocal/ltdl14.m4
-share/libtool14/config.guess
-share/libtool14/config.sub
-share/libtool14/libltdl/COPYING.LIB
-share/libtool14/libltdl/Makefile.am
-share/libtool14/libltdl/Makefile.in
-share/libtool14/libltdl/README
-share/libtool14/libltdl/acinclude.m4
-share/libtool14/libltdl/aclocal.m4
-share/libtool14/libltdl/config-h.in
-share/libtool14/libltdl/configure
-share/libtool14/libltdl/configure.in
-share/libtool14/libltdl/ltdl.c
-share/libtool14/libltdl/ltdl.h
-share/libtool14/libltdl/stamp-h.in
-share/libtool14/ltmain.sh
-@dirrm share/libtool14/libltdl
-@dirrm share/libtool14
-@dirrm libexec/libtool14
+bin/libtool${BUILD_VERSION}
+bin/libtoolize${BUILD_VERSION}
+libexec/libtool${BUILD_VERSION}/libtool
+libexec/libtool${BUILD_VERSION}/libtoolize
+@unexec install-info --delete %D/info/libtool${BUILD_VERSION}.info %D/info/dir
+info/libtool${BUILD_VERSION}.info
+@exec install-info %D/info/libtool${BUILD_VERSION}.info %D/info/dir
+share/aclocal/libtool${BUILD_VERSION}.m4
+share/aclocal/ltdl${BUILD_VERSION}.m4
+share/libtool${BUILD_VERSION}/config.guess
+share/libtool${BUILD_VERSION}/config.sub
+share/libtool${BUILD_VERSION}/libltdl/COPYING.LIB
+share/libtool${BUILD_VERSION}/libltdl/Makefile.am
+share/libtool${BUILD_VERSION}/libltdl/Makefile.in
+share/libtool${BUILD_VERSION}/libltdl/README
+share/libtool${BUILD_VERSION}/libltdl/acinclude.m4
+share/libtool${BUILD_VERSION}/libltdl/aclocal.m4
+share/libtool${BUILD_VERSION}/libltdl/config-h.in
+share/libtool${BUILD_VERSION}/libltdl/configure
+share/libtool${BUILD_VERSION}/libltdl/configure.in
+share/libtool${BUILD_VERSION}/libltdl/ltdl.c
+share/libtool${BUILD_VERSION}/libltdl/ltdl.h
+share/libtool${BUILD_VERSION}/libltdl/stamp-h.in
+share/libtool${BUILD_VERSION}/ltmain.sh
+@dirrm share/libtool${BUILD_VERSION}/libltdl
+@dirrm share/libtool${BUILD_VERSION}
+@dirrm libexec/libtool${BUILD_VERSION}