diff --git a/math/octave/Makefile b/math/octave/Makefile
index f559d679f292..ece66f8f7c54 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	4.0.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
@@ -38,7 +39,6 @@ USES=		charsetfix fortran gmake libtool perl5 pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_TEX=	dvipsk:build
-USE_GCC=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
diff --git a/math/octave/files/patch-libinterp-octave-value-ov-classdef.cc b/math/octave/files/patch-libinterp-octave-value-ov-classdef.cc
new file mode 100644
index 000000000000..5280dad9cd8c
--- /dev/null
+++ b/math/octave/files/patch-libinterp-octave-value-ov-classdef.cc
@@ -0,0 +1,14 @@
+--- libinterp/octave-value/ov-classdef.cc.orig	2015-07-21 17:05:21.000000000 +0900
++++ libinterp/octave-value/ov-classdef.cc	2015-07-21 17:05:32.000000000 +0900
+@@ -1937,6 +1937,11 @@
+   return true;
+ }
+ 
++void cdef_object_scalar::mark_as_constructed (const cdef_class& cls)
++{
++  ctor_list.erase (cls);
++}
++
+ handle_cdef_object::~handle_cdef_object (void)
+ {
+ #if DEBUG_TRACE
diff --git a/math/octave/files/patch-libinterp-octave-value-ov-classdef.h b/math/octave/files/patch-libinterp-octave-value-ov-classdef.h
new file mode 100644
index 000000000000..d7c413868baa
--- /dev/null
+++ b/math/octave/files/patch-libinterp-octave-value-ov-classdef.h
@@ -0,0 +1,11 @@
+--- libinterp/octave-value/ov-classdef.h.orig	2015-07-21 17:04:55.000000000 +0900
++++ libinterp/octave-value/ov-classdef.h	2015-07-21 17:05:32.000000000 +0900
+@@ -438,7 +438,7 @@
+ 
+   void mark_as_constructed (void) { ctor_list.clear (); }
+ 
+-  void mark_as_constructed (const cdef_class& cls) { ctor_list.erase (cls); }
++  void mark_as_constructed (const cdef_class& cls);
+ 
+   bool is_constructed (void) const { return ctor_list.empty (); }
+