Merge swig (committed accidentally) into SWIG. I copied Makefile, files/md5

and pkg/PLIST and made minor changes.  pkg/COMMENT and pkg/DESCR are left
alone to honor the original porter.

I've also left the MAINTAINER line alone.  Please talk to the original
maintainer if you want to change this.

devel/swig will be deleted in a few days.

15 files changed, 450 insertions, 405 deletions

diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index 7ab7a2b3a2df..752adf221079 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -1,22 +1,30 @@
 # New ports collection makefile for:    SWIG
-# Version required:     1.1b5p1
+# Version required:     1.1p2
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.6 1997/03/27 23:48:18 erich Exp $
+# $Id: Makefile,v 1.7 1997/08/11 15:06:30 erich Exp $
 #
 
-DISTNAME=	swig1.1
-PKGNAME=	swig-1.1
+DISTNAME=	swig1.1p2
+PKGNAME=	swig-1.1p2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
+MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	erich@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/SWIG1.1
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	${PREFIX}/bin/python:${PORTSDIR}/lang/python/
 
-post-build:
-	@cd ${WRKSRC}; make runtime
+USE_PERL5=	YES
+WRKSRC=		${WRKDIR}/SWIG1.1p2
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.0/ \
+		--with-tcllib=${PREFIX}/lib/tcl8.0/
+
+ALL_TARGET=	all runtime
+
+MAN1=		swig.1
 
 .include <bsd.port.mk>
diff --git a/devel/SWIG-devel/distinfo b/devel/SWIG-devel/distinfo
index f673096fdbb3..2ead5a1a39c0 100644
--- a/devel/SWIG-devel/distinfo
+++ b/devel/SWIG-devel/distinfo
@@ -1 +1 @@
-MD5 (swig1.1.tar.gz) = 76e09f2e75f1a4ab6ce9e0b28d336d2e
+MD5 (swig1.1p2.tar.gz) = ca618535a14f707ec3c8316a1dfd56c6
diff --git a/devel/SWIG-devel/pkg-plist b/devel/SWIG-devel/pkg-plist
index 96a242bbe7cf..a492aa4e0b72 100644
--- a/devel/SWIG-devel/pkg-plist
+++ b/devel/SWIG-devel/pkg-plist
@@ -1,74 +1,75 @@
 bin/swig
-lib/libswigtcl.a
+lib/libswig.a
 lib/libswigpl.a
-lib/libswigtcl.so
+lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.so
 include/swig.h
-man/man1/swig.1
-share/swig_lib/tcl/blt.i
-share/swig_lib/tcl/expect.i
-share/swig_lib/tcl/expectk.i
-share/swig_lib/tcl/ish.i
-share/swig_lib/tcl/itclsh.i
-share/swig_lib/tcl/itkwish.i
-share/swig_lib/tcl/iwish.i
-share/swig_lib/tcl/ptrlang.i
-share/swig_lib/tcl/tclsh.i
-share/swig_lib/tcl/tix.i
-share/swig_lib/tcl/typemaps.i
-share/swig_lib/tcl/wish.i
-share/swig_lib/tcl/class.swg
-share/swig_lib/tcl/configcode.swg
-share/swig_lib/tcl/delcmd.swg
-share/swig_lib/tcl/delcmd8.swg
-share/swig_lib/tcl/methodcmd.swg
-share/swig_lib/tcl/methodcmd8.swg
-share/swig_lib/tcl/objcmd.swg
-share/swig_lib/tcl/objcmd8.swg
-share/swig_lib/tcl/swigtcl.swg
-share/swig_lib/tcl/tcl8ptr.swg
-share/swig_lib/tcl/Makefile
-share/swig_lib/perl4/userinit.i
-share/swig_lib/perl5/perlmain.i
-share/swig_lib/perl5/ptrlang.i
-share/swig_lib/perl5/typemaps.i
-share/swig_lib/perl5/perl5.swg
-share/swig_lib/perl5/perl5mg.swg
-share/swig_lib/perl5/perl5ptr.swg
-share/swig_lib/perl5/Makefile
-share/swig_lib/perl5/Makefile.pl
-share/swig_lib/python/embed.i
-share/swig_lib/python/embed13.i
-share/swig_lib/python/embed14.i
-share/swig_lib/python/ptrlang.i
-share/swig_lib/python/typemaps.i
-share/swig_lib/python/defarg.swg
-share/swig_lib/python/pyexp.swg
-share/swig_lib/python/python.swg
-share/swig_lib/python/Makefile
-share/swig_lib/guile/guilemain.i
-share/swig_lib/guile/interpreter.i
-share/swig_lib/guile/guile.swg
-share/swig_lib/config/swigptr.swg
-share/swig_lib/array.i
-share/swig_lib/autodoc.i
-share/swig_lib/carray.i
-share/swig_lib/constraints.i
-share/swig_lib/ctype.i
-share/swig_lib/exception.i
-share/swig_lib/malloc.i
-share/swig_lib/math.i
-share/swig_lib/memory.i
-share/swig_lib/objc.i
-share/swig_lib/pointer.i
-share/swig_lib/stdlib.i
-share/swig_lib/timers.i
-share/swig_lib/swigptr.swg
-share/swig_lib/Makefile
-@dirrm share/swig_lib/tcl
-@dirrm share/swig_lib/perl4
-@dirrm share/swig_lib/perl5
-@dirrm share/swig_lib/python
-@dirrm share/swig_lib/guile
-@dirrm share/swig_lib/config
-@dirrm share/swig_lib
+man/man1/swig.1.gz
+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/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/ptrlang.i
+lib/swig_lib/python/typemaps.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
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index 7ab7a2b3a2df..752adf221079 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -1,22 +1,30 @@
 # New ports collection makefile for:    SWIG
