2 files changed, 44 insertions, 42 deletions

diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile
index 154c7665074d..6b7d64ca69c8 100644
--- a/devel/libtool13/Makefile
+++ b/devel/libtool13/Makefile
@@ -15,11 +15,13 @@ DISTNAME=	libtool-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 COMMENT=	Generic shared library support script
 
-LATEST_LINK=	libtool13
+BUILD_VERSION=	13
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	libtool${BUILD_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-ltdl-install \
-		--program-suffix=13
-CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool13
+		--program-suffix=${BUILD_VERSION}
+CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
 USE_REINPLACE=	yes
 
 .if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
@@ -33,22 +35,22 @@ pre-everything:
 .endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
 
 post-extract:
-	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool13.m4
-	@${REINPLACE_CMD} -e 's|libtool.m4|libtool13.m4|g' \
+	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool${BUILD_VERSION}.m4
+	@${REINPLACE_CMD} -e 's|libtool.m4|libtool${BUILD_VERSION}.m4|g' \
 			  ${WRKSRC}/Makefile.in
-	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool13.info
-	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool13.texi
+	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool${BUILD_VERSION}.info
+	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool${BUILD_VERSION}.texi
 
 post-install:
-	@-${RM} -fr ${PREFIX}/libexec/libtool13
-	${MKDIR} ${PREFIX}/libexec/libtool13
+	@-${RM} -fr ${PREFIX}/libexec/libtool${BUILD_VERSION}
+	${MKDIR} ${PREFIX}/libexec/libtool${BUILD_VERSION}
 .for i in libtool libtoolize
-	${LN} -sf ${PREFIX}/bin/${i}13 ${PREFIX}/libexec/libtool13/${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/libtool13/${i}13 ${PREFIX}/share/libtool13/${i}
+	${MV} ${PREFIX}/share/libtool${BUILD_VERSION}/${i}${BUILD_VERSION} ${PREFIX}/share/libtool${BUILD_VERSION}/${i}
 .endfor
-	${LN} -sf ${PREFIX}/share/libtool13/ltconfig13 \
-		${PREFIX}/share/libtool13/ltconfig
+	${LN} -sf ${PREFIX}/share/libtool${BUILD_VERSION}/ltconfig${BUILD_VERSION} \
+		${PREFIX}/share/libtool${BUILD_VERSION}/ltconfig
 
 .include <bsd.port.mk>
diff --git a/devel/libtool13/pkg-plist b/devel/libtool13/pkg-plist
index 6ec0729c163b..c134b400c0dc 100644
--- a/devel/libtool13/pkg-plist
+++ b/devel/libtool13/pkg-plist
@@ -1,30 +1,30 @@
 @comment $FreeBSD$
-bin/libtool13
-bin/libtoolize13
-libexec/libtool13/libtool
-libexec/libtool13/libtoolize
-@unexec install-info --delete %D/info/libtool13.info %D/info/dir
-info/libtool13.info
-@exec install-info %D/info/libtool13.info %D/info/dir
-share/aclocal/libtool13.m4
-share/libtool13/config.guess
-share/libtool13/config.sub
-share/libtool13/libltdl/README
-share/libtool13/libltdl/stamp-h.in
-share/libtool13/libltdl/COPYING.LIB
-share/libtool13/libltdl/Makefile.am
-share/libtool13/libltdl/Makefile.in
-share/libtool13/libltdl/acconfig.h
-share/libtool13/libltdl/acinclude.m4
-share/libtool13/libltdl/aclocal.m4
-share/libtool13/libltdl/config.h.in
-share/libtool13/libltdl/configure
-share/libtool13/libltdl/configure.in
-share/libtool13/libltdl/ltdl.c
-share/libtool13/libltdl/ltdl.h
-share/libtool13/ltconfig
-share/libtool13/ltconfig13
-share/libtool13/ltmain.sh
-@dirrm share/libtool13/libltdl
-@dirrm share/libtool13
-@dirrm libexec/libtool13
+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/libtool%%BUILD_VERSION%%/config.guess
+share/libtool%%BUILD_VERSION%%/config.sub
+share/libtool%%BUILD_VERSION%%/libltdl/README
+share/libtool%%BUILD_VERSION%%/libltdl/stamp-h.in
+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/acconfig.h
+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%%/ltconfig
+share/libtool%%BUILD_VERSION%%/ltconfig%%BUILD_VERSION%%
+share/libtool%%BUILD_VERSION%%/ltmain.sh
+@dirrm share/libtool%%BUILD_VERSION%%/libltdl
+@dirrm share/libtool%%BUILD_VERSION%%
+@dirrm libexec/libtool%%BUILD_VERSION%%