- Update to 1.3.25.

- Assign maintainership to submitter.

PR:		ports/82240
Submitted by:	Soeren Straarup <xride@x12.dk>
Approved by:	maintainer timeout

10 files changed, 668 insertions, 532 deletions

diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index f6513fab1c51..c0dd31cfb356 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3.21
-PORTREVISION=	1
+PORTVERSION=	1.3.25
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	knu@FreeBSD.org
+MAINTAINER=	xride@x12.dk
 COMMENT=	Simplified Wrapper and Interface Generator
 
 WANT_AUTOCONF_VER=253
+
 VER=		${PORTVERSION:R}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-# Supported languages: guile perl php4 python ruby tcl ocaml pike java
+# Supported languages: guile perl php4 python ruby tcl ocaml pike java csharp
+#                      allegrocl modula3 chicken
 SWIG_LANGUAGES?=	guile perl php4 python ruby tcl
 .for lang in ${SWIG_LANGUAGES}
 WANT_SWIG_${lang:U}=	yes
@@ -26,23 +28,20 @@ WANT_SWIG_${lang:U}=	yes
 
 .if defined(WANT_SWIG_GUILE)
 BUILD_DEPENDS+=		guile:${PORTSDIR}/lang/guile
-PLIST_SUB+=		WANT_SWIG_GUILE=""
-.else
-PLIST_SUB+=		WANT_SWIG_GUILE="@comment "
 .endif
+
 .if defined(WANT_SWIG_PERL)
 CATEGORIES+=		perl5
 USE_PERL5=		yes
-PLIST_SUB+=		WANT_SWIG_PERL=""
-.else
-PLIST_SUB+=		WANT_SWIG_PERL="@comment "
 .endif
+
 .if defined(WANT_SWIG_PHP4)
 BUILD_DEPENDS+=		${LOCALBASE}/include/php/main/php.h:${PORTSDIR}/lang/php4
-PLIST_SUB+=		WANT_SWIG_PHP4=""
+CONFIGURE_ARGS+=	--with-php4
 .else
-PLIST_SUB+=		WANT_SWIG_PHP4="@comment "
+CONFIGURE_ARGS+=	--without-php4
 .endif
+
 .if defined(WANT_SWIG_PYTHON)
 CATEGORIES+=		python
 USE_PYTHON=		yes
@@ -50,69 +49,80 @@ PYTHON_NO_DEPENDS=	yes
 BUILD_DEPENDS+=		${PYTHON_CMD}:${PYTHON_PORTSDIR}
 CONFIGURE_ARGS+=	--with-pyincl=${PYTHON_INCLUDEDIR} \
 			--with-pylib=${PYTHON_LIBDIR}
-PLIST_SUB+=		WANT_SWIG_PYTHON=""
-.else
-PLIST_SUB+=		WANT_SWIG_PYTHON="@comment "
 .endif
+
 .if defined(WANT_SWIG_RUBY)
 CATEGORIES+=		ruby
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
-PLIST_SUB+=		WANT_SWIG_RUBY=""
+CONFIGURE_ARGS+=	--with-ruby
 .else
-PLIST_SUB+=		WANT_SWIG_RUBY="@comment "
+CONFIGURE_ARGS+=	--without-ruby
 .endif
+
 .if defined(WANT_SWIG_TCL)
 CATEGORIES+=		tcl84
 BUILD_DEPENDS+=		${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
 CONFIGURE_ARGS+=	--with-tclincl=${LOCALBASE}/include/tcl8.4/ \
 			--with-tcllib=${LOCALBASE}/lib/tcl8.4/
-PLIST_SUB+=		WANT_SWIG_TCL=""
+.endif
+
+.if defined(WANT_SWIG_CSHARP)
+BUILD_DEPENDS+=		${LOCALBASE}/bin/mono:${PORTSDIR}/lang/mono
+CONFIGURE_ARGS+=	--with-csharp-compiler=${LOCALBASE}/bin/mcs
 .else
-PLIST_SUB+=		WANT_SWIG_TCL="@comment "
+CONFIGURE_ARGS+=	--without-csharp-compiler
 .endif
 
 .if defined(WANT_SWIG_OCAML)
 BUILD_DEPENDS+=		${LOCALBASE}/bin/ocamlc:${PORTSDIR}/lang/ocaml
-PLIST_SUB+=		WANT_SWIG_OCAML=""
 .else
-PLIST_SUB+=		WANT_SWIG_OCAML="@comment "
+CONFIGURE_ARGS+=	--without-ocaml
+.endif
+
+.if defined(WANT_SWIG_ALLEGRCL)
+CONFIGURE_ARGS+=	--with-allegrocl
+.else
+CONFIGURE_ARGS+=	--without-allegrocl
+.endif
+
+.if defined(WANT_SWIG_MODULA3)
+CONFIGURE_ARGS+=	--with-modula3
+.else
+CONFIGURE_ARGS+=	--without-modula3
 .endif
 
 .if defined(WANT_SWIG_PIKE)
 BUILD_DEPENDS+=		${LOCALBASE}/bin/pike:${PORTSDIR}/lang/pike
-PLIST_SUB+=		WANT_SWIG_PIKE=""
 .else
-PLIST_SUB+=		WANT_SWIG_PIKE="@comment "
-CONFIGURE_ARGS +=	--without-pike
+CONFIGURE_ARGS+=	--without-pike
 .endif
 
 .if defined(WANT_SWIG_JAVA)
 CATEGORIES+=		java
 USE_JAVA=	1.2+
-PLIST_SUB+=		WANT_SWIG_JAVA=""
 .else
-PLIST_SUB+=		WANT_SWIG_JAVA="@comment "
-CONFIGURE_ARGS +=	--without-java
+CONFIGURE_ARGS+=	--without-java
 .endif
 
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:U}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_LIBTOOL_VER=	13
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fPIC -DPIC"
-ALL_TARGET=	swig runtime
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC -DPIC"
+ALL_TARGET=	swig
 PLIST_SUB+=	VER="${VER}"
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's/SKIP_CHICKEN=$$/&"1"/' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|$$RUBY |${RUBY} |' ${WRKSRC}/configure
 
