3 files changed, 64 insertions, 26 deletions

diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 3888b0cda6cc..1616ccc37dcb 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3.19
-PORTREVISION=	1
+PORTVERSION=	1.3.20
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -104,16 +103,10 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fpic -DPIC"
 ALL_TARGET=	swig runtime
 PLIST_SUB+=	VER="${VER}"
 
-post-patch:
-	${PERL} -i.orig -p \
-		-e 's:/usr/local(/include/php)\b:${LOCALBASE}$$1:;' \
-		-e 's:(/php_config\.h)\b:/main$$1:;' \
-		${WRKSRC}/configure.in ${WRKSRC}/configure
-	${PERL} -i.orig -p \
-		-e 's:^(LIBS\s+=\s+):$${1}libswigphp4\$$(RELEASESUFFIX).la :;' \
-		${WRKSRC}/Runtime/Makefile.in
-
 post-install:
+# A separate swig13-runtime port might be nice
+	@(cd ${INSTALL_WRKSRC}/Runtime && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+
 	${LN} -f ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
 
 .include <bsd.port.mk>
diff --git a/devel/swig13/distinfo b/devel/swig13/distinfo
index d3dbfd4b4337..ea59da3ffb68 100644
--- a/devel/swig13/distinfo
+++ b/devel/swig13/distinfo
@@ -1 +1,2 @@
-MD5 (swig-1.3.19.tar.gz) = a733455544426b31868dd87fc162e750
+MD5 (swig-1.3.20.tar.gz) = aac11adef9f9709a75b9b0f676808d5f
+SIZE (swig-1.3.20.tar.gz) = 2014317
diff --git a/devel/swig13/pkg-plist b/devel/swig13/pkg-plist
index be94a305904e..d6436fb95bc8 100644
--- a/devel/swig13/pkg-plist
+++ b/devel/swig13/pkg-plist
@@ -1,33 +1,37 @@
 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_PHP4%%lib/libswigphp4.a
+%%WANT_SWIG_GUILE%%lib/libswigguile.so.0
+%%WANT_SWIG_GUILE%%lib/libswigguilescm.la
+%%WANT_SWIG_GUILE%%lib/libswigguilescm.so.0
 %%WANT_SWIG_PHP4%%lib/libswigphp4.la
 %%WANT_SWIG_PHP4%%lib/libswigphp4.so
-%%WANT_SWIG_PERL%%lib/libswigpl.a
+%%WANT_SWIG_PHP4%%lib/libswigphp4.so.0
 %%WANT_SWIG_PERL%%lib/libswigpl.la
 %%WANT_SWIG_PERL%%lib/libswigpl.so
-%%WANT_SWIG_PYTHON%%lib/libswigpy.a
+%%WANT_SWIG_PERL%%lib/libswigpl.so.0
 %%WANT_SWIG_PYTHON%%lib/libswigpy.la
 %%WANT_SWIG_PYTHON%%lib/libswigpy.so
-%%WANT_SWIG_RUBY%%lib/libswigrb.a
+%%WANT_SWIG_PYTHON%%lib/libswigpy.so.0
 %%WANT_SWIG_RUBY%%lib/libswigrb.la
 %%WANT_SWIG_RUBY%%lib/libswigrb.so
-%%WANT_SWIG_TCL%%lib/libswigtcl8.a
+%%WANT_SWIG_RUBY%%lib/libswigrb.so.0
 %%WANT_SWIG_TCL%%lib/libswigtcl8.la
 %%WANT_SWIG_TCL%%lib/libswigtcl8.so
-%%WANT_SWIG_OCAML%%lib/libswigocaml.a
+%%WANT_SWIG_TCL%%lib/libswigtcl8.so.0
 %%WANT_SWIG_OCAML%%lib/libswigocaml.la
-%%WANT_SWIG_OCAML%%lib/libswigocaml.so.0
 %%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
@@ -35,57 +39,75 @@ 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.swg
-lib/swig%%VER%%/guile/guiledec.swg
+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/mzscheme.i
+lib/swig%%VER%%/mzscheme/mzrun.swg
 lib/swig%%VER%%/mzscheme/mzscheme.swg
-lib/swig%%VER%%/mzscheme/mzschemedec.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/libswigocaml.h
-lib/swig%%VER%%/ocaml/libswigocaml.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
@@ -94,19 +116,29 @@ 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
@@ -114,39 +146,51 @@ 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