--- Ice-3.3.1.old/Makefile	2009-03-20 18:52:13.000000000 +0100
+++ Ice-3.3.1/Makefile	2009-07-13 19:44:45.042520539 +0200
@@ -7,10 +7,10 @@
 #
 # **********************************************************************
 
-SUBDIRS			= cpp java cs py rb php
-CLEAN_SUBDIRS		= java cs py rb php cpp
+SUBDIRS			= cpp cs py rb php
+CLEAN_SUBDIRS		= cs py rb php cpp
 DEPEND_SUBDIRS		= cpp cs py rb php
-INSTALL_SUBDIRS		= cpp java cs py rb php
+INSTALL_SUBDIRS		= cpp cs py rb php
 
 all::
 	@for subdir in $(SUBDIRS); \
--- Ice-3.3.1.old/cpp/config/Make.rules	2009-03-20 18:52:17.000000000 +0100
+++ Ice-3.3.1/cpp/config/Make.rules	2009-07-13 19:39:52.358340439 +0200
@@ -11,19 +11,19 @@
 # Select an installation base directory. The directory will be created
 # if it does not exist.
 #
-prefix			 ?= /opt/Ice-$(VERSION)
+prefix			 ?= /pkg/usr/lib/Ice-$(VERSION)
 
 #
 # The "root directory" for runpath embedded in executables. Can be unset
 # to avoid adding a runpath to Ice executables.
 #
-embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+embedded_runpath_prefix  ?= /usr/lib/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # Define OPTIMIZE as yes if you want to build with
 # optimization. Otherwise Ice is build with debug information.
 #
-#OPTIMIZE		= yes
+OPTIMIZE		= yes
 
 #
 # Define LP64 as yes or no if you want force a 32 or 64 bit. The
@@ -58,7 +58,7 @@
 # compiler can find it, set BZIP2_HOME to the bzip2 installation
 # directory.
 #
-#BZIP2_HOME		?= /opt/bzip2
+#BZIP2_HOME		?= /usr
 
 
 #
@@ -66,33 +66,33 @@
 # compiler can find it, set DB_HOME to the Berkeley DB installation
 # directory.
 #
-#DB_HOME		?= /opt/db
+#DB_HOME		?= /usr
 
 #
 # If expat is not installed in a standard location where the compiler
 # can find it, set EXPAT_HOME to the expat installation directory.
 #
-#EXPAT_HOME		?= /opt/expat
+#EXPAT_HOME		?= /usr
 
 #
 # If OpenSSL is not installed in a standard location where the
 # compiler can find it, set OPENSSL_HOME to the OpenSSL installation
 # directory.
 #
-#OPENSSL_HOME		?= /opt/openssl
+#OPENSSL_HOME		?= /usr
 
 #
 # If Mcpp is not installed in a standard location where the  compiler 
 # can find it, set MCPP_HOME to the Mcpp installation directory.
 #
-#MCPP_HOME		?= /opt/mcpp
+#MCPP_HOME		?= /usr
 
 #
 # If readline is not installed in a standard location where the
 # compiler can find it, AND you want to use readline, set
 # READLINE_HOME to the readline installation directory.
 #
-#READLINE_HOME		?= /opt/readline
+#READLINE_HOME		?= /usr
 
 #
 # Generate position independent code unless GENPIC is set to no
--- Ice-3.3.1.old/cpp/config/Make.rules.Linux	2009-03-20 18:52:13.000000000 +0100
+++ Ice-3.3.1/cpp/config/Make.rules.Linux	2009-07-13 19:39:52.358340439 +0200
@@ -28,7 +28,7 @@
 #
 # icecpp is built with a C compiler
 #
-CFLAGS = -O2
+CFLAGS = -O2 -march=i486 -mtune=i686
 
 ifeq ($(MACHINE),x86_64)
    ifeq ($(LP64),yes)
@@ -85,19 +85,19 @@
    endif
 
    ifeq ($(OPTIMIZE),yes)
-      CXXFLAGS		+= -O2 -DNDEBUG
+      CXXFLAGS		+= -O2 -march=i486 -mtune=i686 -DNDEBUG
    else
       CXXFLAGS		+= -g 
    endif
 
    ifeq ($(USE_SPARC_ASM),yes)
-      CFLAGS		= -O2 -mcpu=ultrasparc -pipe -DNDEBUG -DUSE_SPARC_ASM
+      CFLAGS		= -O2 -march=i486 -mtune=i686 -mcpu=ultrasparc -pipe -DNDEBUG -DUSE_SPARC_ASM
       ifneq ($(GENPIC),no)
          CFLAGS		+= -fPIC
       endif
    endif
    ifeq ($(USE_SPARC_ASM),no)
-      CFLAGS		= -O2 -mcpu=v8 -pipe -DNDEBUG -DICE_USE_MUTEX_SHARED
+      CFLAGS		= -O2 -march=i486 -mtune=i686 -mcpu=v8 -pipe -DNDEBUG -DICE_USE_MUTEX_SHARED
       ifneq ($(GENPIC),no)
          CFLAGS		+= -fPIC
       endif