-# Version required:     1.1b5p1
+# Version required:     1.1p2
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.6 1997/03/27 23:48:18 erich Exp $
+# $Id: Makefile,v 1.7 1997/08/11 15:06:30 erich Exp $
 #
 
-DISTNAME=	swig1.1
-PKGNAME=	swig-1.1
+DISTNAME=	swig1.1p2
+PKGNAME=	swig-1.1p2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
+MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	erich@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/SWIG1.1
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	${PREFIX}/bin/python:${PORTSDIR}/lang/python/
 
-post-build:
-	@cd ${WRKSRC}; make runtime
+USE_PERL5=	YES
+WRKSRC=		${WRKDIR}/SWIG1.1p2
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.0/ \
+		--with-tcllib=${PREFIX}/lib/tcl8.0/
+
+ALL_TARGET=	all runtime
+
+MAN1=		swig.1
 
 .include <bsd.port.mk>
diff --git a/devel/SWIG/distinfo b/devel/SWIG/distinfo
index f673096fdbb3..2ead5a1a39c0 100644
--- a/devel/SWIG/distinfo
+++ b/devel/SWIG/distinfo
@@ -1 +1 @@
-MD5 (swig1.1.tar.gz) = 76e09f2e75f1a4ab6ce9e0b28d336d2e
+MD5 (swig1.1p2.tar.gz) = ca618535a14f707ec3c8316a1dfd56c6
diff --git a/devel/SWIG/pkg-plist b/devel/SWIG/pkg-plist
index 96a242bbe7cf..a492aa4e0b72 100644
--- a/devel/SWIG/pkg-plist
+++ b/devel/SWIG/pkg-plist
@@ -1,74 +1,75 @@
 bin/swig
-lib/libswigtcl.a
+lib/libswig.a
 lib/libswigpl.a
-lib/libswigtcl.so
+lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.so
 include/swig.h
