3 files changed, 65 insertions, 22 deletions

diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 97a7918d6bc6..0576e5323cb3 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	swig
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.11
 CATEGORIES=	devel perl5 python ruby tcl82
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/languages/swig/ \
@@ -19,16 +19,30 @@ BUILD_DEPENDS=		autoconf:${PORTSDIR}/devel/autoconf
 
 VER=		${PORTVERSION:R}
 
-SWIG_LANGUAGES?=	guile perl python ruby tcl
+SWIG_LANGUAGES?=	guile perl php4 python ruby tcl
 .for lang in ${SWIG_LANGUAGES}
 WANT_SWIG_${lang:U}=	yes
 .endfor
 
 .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)
 USE_PERL5=		yes
+PLIST_SUB+=		WANT_SWIG_PERL=""
+.else
+PLIST_SUB+=		WANT_SWIG_PERL="@comment "
+.endif
+.if defined(WANT_SWIG_PHP4)
+# We need both mod_php4 and php4
+BUILD_DEPENDS+=		${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4 \
+			php:${PORTSDIR}/lang/php4
+PLIST_SUB+=		WANT_SWIG_PHP4=""
+.else
+PLIST_SUB+=		WANT_SWIG_PHP4="@comment "
 .endif
 .if defined(WANT_SWIG_PYTHON)
 USE_PYTHON=		yes
@@ -36,15 +50,24 @@ 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)
 USE_RUBY=	yes
 RUBY_NO_RUN_DEPENDS=	yes
+PLIST_SUB+=		WANT_SWIG_RUBY=""
+.else
+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/
+PLIST_SUB+=		WANT_SWIG_TCL=""
+.else
+PLIST_SUB+=		WANT_SWIG_TCL="@comment "
 .endif
 
 INSTALLS_SHLIB=	yes
@@ -52,7 +75,16 @@ WRKSRC=		${WRKDIR}/${DISTNAME:U}
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -fpic -DPIC"
 ALL_TARGET=	swig runtime
-PLIST_SUB=	VER="${VER}"
+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:
 	${LN} -f ${PREFIX}/bin/swig ${PREFIX}/bin/swig${VER}
diff --git a/devel/swig20/distinfo b/devel/swig20/distinfo
index ecfa3836b4f2..8331cd45221f 100644
--- a/devel/swig20/distinfo
+++ b/devel/swig20/distinfo
@@ -1 +1 @@
-MD5 (swig-1.3.9.tar.gz) = 7879999f7e8cc04a6144b148d1ba4df3
+MD5 (swig-1.3.11.tar.gz) = 671752dda74c16e20732088f533df239
diff --git a/devel/swig20/pkg-plist b/devel/swig20/pkg-plist
index 93d84d73411b..4c25e1f91e25 100644
--- a/devel/swig20/pkg-plist
+++ b/devel/swig20/pkg-plist
@@ -1,20 +1,23 @@
 bin/swig
 bin/swig%%VER%%
-lib/libswigguile.a
-lib/libswigguile.la
-lib/libswigguile.so
-lib/libswigpl.a
-lib/libswigpl.la
-lib/libswigpl.so
-lib/libswigpy.a
-lib/libswigpy.la
-lib/libswigpy.so
-lib/libswigrb.a
-lib/libswigrb.la
-lib/libswigrb.so
-lib/libswigtcl8.a
-lib/libswigtcl8.la
-lib/libswigtcl8.so
+%%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_PHP4%%lib/libswigphp4.la
+%%WANT_SWIG_PHP4%%lib/libswigphp4.so
+%%WANT_SWIG_PERL%%lib/libswigpl.a
+%%WANT_SWIG_PERL%%lib/libswigpl.la
+%%WANT_SWIG_PERL%%lib/libswigpl.so
+%%WANT_SWIG_PYTHON%%lib/libswigpy.a
+%%WANT_SWIG_PYTHON%%lib/libswigpy.la
+%%WANT_SWIG_PYTHON%%lib/libswigpy.so
+%%WANT_SWIG_RUBY%%lib/libswigrb.a
+%%WANT_SWIG_RUBY%%lib/libswigrb.la
+%%WANT_SWIG_RUBY%%lib/libswigrb.so
+%%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%%/autodoc.i
 lib/swig%%VER%%/carray.i
@@ -22,6 +25,7 @@ lib/swig%%VER%%/common.swg
 lib/swig%%VER%%/constraints.i
 lib/swig%%VER%%/ctype.i
 lib/swig%%VER%%/exception.i
+lib/swig%%VER%%/guile/cplusplus.i
 lib/swig%%VER%%/guile/guile.i
 lib/swig%%VER%%/guile/guile.swg
 lib/swig%%VER%%/guile/guiledec.swg
@@ -31,11 +35,12 @@ 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/typemaps.i
-lib/swig%%VER%%/java/java.i
 lib/swig%%VER%%/java/java.swg
 lib/swig%%VER%%/java/java_arrays.i
+lib/swig%%VER%%/java/javahead.swg
 lib/swig%%VER%%/java/stl_string.i
 lib/swig%%VER%%/java/typemaps.i
+lib/swig%%VER%%/java/various.i
 lib/swig%%VER%%/malloc.i
 lib/swig%%VER%%/math.i
 lib/swig%%VER%%/memory.i
@@ -47,8 +52,13 @@ 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/typemaps.i
+lib/swig%%VER%%/php4/php4.swg
+lib/swig%%VER%%/php4/php4run.swg
+lib/swig%%VER%%/php4/ptrlang.i
+lib/swig%%VER%%/php4/typemaps.i
 lib/swig%%VER%%/pointer.i
 lib/swig%%VER%%/python/defarg.swg
 lib/swig%%VER%%/python/embed.i
@@ -56,6 +66,7 @@ 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/typemaps.i
 lib/swig%%VER%%/python/typemaps_old.i
@@ -64,16 +75,15 @@ lib/swig%%VER%%/ruby/embed.i
 lib/swig%%VER%%/ruby/exception.i
 lib/swig%%VER%%/ruby/extconf.rb
 lib/swig%%VER%%/ruby/ptrlang.i
-lib/swig%%VER%%/ruby/ruby.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/typemaps.i
 lib/swig%%VER%%/stdlib.i
 lib/swig%%VER%%/swig.swg
 lib/swig%%VER%%/tcl/constarray.i
 lib/swig%%VER%%/tcl/consthash.i
-lib/swig%%VER%%/tcl/object.swg
 lib/swig%%VER%%/tcl/ptrlang.i
 lib/swig%%VER%%/tcl/swigtcl8.swg
 lib/swig%%VER%%/tcl/tcl8.swg
@@ -85,6 +95,7 @@ lib/swig%%VER%%/timers.i
 @dirrm lib/swig%%VER%%/java
 @dirrm lib/swig%%VER%%/mzscheme
 @dirrm lib/swig%%VER%%/perl5
+@dirrm lib/swig%%VER%%/php4
 @dirrm lib/swig%%VER%%/python
 @dirrm lib/swig%%VER%%/ruby
 @dirrm lib/swig%%VER%%/tcl