#i99049# use vanilla sources

11 files changed, 92 insertions, 102 deletions

diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index 5c949ad4e7f1..a5bef2a6563c 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=flute
-VERSION=-1.3.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
@@ -43,18 +43,16 @@ VERSION=-1.3.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-# CONVERTFILES=build.xml		 
-
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -68,9 +66,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 .IF "$(L10N_framework)"==""
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 .ENDIF
 .ENDIF
 
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index 6e83b0e23932..6904557ee3a8 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=flow-engine
-VERSION=-0.9.2
+VERSION=0.9.2
 
 # --- Settings -----------------------------------------------------
 
@@ -67,8 +67,8 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 .IF "$(L10N_framework)"==""
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 .ENDIF
 .ENDIF
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index 9c1d8cf18660..637295bbc876 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libbase
-VERSION=-1.0.0
+VERSION=1.1.2
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
@@ -42,8 +42,9 @@ VERSION=-1.0.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
 
 # PATCH_FILES=$(PRJ)$/patches$/libbase.patch
 # CONVERTFILES=build.xml
@@ -51,9 +52,9 @@ TARFILE_ROOTDIR=$(TARGET)
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -67,7 +68,7 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(L10N_framework)"==""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
 
 # XCLASSPATH/CLASSPATH does not work and we only can give lib once. But
 # the build.xmls fortunately take *.jar out of lib so we can copy our
@@ -82,7 +83,7 @@ $(CLASSDIR)$/commons-logging.jar :
     $(COPY) $(COMMONS_LOGGING_JAR) $(CLASSDIR)$/commons-logging.jar
 .ENDIF
 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(CLASSDIR)$/commons-logging.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 .ENDIF
 .ENDIF
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index e7f6b174ad45..1bd28f050c04 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libfonts
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
@@ -43,17 +43,18 @@ VERSION=-1.0.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -66,9 +67,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
 
 .ENDIF
 .ENDIF
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 35a5b0407740..cb720bc89809 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libformula
-VERSION=-0.2.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
@@ -43,19 +43,20 @@ VERSION=-0.2.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml \
-            source$/org$/pentaho$/reporting$/libraries$/formula$/function$/datetime$/DateDifFunction.java \
-            source$/org$/pentaho$/reporting$/libraries$/formula$/lvalues$/FormulaFunction.java
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+#PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+#CONVERTFILES=build.xml \
+#            source$/org$/pentaho$/reporting$/libraries$/formula$/function$/datetime$/DateDifFunction.java \
+#            source$/org$/pentaho$/reporting$/libraries$/formula$/lvalues$/FormulaFunction.java
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 
@@ -69,9 +70,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
     
 .ENDIF
 # $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : 
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index 6b6e95da5490..6925948201cf 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libloader
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
@@ -43,17 +43,18 @@ VERSION=-1.0.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 .IF "$(L10N_framework)"==""
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -66,9 +67,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
     
 .ENDIF
 .ENDIF
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index 7ab0fd6ce623..f7a9a250b26b 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=librepository
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
@@ -43,17 +43,18 @@ VERSION=-1.0.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 .IF "$(L10N_framework)"==""
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -66,9 +67,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
     
 .ENDIF
 .ENDIF
diff --git a/jfreereport/java/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index 04b4fdb8e760..57c80f75a91e 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libserializer
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
@@ -43,17 +43,18 @@ VERSION=-1.0.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
                 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -66,9 +67,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
     
 .ENDIF
 .ENDIF
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index 708cdcbe2f0a..4cd60fffaf86 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -33,7 +33,7 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libxml
-VERSION=-1.0.0
+VERSION=1.1.2
 
 # --- Settings -----------------------------------------------------
 
@@ -43,17 +43,18 @@ VERSION=-1.0.0
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 .IF "$(L10N_framework)"==""
-TARFILE_NAME=$(TARGET)
-TARFILE_ROOTDIR=$(TARGET)
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-CONVERTFILES=build.xml
+TARFILE_NAME=$(TARGET)-$(VERSION)
+#TARFILE_ROOTDIR=$(TARGET)
+TARFILE_IS_FLAT=true
+# PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -66,9 +67,9 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
-ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
-$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
-    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)-$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)-$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/dist$/$(TARGET)-$(VERSION).jar $(CLASSDIR)$/$(TARGET)-$(VERSION).jar
     
 .ENDIF
 .ENDIF
diff --git a/jfreereport/java/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index f0982691b3a1..d3828d4f1cab 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -61,9 +61,9 @@ ADDITIONAL_FILES=build.xml
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
 .ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dproject.revision="$(VERSION)" -f $(ANT_BUILDFILE) all
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
diff --git a/jfreereport/patches/libformula.patch b/jfreereport/patches/libformula.patch
index 07968b448675..8beb270e22e8 100644
--- a/jfreereport/patches/libformula.patch
+++ b/jfreereport/patches/libformula.patch
@@ -1,18 +1,3 @@
---- misc/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java	2008-12-12 13:04:46.000000000 +0100
-+++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java	2008-12-15 08:15:18.293125000 +0100
-@@ -198,12 +198,6 @@
-           LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
-     }
- 
--    if (res < 0)
--    {
--      throw new EvaluationException(
--          LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
--    }
--
-     //noinspection UnpredictableBigDecimalConstructorCall
-     return new TypeValuePair(NumberType.GENERIC_NUMBER, new BigDecimal((double) res));
-   }
 --- misc/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java	2008-12-12 13:04:46.000000000 +0100
 +++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java	2008-12-15 08:13:14.308750000 +0100
 @@ -161,7 +161,8 @@