diff -ruN /usr/ports/graphics/geos/Makefile geos/Makefile
--- /usr/ports/graphics/geos/Makefile	2011-09-13 18:51:12.000000000 +0200
+++ geos/Makefile	2011-10-20 20:59:57.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	geos
-PORTVERSION=	3.3.0
-PORTREVISION=	2
+PORTVERSION=	3.3.1
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/geos/
 
@@ -22,20 +21,55 @@
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS=	PYTHON "Enable python bindings" off
+OPTIONS=	PYTHON 	"Enable python bindings" off \
+		PHP	"Enable php bindings"	off \
+		RUBY	"Enable ruby bindings"	off
 
 .include <bsd.port.options.mk>
 
+
+.if defined(WITH_PHP) || defined(WITH_PYTHON) || defined(WITH_RUBY)
+BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+RUN_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
+CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig1.3"
+.else
+CONFIGURE_ENV+=		SWIG="/nonexistent"
+.endif
+
 .if defined(WITH_PYTHON)
+.include "${PORTSDIR}/Mk/bsd.python.mk"
 USE_PYTHON=	yes
 CONFIGURE_ARGS+=--enable-python
 PLIST_SUB+=	PYTHON=""
-BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
 PKGNAMESUFFIX=	-python
 .else
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
+.if defined(WITH_PHP)
+.include "${PORTSDIR}/Mk/bsd.php.mk"
+CONFIGURE_ARGS+=	--enable-php
+PLIST_SUB+=		WITH_PHP=""
+USE_PHP=	yes
+USE_PHP_BUILD=	yes
+CPPFLAGS+=		-I${LOCALBASE}/include/php/Zend
+.else
+CONFIGURE_ARGS+=	--disable-php
+PLIST_SUB+=		WITH_PHP="@comment "
+.endif
+
+.if defined(WITH_RUBY)
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+CONFIGURE_ARGS+=	--enable-ruby
+CONFIGURE_ENV+=		RUBY="${RUBY}"
+PLIST_SUB+=		WITH_RUBY=""
+USE_RUBY=		yes
+.else
+CONFIGURE_ARGS+=	--disable-ruby
+PLIST_SUB+=		WITH_RUBY="@comment "
+.endif
+
+
 post-install:
 		@${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so ${PREFIX}/lib/libgeos.so.0
 
diff -ruN /usr/ports/graphics/geos/distinfo geos/distinfo
--- /usr/ports/graphics/geos/distinfo	2011-06-28 21:16:03.000000000 +0200
+++ geos/distinfo	2011-10-20 19:35:07.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (geos-3.3.0.tar.bz2) = 791355457910f1b16924d1b966e7d6e376273617c6c3694145f638432c38aba6
-SIZE (geos-3.3.0.tar.bz2) = 1765056
+SHA256 (geos-3.3.1.tar.bz2) = 3e0a158df06e8f3c6a23978feb62e5c91f2f8239b6ad9d9abc2bd2958abb94c2
+SIZE (geos-3.3.1.tar.bz2) = 1791111
diff -ruN /usr/ports/graphics/geos/pkg-plist geos/pkg-plist
--- /usr/ports/graphics/geos/pkg-plist	2011-09-13 18:51:12.000000000 +0200
+++ geos/pkg-plist	2011-10-20 21:12:02.000000000 +0200
@@ -356,7 +356,7 @@
 include/geos/util/math.h
 include/geos/version.h
 include/geos_c.h
-lib/libgeos-3.3.0.so
+lib/libgeos-3.3.1.so
 lib/libgeos.a
 lib/libgeos.la
 lib/libgeos.so
@@ -365,49 +365,16 @@
 lib/libgeos_c.la
 lib/libgeos_c.so
 lib/libgeos_c.so.8
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos.pth
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/geos
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%
-@dirrm lib/geos
-@dirrm include/geos/util
-@dirrm include/geos/simplify
-@dirrm include/geos/precision
-@dirrm include/geos/planargraph/algorithm
-@dirrm include/geos/planargraph
-@dirrm include/geos/operation/valid
-@dirrm include/geos/operation/union
-@dirrm include/geos/operation/sharedpaths
-@dirrm include/geos/operation/relate
-@dirrm include/geos/operation/predicate
-@dirrm include/geos/operation/polygonize
-@dirrm include/geos/operation/overlay/snap
-@dirrm include/geos/operation/overlay
-@dirrm include/geos/operation/linemerge
-@dirrm include/geos/operation/distance
-@dirrm include/geos/operation/buffer
-@dirrm include/geos/operation
-@dirrm include/geos/noding/snapround
-@dirrm include/geos/noding
-@dirrm include/geos/io
-@dirrm include/geos/index/sweepline
-@dirrm include/geos/index/strtree
-@dirrm include/geos/index/quadtree
-@dirrm include/geos/index/intervalrtree
-@dirrm include/geos/index/chain
-@dirrm include/geos/index/bintree
-@dirrm include/geos/index
-@dirrm include/geos/geomgraph/index
-@dirrm include/geos/geomgraph
-@dirrm include/geos/geom/util
-@dirrm include/geos/geom/prep
-@dirrm include/geos/geom
-@dirrm include/geos/algorithm/locate
-@dirrm include/geos/algorithm/distance
-@dirrm include/geos/algorithm
-@dirrm include/geos
+lib/python2.7/site-packages/geos.pth
+lib/python2.7/site-packages/geos/_geos.a
+lib/python2.7/site-packages/geos/_geos.la
+lib/python2.7/site-packages/geos/_geos.so
+lib/python2.7/site-packages/geos/geos.py
+lib/python2.7/site-packages/geos/geos.pyc
+lib/python2.7/site-packages/geos/geos.pyo
+lib/ruby/site_ruby/1.8/amd64-freebsd8/geos.a
+lib/ruby/site_ruby/1.8/amd64-freebsd8/geos.la
+lib/ruby/site_ruby/1.8/amd64-freebsd8/geos.so
+share/licenses/geos-python-3.3.1/LGPL21
+share/licenses/geos-python-3.3.1/LICENSE
+share/licenses/geos-python-3.3.1/catalog.mk