@@ -136,7 +136,7 @@
    endif
 
    ifeq ($(OPTIMIZE),yes)
-      CXXFLAGS		+= -O2 -DNDEBUG
+      CXXFLAGS		+= -O2 -march=i486 -mtune=i686 -DNDEBUG
    else
       CXXFLAGS		+= -g
    endif
--- Ice-3.3.1.old/cs/config/Make.rules.cs	2009-03-20 18:52:14.000000000 +0100
+++ Ice-3.3.1/cs/config/Make.rules.cs	2009-07-13 19:39:52.418651109 +0200
@@ -12,7 +12,7 @@
 # if it does not exist.
 #
 
-prefix			?= /opt/Ice-$(VERSION)
+prefix			?= /pkg/usr/lib/Ice-$(VERSION)
 
 #
 # The default behavior of 'make install' is to install the Ice for .NET
@@ -45,7 +45,7 @@
 # Define OPTIMIZE as yes if you want to build with optmization.
 #
 
-#OPTIMIZE		= yes
+OPTIMIZE		= yes
 
 #
 # Set the key file used to sign assemblies.
--- Ice-3.3.1.old/php/config/Make.rules	2009-03-20 18:52:15.000000000 +0100
+++ Ice-3.3.1/php/config/Make.rules	2009-07-13 19:39:52.489338866 +0200
@@ -12,20 +12,20 @@
 # if it does not exist.
 #
 
-prefix			?= /opt/Ice-$(VERSION)
+prefix			?= /pkg/usr/lib/Ice-$(VERSION)
 
 #
 # The "root directory" for runpath embedded in executables. Can be unset
 # to avoid adding a runpath to Ice executables.
 #
-embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+embedded_runpath_prefix  ?= /usr/lib/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # Define OPTIMIZE as yes if you want to build with optimization.
 # Otherwise the Ice extension is built with debug information.
 #
 
-#OPTIMIZE		= yes
+OPTIMIZE		= yes
 
 #
 # Define LP64 as yes if you want to build in 64 bit mode on a platform
@@ -48,7 +48,7 @@
 # PHP_INCLUDE_DIR and PHP_LIB_DIR.
 #
 
-PHP_HOME		?= /opt/php
+PHP_HOME		?= /usr
 
 #
 # Verifies the PHP_HOME is valid and attempts to adjust for platform variances
--- Ice-3.3.1.old/py/config/Make.rules	2009-03-20 18:52:15.000000000 +0100
+++ Ice-3.3.1/py/config/Make.rules	2009-07-13 19:39:52.512337880 +0200
@@ -12,20 +12,20 @@
 # if it does not exist.
 #
 
-prefix			?= /opt/Ice-$(VERSION)
+prefix			?= /pkg/usr/lib/Ice-$(VERSION)
 
 #
 # The "root directory" for runpath embedded in executables. Can be unset
 # to avoid adding a runpath to Ice executables.
 #
-embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+embedded_runpath_prefix  ?= /usr/lib/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # Define OPTIMIZE as yes if you want to build with optimization.
 # Otherwise the Ice extension is built with debug information.
 #
 
-#OPTIMIZE		= yes
+OPTIMIZE		= yes
 
 #
 # Define LP64 as yes if you want to build in 64 bit mode on a platform
--- Ice-3.3.1.old/rb/config/Make.rules	2009-03-20 18:52:15.000000000 +0100
+++ Ice-3.3.1/rb/config/Make.rules	2009-07-13 19:39:52.558338839 +0200
@@ -12,20 +12,20 @@
 # if it does not exist.
 #
 
-prefix			?= /opt/Ice-$(VERSION)
+prefix			?= /pkg/usr/lib/Ice-$(VERSION)
 
 #
 # The "root directory" for runpath embedded in executables. Can be unset
 # to avoid adding a runpath to Ice executables.
 #
-embedded_runpath_prefix  ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+embedded_runpath_prefix  ?= /usr/lib/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
 
 #
 # Define OPTIMIZE as yes if you want to build with optimization.
 # Otherwise the Ice extension is built with debug information.
 #
 
-#OPTIMIZE		= yes
+OPTIMIZE		= yes
 
 #
 # Define LP64 as yes if you want to build in 64 bit mode on a platform
--- Ice-3.3.1.old/allTests.py	2009-03-20 18:52:13.000000000 +0100
+++ Ice-3.3.1/allTests.py	2009-07-13 20:11:09.329337974 +0200
@@ -15,7 +15,7 @@
 
 testGroups = []
 
-for d in [ "cpp", "java", "cs", "py", "rb", "php" ]:
+for d in [ "cpp", "cs", "py", "rb", "php" ]:
     
     filename = os.path.abspath(os.path.join(os.path.dirname(__file__), d, "allTests.py"))
     f = file(filename, "r")