diff --git a/devel/codeworker/Makefile b/devel/codeworker/Makefile
index 2741c75bcb0d..8024a4a1f118 100644
--- a/devel/codeworker/Makefile
+++ b/devel/codeworker/Makefile
@@ -30,10 +30,6 @@ PLIST_FILES=	bin/codeworker
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 .if ${OSVERSION} < 500035
 CFLAGS+=	-fpermissive
 .endif
diff --git a/devel/codeworker/files/patch-GrfForeach.h b/devel/codeworker/files/patch-GrfForeach.h
new file mode 100644
index 000000000000..8ad4584eae36
--- /dev/null
+++ b/devel/codeworker/files/patch-GrfForeach.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- GrfForeach.h.orig
++++ GrfForeach.h
+@@ -83,7 +83,7 @@
+ 		virtual SEQUENCE_INTERRUPTION_LIST executeReverseSortedForeach(DtaScriptVariable& theVariable, DtaScriptVariable& stackForeach);
+ 		virtual SEQUENCE_INTERRUPTION_LIST executeReverseSortedIndirectForeach(DtaScriptVariable& theVariable, DtaScriptVariable& stackForeach);
+ 
+-		SEQUENCE_INTERRUPTION_LIST GrfForeach::iterate(DtaArrayIterator& iteratorData, DtaScriptVariable& stackForeach);
++		SEQUENCE_INTERRUPTION_LIST iterate(DtaArrayIterator& iteratorData, DtaScriptVariable& stackForeach);
+ 	};
+ }
+ 
diff --git a/devel/codeworker/files/patch-NetSocket.cpp b/devel/codeworker/files/patch-NetSocket.cpp
new file mode 100644
index 000000000000..6620067f24e1
--- /dev/null
+++ b/devel/codeworker/files/patch-NetSocket.cpp
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- NetSocket.cpp.orig
++++ NetSocket.cpp
+@@ -45,7 +45,7 @@
+ namespace CodeWorker {
+ 	bool socketReaderCBK(ScpStream& theStream, void* pData) {
+ 		char tcBuffer[2048];
+-		int hSocket = (int) pData;
++		int hSocket = (intptr_t) pData;
+ 		int iLength = recv(hSocket, tcBuffer, 2047, 0);
+ 		if (iLength <= 0) return false;
+ 		theStream.writeBinaryData(tcBuffer, iLength);
+@@ -53,7 +53,7 @@
+ 	}
+ 
+ 	bool socketWriterCBK(ScpStream& theStream, void* pData) {
+-		int hSocket = (int) pData;
++		int hSocket = (intptr_t) pData;
+ 		int iLength = theStream.size();
+ 		if (iLength <= 0) return false;
+ 		return NetSocket::sendToSocket(hSocket, theStream.readBuffer(), iLength);