-post-install:
-# A separate swig13-runtime port might be nice
-	@(cd ${INSTALL_WRKSRC}/Runtime && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+post-configure:
+	${REINPLACE_CMD} -e 's#null#&|| true#' ${WRKSRC}/Makefile
 
+post-install:
 	${LN} -f ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.post.mk>
diff --git a/devel/swig13/distinfo b/devel/swig13/distinfo
index 674e9704ad21..2f84aae65483 100644
--- a/devel/swig13/distinfo
+++ b/devel/swig13/distinfo
@@ -1,2 +1,2 @@
-MD5 (swig-1.3.21.tar.gz) = 88ff5b99be3eafebb8a6e20f4f986c04
-SIZE (swig-1.3.21.tar.gz) = 2023025
+MD5 (swig-1.3.25.tar.gz) = 0a338d9de65e266338cbe7e2bea7a4a9
+SIZE (swig-1.3.25.tar.gz) = 3451186
diff --git a/devel/swig13/files/patch-Makefile.in b/devel/swig13/files/patch-Makefile.in
deleted file mode 100644
index 4e39bc09307d..000000000000
--- a/devel/swig13/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Mon Oct 14 22:37:59 2002
-+++ Makefile.in	Mon Oct 28 07:23:38 2002
-@@ -290,8 +290,8 @@
- 	    dst=$(DESTDIR)$(SWIG_LIB)/$$lang;			\
- 	    $(MKINSTDIRS) $$dst;				\
- 	    ( cd $(srcdir)/Lib/$$lang;				\
--	      doti="`ls *.i 2>/dev/null`";			\
--	      dotswg="`ls *.swg 2>/dev/null`";			\
-+	      doti="`ls *.i 2>/dev/null || true`";		\
-+	      dotswg="`ls *.swg 2>/dev/null || true`";		\
- 	      if [ -f extra-install.list ]; then		\
- 		  extra="`sed '/^#/d' extra-install.list`";	\
- 	      fi;						\
diff --git a/devel/swig13/pkg-descr b/devel/swig13/pkg-descr
index c9ea8c17ee94..188307a145ab 100644
--- a/devel/swig13/pkg-descr
+++ b/devel/swig13/pkg-descr
@@ -9,6 +9,10 @@ scripting languages.    Currently, SWIG supports :
         - Guile
         - MzScheme
         - Ruby
+        - CSharp
+        - Modula-3
+        - Allegro CL
+        - Chicken
 
 Using SWIG, it is possible to greatly simplify interface development
 and to put interesting interfaces on existing applications with
diff --git a/devel/swig13/pkg-plist b/devel/swig13/pkg-plist
index 887f450ce155..55870fd3d66b 100644
--- a/devel/swig13/pkg-plist
+++ b/devel/swig13/pkg-plist
@@ -1,219 +1,286 @@
-bin/swig
 bin/swig%%VER%%
-%%WANT_SWIG_GUILE%%lib/libswigguile.a
-%%WANT_SWIG_GUILE%%lib/libswigguile.la
-%%WANT_SWIG_GUILE%%lib/libswigguile.so
-%%WANT_SWIG_GUILE%%lib/libswigguile.so.0
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.a
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.la
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.so
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.so.0
-%%WANT_SWIG_PHP4%%lib/libswigphp4.a
-%%WANT_SWIG_PHP4%%lib/libswigphp4.la
-%%WANT_SWIG_PHP4%%lib/libswigphp4.so
-%%WANT_SWIG_PHP4%%lib/libswigphp4.so.0
-%%WANT_SWIG_PERL%%lib/libswigpl.a
-%%WANT_SWIG_PERL%%lib/libswigpl.la
-%%WANT_SWIG_PERL%%lib/libswigpl.so
-%%WANT_SWIG_PERL%%lib/libswigpl.so.0
-%%WANT_SWIG_PYTHON%%lib/libswigpy.a
-%%WANT_SWIG_PYTHON%%lib/libswigpy.la
-%%WANT_SWIG_PYTHON%%lib/libswigpy.so
-%%WANT_SWIG_PYTHON%%lib/libswigpy.so.0
-%%WANT_SWIG_RUBY%%lib/libswigrb.a
-%%WANT_SWIG_RUBY%%lib/libswigrb.la
-%%WANT_SWIG_RUBY%%lib/libswigrb.so
-%%WANT_SWIG_RUBY%%lib/libswigrb.so.0
-%%WANT_SWIG_TCL%%lib/libswigtcl8.a
-%%WANT_SWIG_TCL%%lib/libswigtcl8.la
-%%WANT_SWIG_TCL%%lib/libswigtcl8.so
-%%WANT_SWIG_TCL%%lib/libswigtcl8.so.0
-%%WANT_SWIG_OCAML%%lib/libswigocaml.a
-%%WANT_SWIG_OCAML%%lib/libswigocaml.la
-%%WANT_SWIG_OCAML%%lib/libswigocaml.so
-%%WANT_SWIG_OCAML%%lib/libswigocaml.so.0
-lib/swig%%VER%%/_std_deque.i
-lib/swig%%VER%%/allkw.swg
-lib/swig%%VER%%/carrays.i
-lib/swig%%VER%%/cdata.i
-lib/swig%%VER%%/chicken/chicken.swg
-lib/swig%%VER%%/chicken/chickenkw.swg
-lib/swig%%VER%%/chicken/chickenrun.swg
-lib/swig%%VER%%/chicken/fragments.i
-lib/swig%%VER%%/chicken/precommon.swg
-lib/swig%%VER%%/chicken/typemaps.i
-lib/swig%%VER%%/cmalloc.i
-lib/swig%%VER%%/common.swg
-lib/swig%%VER%%/constraints.i
-lib/swig%%VER%%/cpointer.i
-lib/swig%%VER%%/csharp/csharp.swg
-lib/swig%%VER%%/csharp/csharphead.swg
-lib/swig%%VER%%/csharp/csharpkw.swg
-lib/swig%%VER%%/csharp/std_string.i
-lib/swig%%VER%%/csharp/typemaps.i
-lib/swig%%VER%%/cstring.i
-lib/swig%%VER%%/exception.i
-lib/swig%%VER%%/guile/common.scm
-lib/swig%%VER%%/guile/cplusplus.i
-lib/swig%%VER%%/guile/ghinterface.i
-lib/swig%%VER%%/guile/guile.i
-lib/swig%%VER%%/guile/guile_gh.swg
-lib/swig%%VER%%/guile/guile_gh_run.swg
-lib/swig%%VER%%/guile/guile_scm.swg
-lib/swig%%VER%%/guile/guile_scm_run.swg
-lib/swig%%VER%%/guile/guilemain.i
-lib/swig%%VER%%/guile/interpreter.i
-lib/swig%%VER%%/guile/list-vector.i
-lib/swig%%VER%%/guile/pointer-in-out.i
-lib/swig%%VER%%/guile/ports.i
-lib/swig%%VER%%/guile/precommon.swg
-lib/swig%%VER%%/guile/std_common.i
-lib/swig%%VER%%/guile/std_map.i
-lib/swig%%VER%%/guile/std_pair.i
-lib/swig%%VER%%/guile/std_string.i
-lib/swig%%VER%%/guile/std_vector.i
-lib/swig%%VER%%/guile/typemaps.i
-lib/swig%%VER%%/java/arrays_java.i
-lib/swig%%VER%%/java/director.swg
-lib/swig%%VER%%/java/java.swg
-lib/swig%%VER%%/java/javahead.swg
-lib/swig%%VER%%/java/javakw.swg
-lib/swig%%VER%%/java/std_common.i
-lib/swig%%VER%%/java/std_map.i
-lib/swig%%VER%%/java/std_pair.i
-lib/swig%%VER%%/java/std_string.i
-lib/swig%%VER%%/java/std_vector.i
-lib/swig%%VER%%/java/typemaps.i
-lib/swig%%VER%%/java/various.i
-lib/swig%%VER%%/math.i
-lib/swig%%VER%%/mzscheme/mzrun.swg
-lib/swig%%VER%%/mzscheme/mzscheme.swg
-lib/swig%%VER%%/mzscheme/precommon.swg
-lib/swig%%VER%%/mzscheme/std_common.i
-lib/swig%%VER%%/mzscheme/std_map.i
-lib/swig%%VER%%/mzscheme/std_pair.i
-lib/swig%%VER%%/mzscheme/std_string.i
-lib/swig%%VER%%/mzscheme/std_vector.i
-lib/swig%%VER%%/mzscheme/typemaps.i
-lib/swig%%VER%%/ocaml/carray.i
-lib/swig%%VER%%/ocaml/class.swg
-lib/swig%%VER%%/ocaml/cstring.i
-lib/swig%%VER%%/ocaml/director.swg
-lib/swig%%VER%%/ocaml/mlheading.swg
-lib/swig%%VER%%/ocaml/mliheading.swg
-lib/swig%%VER%%/ocaml/ocaml.i
-lib/swig%%VER%%/ocaml/ocaml.swg
-lib/swig%%VER%%/ocaml/ocamldec.swg
-lib/swig%%VER%%/ocaml/ocamlkw.swg
-lib/swig%%VER%%/ocaml/preamble.swg
-lib/swig%%VER%%/ocaml/std_common.i
-lib/swig%%VER%%/ocaml/std_complex.i
-lib/swig%%VER%%/ocaml/std_deque.i
-lib/swig%%VER%%/ocaml/std_list.i
-lib/swig%%VER%%/ocaml/std_map.i
-lib/swig%%VER%%/ocaml/std_pair.i
-lib/swig%%VER%%/ocaml/std_string.i
-lib/swig%%VER%%/ocaml/std_vector.i
-lib/swig%%VER%%/ocaml/swig.ml
-lib/swig%%VER%%/ocaml/swig.mli
-lib/swig%%VER%%/ocaml/swigp4.ml
-lib/swig%%VER%%/ocaml/typecheck.i
-lib/swig%%VER%%/ocaml/typemaps.i
-lib/swig%%VER%%/ocaml/typeregister.swg
-lib/swig%%VER%%/perl5/Makefile.pl
-lib/swig%%VER%%/perl5/noembed.h
-lib/swig%%VER%%/perl5/perl5.swg
-lib/swig%%VER%%/perl5/perlmain.i
-lib/swig%%VER%%/perl5/perlrun.swg
-lib/swig%%VER%%/perl5/precommon.swg
-lib/swig%%VER%%/perl5/std_common.i
-lib/swig%%VER%%/perl5/std_map.i
-lib/swig%%VER%%/perl5/std_pair.i
-lib/swig%%VER%%/perl5/std_string.i
-lib/swig%%VER%%/perl5/std_vector.i
-lib/swig%%VER%%/perl5/typemaps.i
-lib/swig%%VER%%/php4/php4.swg
-lib/swig%%VER%%/php4/php4kw.swg
-lib/swig%%VER%%/php4/php4run.swg
-lib/swig%%VER%%/php4/precommon.swg
-lib/swig%%VER%%/php4/std_common.i
-lib/swig%%VER%%/php4/std_map.i
-lib/swig%%VER%%/php4/std_pair.i
-lib/swig%%VER%%/php4/std_string.i
-lib/swig%%VER%%/php4/std_vector.i
-lib/swig%%VER%%/php4/typemaps.i
-lib/swig%%VER%%/php4/utils.i
-lib/swig%%VER%%/pike/pike.swg
-lib/swig%%VER%%/pike/pikekw.swg
-lib/swig%%VER%%/pike/pikerun.swg
-lib/swig%%VER%%/pike/precommon.swg
-lib/swig%%VER%%/pike/std_string.i
-lib/swig%%VER%%/pointer.i
-lib/swig%%VER%%/python/cstring.i
-lib/swig%%VER%%/python/defarg.swg
-lib/swig%%VER%%/python/director.swg
-lib/swig%%VER%%/python/embed.i
-lib/swig%%VER%%/python/embed15.i
-lib/swig%%VER%%/python/fragments.i
-lib/swig%%VER%%/python/precommon.swg
-lib/swig%%VER%%/python/pyrun.swg
-lib/swig%%VER%%/python/python.swg
-lib/swig%%VER%%/python/pythonkw.swg
-lib/swig%%VER%%/python/std_common.i
-lib/swig%%VER%%/python/std_complex.i
-lib/swig%%VER%%/python/std_deque.i
-lib/swig%%VER%%/python/std_list.i
-lib/swig%%VER%%/python/std_map.i
-lib/swig%%VER%%/python/std_pair.i
-lib/swig%%VER%%/python/std_string.i
-lib/swig%%VER%%/python/std_vector.i
-lib/swig%%VER%%/python/typemaps.i
-lib/swig%%VER%%/ruby/Makefile.swig
-lib/swig%%VER%%/ruby/director.swg
-lib/swig%%VER%%/ruby/embed.i
-lib/swig%%VER%%/ruby/extconf.rb
-lib/swig%%VER%%/ruby/fragments.i
-lib/swig%%VER%%/ruby/precommon.swg
-lib/swig%%VER%%/ruby/ruby.swg
-lib/swig%%VER%%/ruby/rubydec.swg
-lib/swig%%VER%%/ruby/rubydef.swg
-lib/swig%%VER%%/ruby/rubyhead.swg
-lib/swig%%VER%%/ruby/rubykw.swg
-lib/swig%%VER%%/ruby/std_common.i
-lib/swig%%VER%%/ruby/std_deque.i
-lib/swig%%VER%%/ruby/std_map.i
-lib/swig%%VER%%/ruby/std_pair.i
-lib/swig%%VER%%/ruby/std_string.i
-lib/swig%%VER%%/ruby/std_vector.i
-lib/swig%%VER%%/ruby/typemaps.i
-lib/swig%%VER%%/std_deque.i
-lib/swig%%VER%%/stl.i
-lib/swig%%VER%%/swig.swg
-lib/swig%%VER%%/swigrun.i
-lib/swig%%VER%%/tcl/cstring.i
-lib/swig%%VER%%/tcl/precommon.swg
-lib/swig%%VER%%/tcl/std_common.i
-lib/swig%%VER%%/tcl/std_map.i
-lib/swig%%VER%%/tcl/std_pair.i
-lib/swig%%VER%%/tcl/std_string.i
-lib/swig%%VER%%/tcl/std_vector.i
-lib/swig%%VER%%/tcl/swigtcl8.swg
-lib/swig%%VER%%/tcl/tcl8.swg
-lib/swig%%VER%%/tcl/tcl8kw.swg
-lib/swig%%VER%%/tcl/tclsh.i
-lib/swig%%VER%%/tcl/typemaps.i
-lib/swig%%VER%%/tcl/wish.i
-share/aclocal/swig.m4
-@dirrm lib/swig%%VER%%/tcl
-@dirrm lib/swig%%VER%%/ruby
-@dirrm lib/swig%%VER%%/python
-@dirrm lib/swig%%VER%%/pike
-@dirrm lib/swig%%VER%%/php4
-@dirrm lib/swig%%VER%%/perl5
-@dirrm lib/swig%%VER%%/ocaml
-@dirrm lib/swig%%VER%%/mzscheme
-@dirrm lib/swig%%VER%%/java
-@dirrm lib/swig%%VER%%/guile
-@dirrm lib/swig%%VER%%/csharp
-@dirrm lib/swig%%VER%%/chicken
-@dirrm lib/swig%%VER%%
+bin/swig
+%%DATADIR%%/%%PORTVERSION%%/tcl/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/tclsh.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/wish.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/swigtcl8.swg
+%%DATADIR%%/%%PORTVERSION%%/tcl/tcl8.swg
+%%DATADIR%%/%%PORTVERSION%%/tcl/tcl8kw.swg
+%%DATADIR%%/%%PORTVERSION%%/_std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/carrays.i
+%%DATADIR%%/%%PORTVERSION%%/cdata.i
+%%DATADIR%%/%%PORTVERSION%%/cmalloc.i
+%%DATADIR%%/%%PORTVERSION%%/constraints.i
+%%DATADIR%%/%%PORTVERSION%%/cpointer.i
+%%DATADIR%%/%%PORTVERSION%%/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/exception.i
+%%DATADIR%%/%%PORTVERSION%%/math.i
+%%DATADIR%%/%%PORTVERSION%%/pointer.i
+%%DATADIR%%/%%PORTVERSION%%/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/stl.i
+%%DATADIR%%/%%PORTVERSION%%/swigrun.i
+%%DATADIR%%/%%PORTVERSION%%/allkw.swg
+%%DATADIR%%/%%PORTVERSION%%/runtime.swg
+%%DATADIR%%/%%PORTVERSION%%/swig.swg
+%%DATADIR%%/%%PORTVERSION%%/swiginit.swg
+%%DATADIR%%/%%PORTVERSION%%/swiglabels.swg
+%%DATADIR%%/%%PORTVERSION%%/swigrun.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/perlmain.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/perl5.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/perlinit.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/perlrun.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/Makefile.pl
+%%DATADIR%%/%%PORTVERSION%%/perl5/noembed.h
+%%DATADIR%%/%%PORTVERSION%%/python/argcargv.i
+%%DATADIR%%/%%PORTVERSION%%/python/attribute.i
+%%DATADIR%%/%%PORTVERSION%%/python/ccomplex.i
+%%DATADIR%%/%%PORTVERSION%%/python/complex.i
+%%DATADIR%%/%%PORTVERSION%%/python/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/python/embed.i
+%%DATADIR%%/%%PORTVERSION%%/python/embed15.i
+%%DATADIR%%/%%PORTVERSION%%/python/file.i
+%%DATADIR%%/%%PORTVERSION%%/python/implicit.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_alloc.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_basic_string.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_char_traits.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_complex.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_container.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_except.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_ios.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_iostream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/python/wchar.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_multimap.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_multiset.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_set.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_sstream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_streambuf.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_vectora.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wios.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wiostream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wsstream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wstreambuf.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wstring.i
+%%DATADIR%%/%%PORTVERSION%%/python/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/python/defarg.swg
+%%DATADIR%%/%%PORTVERSION%%/python/director.swg
+%%DATADIR%%/%%PORTVERSION%%/python/director_h.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyapi.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pycomplex.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pycontainer.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pydocs.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyenum.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyfragments.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyinit.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyinout.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pymacros.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pymisctypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyobject.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyopers.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyprimtypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyptrtypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyrun.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyruntime.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pystdcommon.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pystrbase.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pystrings.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyswigtype.swg
+%%DATADIR%%/%%PORTVERSION%%/python/python.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pythonkw.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pytuplehlp.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyuserdir.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyvaltypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyvoid.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pywstrings.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/cplusplus.i
+%%DATADIR%%/%%PORTVERSION%%/guile/ghinterface.i
+%%DATADIR%%/%%PORTVERSION%%/guile/guile.i
+%%DATADIR%%/%%PORTVERSION%%/guile/guilemain.i
+%%DATADIR%%/%%PORTVERSION%%/guile/interpreter.i
+%%DATADIR%%/%%PORTVERSION%%/guile/list-vector.i
+%%DATADIR%%/%%PORTVERSION%%/guile/pointer-in-out.i
+%%DATADIR%%/%%PORTVERSION%%/guile/ports.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/guile/swigrun.i
+%%DATADIR%%/%%PORTVERSION%%/guile/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_gh.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_gh_run.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_scm.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_scm_run.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/common.scm
+%%DATADIR%%/%%PORTVERSION%%/java/arrays_java.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_wstring.i
+%%DATADIR%%/%%PORTVERSION%%/java/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/java/various.i
+%%DATADIR%%/%%PORTVERSION%%/java/director.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enums.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enumsimple.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enumtypesafe.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enumtypeunsafe.swg
+%%DATADIR%%/%%PORTVERSION%%/java/java.swg
+%%DATADIR%%/%%PORTVERSION%%/java/javahead.swg
+%%DATADIR%%/%%PORTVERSION%%/java/javakw.swg
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/mzrun.swg
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/mzscheme.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/embed.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/fragments.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/director.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/ruby.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubydef.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyenum.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyhead.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubykw.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubymisctypes.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyobject.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyopers.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyprimtypes.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubystrings.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyswigtype.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyvoid.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/Makefile.swig
+%%DATADIR%%/%%PORTVERSION%%/ruby/extconf.rb
+%%DATADIR%%/%%PORTVERSION%%/php4/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/php4/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/php4/utils.i
+%%DATADIR%%/%%PORTVERSION%%/php4/php4.swg
+%%DATADIR%%/%%PORTVERSION%%/php4/php4kw.swg
+%%DATADIR%%/%%PORTVERSION%%/php4/php4run.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/carray.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocaml.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_complex.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/typecheck.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/class.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/director.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocaml.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocamldec.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocamlkw.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/preamble.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/typeregister.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/swigp4.ml
+%%DATADIR%%/%%PORTVERSION%%/ocaml/swig.mli
+%%DATADIR%%/%%PORTVERSION%%/ocaml/swig.ml
+%%DATADIR%%/%%PORTVERSION%%/pike/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/pike/pike.swg
+%%DATADIR%%/%%PORTVERSION%%/pike/pikekw.swg
+%%DATADIR%%/%%PORTVERSION%%/pike/pikerun.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/chicken/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/chicken/chicken.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/chickenkw.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/chickenrun.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/swigclosprefix.scm
+%%DATADIR%%/%%PORTVERSION%%/chicken/multi-generic.scm
+%%DATADIR%%/%%PORTVERSION%%/chicken/tinyclos-multi-generic.patch
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/csharp.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/csharphead.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/csharpkw.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/enums.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/enumsimple.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/enumtypesafe.swg
+%%DATADIR%%/%%PORTVERSION%%/modula3/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/modula3/modula3.swg
+%%DATADIR%%/%%PORTVERSION%%/modula3/modula3head.swg
+%%DATADIR%%/%%PORTVERSION%%/allegrocl/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/allegrocl/allegrocl.swg
+%%DATADIR%%/%%PORTVERSION%%/std/std_alloc.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_basic_string.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_char_traits.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_container.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_except.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_ios.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_iostream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_multimap.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_multiset.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_set.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_sstream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_streambuf.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_vectora.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wios.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wiostream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wsstream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wstreambuf.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wstring.i
+@dirrm %%DATADIR%%/%%PORTVERSION%%/perl5
+@dirrm %%DATADIR%%/%%PORTVERSION%%/python
+@dirrm %%DATADIR%%/%%PORTVERSION%%/guile
+@dirrm %%DATADIR%%/%%PORTVERSION%%/java
+@dirrm %%DATADIR%%/%%PORTVERSION%%/mzscheme
+@dirrm %%DATADIR%%/%%PORTVERSION%%/ruby
+@dirrm %%DATADIR%%/%%PORTVERSION%%/php4
+@dirrm %%DATADIR%%/%%PORTVERSION%%/ocaml
+@dirrm %%DATADIR%%/%%PORTVERSION%%/pike
+@dirrm %%DATADIR%%/%%PORTVERSION%%/chicken
+@dirrm %%DATADIR%%/%%PORTVERSION%%/csharp
+@dirrm %%DATADIR%%/%%PORTVERSION%%/modula3
+@dirrm %%DATADIR%%/%%PORTVERSION%%/allegrocl
+@dirrm %%DATADIR%%/%%PORTVERSION%%/std
+@dirrm %%DATADIR%%/%%PORTVERSION%%/tcl
+@dirrm %%DATADIR%%/%%PORTVERSION%%
+@dirrm %%DATADIR%%
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index f6513fab1c51..c0dd31cfb356 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3.21
-PORTREVISION=	1
+PORTVERSION=	1.3.25
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	knu@FreeBSD.org
+MAINTAINER=	xride@x12.dk
 COMMENT=	Simplified Wrapper and Interface Generator
 
 WANT_AUTOCONF_VER=253
+
 VER=		${PORTVERSION:R}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-# Supported languages: guile perl php4 python ruby tcl ocaml pike java
+# Supported languages: guile perl php4 python ruby tcl ocaml pike java csharp
+#                      allegrocl modula3 chicken
 SWIG_LANGUAGES?=	guile perl php4 python ruby tcl
 .for lang in ${SWIG_LANGUAGES}
 WANT_SWIG_${lang:U}=	yes
@@ -26,23 +28,20 @@ WANT_SWIG_${lang:U}=	yes
 
 .if defined(WANT_SWIG_GUILE)
 BUILD_DEPENDS+=		guile:${PORTSDIR}/lang/guile
-PLIST_SUB+=		WANT_SWIG_GUILE=""
-.else
-PLIST_SUB+=		WANT_SWIG_GUILE="@comment "
 .endif
+
 .if defined(WANT_SWIG_PERL)
 CATEGORIES+=		perl5
 USE_PERL5=		yes
-PLIST_SUB+=		WANT_SWIG_PERL=""
-.else
-PLIST_SUB+=		WANT_SWIG_PERL="@comment "
 .endif
+
 .if defined(WANT_SWIG_PHP4)
 BUILD_DEPENDS+=		${LOCALBASE}/include/php/main/php.h:${PORTSDIR}/lang/php4
-PLIST_SUB+=		WANT_SWIG_PHP4=""
+CONFIGURE_ARGS+=	--with-php4
 .else
-PLIST_SUB+=		WANT_SWIG_PHP4="@comment "
+CONFIGURE_ARGS+=	--without-php4
 .endif
+
 .if defined(WANT_SWIG_PYTHON)
 CATEGORIES+=		python
 USE_PYTHON=		yes
@@ -50,69 +49,80 @@ PYTHON_NO_DEPENDS=	yes
 BUILD_DEPENDS+=		${PYTHON_CMD}:${PYTHON_PORTSDIR}
 CONFIGURE_ARGS+=	--with-pyincl=${PYTHON_INCLUDEDIR} \
 			--with-pylib=${PYTHON_LIBDIR}
-PLIST_SUB+=		WANT_SWIG_PYTHON=""
-.else
-PLIST_SUB+=		WANT_SWIG_PYTHON="@comment "
 .endif
+
 .if defined(WANT_SWIG_RUBY)
 CATEGORIES+=		ruby
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
-PLIST_SUB+=		WANT_SWIG_RUBY=""
+CONFIGURE_ARGS+=	--with-ruby
 .else
-PLIST_SUB+=		WANT_SWIG_RUBY="@comment "
+CONFIGURE_ARGS+=	--without-ruby
 .endif
+
 .if defined(WANT_SWIG_TCL)
 CATEGORIES+=		tcl84
 BUILD_DEPENDS+=		${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
 CONFIGURE_ARGS+=	--with-tclincl=${LOCALBASE}/include/tcl8.4/ \
 			--with-tcllib=${LOCALBASE}/lib/tcl8.4/
-PLIST_SUB+=		WANT_SWIG_TCL=""
+.endif
+
+.if defined(WANT_SWIG_CSHARP)
+BUILD_DEPENDS+=		${LOCALBASE}/bin/mono:${PORTSDIR}/lang/mono
+CONFIGURE_ARGS+=	--with-csharp-compiler=${LOCALBASE}/bin/mcs
 .else
-PLIST_SUB+=		WANT_SWIG_TCL="@comment "
+CONFIGURE_ARGS+=	--without-csharp-compiler
 .endif
 
 .if defined(WANT_SWIG_OCAML)
 BUILD_DEPENDS+=		${LOCALBASE}/bin/ocamlc:${PORTSDIR}/lang/ocaml
-PLIST_SUB+=		WANT_SWIG_OCAML=""
 .else
-PLIST_SUB+=		WANT_SWIG_OCAML="@comment "
+CONFIGURE_ARGS+=	--without-ocaml
+.endif
+
+.if defined(WANT_SWIG_ALLEGRCL)
+CONFIGURE_ARGS+=	--with-allegrocl
+.else
+CONFIGURE_ARGS+=	--without-allegrocl
+.endif
+
+.if defined(WANT_SWIG_MODULA3)
+CONFIGURE_ARGS+=	--with-modula3
+.else
+CONFIGURE_ARGS+=	--without-modula3
 .endif
 
 .if defined(WANT_SWIG_PIKE)
 BUILD_DEPENDS+=		${LOCALBASE}/bin/pike:${PORTSDIR}/lang/pike
-PLIST_SUB+=		WANT_SWIG_PIKE=""
 .else
-PLIST_SUB+=		WANT_SWIG_PIKE="@comment "
-CONFIGURE_ARGS +=	--without-pike
+CONFIGURE_ARGS+=	--without-pike
 .endif
 
 .if defined(WANT_SWIG_JAVA)
 CATEGORIES+=		java
 USE_JAVA=	1.2+
-PLIST_SUB+=		WANT_SWIG_JAVA=""
 .else
-PLIST_SUB+=		WANT_SWIG_JAVA="@comment "
-CONFIGURE_ARGS +=	--without-java
+CONFIGURE_ARGS+=	--without-java
 .endif
 
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:U}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_LIBTOOL_VER=	13
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fPIC -DPIC"
-ALL_TARGET=	swig runtime
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -fPIC -DPIC"
+ALL_TARGET=	swig
 PLIST_SUB+=	VER="${VER}"
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's/SKIP_CHICKEN=$$/&"1"/' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|$$RUBY |${RUBY} |' ${WRKSRC}/configure
 
-post-install:
-# A separate swig13-runtime port might be nice
-	@(cd ${INSTALL_WRKSRC}/Runtime && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+post-configure:
+	${REINPLACE_CMD} -e 's#null#&|| true#' ${WRKSRC}/Makefile
 
+post-install:
 	${LN} -f ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.post.mk>
diff --git a/devel/swig20/distinfo b/devel/swig20/distinfo
index 674e9704ad21..2f84aae65483 100644
--- a/devel/swig20/distinfo
+++ b/devel/swig20/distinfo
@@ -1,2 +1,2 @@
-MD5 (swig-1.3.21.tar.gz) = 88ff5b99be3eafebb8a6e20f4f986c04
-SIZE (swig-1.3.21.tar.gz) = 2023025
+MD5 (swig-1.3.25.tar.gz) = 0a338d9de65e266338cbe7e2bea7a4a9
+SIZE (swig-1.3.25.tar.gz) = 3451186
diff --git a/devel/swig20/files/patch-Makefile.in b/devel/swig20/files/patch-Makefile.in
deleted file mode 100644
index 4e39bc09307d..000000000000
--- a/devel/swig20/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Mon Oct 14 22:37:59 2002
-+++ Makefile.in	Mon Oct 28 07:23:38 2002
-@@ -290,8 +290,8 @@
- 	    dst=$(DESTDIR)$(SWIG_LIB)/$$lang;			\
- 	    $(MKINSTDIRS) $$dst;				\
- 	    ( cd $(srcdir)/Lib/$$lang;				\
--	      doti="`ls *.i 2>/dev/null`";			\
--	      dotswg="`ls *.swg 2>/dev/null`";			\
-+	      doti="`ls *.i 2>/dev/null || true`";		\
-+	      dotswg="`ls *.swg 2>/dev/null || true`";		\
- 	      if [ -f extra-install.list ]; then		\
- 		  extra="`sed '/^#/d' extra-install.list`";	\
- 	      fi;						\
diff --git a/devel/swig20/pkg-descr b/devel/swig20/pkg-descr
index c9ea8c17ee94..188307a145ab 100644
--- a/devel/swig20/pkg-descr
+++ b/devel/swig20/pkg-descr
@@ -9,6 +9,10 @@ scripting languages.    Currently, SWIG supports :
         - Guile
         - MzScheme
         - Ruby
+        - CSharp
+        - Modula-3
+        - Allegro CL
+        - Chicken
 
 Using SWIG, it is possible to greatly simplify interface development
 and to put interesting interfaces on existing applications with
diff --git a/devel/swig20/pkg-plist b/devel/swig20/pkg-plist
index 887f450ce155..55870fd3d66b 100644
--- a/devel/swig20/pkg-plist
+++ b/devel/swig20/pkg-plist
@@ -1,219 +1,286 @@
-bin/swig
 bin/swig%%VER%%
-%%WANT_SWIG_GUILE%%lib/libswigguile.a
-%%WANT_SWIG_GUILE%%lib/libswigguile.la
-%%WANT_SWIG_GUILE%%lib/libswigguile.so
-%%WANT_SWIG_GUILE%%lib/libswigguile.so.0
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.a
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.la
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.so
-%%WANT_SWIG_GUILE%%lib/libswigguilescm.so.0
-%%WANT_SWIG_PHP4%%lib/libswigphp4.a
-%%WANT_SWIG_PHP4%%lib/libswigphp4.la
-%%WANT_SWIG_PHP4%%lib/libswigphp4.so
-%%WANT_SWIG_PHP4%%lib/libswigphp4.so.0
-%%WANT_SWIG_PERL%%lib/libswigpl.a
-%%WANT_SWIG_PERL%%lib/libswigpl.la
-%%WANT_SWIG_PERL%%lib/libswigpl.so
-%%WANT_SWIG_PERL%%lib/libswigpl.so.0
-%%WANT_SWIG_PYTHON%%lib/libswigpy.a
-%%WANT_SWIG_PYTHON%%lib/libswigpy.la
-%%WANT_SWIG_PYTHON%%lib/libswigpy.so
-%%WANT_SWIG_PYTHON%%lib/libswigpy.so.0
-%%WANT_SWIG_RUBY%%lib/libswigrb.a
-%%WANT_SWIG_RUBY%%lib/libswigrb.la
-%%WANT_SWIG_RUBY%%lib/libswigrb.so
-%%WANT_SWIG_RUBY%%lib/libswigrb.so.0
-%%WANT_SWIG_TCL%%lib/libswigtcl8.a
-%%WANT_SWIG_TCL%%lib/libswigtcl8.la
-%%WANT_SWIG_TCL%%lib/libswigtcl8.so
-%%WANT_SWIG_TCL%%lib/libswigtcl8.so.0
-%%WANT_SWIG_OCAML%%lib/libswigocaml.a
-%%WANT_SWIG_OCAML%%lib/libswigocaml.la
-%%WANT_SWIG_OCAML%%lib/libswigocaml.so
-%%WANT_SWIG_OCAML%%lib/libswigocaml.so.0
-lib/swig%%VER%%/_std_deque.i
-lib/swig%%VER%%/allkw.swg
-lib/swig%%VER%%/carrays.i
-lib/swig%%VER%%/cdata.i
-lib/swig%%VER%%/chicken/chicken.swg
-lib/swig%%VER%%/chicken/chickenkw.swg
-lib/swig%%VER%%/chicken/chickenrun.swg
-lib/swig%%VER%%/chicken/fragments.i
-lib/swig%%VER%%/chicken/precommon.swg
-lib/swig%%VER%%/chicken/typemaps.i
-lib/swig%%VER%%/cmalloc.i
-lib/swig%%VER%%/common.swg
-lib/swig%%VER%%/constraints.i
-lib/swig%%VER%%/cpointer.i
-lib/swig%%VER%%/csharp/csharp.swg
-lib/swig%%VER%%/csharp/csharphead.swg
-lib/swig%%VER%%/csharp/csharpkw.swg
-lib/swig%%VER%%/csharp/std_string.i
-lib/swig%%VER%%/csharp/typemaps.i
-lib/swig%%VER%%/cstring.i
-lib/swig%%VER%%/exception.i
-lib/swig%%VER%%/guile/common.scm
-lib/swig%%VER%%/guile/cplusplus.i
-lib/swig%%VER%%/guile/ghinterface.i
-lib/swig%%VER%%/guile/guile.i
-lib/swig%%VER%%/guile/guile_gh.swg
-lib/swig%%VER%%/guile/guile_gh_run.swg
-lib/swig%%VER%%/guile/guile_scm.swg
-lib/swig%%VER%%/guile/guile_scm_run.swg
-lib/swig%%VER%%/guile/guilemain.i
-lib/swig%%VER%%/guile/interpreter.i
-lib/swig%%VER%%/guile/list-vector.i
-lib/swig%%VER%%/guile/pointer-in-out.i
-lib/swig%%VER%%/guile/ports.i
-lib/swig%%VER%%/guile/precommon.swg
-lib/swig%%VER%%/guile/std_common.i
-lib/swig%%VER%%/guile/std_map.i
-lib/swig%%VER%%/guile/std_pair.i
-lib/swig%%VER%%/guile/std_string.i
-lib/swig%%VER%%/guile/std_vector.i
-lib/swig%%VER%%/guile/typemaps.i
-lib/swig%%VER%%/java/arrays_java.i
-lib/swig%%VER%%/java/director.swg
-lib/swig%%VER%%/java/java.swg
-lib/swig%%VER%%/java/javahead.swg
-lib/swig%%VER%%/java/javakw.swg
-lib/swig%%VER%%/java/std_common.i
-lib/swig%%VER%%/java/std_map.i
-lib/swig%%VER%%/java/std_pair.i
-lib/swig%%VER%%/java/std_string.i
-lib/swig%%VER%%/java/std_vector.i
-lib/swig%%VER%%/java/typemaps.i
-lib/swig%%VER%%/java/various.i
-lib/swig%%VER%%/math.i
-lib/swig%%VER%%/mzscheme/mzrun.swg
-lib/swig%%VER%%/mzscheme/mzscheme.swg
-lib/swig%%VER%%/mzscheme/precommon.swg
-lib/swig%%VER%%/mzscheme/std_common.i
-lib/swig%%VER%%/mzscheme/std_map.i
-lib/swig%%VER%%/mzscheme/std_pair.i
-lib/swig%%VER%%/mzscheme/std_string.i
-lib/swig%%VER%%/mzscheme/std_vector.i
-lib/swig%%VER%%/mzscheme/typemaps.i
-lib/swig%%VER%%/ocaml/carray.i
-lib/swig%%VER%%/ocaml/class.swg
-lib/swig%%VER%%/ocaml/cstring.i
-lib/swig%%VER%%/ocaml/director.swg
-lib/swig%%VER%%/ocaml/mlheading.swg
-lib/swig%%VER%%/ocaml/mliheading.swg
-lib/swig%%VER%%/ocaml/ocaml.i
-lib/swig%%VER%%/ocaml/ocaml.swg
-lib/swig%%VER%%/ocaml/ocamldec.swg
-lib/swig%%VER%%/ocaml/ocamlkw.swg
-lib/swig%%VER%%/ocaml/preamble.swg
-lib/swig%%VER%%/ocaml/std_common.i
-lib/swig%%VER%%/ocaml/std_complex.i
-lib/swig%%VER%%/ocaml/std_deque.i
-lib/swig%%VER%%/ocaml/std_list.i
-lib/swig%%VER%%/ocaml/std_map.i
-lib/swig%%VER%%/ocaml/std_pair.i
-lib/swig%%VER%%/ocaml/std_string.i
-lib/swig%%VER%%/ocaml/std_vector.i
-lib/swig%%VER%%/ocaml/swig.ml
-lib/swig%%VER%%/ocaml/swig.mli
-lib/swig%%VER%%/ocaml/swigp4.ml
-lib/swig%%VER%%/ocaml/typecheck.i
-lib/swig%%VER%%/ocaml/typemaps.i
-lib/swig%%VER%%/ocaml/typeregister.swg
-lib/swig%%VER%%/perl5/Makefile.pl
-lib/swig%%VER%%/perl5/noembed.h
-lib/swig%%VER%%/perl5/perl5.swg
-lib/swig%%VER%%/perl5/perlmain.i
-lib/swig%%VER%%/perl5/perlrun.swg
-lib/swig%%VER%%/perl5/precommon.swg
-lib/swig%%VER%%/perl5/std_common.i
-lib/swig%%VER%%/perl5/std_map.i
-lib/swig%%VER%%/perl5/std_pair.i
-lib/swig%%VER%%/perl5/std_string.i
-lib/swig%%VER%%/perl5/std_vector.i
-lib/swig%%VER%%/perl5/typemaps.i
-lib/swig%%VER%%/php4/php4.swg
-lib/swig%%VER%%/php4/php4kw.swg
-lib/swig%%VER%%/php4/php4run.swg
-lib/swig%%VER%%/php4/precommon.swg
-lib/swig%%VER%%/php4/std_common.i
-lib/swig%%VER%%/php4/std_map.i
-lib/swig%%VER%%/php4/std_pair.i
-lib/swig%%VER%%/php4/std_string.i
-lib/swig%%VER%%/php4/std_vector.i
-lib/swig%%VER%%/php4/typemaps.i
-lib/swig%%VER%%/php4/utils.i
-lib/swig%%VER%%/pike/pike.swg
-lib/swig%%VER%%/pike/pikekw.swg
-lib/swig%%VER%%/pike/pikerun.swg
-lib/swig%%VER%%/pike/precommon.swg
-lib/swig%%VER%%/pike/std_string.i
-lib/swig%%VER%%/pointer.i
-lib/swig%%VER%%/python/cstring.i
-lib/swig%%VER%%/python/defarg.swg
-lib/swig%%VER%%/python/director.swg
-lib/swig%%VER%%/python/embed.i
-lib/swig%%VER%%/python/embed15.i
-lib/swig%%VER%%/python/fragments.i
-lib/swig%%VER%%/python/precommon.swg
-lib/swig%%VER%%/python/pyrun.swg
-lib/swig%%VER%%/python/python.swg
-lib/swig%%VER%%/python/pythonkw.swg
-lib/swig%%VER%%/python/std_common.i
-lib/swig%%VER%%/python/std_complex.i
-lib/swig%%VER%%/python/std_deque.i
-lib/swig%%VER%%/python/std_list.i
-lib/swig%%VER%%/python/std_map.i
-lib/swig%%VER%%/python/std_pair.i
-lib/swig%%VER%%/python/std_string.i
-lib/swig%%VER%%/python/std_vector.i
-lib/swig%%VER%%/python/typemaps.i
-lib/swig%%VER%%/ruby/Makefile.swig
-lib/swig%%VER%%/ruby/director.swg
-lib/swig%%VER%%/ruby/embed.i
-lib/swig%%VER%%/ruby/extconf.rb
-lib/swig%%VER%%/ruby/fragments.i
-lib/swig%%VER%%/ruby/precommon.swg
-lib/swig%%VER%%/ruby/ruby.swg
-lib/swig%%VER%%/ruby/rubydec.swg
-lib/swig%%VER%%/ruby/rubydef.swg
-lib/swig%%VER%%/ruby/rubyhead.swg
-lib/swig%%VER%%/ruby/rubykw.swg
-lib/swig%%VER%%/ruby/std_common.i
-lib/swig%%VER%%/ruby/std_deque.i
-lib/swig%%VER%%/ruby/std_map.i
-lib/swig%%VER%%/ruby/std_pair.i
-lib/swig%%VER%%/ruby/std_string.i
-lib/swig%%VER%%/ruby/std_vector.i
-lib/swig%%VER%%/ruby/typemaps.i
-lib/swig%%VER%%/std_deque.i
-lib/swig%%VER%%/stl.i
-lib/swig%%VER%%/swig.swg
-lib/swig%%VER%%/swigrun.i
-lib/swig%%VER%%/tcl/cstring.i
-lib/swig%%VER%%/tcl/precommon.swg
-lib/swig%%VER%%/tcl/std_common.i
-lib/swig%%VER%%/tcl/std_map.i
-lib/swig%%VER%%/tcl/std_pair.i
-lib/swig%%VER%%/tcl/std_string.i
-lib/swig%%VER%%/tcl/std_vector.i
-lib/swig%%VER%%/tcl/swigtcl8.swg
-lib/swig%%VER%%/tcl/tcl8.swg
-lib/swig%%VER%%/tcl/tcl8kw.swg
-lib/swig%%VER%%/tcl/tclsh.i
-lib/swig%%VER%%/tcl/typemaps.i
-lib/swig%%VER%%/tcl/wish.i
-share/aclocal/swig.m4
-@dirrm lib/swig%%VER%%/tcl
-@dirrm lib/swig%%VER%%/ruby
-@dirrm lib/swig%%VER%%/python
-@dirrm lib/swig%%VER%%/pike
-@dirrm lib/swig%%VER%%/php4
-@dirrm lib/swig%%VER%%/perl5
-@dirrm lib/swig%%VER%%/ocaml
-@dirrm lib/swig%%VER%%/mzscheme
-@dirrm lib/swig%%VER%%/java
-@dirrm lib/swig%%VER%%/guile
-@dirrm lib/swig%%VER%%/csharp
-@dirrm lib/swig%%VER%%/chicken
-@dirrm lib/swig%%VER%%
+bin/swig
+%%DATADIR%%/%%PORTVERSION%%/tcl/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/tclsh.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/wish.i
+%%DATADIR%%/%%PORTVERSION%%/tcl/swigtcl8.swg
+%%DATADIR%%/%%PORTVERSION%%/tcl/tcl8.swg
+%%DATADIR%%/%%PORTVERSION%%/tcl/tcl8kw.swg
+%%DATADIR%%/%%PORTVERSION%%/_std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/carrays.i
+%%DATADIR%%/%%PORTVERSION%%/cdata.i
+%%DATADIR%%/%%PORTVERSION%%/cmalloc.i
+%%DATADIR%%/%%PORTVERSION%%/constraints.i
+%%DATADIR%%/%%PORTVERSION%%/cpointer.i
+%%DATADIR%%/%%PORTVERSION%%/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/exception.i
+%%DATADIR%%/%%PORTVERSION%%/math.i
+%%DATADIR%%/%%PORTVERSION%%/pointer.i
+%%DATADIR%%/%%PORTVERSION%%/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/stl.i
+%%DATADIR%%/%%PORTVERSION%%/swigrun.i
+%%DATADIR%%/%%PORTVERSION%%/allkw.swg
+%%DATADIR%%/%%PORTVERSION%%/runtime.swg
+%%DATADIR%%/%%PORTVERSION%%/swig.swg
+%%DATADIR%%/%%PORTVERSION%%/swiginit.swg
+%%DATADIR%%/%%PORTVERSION%%/swiglabels.swg
+%%DATADIR%%/%%PORTVERSION%%/swigrun.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/perlmain.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/perl5/perl5.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/perlinit.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/perlrun.swg
+%%DATADIR%%/%%PORTVERSION%%/perl5/Makefile.pl
+%%DATADIR%%/%%PORTVERSION%%/perl5/noembed.h
+%%DATADIR%%/%%PORTVERSION%%/python/argcargv.i
+%%DATADIR%%/%%PORTVERSION%%/python/attribute.i
+%%DATADIR%%/%%PORTVERSION%%/python/ccomplex.i
+%%DATADIR%%/%%PORTVERSION%%/python/complex.i
+%%DATADIR%%/%%PORTVERSION%%/python/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/python/embed.i
+%%DATADIR%%/%%PORTVERSION%%/python/embed15.i
+%%DATADIR%%/%%PORTVERSION%%/python/file.i
+%%DATADIR%%/%%PORTVERSION%%/python/implicit.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_alloc.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_basic_string.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_char_traits.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_complex.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_container.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_except.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_ios.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_iostream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/python/wchar.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_multimap.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_multiset.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_set.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_sstream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_streambuf.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_vectora.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wios.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wiostream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wsstream.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wstreambuf.i
+%%DATADIR%%/%%PORTVERSION%%/python/std_wstring.i
+%%DATADIR%%/%%PORTVERSION%%/python/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/python/defarg.swg
+%%DATADIR%%/%%PORTVERSION%%/python/director.swg
+%%DATADIR%%/%%PORTVERSION%%/python/director_h.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyapi.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pycomplex.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pycontainer.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pydocs.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyenum.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyfragments.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyinit.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyinout.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pymacros.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pymisctypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyobject.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyopers.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyprimtypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyptrtypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyrun.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyruntime.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pystdcommon.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pystrbase.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pystrings.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyswigtype.swg
+%%DATADIR%%/%%PORTVERSION%%/python/python.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pythonkw.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pytuplehlp.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyuserdir.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyvaltypes.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pyvoid.swg
+%%DATADIR%%/%%PORTVERSION%%/python/pywstrings.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/cplusplus.i
+%%DATADIR%%/%%PORTVERSION%%/guile/ghinterface.i
+%%DATADIR%%/%%PORTVERSION%%/guile/guile.i
+%%DATADIR%%/%%PORTVERSION%%/guile/guilemain.i
+%%DATADIR%%/%%PORTVERSION%%/guile/interpreter.i
+%%DATADIR%%/%%PORTVERSION%%/guile/list-vector.i
+%%DATADIR%%/%%PORTVERSION%%/guile/pointer-in-out.i
+%%DATADIR%%/%%PORTVERSION%%/guile/ports.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/guile/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/guile/swigrun.i
+%%DATADIR%%/%%PORTVERSION%%/guile/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_gh.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_gh_run.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_scm.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/guile_scm_run.swg
+%%DATADIR%%/%%PORTVERSION%%/guile/common.scm
+%%DATADIR%%/%%PORTVERSION%%/java/arrays_java.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/java/std_wstring.i
+%%DATADIR%%/%%PORTVERSION%%/java/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/java/various.i
+%%DATADIR%%/%%PORTVERSION%%/java/director.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enums.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enumsimple.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enumtypesafe.swg
+%%DATADIR%%/%%PORTVERSION%%/java/enumtypeunsafe.swg
+%%DATADIR%%/%%PORTVERSION%%/java/java.swg
+%%DATADIR%%/%%PORTVERSION%%/java/javahead.swg
+%%DATADIR%%/%%PORTVERSION%%/java/javakw.swg
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/mzrun.swg
+%%DATADIR%%/%%PORTVERSION%%/mzscheme/mzscheme.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/embed.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/fragments.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/ruby/director.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/ruby.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubydef.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyenum.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyhead.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubykw.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubymisctypes.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyobject.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyopers.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyprimtypes.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubystrings.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyswigtype.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/rubyvoid.swg
+%%DATADIR%%/%%PORTVERSION%%/ruby/Makefile.swig
+%%DATADIR%%/%%PORTVERSION%%/ruby/extconf.rb
+%%DATADIR%%/%%PORTVERSION%%/php4/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/php4/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/php4/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/php4/utils.i
+%%DATADIR%%/%%PORTVERSION%%/php4/php4.swg
+%%DATADIR%%/%%PORTVERSION%%/php4/php4kw.swg
+%%DATADIR%%/%%PORTVERSION%%/php4/php4run.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/carray.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/cstring.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocaml.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_complex.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/typecheck.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/ocaml/class.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/director.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocaml.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocamldec.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/ocamlkw.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/preamble.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/typeregister.swg
+%%DATADIR%%/%%PORTVERSION%%/ocaml/swigp4.ml
+%%DATADIR%%/%%PORTVERSION%%/ocaml/swig.mli
+%%DATADIR%%/%%PORTVERSION%%/ocaml/swig.ml
+%%DATADIR%%/%%PORTVERSION%%/pike/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/pike/pike.swg
+%%DATADIR%%/%%PORTVERSION%%/pike/pikekw.swg
+%%DATADIR%%/%%PORTVERSION%%/pike/pikerun.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/chicken/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/chicken/chicken.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/chickenkw.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/chickenrun.swg
+%%DATADIR%%/%%PORTVERSION%%/chicken/swigclosprefix.scm
+%%DATADIR%%/%%PORTVERSION%%/chicken/multi-generic.scm
+%%DATADIR%%/%%PORTVERSION%%/chicken/tinyclos-multi-generic.patch
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/csharp/csharp.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/csharphead.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/csharpkw.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/enums.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/enumsimple.swg
+%%DATADIR%%/%%PORTVERSION%%/csharp/enumtypesafe.swg
+%%DATADIR%%/%%PORTVERSION%%/modula3/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/modula3/modula3.swg
+%%DATADIR%%/%%PORTVERSION%%/modula3/modula3head.swg
+%%DATADIR%%/%%PORTVERSION%%/allegrocl/typemaps.i
+%%DATADIR%%/%%PORTVERSION%%/allegrocl/allegrocl.swg
+%%DATADIR%%/%%PORTVERSION%%/std/std_alloc.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_basic_string.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_char_traits.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_common.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_container.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_deque.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_except.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_ios.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_iostream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_list.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_map.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_multimap.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_multiset.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_pair.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_set.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_sstream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_streambuf.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_string.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_vector.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_vectora.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wios.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wiostream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wsstream.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wstreambuf.i
+%%DATADIR%%/%%PORTVERSION%%/std/std_wstring.i
+@dirrm %%DATADIR%%/%%PORTVERSION%%/perl5
+@dirrm %%DATADIR%%/%%PORTVERSION%%/python
+@dirrm %%DATADIR%%/%%PORTVERSION%%/guile
+@dirrm %%DATADIR%%/%%PORTVERSION%%/java
+@dirrm %%DATADIR%%/%%PORTVERSION%%/mzscheme
+@dirrm %%DATADIR%%/%%PORTVERSION%%/ruby
+@dirrm %%DATADIR%%/%%PORTVERSION%%/php4
+@dirrm %%DATADIR%%/%%PORTVERSION%%/ocaml
+@dirrm %%DATADIR%%/%%PORTVERSION%%/pike
+@dirrm %%DATADIR%%/%%PORTVERSION%%/chicken
+@dirrm %%DATADIR%%/%%PORTVERSION%%/csharp
+@dirrm %%DATADIR%%/%%PORTVERSION%%/modula3
+@dirrm %%DATADIR%%/%%PORTVERSION%%/allegrocl
+@dirrm %%DATADIR%%/%%PORTVERSION%%/std
+@dirrm %%DATADIR%%/%%PORTVERSION%%/tcl
+@dirrm %%DATADIR%%/%%PORTVERSION%%
+@dirrm %%DATADIR%%