-man/man1/swig.1
-share/swig_lib/tcl/blt.i
-share/swig_lib/tcl/expect.i
-share/swig_lib/tcl/expectk.i
-share/swig_lib/tcl/ish.i
-share/swig_lib/tcl/itclsh.i
-share/swig_lib/tcl/itkwish.i
-share/swig_lib/tcl/iwish.i
-share/swig_lib/tcl/ptrlang.i
-share/swig_lib/tcl/tclsh.i
-share/swig_lib/tcl/tix.i
-share/swig_lib/tcl/typemaps.i
-share/swig_lib/tcl/wish.i
-share/swig_lib/tcl/class.swg
-share/swig_lib/tcl/configcode.swg
-share/swig_lib/tcl/delcmd.swg
-share/swig_lib/tcl/delcmd8.swg
-share/swig_lib/tcl/methodcmd.swg
-share/swig_lib/tcl/methodcmd8.swg
-share/swig_lib/tcl/objcmd.swg
-share/swig_lib/tcl/objcmd8.swg
-share/swig_lib/tcl/swigtcl.swg
-share/swig_lib/tcl/tcl8ptr.swg
-share/swig_lib/tcl/Makefile
-share/swig_lib/perl4/userinit.i
-share/swig_lib/perl5/perlmain.i
-share/swig_lib/perl5/ptrlang.i
-share/swig_lib/perl5/typemaps.i
-share/swig_lib/perl5/perl5.swg
-share/swig_lib/perl5/perl5mg.swg
-share/swig_lib/perl5/perl5ptr.swg
-share/swig_lib/perl5/Makefile
-share/swig_lib/perl5/Makefile.pl
-share/swig_lib/python/embed.i
-share/swig_lib/python/embed13.i
-share/swig_lib/python/embed14.i
-share/swig_lib/python/ptrlang.i
-share/swig_lib/python/typemaps.i
-share/swig_lib/python/defarg.swg
-share/swig_lib/python/pyexp.swg
-share/swig_lib/python/python.swg
-share/swig_lib/python/Makefile
-share/swig_lib/guile/guilemain.i
-share/swig_lib/guile/interpreter.i
-share/swig_lib/guile/guile.swg
-share/swig_lib/config/swigptr.swg
-share/swig_lib/array.i
-share/swig_lib/autodoc.i
-share/swig_lib/carray.i
-share/swig_lib/constraints.i
-share/swig_lib/ctype.i
-share/swig_lib/exception.i
-share/swig_lib/malloc.i
-share/swig_lib/math.i
-share/swig_lib/memory.i
-share/swig_lib/objc.i
-share/swig_lib/pointer.i
-share/swig_lib/stdlib.i
-share/swig_lib/timers.i
-share/swig_lib/swigptr.swg
-share/swig_lib/Makefile
-@dirrm share/swig_lib/tcl
-@dirrm share/swig_lib/perl4
-@dirrm share/swig_lib/perl5
-@dirrm share/swig_lib/python
-@dirrm share/swig_lib/guile
-@dirrm share/swig_lib/config
-@dirrm share/swig_lib
+man/man1/swig.1.gz
+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/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/ptrlang.i
+lib/swig_lib/python/typemaps.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
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index 7ab7a2b3a2df..752adf221079 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -1,22 +1,30 @@
 # New ports collection makefile for:    SWIG
-# Version required:     1.1b5p1
+# Version required:     1.1p2
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.6 1997/03/27 23:48:18 erich Exp $
+# $Id: Makefile,v 1.7 1997/08/11 15:06:30 erich Exp $
 #
 
-DISTNAME=	swig1.1
-PKGNAME=	swig-1.1
+DISTNAME=	swig1.1p2
+PKGNAME=	swig-1.1p2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
+MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	erich@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/SWIG1.1
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	${PREFIX}/bin/python:${PORTSDIR}/lang/python/
 
-post-build:
-	@cd ${WRKSRC}; make runtime
+USE_PERL5=	YES
+WRKSRC=		${WRKDIR}/SWIG1.1p2
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.0/ \
+		--with-tcllib=${PREFIX}/lib/tcl8.0/
+
+ALL_TARGET=	all runtime
+
+MAN1=		swig.1
 
 .include <bsd.port.mk>
diff --git a/devel/swig11/distinfo b/devel/swig11/distinfo
index f673096fdbb3..2ead5a1a39c0 100644
--- a/devel/swig11/distinfo
+++ b/devel/swig11/distinfo
@@ -1 +1 @@
-MD5 (swig1.1.tar.gz) = 76e09f2e75f1a4ab6ce9e0b28d336d2e
+MD5 (swig1.1p2.tar.gz) = ca618535a14f707ec3c8316a1dfd56c6
diff --git a/devel/swig11/pkg-plist b/devel/swig11/pkg-plist
index 96a242bbe7cf..a492aa4e0b72 100644
--- a/devel/swig11/pkg-plist
+++ b/devel/swig11/pkg-plist
@@ -1,74 +1,75 @@
 bin/swig
-lib/libswigtcl.a
+lib/libswig.a
 lib/libswigpl.a
-lib/libswigtcl.so
+lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.so
 include/swig.h
