Install the executables with version numbers, to allow SWIG-dependent

ports to specify the version of SWIG to use.

10 files changed, 67 insertions, 35 deletions

diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index 160aad785fdf..25acdd95a647 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:    SWIG
-# Date created:         19 April 1996
-# Whom:                 jkh
+# New ports collection makefile for:	SWIG
+# Date created:			19 April 1996
+# Whom:				jkh
 #
 # $FreeBSD$
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3a5
-PORTREVISION=	1
+PORTVERSION=	${VER}a5
+PORTREVISION=	2
 CATEGORIES=	devel perl5 python ruby tcl82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
@@ -20,6 +20,8 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR} \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
+VER=		1.3
+
 USE_PERL5=	yes
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
@@ -30,7 +32,10 @@ WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-ALL_TARGET=     swig runtime
-PLIST_SUB+=     VER="1.3"
+ALL_TARGET=	swig runtime
+PLIST_SUB=	VER="${VER}"
+
+post-install:
+	${LN} ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.mk>
diff --git a/devel/SWIG-devel/pkg-plist b/devel/SWIG-devel/pkg-plist
index 80dc5f4a32ad..c5079e302b63 100644
--- a/devel/SWIG-devel/pkg-plist
+++ b/devel/SWIG-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/swig
+bin/swig%%VER%%
 lib/libswigpl.a
 lib/libswigpl.la
 lib/libswigpl.so
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index 0100895d5975..a6ab3e5328d1 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:    SWIG
-# Date created:         19 April 1996
-# Whom:                 jkh
+# New ports collection makefile for:	SWIG
+# Date created:			19 April 1996
+# Whom:				jkh
 #
 # $FreeBSD$
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.1p5
-PORTREVISION=	2
+PORTVERSION=	${VER}p5
+PORTREVISION=	3
 CATEGORIES=	devel perl5 python tcl82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.rge.com/pub/languages/swig/1.1/ \
+		ftp://ftp.rge.com/pub/languages/swig/${VER}/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -20,17 +20,23 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR} \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
+VER=		1.1
+
 USE_PERL5=	yes
 PYTHON_VERSION?=	python1.5
 PYTHON_NO_DEPENDS?=	yes
 INSTALLS_SHLIB=	yes
+
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-
 ALL_TARGET=	all runtime
 
 MAN1=		swig.1
+PLIST_SUB=	VER="${VER}"
+
+post-install:
+	${LN} ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.mk>
diff --git a/devel/SWIG/pkg-plist b/devel/SWIG/pkg-plist
index fdd86265c9a0..027e80ca4830 100644
--- a/devel/SWIG/pkg-plist
+++ b/devel/SWIG/pkg-plist
@@ -1,4 +1,5 @@
 bin/swig
+bin/swig%%VER%%
 lib/libswig.a
 lib/libswigpl.a
 lib/libswigpy.a
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index 0100895d5975..a6ab3e5328d1 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:    SWIG
-# Date created:         19 April 1996
-# Whom:                 jkh
+# New ports collection makefile for:	SWIG
+# Date created:			19 April 1996
+# Whom:				jkh
 #
 # $FreeBSD$
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.1p5
-PORTREVISION=	2
+PORTVERSION=	${VER}p5
+PORTREVISION=	3
 CATEGORIES=	devel perl5 python tcl82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.rge.com/pub/languages/swig/1.1/ \
+		ftp://ftp.rge.com/pub/languages/swig/${VER}/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -20,17 +20,23 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR} \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
+VER=		1.1
+
 USE_PERL5=	yes
 PYTHON_VERSION?=	python1.5
 PYTHON_NO_DEPENDS?=	yes
 INSTALLS_SHLIB=	yes
+
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-
 ALL_TARGET=	all runtime
 
 MAN1=		swig.1
+PLIST_SUB=	VER="${VER}"
+
+post-install:
+	${LN} ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.mk>
diff --git a/devel/swig11/pkg-plist b/devel/swig11/pkg-plist
index fdd86265c9a0..027e80ca4830 100644
--- a/devel/swig11/pkg-plist
+++ b/devel/swig11/pkg-plist
@@ -1,4 +1,5 @@
 bin/swig
+bin/swig%%VER%%
 lib/libswig.a
 lib/libswigpl.a
 lib/libswigpy.a
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 160aad785fdf..25acdd95a647 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:    SWIG
-# Date created:         19 April 1996
-# Whom:                 jkh
+# New ports collection makefile for:	SWIG
+# Date created:			19 April 1996
+# Whom:				jkh
 #
 # $FreeBSD$
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3a5
-PORTREVISION=	1
+PORTVERSION=	${VER}a5
+PORTREVISION=	2
 CATEGORIES=	devel perl5 python ruby tcl82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
@@ -20,6 +20,8 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR} \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
+VER=		1.3
+
 USE_PERL5=	yes
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
@@ -30,7 +32,10 @@ WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-ALL_TARGET=     swig runtime
-PLIST_SUB+=     VER="1.3"
+ALL_TARGET=	swig runtime
+PLIST_SUB=	VER="${VER}"
+
+post-install:
+	${LN} ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.mk>
diff --git a/devel/swig13/pkg-plist b/devel/swig13/pkg-plist
index 80dc5f4a32ad..c5079e302b63 100644
--- a/devel/swig13/pkg-plist
+++ b/devel/swig13/pkg-plist
@@ -1,4 +1,5 @@
 bin/swig
+bin/swig%%VER%%
 lib/libswigpl.a
 lib/libswigpl.la
 lib/libswigpl.so
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 160aad785fdf..25acdd95a647 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:    SWIG
-# Date created:         19 April 1996
-# Whom:                 jkh
+# New ports collection makefile for:	SWIG
+# Date created:			19 April 1996
+# Whom:				jkh
 #
 # $FreeBSD$
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3a5
-PORTREVISION=	1
+PORTVERSION=	${VER}a5
+PORTREVISION=	2
 CATEGORIES=	devel perl5 python ruby tcl82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
@@ -20,6 +20,8 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${PYTHON_CMD}:${PYTHON_PORTSDIR} \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
+VER=		1.3
+
 USE_PERL5=	yes
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
@@ -30,7 +32,10 @@ WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-ALL_TARGET=     swig runtime
-PLIST_SUB+=     VER="1.3"
+ALL_TARGET=	swig runtime
+PLIST_SUB=	VER="${VER}"
+
+post-install:
+	${LN} ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.mk>
diff --git a/devel/swig20/pkg-plist b/devel/swig20/pkg-plist
index 80dc5f4a32ad..c5079e302b63 100644
--- a/devel/swig20/pkg-plist
+++ b/devel/swig20/pkg-plist
@@ -1,4 +1,5 @@
 bin/swig
+bin/swig%%VER%%
 lib/libswigpl.a
 lib/libswigpl.la
 lib/libswigpl.so