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-28 16:02:20.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/
 
@@ -16,26 +15,59 @@
 
 LICENSE=	LGPL21
 
-USE_AUTOTOOLS=	libtool
+USE_AUTOTOOLS=	libtool autoconf
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 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
+CONFIGURE_ARGS+=--disable-python
 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-23 20:42:35.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-descr geos/pkg-descr
--- /usr/ports/graphics/geos/pkg-descr	2011-10-24 06:15:55.000000000 +0200
+++ geos/pkg-descr	2011-10-23 20:41:12.000000000 +0200
@@ -5,3 +5,6 @@
 as well as specific JTS topology functions such as IsValid().
 
 WWW: http://geos.refractions.net
+
+- Leonardo Martins
+lmartins@nepe.eee.ufg.br
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-28 15:46:02.000000000 +0200
@@ -1,4 +1,11 @@
 bin/geos-config
+bin/php
+bin/php-cgi
+bin/php-config
+bin/phpize
+etc/php.conf
+etc/php.ini-development
+etc/php.ini-production
 include/geos.h
 include/geos/algorithm/Angle.h
 include/geos/algorithm/BoundaryNodeRule.h
@@ -356,7 +363,219 @@
 include/geos/util/math.h
 include/geos/version.h
 include/geos_c.h
-lib/libgeos-3.3.0.so
+include/php/TSRM/TSRM.h
+include/php/TSRM/acconfig.h
+include/php/TSRM/readdir.h
+include/php/TSRM/tsrm_config.h
+include/php/TSRM/tsrm_config.w32.h
+include/php/TSRM/tsrm_config_common.h
+include/php/TSRM/tsrm_nw.h
+include/php/TSRM/tsrm_strtok_r.h
+include/php/TSRM/tsrm_virtual_cwd.h
+include/php/TSRM/tsrm_win32.h
+include/php/Zend/acconfig.h
+include/php/Zend/zend.h
+include/php/Zend/zend_API.h
+include/php/Zend/zend_alloc.h
+include/php/Zend/zend_build.h
+include/php/Zend/zend_builtin_functions.h
+include/php/Zend/zend_closures.h
+include/php/Zend/zend_compile.h
+include/php/Zend/zend_config.h
+include/php/Zend/zend_config.nw.h
+include/php/Zend/zend_config.w32.h
+include/php/Zend/zend_constants.h
+include/php/Zend/zend_dynamic_array.h
+include/php/Zend/zend_errors.h
+include/php/Zend/zend_exceptions.h
+include/php/Zend/zend_execute.h
+include/php/Zend/zend_extensions.h
+include/php/Zend/zend_fast_cache.h
+include/php/Zend/zend_float.h
+include/php/Zend/zend_gc.h
+include/php/Zend/zend_globals.h
+include/php/Zend/zend_globals_macros.h
+include/php/Zend/zend_hash.h
+include/php/Zend/zend_highlight.h
+include/php/Zend/zend_indent.h
+include/php/Zend/zend_ini.h
+include/php/Zend/zend_ini_parser.h
+include/php/Zend/zend_ini_scanner.h
+include/php/Zend/zend_ini_scanner_defs.h
+include/php/Zend/zend_interfaces.h
+include/php/Zend/zend_istdiostream.h
+include/php/Zend/zend_iterators.h
+include/php/Zend/zend_language_parser.h
+include/php/Zend/zend_language_scanner.h
+include/php/Zend/zend_language_scanner_defs.h
+include/php/Zend/zend_list.h
+include/php/Zend/zend_llist.h
+include/php/Zend/zend_modules.h
+include/php/Zend/zend_multibyte.h
+include/php/Zend/zend_multiply.h
+include/php/Zend/zend_object_handlers.h
+include/php/Zend/zend_objects.h
+include/php/Zend/zend_objects_API.h
+include/php/Zend/zend_operators.h
+include/php/Zend/zend_ptr_stack.h
+include/php/Zend/zend_qsort.h
+include/php/Zend/zend_stack.h
+include/php/Zend/zend_static_allocator.h
+include/php/Zend/zend_stream.h
+include/php/Zend/zend_strtod.h
+include/php/Zend/zend_ts_hash.h
+include/php/Zend/zend_types.h
+include/php/Zend/zend_variables.h
+include/php/Zend/zend_vm.h
+include/php/Zend/zend_vm_def.h
+include/php/Zend/zend_vm_execute.h
+include/php/Zend/zend_vm_opcodes.h
+include/php/ext/date/lib/timelib.h
+include/php/ext/date/lib/timelib_config.h
+include/php/ext/date/lib/timelib_structs.h
+include/php/ext/date/php_date.h
+include/php/ext/ereg/php_ereg.h
+include/php/ext/ereg/php_regex.h
+include/php/ext/ereg/regex/cclass.h
+include/php/ext/ereg/regex/cname.h
+include/php/ext/ereg/regex/regex.h
+include/php/ext/ereg/regex/regex2.h
+include/php/ext/ereg/regex/utils.h
+include/php/ext/libxml/php_libxml.h
+include/php/ext/mysqlnd/config-win.h
+include/php/ext/mysqlnd/mysqlnd.h
+include/php/ext/mysqlnd/mysqlnd_block_alloc.h
+include/php/ext/mysqlnd/mysqlnd_charset.h
+include/php/ext/mysqlnd/mysqlnd_debug.h
+include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
+include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
+include/php/ext/mysqlnd/mysqlnd_net.h
+include/php/ext/mysqlnd/mysqlnd_portability.h
+include/php/ext/mysqlnd/mysqlnd_priv.h
+include/php/ext/mysqlnd/mysqlnd_result.h
+include/php/ext/mysqlnd/mysqlnd_result_meta.h
+include/php/ext/mysqlnd/mysqlnd_statistics.h
+include/php/ext/mysqlnd/mysqlnd_structs.h
+include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
+include/php/ext/mysqlnd/php_mysqlnd.h
+include/php/ext/mysqlnd/php_mysqlnd_config.h
+include/php/ext/pcre/php_pcre.h
+include/php/ext/php_config.h
+include/php/ext/spl/php_spl.h
+include/php/ext/spl/spl_array.h
+include/php/ext/spl/spl_directory.h
+include/php/ext/spl/spl_dllist.h
+include/php/ext/spl/spl_engine.h
+include/php/ext/spl/spl_exceptions.h
+include/php/ext/spl/spl_fixedarray.h
+include/php/ext/spl/spl_functions.h
+include/php/ext/spl/spl_heap.h
+include/php/ext/spl/spl_iterators.h
+include/php/ext/spl/spl_observer.h
+include/php/ext/standard/base64.h
+include/php/ext/standard/basic_functions.h
+include/php/ext/standard/crc32.h
+include/php/ext/standard/credits.h
+include/php/ext/standard/credits_ext.h
+include/php/ext/standard/credits_sapi.h
+include/php/ext/standard/crypt_blowfish.h
+include/php/ext/standard/crypt_freesec.h
+include/php/ext/standard/css.h
+include/php/ext/standard/cyr_convert.h
+include/php/ext/standard/datetime.h
+include/php/ext/standard/dl.h
+include/php/ext/standard/exec.h
+include/php/ext/standard/file.h
+include/php/ext/standard/flock_compat.h
+include/php/ext/standard/fsock.h
+include/php/ext/standard/head.h
+include/php/ext/standard/html.h
+include/php/ext/standard/info.h
+include/php/ext/standard/md5.h
+include/php/ext/standard/microtime.h
+include/php/ext/standard/pack.h
+include/php/ext/standard/pageinfo.h
+include/php/ext/standard/php_array.h
+include/php/ext/standard/php_assert.h
+include/php/ext/standard/php_browscap.h
+include/php/ext/standard/php_crypt.h
+include/php/ext/standard/php_crypt_r.h
+include/php/ext/standard/php_dir.h
+include/php/ext/standard/php_dns.h
+include/php/ext/standard/php_ext_syslog.h
+include/php/ext/standard/php_filestat.h
+include/php/ext/standard/php_fopen_wrappers.h
+include/php/ext/standard/php_ftok.h
+include/php/ext/standard/php_http.h
+include/php/ext/standard/php_image.h
+include/php/ext/standard/php_incomplete_class.h
+include/php/ext/standard/php_iptc.h
+include/php/ext/standard/php_lcg.h
+include/php/ext/standard/php_link.h
+include/php/ext/standard/php_mail.h
+include/php/ext/standard/php_math.h
+include/php/ext/standard/php_metaphone.h
+include/php/ext/standard/php_rand.h
+include/php/ext/standard/php_smart_str.h
+include/php/ext/standard/php_smart_str_public.h
+include/php/ext/standard/php_standard.h
+include/php/ext/standard/php_string.h
+include/php/ext/standard/php_type.h
+include/php/ext/standard/php_uuencode.h
+include/php/ext/standard/php_var.h
+include/php/ext/standard/php_versioning.h
+include/php/ext/standard/proc_open.h
+include/php/ext/standard/quot_print.h
+include/php/ext/standard/scanf.h
+include/php/ext/standard/sha1.h
+include/php/ext/standard/streamsfuncs.h
+include/php/ext/standard/uniqid.h
+include/php/ext/standard/url.h
+include/php/ext/standard/url_scanner_ex.h
+include/php/ext/standard/winver.h
+include/php/main/SAPI.h
+include/php/main/build-defs.h
+include/php/main/fopen_wrappers.h
+include/php/main/logos.h
+include/php/main/php.h
+include/php/main/php3_compat.h
+include/php/main/php_compat.h
+include/php/main/php_config.h
+include/php/main/php_content_types.h
+include/php/main/php_getopt.h
+include/php/main/php_globals.h
+include/php/main/php_ini.h
+include/php/main/php_logos.h
+include/php/main/php_main.h
+include/php/main/php_memory_streams.h
+include/php/main/php_network.h
+include/php/main/php_open_temporary_file.h
+include/php/main/php_output.h
+include/php/main/php_reentrancy.h
+include/php/main/php_scandir.h
+include/php/main/php_streams.h
+include/php/main/php_syslog.h
+include/php/main/php_ticks.h
+include/php/main/php_variables.h
+include/php/main/php_version.h
+include/php/main/rfc1867.h
+include/php/main/safe_mode.h
+include/php/main/snprintf.h
+include/php/main/spprintf.h
+include/php/main/streams/php_stream_context.h
+include/php/main/streams/php_stream_filter_api.h
+include/php/main/streams/php_stream_glob_wrapper.h
+include/php/main/streams/php_stream_mmap.h
+include/php/main/streams/php_stream_plain_wrapper.h
+include/php/main/streams/php_stream_transport.h
+include/php/main/streams/php_stream_userspace.h
+include/php/main/streams/php_streams_int.h
+include/php/main/suhosin_globals.h
+include/php/main/suhosin_logo.h
+include/php/main/suhosin_patch.h
+include/php/main/win32_internal_function_disabled.h
+include/php/main/win95nt.h
+lib/libgeos-3.3.1.so
 lib/libgeos.a
 lib/libgeos.la
 lib/libgeos.so
@@ -365,15 +584,42 @@
 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%%
+lib/php/build/Makefile.global
+lib/php/build/acinclude.m4
+lib/php/build/config.guess
+lib/php/build/config.sub
+lib/php/build/libtool.m4
+lib/php/build/ltmain.sh
+lib/php/build/mkdep.awk
+lib/php/build/phpize.m4
+lib/php/build/run-tests.php
+lib/php/build/scan_makefile_in.awk
+lib/php/build/shtool
+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
+man/man1/php-config.1.gz
+man/man1/php.1.gz
+man/man1/phpize.1.gz
+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
+@dirrm share/licenses/geos-python-3.3.1
+@dirrm share/licenses
+@dirrm lib/ruby/site_ruby/1.8/amd64-freebsd8
+@dirrm lib/ruby/site_ruby/1.8
+@dirrm lib/ruby/site_ruby
+@dirrm lib/ruby
+@dirrm lib/python2.7/site-packages/geos
+@dirrm lib/python2.7/site-packages
+@dirrm lib/python2.7
 @dirrm lib/geos
 @dirrm include/geos/util
 @dirrm include/geos/simplify