merge commit

20 files changed, 153 insertions, 146 deletions

diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index e68f9fdc27f6..5c949ad4e7f1 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.3.0
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 # PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -60,16 +60,17 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF # $(SOLAR_JAVA)!= ""
 
 # --- Targets ------------------------------------------------------
+.ENDIF
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 
 .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
-    
+.ENDIF
 .ENDIF
 
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index 939964906eea..6e83b0e23932 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-0.9.2
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 TARFILE_NAME=core
 TARFILE_ROOTDIR=core
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -58,7 +58,7 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
@@ -66,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
-    
+.ENDIF
 .ENDIF
diff --git a/jfreereport/java/libbase/makefile.mk b/jfreereport/java/libbase/makefile.mk
index c11070d0a12a..9c1d8cf18660 100644
--- a/jfreereport/java/libbase/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -64,6 +64,7 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .INCLUDE : target.mk
 
 .IF "$(SOLAR_JAVA)" != ""
+.IF "$(L10N_framework)"==""
 .INCLUDE : tg_ext.mk
 
 ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
@@ -84,4 +85,4 @@ $(CLASSDIR)$/commons-logging.jar :
 $(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
 .ENDIF
-
+.ENDIF
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index e8e289337f5b..e7f6b174ad45 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.0.0
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,18 +57,19 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
 .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
-    
+
+.ENDIF
 .ENDIF
 
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 1e4a3093f4bb..35a5b0407740 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-0.2.0
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -60,12 +60,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
@@ -77,4 +77,4 @@ $(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
 # $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : 
 #	@@-$(MKDIRHIER) $(@:d)
 #    $(MV) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/isRef-Function.properties $@	
-
+.ENDIF
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 409b9715fe13..30633b040ef7 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-0.2.9
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
@@ -71,4 +71,4 @@ $(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/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index 9cb1e93066a8..6b6e95da5490 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -47,7 +47,7 @@ TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
 CONVERTFILES=build.xml
-
+.IF "$(L10N_framework)"==""
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
@@ -71,4 +71,4 @@ $(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/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index d6bdab754f88..7ab0fd6ce623 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -47,7 +47,7 @@ TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
 CONVERTFILES=build.xml
-
+.IF "$(L10N_framework)"==""
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
@@ -71,4 +71,4 @@ $(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/libserializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index a062670e63a2..04b4fdb8e760 100644
--- a/jfreereport/java/libserializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.0.0
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
@@ -71,4 +71,4 @@ $(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/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index fafb16753eb3..708cdcbe2f0a 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -42,7 +42,7 @@ VERSION=-1.0.0
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 TARFILE_NAME=$(TARGET)
 TARFILE_ROOTDIR=$(TARGET)
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
@@ -57,12 +57,12 @@ BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)"
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
-
+.IF "$(L10N_framework)"==""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
@@ -71,4 +71,4 @@ $(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/sac/makefile.mk b/jfreereport/java/sac/makefile.mk
index 0ce628ed8ee6..f0982691b3a1 100644
--- a/jfreereport/java/sac/makefile.mk
+++ b/jfreereport/java/sac/makefile.mk
@@ -38,6 +38,8 @@ TARGET=sac-1.3
 
 .INCLUDE :	settings.mk
 
+.IF "$(L10N_framework)"==""
+
 # override buildfile
 ANT_BUILDFILE=build.xml
 
@@ -65,12 +67,13 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
-
+.ENDIF # L10N_framework
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 
+.IF "$(L10N_framework)"==""
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
 
@@ -79,4 +82,5 @@ ALLTAR : $(CLASSDIR)$/sac.jar
 $(CLASSDIR)$/sac.jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
     $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/sac.jar $(CLASSDIR)$/sac.jar
 .ENDIF
+.ENDIF # L10N_framework
 
diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch
index ca3c84e53627..13da432113fb 100644
--- a/jfreereport/patches/flow-engine.patch
+++ b/jfreereport/patches/flow-engine.patch
@@ -1,10 +1,10 @@
---- misc/core/build.xml	(Revision 6728)

-+++ misc/build/core/build.xml	(Arbeitskopie)

-@@ -24,6 +24,6 @@

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/core/build.xml	(Revision 6728)
++++ misc/build/core/build.xml	(Arbeitskopie)
+@@ -24,6 +24,6 @@
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/flute.patch b/jfreereport/patches/flute.patch
index 27cca426319d..aad7756c3b65 100644
--- a/jfreereport/patches/flute.patch
+++ b/jfreereport/patches/flute.patch
@@ -1,19 +1,19 @@
---- misc/flute/build.xml	(Revision 6820)

-+++ misc/build/flute/build.xml	(Arbeitskopie)

-@@ -9,6 +9,7 @@

-    <property name="build.doc" value="${build}/api"/>

-    <property name="build.lib" value="${build}/lib"/>

-    <property name="packagenames" value="org.w3c.flute.*"/>

-+   <property name="lib" value="lib"/>

- 

-    <!-- Targets -->

-    <!-- Prepare build directories -->

-@@ -21,7 +22,7 @@

- 

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/flute/build.xml	(Revision 6820)
++++ misc/build/flute/build.xml	(Arbeitskopie)
+@@ -9,6 +9,7 @@
+    <property name="build.doc" value="${build}/api"/>
+    <property name="build.lib" value="${build}/lib"/>
+    <property name="packagenames" value="org.w3c.flute.*"/>
++   <property name="lib" value="lib"/>
+ 
+    <!-- Targets -->
+    <!-- Prepare build directories -->
+@@ -21,7 +22,7 @@
+ 
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/libbase.patch b/jfreereport/patches/libbase.patch
index 87f79aad156b..f6a7560de145 100644
--- a/jfreereport/patches/libbase.patch
+++ b/jfreereport/patches/libbase.patch
@@ -1,19 +1,19 @@
---- misc/libbase/build.xml	(Revision 6728)

-+++ misc/build/libbase/build.xml	(Arbeitskopie)

-@@ -6,6 +6,7 @@

-    <property name="build.classes" value="${build}/classes"/>

-    <property name="build.doc" value="${build}/api"/>

-    <property name="build.lib" value="${build}/lib"/>

-+   <property name="lib" value="lib"/>

- 

-    <!-- Targets -->

-    <!-- Prepare build directories -->

-@@ -18,7 +19,7 @@

- 

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/libbase/build.xml	(Revision 6728)
++++ misc/build/libbase/build.xml	(Arbeitskopie)
+@@ -6,6 +6,7 @@
+    <property name="build.classes" value="${build}/classes"/>
+    <property name="build.doc" value="${build}/api"/>
+    <property name="build.lib" value="${build}/lib"/>
++   <property name="lib" value="lib"/>
+ 
+    <!-- Targets -->
+    <!-- Prepare build directories -->
+@@ -18,7 +19,7 @@
+ 
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/libfonts.patch b/jfreereport/patches/libfonts.patch
index de09e87b32d6..63c5a1a48f93 100644
--- a/jfreereport/patches/libfonts.patch
+++ b/jfreereport/patches/libfonts.patch
@@ -1,10 +1,10 @@
---- misc/libfonts/build.xml	(Revision 6728)

-+++ misc/build/libfonts/build.xml	(Arbeitskopie)

-@@ -23,6 +23,6 @@

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/libfonts/build.xml	(Revision 6728)
++++ misc/build/libfonts/build.xml	(Arbeitskopie)
+@@ -23,6 +23,6 @@
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch
index a30fdd82a9f6..ef9cb5bb06b3 100644
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
@@ -1,10 +1,10 @@
---- misc/liblayout/build.xml	(Revision 6728)

-+++ misc/build/liblayout/build.xml	(Arbeitskopie)

-@@ -24,6 +24,6 @@

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/liblayout/build.xml	(Revision 6728)
++++ misc/build/liblayout/build.xml	(Arbeitskopie)
+@@ -24,6 +24,6 @@
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/libloader.patch b/jfreereport/patches/libloader.patch
index 67b538f35f48..82a2624855a9 100644
--- a/jfreereport/patches/libloader.patch
+++ b/jfreereport/patches/libloader.patch
@@ -1,11 +1,11 @@
---- misc/libloader/build.xml	2009-02-12 18:01:56.000000000 +0100

-+++ misc/build/libloader/build.xml	2009-02-13 09:57:21.856601684 +0100

-@@ -23,7 +23,7 @@

- 

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/libloader/build.xml	2009-02-12 18:01:56.000000000 +0100
++++ misc/build/libloader/build.xml	2009-02-13 09:57:21.856601684 +0100
+@@ -23,7 +23,7 @@
+ 
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/librepository.patch b/jfreereport/patches/librepository.patch
index 9fe1e48ccdc6..8a981595798c 100644
--- a/jfreereport/patches/librepository.patch
+++ b/jfreereport/patches/librepository.patch
@@ -1,10 +1,10 @@
---- misc/librepository/build.xml	(Revision 6728)

-+++ misc/build/librepository/build.xml	(Arbeitskopie)

-@@ -24,6 +24,6 @@

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/librepository/build.xml	(Revision 6728)
++++ misc/build/librepository/build.xml	(Arbeitskopie)
+@@ -24,6 +24,6 @@
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/libserializer.patch b/jfreereport/patches/libserializer.patch
index b2a610a6478f..830fdb9ca348 100644
--- a/jfreereport/patches/libserializer.patch
+++ b/jfreereport/patches/libserializer.patch
@@ -1,10 +1,10 @@
---- misc/libserializer/build.xml	(Revision 6728)

-+++ misc/build/libserializer/build.xml	(Arbeitskopie)

-@@ -24,6 +24,6 @@

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/libserializer/build.xml	(Revision 6728)
++++ misc/build/libserializer/build.xml	(Arbeitskopie)
+@@ -24,6 +24,6 @@
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>
diff --git a/jfreereport/patches/libxml.patch b/jfreereport/patches/libxml.patch
index 70c2aecc2444..50981a462de2 100644
--- a/jfreereport/patches/libxml.patch
+++ b/jfreereport/patches/libxml.patch
@@ -1,10 +1,10 @@
---- misc/libxml/build.xml	(Revision 6728)

-+++ misc/build/libxml/build.xml	(Arbeitskopie)

-@@ -24,6 +24,6 @@

-   <!-- Setup the compile classpath -->

-   <path id="classpath">

--    <fileset dir="lib">

-+    <fileset dir="${lib}">

-       <include name="*.jar" />

-     </fileset>

-   </path>

+--- misc/libxml/build.xml	(Revision 6728)
++++ misc/build/libxml/build.xml	(Arbeitskopie)
+@@ -24,6 +24,6 @@
+   <!-- Setup the compile classpath -->
+   <path id="classpath">
+-    <fileset dir="lib">
++    <fileset dir="${lib}">
+       <include name="*.jar" />
+     </fileset>
+   </path>