Update to 1.3a2. Add SourceForge master sites. Remove now-irrelevant

patches.

15 files changed, 345 insertions, 425 deletions

diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index dc6517538347..a5dfd947b260 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.1p5
+PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=	ftp://ftp.rge.com/pub/languages/swig/1.1/ \
+MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
+		http://download.sourceforge.net/swig/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
@@ -18,13 +21,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	YES
-WRKSRC=		${WRKDIR}/SWIG1.1p5
-GNU_CONFIGURE=	YES
+WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
+USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-
-ALL_TARGET=	all runtime
-
-MAN1=		swig.1
-
+ALL_TARGET=     swig runtime
+PLIST_SUB+=     VER="1.3"
+		
 .include <bsd.port.mk>
diff --git a/devel/SWIG-devel/distinfo b/devel/SWIG-devel/distinfo
index 4fe25f39dd5c..3e87907d6fca 100644
--- a/devel/SWIG-devel/distinfo
+++ b/devel/SWIG-devel/distinfo
@@ -1,2 +1 @@
-MD5 (swig1.1p5.tar.gz) = 0626b69b2aa6814ca0c61d23a7f9df23
-MD5 (swig1.1p5.tar.gz) = 031ba4d12e2bb27dd2fad83ade749132
+MD5 (swig1.3a2.tar.gz) = ab606181bfcfe169e3de5993828c27a0
diff --git a/devel/SWIG-devel/pkg-plist b/devel/SWIG-devel/pkg-plist
index 3f8ff7c23de1..7d4c1458e78f 100644
--- a/devel/SWIG-devel/pkg-plist
+++ b/devel/SWIG-devel/pkg-plist
@@ -1,78 +1,62 @@
 bin/swig
-lib/libswig.a
+lib/swig%%VER%%/tcl/constarray.i
+lib/swig%%VER%%/tcl/consthash.i
+lib/swig%%VER%%/tcl/ptrlang.i
+lib/swig%%VER%%/tcl/tclsh.i
+lib/swig%%VER%%/tcl/typemaps.i
+lib/swig%%VER%%/tcl/wish.i
+lib/swig%%VER%%/tcl/object.swg
+lib/swig%%VER%%/tcl/swigtcl8.swg
+lib/swig%%VER%%/perl5/perlmain.i
+lib/swig%%VER%%/perl5/ptrlang.i
+lib/swig%%VER%%/perl5/typemaps.i
+lib/swig%%VER%%/perl5/headers.swg
+lib/swig%%VER%%/perl5/perl5.swg
+lib/swig%%VER%%/perl5/perl5mg.swg
+lib/swig%%VER%%/perl5/Makefile.pl
+lib/swig%%VER%%/python/embed.i
+lib/swig%%VER%%/python/embed13.i
+lib/swig%%VER%%/python/embed14.i
+lib/swig%%VER%%/python/embed15.i
+lib/swig%%VER%%/python/ptrlang.i
+lib/swig%%VER%%/python/typemaps.i
+lib/swig%%VER%%/python/typemaps_old.i
+lib/swig%%VER%%/python/defarg.swg
+lib/swig%%VER%%/python/python.swg
+lib/swig%%VER%%/guile/guilemain.i
+lib/swig%%VER%%/guile/interpreter.i
+lib/swig%%VER%%/guile/typemaps.i
+lib/swig%%VER%%/guile/guile.swg
+lib/swig%%VER%%/java/typemaps.i
+lib/swig%%VER%%/java/java.swg
+lib/swig%%VER%%/array.i
+lib/swig%%VER%%/autodoc.i
+lib/swig%%VER%%/carray.i
+lib/swig%%VER%%/constraints.i
+lib/swig%%VER%%/ctype.i
+lib/swig%%VER%%/exception.i
+lib/swig%%VER%%/malloc.i
+lib/swig%%VER%%/math.i
+lib/swig%%VER%%/memory.i
+lib/swig%%VER%%/objc.i
+lib/swig%%VER%%/pointer.i
+lib/swig%%VER%%/stdlib.i
+lib/swig%%VER%%/timers.i
+lib/swig%%VER%%/swigptr.swg
+lib/libswigtcl8.so
+lib/libswigtcl8.a
 lib/libswigpl.a
-lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.a
 lib/libswigpy.so
