Update to 1.3.14.

- Switch tcl from 8.2 to 8.3.
- Add support for java, ocaml and pike.

Submitted by:	Andrew Filonov <aef@antar.bryansk.ru>

- Set CATEGORIES dynamically according to SWIG_LANGUAGES.

3 files changed, 64 insertions, 19 deletions

diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 5c7878825a62..d4b5dc6061dd 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3.12
-CATEGORIES=	devel perl5 python ruby tcl82
+PORTVERSION=	1.3.14
+CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
 		ftp://ftp.mcc.ac.uk/pub/mvc/swig/
@@ -31,6 +31,7 @@ PLIST_SUB+=		WANT_SWIG_GUILE=""
 PLIST_SUB+=		WANT_SWIG_GUILE="@comment "
 .endif
 .if defined(WANT_SWIG_PERL)
+CATEGORIES+=		perl5
 USE_PERL5=		yes
 PLIST_SUB+=		WANT_SWIG_PERL=""
 .else
@@ -45,6 +46,7 @@ PLIST_SUB+=		WANT_SWIG_PHP4=""
 PLIST_SUB+=		WANT_SWIG_PHP4="@comment "
 .endif
 .if defined(WANT_SWIG_PYTHON)
+CATEGORIES+=		python
 USE_PYTHON=		yes
 PYTHON_NO_DEPENDS=	yes
 BUILD_DEPENDS+=		${PYTHON_CMD}:${PYTHON_PORTSDIR}
@@ -55,6 +57,7 @@ PLIST_SUB+=		WANT_SWIG_PYTHON=""
 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=""
@@ -62,14 +65,39 @@ PLIST_SUB+=		WANT_SWIG_RUBY=""
 PLIST_SUB+=		WANT_SWIG_RUBY="@comment "
 .endif
 .if defined(WANT_SWIG_TCL)
-BUILD_DEPENDS+=		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
-CONFIGURE_ARGS+=	--with-tclincl=${LOCALBASE}/include/tcl8.2/ \
-			--with-tcllib=${LOCALBASE}/lib/tcl8.2/
+CATEGORIES+=		tcl83
+BUILD_DEPENDS+=		${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83
+CONFIGURE_ARGS+=	--with-tclincl=${LOCALBASE}/include/tcl8.3/ \
+			--with-tcllib=${LOCALBASE}/lib/tcl8.3/
 PLIST_SUB+=		WANT_SWIG_TCL=""
 .else
 PLIST_SUB+=		WANT_SWIG_TCL="@comment "
 .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 "
+.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
+.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
+.endif
+
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:U}
 USE_LIBTOOL=	yes
diff --git a/devel/swig13/distinfo b/devel/swig13/distinfo
index ef08abf8774e..d722b7ed24f0 100644
--- a/devel/swig13/distinfo
+++ b/devel/swig13/distinfo
@@ -1 +1 @@
-MD5 (swig-1.3.12.tar.gz) = 70f86b0a5c93807f276abbf6874743e0
+MD5 (swig-1.3.14.tar.gz) = d67e56ac2edba961d74e6d6b53b6d821
diff --git a/devel/swig13/pkg-plist b/devel/swig13/pkg-plist
index 7fd97bf75b9d..71e6c1e82ec1 100644
--- a/devel/swig13/pkg-plist
+++ b/devel/swig13/pkg-plist
@@ -18,8 +18,10 @@ bin/swig%%VER%%
 %%WANT_SWIG_TCL%%lib/libswigtcl8.a
 %%WANT_SWIG_TCL%%lib/libswigtcl8.la
 %%WANT_SWIG_TCL%%lib/libswigtcl8.so
-lib/swig%%VER%%/array.i
-lib/swig%%VER%%/carray.i
+%%WANT_SWIG_OCAML%%lib/libswigocaml.a
+%%WANT_SWIG_OCAML%%lib/libswigocaml.la
+%%WANT_SWIG_OCAML%%lib/libswigocaml.so.0
+%%WANT_SWIG_OCAML%%lib/libswigocaml.so
 lib/swig%%VER%%/carrays.i
 lib/swig%%VER%%/cdata.i
 lib/swig%%VER%%/cmalloc.i
@@ -27,6 +29,9 @@ lib/swig%%VER%%/common.swg
 lib/swig%%VER%%/constraints.i
 lib/swig%%VER%%/cpointer.i
 lib/swig%%VER%%/exception.i
+lib/swig%%VER%%/std_deque.i
+lib/swig%%VER%%/_std_deque.i
+lib/swig%%VER%%/cstring.i
 lib/swig%%VER%%/guile/cplusplus.i
 lib/swig%%VER%%/guile/guile.i
 lib/swig%%VER%%/guile/guile.swg
@@ -38,10 +43,10 @@ lib/swig%%VER%%/guile/pointer-in-out.i
 lib/swig%%VER%%/guile/ports.i
 lib/swig%%VER%%/guile/std_string.i
 lib/swig%%VER%%/guile/std_vector.i
