diff -up mapserver-6.2.2/mapscript/java/javamodule.i.orig mapserver-6.2.2/mapscript/java/javamodule.i
--- mapserver-6.2.2/mapscript/java/javamodule.i.orig	2015-02-27 10:45:48.511177981 +0100
+++ mapserver-6.2.2/mapscript/java/javamodule.i	2015-02-27 10:47:28.167527155 +0100
@@ -1,9 +1,11 @@
 
 %include arrays_java.i
 
+/*
 # Uncomment this if you wish to hace enums wrapped in an interface compatible
 # with that generated by swig 1.3.21 (tests wont compile, though)
 #%include enumsimple.swg
+*/
 
 /* Mapscript library loader */
 
diff -up mapserver-6.2.2/mapscript/python/pyextend.i.orig mapserver-6.2.2/mapscript/python/pyextend.i
--- mapserver-6.2.2/mapscript/python/pyextend.i.orig	2015-02-27 10:51:10.600538511 +0100
+++ mapserver-6.2.2/mapscript/python/pyextend.i	2015-02-27 10:52:10.077343724 +0100
@@ -16,7 +16,7 @@
 
 /* fromstring: Factory for mapfile objects */
 
-%pythoncode {
+%pythoncode %{
 def fromstring(data, mappath=None):
     """Creates map objects from mapfile strings.
 
@@ -50,7 +50,7 @@ def fromstring(data, mappath=None):
         return ob
     else:
         raise ValueError, "No map, layer, class, or style found. Can not load from provided string"
-}
+%}
 
 /* ===========================================================================
    Python rectObj extensions
@@ -58,12 +58,12 @@ def fromstring(data, mappath=None):
 
 %extend pointObj {
 
-%pythoncode {
+%pythoncode %{
 
     def __str__(self):
         return self.toString()
 
-}
+%}
     
 }
 
@@ -74,7 +74,7 @@ def fromstring(data, mappath=None):
    
 %extend rectObj {
 
-%pythoncode {
+%pythoncode %{
 
     def __str__(self):
         return self.toString()
@@ -91,7 +91,7 @@ def fromstring(data, mappath=None):
             raise TypeError, \
                 '__contains__ does not yet handle %s' % (item_type)
         
-}
+%}
 
 }
 
@@ -131,7 +131,7 @@ def fromstring(data, mappath=None):
         PyTuple_SetItem(output,1,PyInt_FromLong((long)self->height));
         return output;
     }    
-%pythoncode {
+%pythoncode %{
 
     def get_height(self):
         return self.getSize()[1] # <-- second member is the height
@@ -144,7 +144,7 @@ def fromstring(data, mappath=None):
     width = property(get_width, set_width)
     height = property(get_height, set_height)
     
-}    
+%}    
     
 }