-include/swig.h
-lib/swig_lib/Makefile
-lib/swig_lib/array.i
-lib/swig_lib/autodoc.i
-lib/swig_lib/carray.i
-lib/swig_lib/constraints.i
-lib/swig_lib/ctype.i
-lib/swig_lib/exception.i
-lib/swig_lib/malloc.i
-lib/swig_lib/math.i
-lib/swig_lib/memory.i
-lib/swig_lib/objc.i
-lib/swig_lib/pointer.i
-lib/swig_lib/stdlib.i
-lib/swig_lib/timers.i
-lib/swig_lib/swigptr.swg
-lib/swig_lib/tcl/blt.i
-lib/swig_lib/tcl/expect.i
-lib/swig_lib/tcl/expectk.i
-lib/swig_lib/tcl/ish.i
-lib/swig_lib/tcl/itclsh.i
-lib/swig_lib/tcl/itkwish.i
-lib/swig_lib/tcl/iwish.i
-lib/swig_lib/tcl/ptrlang.i
-lib/swig_lib/tcl/tclsh.i
-lib/swig_lib/tcl/tix.i
-lib/swig_lib/tcl/typemaps.i
-lib/swig_lib/tcl/wish.i
-lib/swig_lib/tcl/class.swg
-lib/swig_lib/tcl/configcode.swg
-lib/swig_lib/tcl/constarray.i
-lib/swig_lib/tcl/consthash.i
-lib/swig_lib/tcl/delcmd.swg
-lib/swig_lib/tcl/delcmd8.swg
-lib/swig_lib/tcl/methodcmd.swg
-lib/swig_lib/tcl/methodcmd8.swg
-lib/swig_lib/tcl/objcmd.swg
-lib/swig_lib/tcl/objcmd8.swg
-lib/swig_lib/tcl/swigtcl.swg
-lib/swig_lib/tcl/tcl8ptr.swg
-lib/swig_lib/tcl/Makefile
-lib/swig_lib/perl4/userinit.i
-lib/swig_lib/perl5/perlmain.i
-lib/swig_lib/perl5/ptrlang.i
-lib/swig_lib/perl5/typemaps.i
-lib/swig_lib/perl5/perl5.swg
-lib/swig_lib/perl5/perl5mg.swg
-lib/swig_lib/perl5/perl5ptr.swg
-lib/swig_lib/perl5/Makefile
-lib/swig_lib/perl5/Makefile.pl
-lib/swig_lib/python/embed.i
-lib/swig_lib/python/embed13.i
-lib/swig_lib/python/embed14.i
-lib/swig_lib/python/embed15.i
-lib/swig_lib/python/ptrlang.i
-lib/swig_lib/python/typemaps.i
-lib/swig_lib/python/typemaps_old.i
-lib/swig_lib/python/defarg.swg
-lib/swig_lib/python/pyexp.swg
-lib/swig_lib/python/python.swg
-lib/swig_lib/python/Makefile
-lib/swig_lib/guile/guilemain.i
-lib/swig_lib/guile/interpreter.i
-lib/swig_lib/guile/guile.swg
-lib/swig_lib/config/swigptr.swg
-@dirrm lib/swig_lib/tcl
-@dirrm lib/swig_lib/perl4
-@dirrm lib/swig_lib/perl5
-@dirrm lib/swig_lib/python
-@dirrm lib/swig_lib/guile
-@dirrm lib/swig_lib/config
-@dirrm lib/swig_lib
+lib/libswigpl.la
+lib/libswigpy.la
+lib/libswigtcl8.la
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+@dirrm lib/swig%%VER%%/guile
+@dirrm lib/swig%%VER%%/java
+@dirrm lib/swig%%VER%%/python
+@dirrm lib/swig%%VER%%/perl5
+@dirrm lib/swig%%VER%%/tcl
+@dirrm lib/swig%%VER%%
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index dc6517538347..a5dfd947b260 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.1p5
+PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=	ftp://ftp.rge.com/pub/languages/swig/1.1/ \
+MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
+		http://download.sourceforge.net/swig/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
@@ -18,13 +21,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	YES
-WRKSRC=		${WRKDIR}/SWIG1.1p5
-GNU_CONFIGURE=	YES
+WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
+USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-
-ALL_TARGET=	all runtime
-
-MAN1=		swig.1
-
+ALL_TARGET=     swig runtime
+PLIST_SUB+=     VER="1.3"
+		
 .include <bsd.port.mk>
diff --git a/devel/SWIG/distinfo b/devel/SWIG/distinfo
index 4fe25f39dd5c..3e87907d6fca 100644
--- a/devel/SWIG/distinfo
+++ b/devel/SWIG/distinfo
@@ -1,2 +1 @@
-MD5 (swig1.1p5.tar.gz) = 0626b69b2aa6814ca0c61d23a7f9df23
-MD5 (swig1.1p5.tar.gz) = 031ba4d12e2bb27dd2fad83ade749132
+MD5 (swig1.3a2.tar.gz) = ab606181bfcfe169e3de5993828c27a0
diff --git a/devel/SWIG/pkg-plist b/devel/SWIG/pkg-plist
index 3f8ff7c23de1..7d4c1458e78f 100644
--- a/devel/SWIG/pkg-plist
+++ b/devel/SWIG/pkg-plist
@@ -1,78 +1,62 @@
 bin/swig