+lib/swig%%VER%%/guile/std_common.i
 lib/swig%%VER%%/guile/stl.i
 lib/swig%%VER%%/guile/typemaps.i
 lib/swig%%VER%%/java/java.swg
-lib/swig%%VER%%/java/java_arrays.i
 lib/swig%%VER%%/java/javahead.swg
 lib/swig%%VER%%/java/std_string.i
 lib/swig%%VER%%/java/std_vector.i
@@ -54,21 +59,21 @@ lib/swig%%VER%%/mzscheme/mzscheme.swg
 lib/swig%%VER%%/mzscheme/mzschemedec.swg
 lib/swig%%VER%%/mzscheme/std_string.i
 lib/swig%%VER%%/mzscheme/std_vector.i
+lib/swig%%VER%%/mzscheme/std_common.i
 lib/swig%%VER%%/mzscheme/stl.i
 lib/swig%%VER%%/mzscheme/typemaps.i
-lib/swig%%VER%%/objc.i
 lib/swig%%VER%%/perl5/Makefile.pl
 lib/swig%%VER%%/perl5/perl5.swg
 lib/swig%%VER%%/perl5/perlmain.i
 lib/swig%%VER%%/perl5/perlrun.swg
-lib/swig%%VER%%/perl5/ptrlang.i
 lib/swig%%VER%%/perl5/std_string.i
 lib/swig%%VER%%/perl5/std_vector.i
 lib/swig%%VER%%/perl5/stl.i
 lib/swig%%VER%%/perl5/typemaps.i
+lib/swig%%VER%%/pike/pike.swg
+lib/swig%%VER%%/pike/pikerun.swg
 lib/swig%%VER%%/php4/php4.swg
 lib/swig%%VER%%/php4/php4run.swg
-lib/swig%%VER%%/php4/ptrlang.i
 lib/swig%%VER%%/php4/std_string.i
 lib/swig%%VER%%/php4/std_vector.i
 lib/swig%%VER%%/php4/stl.i
@@ -79,30 +84,33 @@ 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/pyrun.swg
 lib/swig%%VER%%/python/python.swg
 lib/swig%%VER%%/python/std_string.i
 lib/swig%%VER%%/python/std_vector.i
+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/stl.i
+lib/swig%%VER%%/python/fragments.i
+lib/swig%%VER%%/python/cstring.i
 lib/swig%%VER%%/python/typemaps.i
-lib/swig%%VER%%/python/typemaps_old.i
 lib/swig%%VER%%/ruby/Makefile.swig
 lib/swig%%VER%%/ruby/embed.i
+lib/swig%%VER%%/ruby/fragments.i
 lib/swig%%VER%%/ruby/extconf.rb
-lib/swig%%VER%%/ruby/ptrlang.i
 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/std_string.i
 lib/swig%%VER%%/ruby/std_vector.i
+lib/swig%%VER%%/ruby/std_common.i
 lib/swig%%VER%%/ruby/stl.i
 lib/swig%%VER%%/ruby/typemaps.i
 lib/swig%%VER%%/swig.swg
-lib/swig%%VER%%/tcl/constarray.i
-lib/swig%%VER%%/tcl/consthash.i
-lib/swig%%VER%%/tcl/ptrlang.i
+lib/swig%%VER%%/tcl/cstring.i
 lib/swig%%VER%%/tcl/std_string.i
 lib/swig%%VER%%/tcl/std_vector.i
 lib/swig%%VER%%/tcl/stl.i
@@ -111,7 +119,14 @@ lib/swig%%VER%%/tcl/tcl8.swg
 lib/swig%%VER%%/tcl/tclsh.i
 lib/swig%%VER%%/tcl/typemaps.i
 lib/swig%%VER%%/tcl/wish.i
-lib/swig%%VER%%/timers.i
+lib/swig%%VER%%/ocaml/ocaml.i
+lib/swig%%VER%%/ocaml/std_string.i
+lib/swig%%VER%%/ocaml/std_vector.i
+lib/swig%%VER%%/ocaml/stl.i
+lib/swig%%VER%%/ocaml/typemaps.i
+lib/swig%%VER%%/ocaml/libswigocaml.swg
+lib/swig%%VER%%/ocaml/ocaml.swg
+lib/swig%%VER%%/ocaml/ocamldec.swg
 @dirrm lib/swig%%VER%%/guile
 @dirrm lib/swig%%VER%%/java
 @dirrm lib/swig%%VER%%/mzscheme
@@ -120,4 +135,6 @@ lib/swig%%VER%%/timers.i
 @dirrm lib/swig%%VER%%/python
 @dirrm lib/swig%%VER%%/ruby
 @dirrm lib/swig%%VER%%/tcl
+@dirrm lib/swig%%VER%%/ocaml
+@dirrm lib/swig%%VER%%/pike
 @dirrm lib/swig%%VER%%