diff --git a/math/octave/Portfile b/math/octave/Portfile
index 8e21e05308839..8442eb5695139 100644
--- a/math/octave/Portfile
+++ b/math/octave/Portfile
@@ -2,10 +2,10 @@
 
 PortSystem 1.0
 name		octave
-version		2.1.72
-revision	5
+version		2.9.9
+revision	0
 categories	math science
-maintainers     persquare@mac.com persquare@users.sourceforge.net
+maintainers     andre@splunk.com
 platforms	darwin
 description     a Matlab-like environment for numerical analysis
 long_description	\
@@ -20,10 +20,10 @@ homepage	http://www.octave.org
 master_sites	ftp://ftp.octave.org/pub/octave/bleeding-edge/
 
 use_bzip2	yes
-checksums	md5 47012ee5efee3a36d04fea3341748862
+checksums	md5 a76a6d88f414285472896a63e4282b7f
 
-patchfiles	patch-configure-gcc34argbug \
-		patch-configure-casesensitivefs
+patch.args	-p1
+patchfiles	patch-configure-uglydefs
 
 depends_build   bin:texinfo:texinfo	\
 		bin:tex:teTeX
@@ -76,17 +76,19 @@ platform darwin 8 powerpc {
 platform darwin 8 i386 {
 	depends_run-delete	port:gcc34
 	depends_run-append	port:gcc42
+
 	configure.env-delete	CC="gcc-dp-3.4"
 	configure.env-delete	CXX="g++-dp-3.4"
 	configure.env-delete	F77="g77-dp-3.4"
-
 	configure.env-delete	FLIBS="-lg2c"
 
 	configure.env-append	CC="gcc-dp-4.2"
 	configure.env-append	CXX="g++-dp-4.2"
 	configure.env-append	F77="gfortran-dp-4.2"
-	configure.env-append	FLIBS="-lgfortran"
 
+	configure.args-delete   --disable-static
+	configure.args-delete   --enable-dl
+	configure.args-delete   --enable-shared
 	configure.args-append	--with-blas="-framework Accelerate"
 }
 
diff --git a/math/octave/files/patch-configure-uglydefs b/math/octave/files/patch-configure-uglydefs
new file mode 100644
index 0000000000000..55c2e1495b34e
--- /dev/null
+++ b/math/octave/files/patch-configure-uglydefs
@@ -0,0 +1,12 @@
+--- octave-2.1.73.orig/configure	2006-03-20 13:12:22.000000000 -0800
++++ octave-2.1.73/configure	2006-10-29 16:42:30.000000000 -0800
+@@ -21460,9 +21460,6 @@
+ 
+ 
+ case "$canonical_host_type" in
+-  *-*-darwin*)
+-    UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'`
+-  ;;
+   *)
+     UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'`
+   ;;