-lib/libswig.a
+lib/swig%%VER%%/tcl/constarray.i
+lib/swig%%VER%%/tcl/consthash.i
+lib/swig%%VER%%/tcl/ptrlang.i
+lib/swig%%VER%%/tcl/tclsh.i
+lib/swig%%VER%%/tcl/typemaps.i
+lib/swig%%VER%%/tcl/wish.i
+lib/swig%%VER%%/tcl/object.swg
+lib/swig%%VER%%/tcl/swigtcl8.swg
+lib/swig%%VER%%/perl5/perlmain.i
+lib/swig%%VER%%/perl5/ptrlang.i
+lib/swig%%VER%%/perl5/typemaps.i
+lib/swig%%VER%%/perl5/headers.swg
+lib/swig%%VER%%/perl5/perl5.swg
+lib/swig%%VER%%/perl5/perl5mg.swg
+lib/swig%%VER%%/perl5/Makefile.pl
+lib/swig%%VER%%/python/embed.i
+lib/swig%%VER%%/python/embed13.i
+lib/swig%%VER%%/python/embed14.i
+lib/swig%%VER%%/python/embed15.i
+lib/swig%%VER%%/python/ptrlang.i
+lib/swig%%VER%%/python/typemaps.i
+lib/swig%%VER%%/python/typemaps_old.i
+lib/swig%%VER%%/python/defarg.swg
+lib/swig%%VER%%/python/python.swg
+lib/swig%%VER%%/guile/guilemain.i
+lib/swig%%VER%%/guile/interpreter.i
+lib/swig%%VER%%/guile/typemaps.i
+lib/swig%%VER%%/guile/guile.swg
+lib/swig%%VER%%/java/typemaps.i
+lib/swig%%VER%%/java/java.swg
+lib/swig%%VER%%/array.i
+lib/swig%%VER%%/autodoc.i
+lib/swig%%VER%%/carray.i
+lib/swig%%VER%%/constraints.i
+lib/swig%%VER%%/ctype.i
+lib/swig%%VER%%/exception.i
+lib/swig%%VER%%/malloc.i
+lib/swig%%VER%%/math.i
+lib/swig%%VER%%/memory.i
+lib/swig%%VER%%/objc.i
+lib/swig%%VER%%/pointer.i
+lib/swig%%VER%%/stdlib.i
+lib/swig%%VER%%/timers.i
+lib/swig%%VER%%/swigptr.swg
+lib/libswigtcl8.so
+lib/libswigtcl8.a
 lib/libswigpl.a
-lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.a
 lib/libswigpy.so
-include/swig.h
-lib/swig_lib/Makefile
-lib/swig_lib/array.i
-lib/swig_lib/autodoc.i
-lib/swig_lib/carray.i
-lib/swig_lib/constraints.i
-lib/swig_lib/ctype.i
-lib/swig_lib/exception.i
-lib/swig_lib/malloc.i
-lib/swig_lib/math.i
-lib/swig_lib/memory.i
-lib/swig_lib/objc.i
-lib/swig_lib/pointer.i
-lib/swig_lib/stdlib.i
-lib/swig_lib/timers.i
-lib/swig_lib/swigptr.swg
-lib/swig_lib/tcl/blt.i
-lib/swig_lib/tcl/expect.i
-lib/swig_lib/tcl/expectk.i
-lib/swig_lib/tcl/ish.i
-lib/swig_lib/tcl/itclsh.i
-lib/swig_lib/tcl/itkwish.i
-lib/swig_lib/tcl/iwish.i
-lib/swig_lib/tcl/ptrlang.i
-lib/swig_lib/tcl/tclsh.i
-lib/swig_lib/tcl/tix.i
-lib/swig_lib/tcl/typemaps.i
-lib/swig_lib/tcl/wish.i
-lib/swig_lib/tcl/class.swg
-lib/swig_lib/tcl/configcode.swg
-lib/swig_lib/tcl/constarray.i
-lib/swig_lib/tcl/consthash.i
-lib/swig_lib/tcl/delcmd.swg
-lib/swig_lib/tcl/delcmd8.swg
-lib/swig_lib/tcl/methodcmd.swg
-lib/swig_lib/tcl/methodcmd8.swg
-lib/swig_lib/tcl/objcmd.swg
-lib/swig_lib/tcl/objcmd8.swg
-lib/swig_lib/tcl/swigtcl.swg
-lib/swig_lib/tcl/tcl8ptr.swg
-lib/swig_lib/tcl/Makefile
-lib/swig_lib/perl4/userinit.i
-lib/swig_lib/perl5/perlmain.i
-lib/swig_lib/perl5/ptrlang.i
-lib/swig_lib/perl5/typemaps.i
-lib/swig_lib/perl5/perl5.swg
-lib/swig_lib/perl5/perl5mg.swg
-lib/swig_lib/perl5/perl5ptr.swg
-lib/swig_lib/perl5/Makefile
-lib/swig_lib/perl5/Makefile.pl
-lib/swig_lib/python/embed.i
-lib/swig_lib/python/embed13.i
-lib/swig_lib/python/embed14.i
-lib/swig_lib/python/embed15.i
-lib/swig_lib/python/ptrlang.i
-lib/swig_lib/python/typemaps.i
-lib/swig_lib/python/typemaps_old.i
-lib/swig_lib/python/defarg.swg
-lib/swig_lib/python/pyexp.swg
-lib/swig_lib/python/python.swg
-lib/swig_lib/python/Makefile
-lib/swig_lib/guile/guilemain.i
-lib/swig_lib/guile/interpreter.i
-lib/swig_lib/guile/guile.swg
-lib/swig_lib/config/swigptr.swg
-@dirrm lib/swig_lib/tcl
-@dirrm lib/swig_lib/perl4
-@dirrm lib/swig_lib/perl5
-@dirrm lib/swig_lib/python
-@dirrm lib/swig_lib/guile
-@dirrm lib/swig_lib/config
-@dirrm lib/swig_lib
+lib/libswigpl.la
+lib/libswigpy.la
+lib/libswigtcl8.la
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+@dirrm lib/swig%%VER%%/guile
+@dirrm lib/swig%%VER%%/java
+@dirrm lib/swig%%VER%%/python
+@dirrm lib/swig%%VER%%/perl5
+@dirrm lib/swig%%VER%%/tcl
+@dirrm lib/swig%%VER%%
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index dc6517538347..a5dfd947b260 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.1p5
+PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=	ftp://ftp.rge.com/pub/languages/swig/1.1/ \
+MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
+		http://download.sourceforge.net/swig/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
@@ -18,13 +21,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	YES
-WRKSRC=		${WRKDIR}/SWIG1.1p5
-GNU_CONFIGURE=	YES
+WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
+USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-
-ALL_TARGET=	all runtime
-
-MAN1=		swig.1
-
+ALL_TARGET=     swig runtime
+PLIST_SUB+=     VER="1.3"
+		
 .include <bsd.port.mk>