-man/man1/swig.1
-share/swig_lib/tcl/blt.i
-share/swig_lib/tcl/expect.i
-share/swig_lib/tcl/expectk.i
-share/swig_lib/tcl/ish.i
-share/swig_lib/tcl/itclsh.i
-share/swig_lib/tcl/itkwish.i
-share/swig_lib/tcl/iwish.i
-share/swig_lib/tcl/ptrlang.i
-share/swig_lib/tcl/tclsh.i
-share/swig_lib/tcl/tix.i
-share/swig_lib/tcl/typemaps.i
-share/swig_lib/tcl/wish.i
-share/swig_lib/tcl/class.swg
-share/swig_lib/tcl/configcode.swg
-share/swig_lib/tcl/delcmd.swg
-share/swig_lib/tcl/delcmd8.swg
-share/swig_lib/tcl/methodcmd.swg
-share/swig_lib/tcl/methodcmd8.swg
-share/swig_lib/tcl/objcmd.swg
-share/swig_lib/tcl/objcmd8.swg
-share/swig_lib/tcl/swigtcl.swg
-share/swig_lib/tcl/tcl8ptr.swg
-share/swig_lib/tcl/Makefile
-share/swig_lib/perl4/userinit.i
-share/swig_lib/perl5/perlmain.i
-share/swig_lib/perl5/ptrlang.i
-share/swig_lib/perl5/typemaps.i
-share/swig_lib/perl5/perl5.swg
-share/swig_lib/perl5/perl5mg.swg
-share/swig_lib/perl5/perl5ptr.swg
-share/swig_lib/perl5/Makefile
-share/swig_lib/perl5/Makefile.pl
-share/swig_lib/python/embed.i
-share/swig_lib/python/embed13.i
-share/swig_lib/python/embed14.i
-share/swig_lib/python/ptrlang.i
-share/swig_lib/python/typemaps.i
-share/swig_lib/python/defarg.swg
-share/swig_lib/python/pyexp.swg
-share/swig_lib/python/python.swg
-share/swig_lib/python/Makefile
-share/swig_lib/guile/guilemain.i
-share/swig_lib/guile/interpreter.i
-share/swig_lib/guile/guile.swg
-share/swig_lib/config/swigptr.swg
-share/swig_lib/array.i
-share/swig_lib/autodoc.i
-share/swig_lib/carray.i
-share/swig_lib/constraints.i
-share/swig_lib/ctype.i
-share/swig_lib/exception.i
-share/swig_lib/malloc.i
-share/swig_lib/math.i
-share/swig_lib/memory.i
-share/swig_lib/objc.i
-share/swig_lib/pointer.i
-share/swig_lib/stdlib.i
-share/swig_lib/timers.i
-share/swig_lib/swigptr.swg
-share/swig_lib/Makefile
-@dirrm share/swig_lib/tcl
-@dirrm share/swig_lib/perl4
-@dirrm share/swig_lib/perl5
-@dirrm share/swig_lib/python
-@dirrm share/swig_lib/guile
-@dirrm share/swig_lib/config
-@dirrm share/swig_lib
+man/man1/swig.1.gz
+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/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/ptrlang.i
+lib/swig_lib/python/typemaps.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
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 7ab7a2b3a2df..752adf221079 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -1,22 +1,30 @@
 # New ports collection makefile for:    SWIG
-# Version required:     1.1b5p1
+# Version required:     1.1p2
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.6 1997/03/27 23:48:18 erich Exp $
+# $Id: Makefile,v 1.7 1997/08/11 15:06:30 erich Exp $
 #
 
-DISTNAME=	swig1.1
-PKGNAME=	swig-1.1
+DISTNAME=	swig1.1p2
+PKGNAME=	swig-1.1p2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
+MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	erich@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/SWIG1.1
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	${PREFIX}/bin/python:${PORTSDIR}/lang/python/
 
-post-build:
-	@cd ${WRKSRC}; make runtime
+USE_PERL5=	YES
+WRKSRC=		${WRKDIR}/SWIG1.1p2
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.0/ \
+		--with-tcllib=${PREFIX}/lib/tcl8.0/
+
+ALL_TARGET=	all runtime
+
+MAN1=		swig.1
 
 .include <bsd.port.mk>
diff --git a/devel/swig13/distinfo b/devel/swig13/distinfo
index f673096fdbb3..2ead5a1a39c0 100644
--- a/devel/swig13/distinfo
+++ b/devel/swig13/distinfo
@@ -1 +1 @@
-MD5 (swig1.1.tar.gz) = 76e09f2e75f1a4ab6ce9e0b28d336d2e
+MD5 (swig1.1p2.tar.gz) = ca618535a14f707ec3c8316a1dfd56c6
diff --git a/devel/swig13/pkg-plist b/devel/swig13/pkg-plist
index 96a242bbe7cf..a492aa4e0b72 100644
--- a/devel/swig13/pkg-plist
+++ b/devel/swig13/pkg-plist
@@ -1,74 +1,75 @@
 bin/swig
