5 files changed, 93 insertions, 69 deletions

diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index b15c2f683c07..e530f12155b1 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3a3
-CATEGORIES=	devel python tcl82
+PORTVERSION=	1.1p5
+CATEGORIES=	devel perl5 python tcl82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.rge.com/pub/languages/swig/ \
-		ftp://ftp.python.org/pub/python/contrib/System/ \
+		ftp://ftp.rge.com/pub/languages/swig/1.1/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	knu@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
@@ -23,10 +22,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	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=	all runtime
+
+MAN1=		swig.1
 
 .include <bsd.port.mk>
diff --git a/devel/swig11/distinfo b/devel/swig11/distinfo
index 7c8379a75a2f..8c928a2a64e0 100644
--- a/devel/swig11/distinfo
+++ b/devel/swig11/distinfo
@@ -1 +1 @@
-MD5 (swig1.3a3.tar.gz) = 7e71ab07c330e129bc0119b47d96b030
+MD5 (swig1.1p5.tar.gz) = 097bd08998590c400472995cbf282622
diff --git a/devel/swig11/files/patch-ag b/devel/swig11/files/patch-ag
new file mode 100644
index 000000000000..9e3495285f37
--- /dev/null
+++ b/devel/swig11/files/patch-ag
@@ -0,0 +1,9 @@
+--- Runtime/perlrun.h.orig	Mon Jun 23 05:18:37 1997
++++ Runtime/perlrun.h	Tue Aug 22 02:36:55 2000
+@@ -1,3 +1,6 @@
+ #include "EXTERN.h"
+ #include "perl.h"
+ #include "XSUB.h"
++
++#define PERL_POLLUTE 1
++#include "embedvar.h"
diff --git a/devel/swig11/pkg-descr b/devel/swig11/pkg-descr
index b2bad2b89850..89e45f9bd327 100644
--- a/devel/swig11/pkg-descr
+++ b/devel/swig11/pkg-descr
@@ -7,7 +7,6 @@ scripting languages.    Currently, SWIG supports :
         - Perl5
         - Guile-iii
         - Python 1.3
-        - MzScheme
 
 Using SWIG, it is possible to greatly simplify interface development
 and to put interesting interfaces on existing applications with
diff --git a/devel/swig11/pkg-plist b/devel/swig11/pkg-plist
index 8d23fa0f5831..3f8ff7c23de1 100644
--- a/devel/swig11/pkg-plist
+++ b/devel/swig11/pkg-plist
@@ -1,63 +1,78 @@
 bin/swig
-lib/swig%%VER%%/mzscheme/typemaps.i
-lib/swig%%VER%%/mzscheme/mzscheme.swg
-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%%/guile/guiledec.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/libswigtcl8.a
-lib/libswigtcl8.la
-lib/libswigtcl8.so
+lib/libswig.a
 lib/libswigpl.a
-lib/libswigpl.la
-lib/libswigpl.so
 lib/libswigpy.a
-lib/libswigpy.la
+lib/libswigpl.so
 lib/libswigpy.so
-@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%%/mzscheme
-@dirrm lib/swig%%VER%%
+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