diff --git a/devel/swig11/distinfo b/devel/swig11/distinfo
index 4fe25f39dd5c..3e87907d6fca 100644
--- a/devel/swig11/distinfo
+++ b/devel/swig11/distinfo
@@ -1,2 +1 @@
-MD5 (swig1.1p5.tar.gz) = 0626b69b2aa6814ca0c61d23a7f9df23
-MD5 (swig1.1p5.tar.gz) = 031ba4d12e2bb27dd2fad83ade749132
+MD5 (swig1.3a2.tar.gz) = ab606181bfcfe169e3de5993828c27a0
diff --git a/devel/swig11/pkg-plist b/devel/swig11/pkg-plist
index 3f8ff7c23de1..7d4c1458e78f 100644
--- a/devel/swig11/pkg-plist
+++ b/devel/swig11/pkg-plist
@@ -1,78 +1,62 @@
 bin/swig
-lib/libswig.a
+lib/swig%%VER%%/tcl/constarray.i
+lib/swig%%VER%%/tcl/consthash.i
+lib/swig%%VER%%/tcl/ptrlang.i
+lib/swig%%VER%%/tcl/tclsh.i
+lib/swig%%VER%%/tcl/typemaps.i
+lib/swig%%VER%%/tcl/wish.i
+lib/swig%%VER%%/tcl/object.swg
+lib/swig%%VER%%/tcl/swigtcl8.swg
+lib/swig%%VER%%/perl5/perlmain.i
+lib/swig%%VER%%/perl5/ptrlang.i
+lib/swig%%VER%%/perl5/typemaps.i
+lib/swig%%VER%%/perl5/headers.swg
+lib/swig%%VER%%/perl5/perl5.swg
+lib/swig%%VER%%/perl5/perl5mg.swg
+lib/swig%%VER%%/perl5/Makefile.pl
+lib/swig%%VER%%/python/embed.i
+lib/swig%%VER%%/python/embed13.i
+lib/swig%%VER%%/python/embed14.i
+lib/swig%%VER%%/python/embed15.i
+lib/swig%%VER%%/python/ptrlang.i
+lib/swig%%VER%%/python/typemaps.i
+lib/swig%%VER%%/python/typemaps_old.i
+lib/swig%%VER%%/python/defarg.swg
+lib/swig%%VER%%/python/python.swg
+lib/swig%%VER%%/guile/guilemain.i
+lib/swig%%VER%%/guile/interpreter.i
+lib/swig%%VER%%/guile/typemaps.i
+lib/swig%%VER%%/guile/guile.swg
+lib/swig%%VER%%/java/typemaps.i
+lib/swig%%VER%%/java/java.swg
+lib/swig%%VER%%/array.i
+lib/swig%%VER%%/autodoc.i
+lib/swig%%VER%%/carray.i
+lib/swig%%VER%%/constraints.i
+lib/swig%%VER%%/ctype.i
+lib/swig%%VER%%/exception.i
+lib/swig%%VER%%/malloc.i
+lib/swig%%VER%%/math.i
+lib/swig%%VER%%/memory.i
+lib/swig%%VER%%/objc.i
+lib/swig%%VER%%/pointer.i
+lib/swig%%VER%%/stdlib.i
+lib/swig%%VER%%/timers.i
+lib/swig%%VER%%/swigptr.swg
+lib/libswigtcl8.so
+lib/libswigtcl8.a
 lib/libswigpl.a
-lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.a
 lib/libswigpy.so
-include/swig.h
-lib/swig_lib/Makefile
-lib/swig_lib/array.i
-lib/swig_lib/autodoc.i
-lib/swig_lib/carray.i
-lib/swig_lib/constraints.i
-lib/swig_lib/ctype.i
-lib/swig_lib/exception.i
-lib/swig_lib/malloc.i
-lib/swig_lib/math.i
-lib/swig_lib/memory.i
-lib/swig_lib/objc.i
-lib/swig_lib/pointer.i
-lib/swig_lib/stdlib.i
-lib/swig_lib/timers.i
-lib/swig_lib/swigptr.swg
-lib/swig_lib/tcl/blt.i
-lib/swig_lib/tcl/expect.i
-lib/swig_lib/tcl/expectk.i
-lib/swig_lib/tcl/ish.i
-lib/swig_lib/tcl/itclsh.i
-lib/swig_lib/tcl/itkwish.i
-lib/swig_lib/tcl/iwish.i
-lib/swig_lib/tcl/ptrlang.i
-lib/swig_lib/tcl/tclsh.i
-lib/swig_lib/tcl/tix.i
-lib/swig_lib/tcl/typemaps.i
-lib/swig_lib/tcl/wish.i
-lib/swig_lib/tcl/class.swg
-lib/swig_lib/tcl/configcode.swg
-lib/swig_lib/tcl/constarray.i
-lib/swig_lib/tcl/consthash.i
-lib/swig_lib/tcl/delcmd.swg
-lib/swig_lib/tcl/delcmd8.swg
-lib/swig_lib/tcl/methodcmd.swg
-lib/swig_lib/tcl/methodcmd8.swg
-lib/swig_lib/tcl/objcmd.swg
-lib/swig_lib/tcl/objcmd8.swg
-lib/swig_lib/tcl/swigtcl.swg
-lib/swig_lib/tcl/tcl8ptr.swg
-lib/swig_lib/tcl/Makefile
-lib/swig_lib/perl4/userinit.i
-lib/swig_lib/perl5/perlmain.i
-lib/swig_lib/perl5/ptrlang.i
-lib/swig_lib/perl5/typemaps.i
-lib/swig_lib/perl5/perl5.swg
-lib/swig_lib/perl5/perl5mg.swg
-lib/swig_lib/perl5/perl5ptr.swg
-lib/swig_lib/perl5/Makefile
-lib/swig_lib/perl5/Makefile.pl
-lib/swig_lib/python/embed.i
-lib/swig_lib/python/embed13.i
-lib/swig_lib/python/embed14.i
-lib/swig_lib/python/embed15.i
-lib/swig_lib/python/ptrlang.i
-lib/swig_lib/python/typemaps.i
-lib/swig_lib/python/typemaps_old.i
-lib/swig_lib/python/defarg.swg
-lib/swig_lib/python/pyexp.swg
-lib/swig_lib/python/python.swg
-lib/swig_lib/python/Makefile
-lib/swig_lib/guile/guilemain.i
-lib/swig_lib/guile/interpreter.i
-lib/swig_lib/guile/guile.swg
-lib/swig_lib/config/swigptr.swg
-@dirrm lib/swig_lib/tcl
-@dirrm lib/swig_lib/perl4
-@dirrm lib/swig_lib/perl5
-@dirrm lib/swig_lib/python
-@dirrm lib/swig_lib/guile
-@dirrm lib/swig_lib/config
-@dirrm lib/swig_lib
+lib/libswigpl.la
+lib/libswigpy.la
+lib/libswigtcl8.la
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+@dirrm lib/swig%%VER%%/guile
+@dirrm lib/swig%%VER%%/java
+@dirrm lib/swig%%VER%%/python
+@dirrm lib/swig%%VER%%/perl5
+@dirrm lib/swig%%VER%%/tcl
+@dirrm lib/swig%%VER%%
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index dc6517538347..a5dfd947b260 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.1p5
+PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=	ftp://ftp.rge.com/pub/languages/swig/1.1/ \
+MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
+		http://download.sourceforge.net/swig/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
@@ -18,13 +21,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	YES
-WRKSRC=		${WRKDIR}/SWIG1.1p5
-GNU_CONFIGURE=	YES
+WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
+USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-
-ALL_TARGET=	all runtime
-
-MAN1=		swig.1
-
+ALL_TARGET=     swig runtime
+PLIST_SUB+=     VER="1.3"
+		
 .include <bsd.port.mk>
diff --git a/devel/swig13/distinfo b/devel/swig13/distinfo
index 4fe25f39dd5c..3e87907d6fca 100644
--- a/devel/swig13/distinfo
+++ b/devel/swig13/distinfo
@@ -1,2 +1 @@
-MD5 (swig1.1p5.tar.gz) = 0626b69b2aa6814ca0c61d23a7f9df23
-MD5 (swig1.1p5.tar.gz) = 031ba4d12e2bb27dd2fad83ade749132
+MD5 (swig1.3a2.tar.gz) = ab606181bfcfe169e3de5993828c27a0
diff --git a/devel/swig13/pkg-plist b/devel/swig13/pkg-plist
index 3f8ff7c23de1..7d4c1458e78f 100644
--- a/devel/swig13/pkg-plist
+++ b/devel/swig13/pkg-plist
@@ -1,78 +1,62 @@
 bin/swig