-lib/libswigtcl.a
+lib/libswig.a
 lib/libswigpl.a
-lib/libswigtcl.so
+lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.so
 include/swig.h
-man/man1/swig.1
-share/swig_lib/tcl/blt.i
-share/swig_lib/tcl/expect.i
-share/swig_lib/tcl/expectk.i
-share/swig_lib/tcl/ish.i
-share/swig_lib/tcl/itclsh.i
-share/swig_lib/tcl/itkwish.i
-share/swig_lib/tcl/iwish.i
-share/swig_lib/tcl/ptrlang.i
-share/swig_lib/tcl/tclsh.i
-share/swig_lib/tcl/tix.i
-share/swig_lib/tcl/typemaps.i
-share/swig_lib/tcl/wish.i
-share/swig_lib/tcl/class.swg
-share/swig_lib/tcl/configcode.swg
-share/swig_lib/tcl/delcmd.swg
-share/swig_lib/tcl/delcmd8.swg
-share/swig_lib/tcl/methodcmd.swg
-share/swig_lib/tcl/methodcmd8.swg
-share/swig_lib/tcl/objcmd.swg
-share/swig_lib/tcl/objcmd8.swg
-share/swig_lib/tcl/swigtcl.swg
-share/swig_lib/tcl/tcl8ptr.swg
-share/swig_lib/tcl/Makefile
-share/swig_lib/perl4/userinit.i
-share/swig_lib/perl5/perlmain.i
-share/swig_lib/perl5/ptrlang.i
-share/swig_lib/perl5/typemaps.i
-share/swig_lib/perl5/perl5.swg
-share/swig_lib/perl5/perl5mg.swg
-share/swig_lib/perl5/perl5ptr.swg
-share/swig_lib/perl5/Makefile
-share/swig_lib/perl5/Makefile.pl
-share/swig_lib/python/embed.i
-share/swig_lib/python/embed13.i
-share/swig_lib/python/embed14.i
-share/swig_lib/python/ptrlang.i
-share/swig_lib/python/typemaps.i
-share/swig_lib/python/defarg.swg
-share/swig_lib/python/pyexp.swg
-share/swig_lib/python/python.swg
-share/swig_lib/python/Makefile
-share/swig_lib/guile/guilemain.i
-share/swig_lib/guile/interpreter.i
-share/swig_lib/guile/guile.swg
-share/swig_lib/config/swigptr.swg
-share/swig_lib/array.i
-share/swig_lib/autodoc.i
-share/swig_lib/carray.i
-share/swig_lib/constraints.i
-share/swig_lib/ctype.i
-share/swig_lib/exception.i
-share/swig_lib/malloc.i
-share/swig_lib/math.i
-share/swig_lib/memory.i
-share/swig_lib/objc.i
-share/swig_lib/pointer.i
-share/swig_lib/stdlib.i
-share/swig_lib/timers.i
-share/swig_lib/swigptr.swg
-share/swig_lib/Makefile
-@dirrm share/swig_lib/tcl
-@dirrm share/swig_lib/perl4
-@dirrm share/swig_lib/perl5
-@dirrm share/swig_lib/python
-@dirrm share/swig_lib/guile
-@dirrm share/swig_lib/config
-@dirrm share/swig_lib
+man/man1/swig.1.gz
+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/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/ptrlang.i
+lib/swig_lib/python/typemaps.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
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 7ab7a2b3a2df..752adf221079 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -1,22 +1,30 @@
 # New ports collection makefile for:    SWIG
-# Version required:     1.1b5p1
+# Version required:     1.1p2
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.6 1997/03/27 23:48:18 erich Exp $
+# $Id: Makefile,v 1.7 1997/08/11 15:06:30 erich Exp $
 #
 
-DISTNAME=	swig1.1
-PKGNAME=	swig-1.1
+DISTNAME=	swig1.1p2
+PKGNAME=	swig-1.1p2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
+MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
+		ftp://ftp.rge.com/pub/languages/swig/ \
+		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	erich@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/SWIG1.1
-GNU_CONFIGURE=	yes
+BUILD_DEPENDS=	${PREFIX}/bin/python:${PORTSDIR}/lang/python/
 
