Index: Portfile
===================================================================
--- Portfile	(revision 21115)
+++ Portfile	(working copy)
@@ -44,6 +44,28 @@
 }
 
 platform darwin 8 {
+			set cppflags { }
+			set ldflags { }
+
+			if { [variant_isset java] } {
+			    lappend cppflags -I/System/Library/Frameworks/JavaVM.framework/Headers
+			    lappend ldflags "-framework JavaVM"
+			}
+
+			if { [variant_isset ocaml] } {
+			    lappend cppflags -I${prefix}/lib/ocaml
+			    lappend ldflags -L${prefix}/lib/ocaml
+			}
+
+			if { [variant_isset python] } {
+			    lappend cppflags -I/Library/Frameworks/Python.framework/Headers
+			}
+
+			if { [llength ${cppflags}] > 0 } {
+				configure.env-append	CPPFLAGS="-I${prefix}/include [join ${cppflags} " "]" \
+							LDFLAGS="-L${prefix}/lib [join ${ldflags} " "]"
+			}
+
 			configure.env-append	MACOSX_DEPLOYMENT_TARGET=10.4 \
 						CC=/usr/bin/gcc-4.0	\
 						CPP=/usr/bin/cpp-4.0	\
@@ -72,6 +94,10 @@
 		LDFLAGS=-L${prefix}/lib
 		
 configure.args	--mandir=${prefix}/share/man	\
+		--disable-sharp			\
+		--disable-io			\
+		--disable-tcl			\
+		--disable-java			\
 		--disable-guile			\
 		--disable-lua			\
 		--disable-ocaml			\
@@ -80,31 +106,46 @@
 		--disable-python		\
 		--disable-ruby
 
+variant tcl	{ depends_build-append	bin:swig:swig
+		  configure.args-append	--enable-tcl
+		}
+
+variant java	{ depends_build-append	bin:swig:swig
+		  configure.args-append	--enable-java
+		}
+
 variant guile	{ depends_lib-append	port:guile
+		  depends_build-append	bin:swig:swig
 		  configure.args-append	--enable-guile
 		}
 
 variant lua	{ depends_lib-append	port:lua
+		  depends_build-append	bin:swig:swig
 		  configure.args-append	--enable-lua
 		}
 
 variant ocaml	{ depends_lib-append	port:ocaml
+		  depends_build-append	bin:swig:swig
 		  configure.args-append	--enable-ocaml
 		}
 
 variant perl	{ depends_lib-append	port:perl5.8
+		  depends_build-append	bin:swig:swig
 		  configure.args-append	--enable-perl
 		}
 
 variant php	{ depends_lib-append	port:php4
+		  depends_build-append	bin:swig:swig
 		  configure.args-append	--enable-php
 		}
 
-variant python	{ depends_lib-append	port:python24
+variant python	{ depends_lib-append	port:python25
+		  depends_build-append	bin:swig:swig
 		  configure.args-append	--enable-python
 		}
 
 variant ruby	{ depends_lib-append	port:ruby
+		  depends_build-append	bin:swig:swig
 		  configure.args-append	--enable-ruby
 		}
 
@@ -116,6 +157,8 @@
 					port:python24	\
 					port:ruby
 
+		  depends_build-append	bin:swig:swig
+
 		  configure.args-append	--enable-guile	\
 					--enable-lua	\
 					--enable-ocaml	\