-lib/libswig.a
+lib/swig%%VER%%/tcl/constarray.i
+lib/swig%%VER%%/tcl/consthash.i
+lib/swig%%VER%%/tcl/ptrlang.i
+lib/swig%%VER%%/tcl/tclsh.i
+lib/swig%%VER%%/tcl/typemaps.i
+lib/swig%%VER%%/tcl/wish.i
+lib/swig%%VER%%/tcl/object.swg
+lib/swig%%VER%%/tcl/swigtcl8.swg
+lib/swig%%VER%%/perl5/perlmain.i
+lib/swig%%VER%%/perl5/ptrlang.i
+lib/swig%%VER%%/perl5/typemaps.i
+lib/swig%%VER%%/perl5/headers.swg
+lib/swig%%VER%%/perl5/perl5.swg
+lib/swig%%VER%%/perl5/perl5mg.swg
+lib/swig%%VER%%/perl5/Makefile.pl
+lib/swig%%VER%%/python/embed.i
+lib/swig%%VER%%/python/embed13.i
+lib/swig%%VER%%/python/embed14.i
+lib/swig%%VER%%/python/embed15.i
+lib/swig%%VER%%/python/ptrlang.i
+lib/swig%%VER%%/python/typemaps.i
+lib/swig%%VER%%/python/typemaps_old.i
+lib/swig%%VER%%/python/defarg.swg
+lib/swig%%VER%%/python/python.swg
+lib/swig%%VER%%/guile/guilemain.i
+lib/swig%%VER%%/guile/interpreter.i
+lib/swig%%VER%%/guile/typemaps.i
+lib/swig%%VER%%/guile/guile.swg
+lib/swig%%VER%%/java/typemaps.i
+lib/swig%%VER%%/java/java.swg
+lib/swig%%VER%%/array.i
+lib/swig%%VER%%/autodoc.i
+lib/swig%%VER%%/carray.i
+lib/swig%%VER%%/constraints.i
+lib/swig%%VER%%/ctype.i
+lib/swig%%VER%%/exception.i
+lib/swig%%VER%%/malloc.i
+lib/swig%%VER%%/math.i
+lib/swig%%VER%%/memory.i
+lib/swig%%VER%%/objc.i
+lib/swig%%VER%%/pointer.i
+lib/swig%%VER%%/stdlib.i
+lib/swig%%VER%%/timers.i
+lib/swig%%VER%%/swigptr.swg
+lib/libswigtcl8.so
+lib/libswigtcl8.a
 lib/libswigpl.a
-lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.a
 lib/libswigpy.so