-post-build:
-	@cd ${WRKSRC}; make runtime
+USE_PERL5=	YES
+WRKSRC=		${WRKDIR}/SWIG1.1p2
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.0/ \
+		--with-tcllib=${PREFIX}/lib/tcl8.0/
+
+ALL_TARGET=	all runtime
+
+MAN1=		swig.1
 
 .include <bsd.port.mk>
diff --git a/devel/swig20/distinfo b/devel/swig20/distinfo
index f673096fdbb3..2ead5a1a39c0 100644
--- a/devel/swig20/distinfo
+++ b/devel/swig20/distinfo
@@ -1 +1 @@
-MD5 (swig1.1.tar.gz) = 76e09f2e75f1a4ab6ce9e0b28d336d2e
+MD5 (swig1.1p2.tar.gz) = ca618535a14f707ec3c8316a1dfd56c6
diff --git a/devel/swig20/pkg-plist b/devel/swig20/pkg-plist
index 96a242bbe7cf..a492aa4e0b72 100644
--- a/devel/swig20/pkg-plist
+++ b/devel/swig20/pkg-plist
@@ -1,74 +1,75 @@
 bin/swig
-lib/libswigtcl.a
+lib/libswig.a
 lib/libswigpl.a
-lib/libswigtcl.so
+lib/libswigpy.a
 lib/libswigpl.so
+lib/libswigpy.so
 include/swig.h
-man/man1/swig.1
-share/swig_lib/tcl/blt.i
-share/swig_lib/tcl/expect.i
-share/swig_lib/tcl/expectk.i
-share/swig_lib/tcl/ish.i
-share/swig_lib/tcl/itclsh.i
-share/swig_lib/tcl/itkwish.i
-share/swig_lib/tcl/iwish.i
-share/swig_lib/tcl/ptrlang.i
-share/swig_lib/tcl/tclsh.i
-share/swig_lib/tcl/tix.i
-share/swig_lib/tcl/typemaps.i
-share/swig_lib/tcl/wish.i
-share/swig_lib/tcl/class.swg
-share/swig_lib/tcl/configcode.swg
-share/swig_lib/tcl/delcmd.swg
-share/swig_lib/tcl/delcmd8.swg
-share/swig_lib/tcl/methodcmd.swg
-share/swig_lib/tcl/methodcmd8.swg
-share/swig_lib/tcl/objcmd.swg
-share/swig_lib/tcl/objcmd8.swg
-share/swig_lib/tcl/swigtcl.swg
-share/swig_lib/tcl/tcl8ptr.swg
-share/swig_lib/tcl/Makefile
-share/swig_lib/perl4/userinit.i
-share/swig_lib/perl5/perlmain.i
-share/swig_lib/perl5/ptrlang.i
-share/swig_lib/perl5/typemaps.i
-share/swig_lib/perl5/perl5.swg
-share/swig_lib/perl5/perl5mg.swg
-share/swig_lib/perl5/perl5ptr.swg
-share/swig_lib/perl5/Makefile
-share/swig_lib/perl5/Makefile.pl
-share/swig_lib/python/embed.i
-share/swig_lib/python/embed13.i
-share/swig_lib/python/embed14.i
-share/swig_lib/python/ptrlang.i
-share/swig_lib/python/typemaps.i
-share/swig_lib/python/defarg.swg
-share/swig_lib/python/pyexp.swg
-share/swig_lib/python/python.swg
-share/swig_lib/python/Makefile
-share/swig_lib/guile/guilemain.i
-share/swig_lib/guile/interpreter.i
-share/swig_lib/guile/guile.swg
-share/swig_lib/config/swigptr.swg
-share/swig_lib/array.i
-share/swig_lib/autodoc.i
-share/swig_lib/carray.i
-share/swig_lib/constraints.i
-share/swig_lib/ctype.i
-share/swig_lib/exception.i
-share/swig_lib/malloc.i
-share/swig_lib/math.i
-share/swig_lib/memory.i
-share/swig_lib/objc.i
-share/swig_lib/pointer.i
-share/swig_lib/stdlib.i
-share/swig_lib/timers.i
-share/swig_lib/swigptr.swg
-share/swig_lib/Makefile
-@dirrm share/swig_lib/tcl
-@dirrm share/swig_lib/perl4
-@dirrm share/swig_lib/perl5
-@dirrm share/swig_lib/python
-@dirrm share/swig_lib/guile
-@dirrm share/swig_lib/config
-@dirrm share/swig_lib
+man/man1/swig.1.gz
+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/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/ptrlang.i
+lib/swig_lib/python/typemaps.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