-include/swig.h
-lib/swig_lib/Makefile
-lib/swig_lib/array.i
-lib/swig_lib/autodoc.i
-lib/swig_lib/carray.i
-lib/swig_lib/constraints.i
-lib/swig_lib/ctype.i
-lib/swig_lib/exception.i
-lib/swig_lib/malloc.i
-lib/swig_lib/math.i
-lib/swig_lib/memory.i
-lib/swig_lib/objc.i
-lib/swig_lib/pointer.i
-lib/swig_lib/stdlib.i
-lib/swig_lib/timers.i
-lib/swig_lib/swigptr.swg
-lib/swig_lib/tcl/blt.i
-lib/swig_lib/tcl/expect.i
-lib/swig_lib/tcl/expectk.i
-lib/swig_lib/tcl/ish.i
-lib/swig_lib/tcl/itclsh.i
-lib/swig_lib/tcl/itkwish.i
-lib/swig_lib/tcl/iwish.i
-lib/swig_lib/tcl/ptrlang.i
-lib/swig_lib/tcl/tclsh.i
-lib/swig_lib/tcl/tix.i
-lib/swig_lib/tcl/typemaps.i
-lib/swig_lib/tcl/wish.i
-lib/swig_lib/tcl/class.swg
-lib/swig_lib/tcl/configcode.swg
-lib/swig_lib/tcl/constarray.i
-lib/swig_lib/tcl/consthash.i
-lib/swig_lib/tcl/delcmd.swg
-lib/swig_lib/tcl/delcmd8.swg
-lib/swig_lib/tcl/methodcmd.swg
-lib/swig_lib/tcl/methodcmd8.swg
-lib/swig_lib/tcl/objcmd.swg
-lib/swig_lib/tcl/objcmd8.swg
-lib/swig_lib/tcl/swigtcl.swg
-lib/swig_lib/tcl/tcl8ptr.swg
-lib/swig_lib/tcl/Makefile
-lib/swig_lib/perl4/userinit.i
-lib/swig_lib/perl5/perlmain.i
-lib/swig_lib/perl5/ptrlang.i
-lib/swig_lib/perl5/typemaps.i
-lib/swig_lib/perl5/perl5.swg
-lib/swig_lib/perl5/perl5mg.swg
-lib/swig_lib/perl5/perl5ptr.swg
-lib/swig_lib/perl5/Makefile
-lib/swig_lib/perl5/Makefile.pl
-lib/swig_lib/python/embed.i
-lib/swig_lib/python/embed13.i
-lib/swig_lib/python/embed14.i
-lib/swig_lib/python/embed15.i
-lib/swig_lib/python/ptrlang.i
-lib/swig_lib/python/typemaps.i
-lib/swig_lib/python/typemaps_old.i
-lib/swig_lib/python/defarg.swg
-lib/swig_lib/python/pyexp.swg
-lib/swig_lib/python/python.swg
-lib/swig_lib/python/Makefile
-lib/swig_lib/guile/guilemain.i
-lib/swig_lib/guile/interpreter.i
-lib/swig_lib/guile/guile.swg
-lib/swig_lib/config/swigptr.swg
-@dirrm lib/swig_lib/tcl
-@dirrm lib/swig_lib/perl4
-@dirrm lib/swig_lib/perl5
-@dirrm lib/swig_lib/python
-@dirrm lib/swig_lib/guile
-@dirrm lib/swig_lib/config
-@dirrm lib/swig_lib
+lib/libswigpl.la
+lib/libswigpy.la
+lib/libswigtcl8.la
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+@dirrm lib/swig%%VER%%/guile
+@dirrm lib/swig%%VER%%/java
+@dirrm lib/swig%%VER%%/python
+@dirrm lib/swig%%VER%%/perl5
+@dirrm lib/swig%%VER%%/tcl
+@dirrm lib/swig%%VER%%
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index dc6517538347..a5dfd947b260 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.1p5
+PORTVERSION=	1.3a2
 CATEGORIES=	devel python tcl82
-MASTER_SITES=	ftp://ftp.rge.com/pub/languages/swig/1.1/ \
+MASTER_SITES=   ftp://ftp.sourceforge.net/pub/sourceforge/swig/ \
+		http://download.sourceforge.net/swig/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.python.org/pub/python/contrib/System/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
@@ -18,13 +21,11 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	YES
-WRKSRC=		${WRKDIR}/SWIG1.1p5
-GNU_CONFIGURE=	YES
+WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
+USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
-
-ALL_TARGET=	all runtime
-
-MAN1=		swig.1
-
+ALL_TARGET=     swig runtime
+PLIST_SUB+=     VER="1.3"
+		
 .include <bsd.port.mk>
diff --git a/devel/swig20/distinfo b/devel/swig20/distinfo
index 4fe25f39dd5c..3e87907d6fca 100644
--- a/devel/swig20/distinfo
+++ b/devel/swig20/distinfo
@@ -1,2 +1 @@
-MD5 (swig1.1p5.tar.gz) = 0626b69b2aa6814ca0c61d23a7f9df23
-MD5 (swig1.1p5.tar.gz) = 031ba4d12e2bb27dd2fad83ade749132
+MD5 (swig1.3a2.tar.gz) = ab606181bfcfe169e3de5993828c27a0
diff --git a/devel/swig20/pkg-plist b/devel/swig20/pkg-plist
index 3f8ff7c23de1..7d4c1458e78f 100644
--- a/devel/swig20/pkg-plist
+++ b/devel/swig20/pkg-plist
@@ -1,78 +1,62 @@
 bin/swig
-lib/libswig.a
+lib/swig%%VER%%/tcl/constarray.i
+lib/swig%%VER%%/tcl/consthash.i
+lib/swig%%VER%%/tcl/ptrlang.i
+lib/swig%%VER%%/tcl/tclsh.i
+lib/swig%%VER%%/tcl/typemaps.i
+lib/swig%%VER%%/tcl/wish.i
+lib/swig%%VER%%/tcl/object.swg
+lib/swig%%VER%%/tcl/swigtcl8.swg
+lib/swig%%VER%%/perl5/perlmain.i
+lib/swig%%VER%%/perl5/ptrlang.i
+lib/swig%%VER%%/perl5/typemaps.i
+lib/swig%%VER%%/perl5/headers.swg
+lib/swig%%VER%%/perl5/perl5.swg
+lib/swig%%VER%%/perl5/perl5mg.swg
+lib/swig%%VER%%/perl5/Makefile.pl
+lib/swig%%VER%%/python/embed.i
+lib/swig%%VER%%/python/embed13.i
+lib/swig%%VER%%/python/embed14.i
+lib/swig%%VER%%/python/embed15.i
+lib/swig%%VER%%/python/ptrlang.i
+lib/swig%%VER%%/python/typemaps.i
+lib/swig%%VER%%/python/typemaps_old.i
+lib/swig%%VER%%/python/defarg.swg
+lib/swig%%VER%%/python/python.swg
+lib/swig%%VER%%/guile/guilemain.i
+lib/swig%%VER%%/guile/interpreter.i
+lib/swig%%VER%%/guile/typemaps.i
+lib/swig%%VER%%/guile/guile.swg
+lib/swig%%VER%%/java/typemaps.i
+lib/swig%%VER%%/java/java.swg
+lib/swig%%VER%%/array.i
+lib/swig%%VER%%/autodoc.i
+lib/swig%%VER%%/carray.i
+lib/swig%%VER%%/constraints.i
+lib/swig%%VER%%/ctype.i
+lib/swig%%VER%%/exception.i
+lib/swig%%VER%%/malloc.i
+lib/swig%%VER%%/math.i
+lib/swig%%VER%%/memory.i
+lib/swig%%VER%%/objc.i
+lib/swig%%VER%%/pointer.i
+lib/swig%%VER%%/stdlib.i
+lib/swig%%VER%%/timers.i
+lib/swig%%VER%%/swigptr.swg
+lib/libswigtcl8.so
+lib/libswigtcl8.a
 lib/libswigpl.a
-lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.a
 lib/libswigpy.so
-include/swig.h
-lib/swig_lib/Makefile
-lib/swig_lib/array.i
-lib/swig_lib/autodoc.i
-lib/swig_lib/carray.i
-lib/swig_lib/constraints.i
-lib/swig_lib/ctype.i
-lib/swig_lib/exception.i
-lib/swig_lib/malloc.i
-lib/swig_lib/math.i
-lib/swig_lib/memory.i
-lib/swig_lib/objc.i
-lib/swig_lib/pointer.i
-lib/swig_lib/stdlib.i
-lib/swig_lib/timers.i
-lib/swig_lib/swigptr.swg
-lib/swig_lib/tcl/blt.i
-lib/swig_lib/tcl/expect.i
-lib/swig_lib/tcl/expectk.i
-lib/swig_lib/tcl/ish.i
-lib/swig_lib/tcl/itclsh.i
-lib/swig_lib/tcl/itkwish.i
-lib/swig_lib/tcl/iwish.i
-lib/swig_lib/tcl/ptrlang.i
-lib/swig_lib/tcl/tclsh.i
-lib/swig_lib/tcl/tix.i
-lib/swig_lib/tcl/typemaps.i
-lib/swig_lib/tcl/wish.i
-lib/swig_lib/tcl/class.swg
-lib/swig_lib/tcl/configcode.swg
-lib/swig_lib/tcl/constarray.i
-lib/swig_lib/tcl/consthash.i
-lib/swig_lib/tcl/delcmd.swg
-lib/swig_lib/tcl/delcmd8.swg
-lib/swig_lib/tcl/methodcmd.swg
-lib/swig_lib/tcl/methodcmd8.swg
-lib/swig_lib/tcl/objcmd.swg
-lib/swig_lib/tcl/objcmd8.swg
-lib/swig_lib/tcl/swigtcl.swg
-lib/swig_lib/tcl/tcl8ptr.swg
-lib/swig_lib/tcl/Makefile
-lib/swig_lib/perl4/userinit.i
-lib/swig_lib/perl5/perlmain.i
-lib/swig_lib/perl5/ptrlang.i
-lib/swig_lib/perl5/typemaps.i
-lib/swig_lib/perl5/perl5.swg
-lib/swig_lib/perl5/perl5mg.swg
-lib/swig_lib/perl5/perl5ptr.swg
-lib/swig_lib/perl5/Makefile
-lib/swig_lib/perl5/Makefile.pl
-lib/swig_lib/python/embed.i
-lib/swig_lib/python/embed13.i
-lib/swig_lib/python/embed14.i
-lib/swig_lib/python/embed15.i
-lib/swig_lib/python/ptrlang.i
-lib/swig_lib/python/typemaps.i
-lib/swig_lib/python/typemaps_old.i
-lib/swig_lib/python/defarg.swg
-lib/swig_lib/python/pyexp.swg
-lib/swig_lib/python/python.swg
-lib/swig_lib/python/Makefile
-lib/swig_lib/guile/guilemain.i
-lib/swig_lib/guile/interpreter.i
-lib/swig_lib/guile/guile.swg
-lib/swig_lib/config/swigptr.swg
-@dirrm lib/swig_lib/tcl
-@dirrm lib/swig_lib/perl4
-@dirrm lib/swig_lib/perl5
-@dirrm lib/swig_lib/python
-@dirrm lib/swig_lib/guile
-@dirrm lib/swig_lib/config
-@dirrm lib/swig_lib
+lib/libswigpl.la
+lib/libswigpy.la
+lib/libswigtcl8.la
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
+@dirrm lib/swig%%VER%%/guile
+@dirrm lib/swig%%VER%%/java
+@dirrm lib/swig%%VER%%/python
+@dirrm lib/swig%%VER%%/perl5
+@dirrm lib/swig%%VER%%/tcl
+@dirrm lib/swig%%VER%%