Index: pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile	Fri Sep 17 08:54:18 EDT 2010
@@ -21,6 +21,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -34,8 +35,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile	Fri Sep 17 08:39:02 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/java_libs/Makefile
===================================================================
--- pdftk-1.41/java_libs/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/Makefile	Tue Sep 21 11:54:01 EDT 2010
@@ -13,14 +13,8 @@
 # append gcj flags
 export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)"
 
-all : libgcj_local itext
+all : itext
 
-libgcj_local :
-	$(MAKE) -C "$(java_libs_root)/gnu_local/java/security";
-	$(MAKE) -C "$(java_libs_root)/gnu_local/java/security/provider";
-	$(MAKE) -C "$(java_libs_root)/gnu/gcj/convert";
-	$(MAKE) -C "$(java_libs_root)/java_local/security";
-
 itext :
 	$(MAKE) -C "$(java_libs_root)/com/lowagie/text";
 #	$(MAKE) -C "$(java_libs_root)/com/lowagie/text/html";
@@ -35,14 +29,8 @@
 	$(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1";
 	$(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript";
 
-clean : libgcj_local_clean itext_clean
+clean : itext_clean
 
-libgcj_local_clean :
-	$(MAKE) -iC "$(java_libs_root)/gnu_local/java/security" clean;
-	$(MAKE) -iC "$(java_libs_root)/gnu_local/java/security/provider" clean;
-	$(MAKE) -iC "$(java_libs_root)/gnu/gcj/convert" clean;
-	$(MAKE) -iC "$(java_libs_root)/java_local/security" clean;
-
 itext_clean :
 	$(MAKE) -iC "$(java_libs_root)/com/lowagie/text" clean;
 #	$(MAKE) -iC "$(java_libs_root)/com/lowagie/text/html" clean;
Index: pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java	Thu Sep 16 10:55:12 EDT 2010
@@ -50,7 +50,7 @@
 
 package com.lowagie.text.pdf;
 
-import java_local.security.MessageDigest; // ssteward
+import java.security.MessageDigest;
 import com.lowagie.text.ExceptionConverter;
 
 /**
Index: pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java	Thu Sep 16 11:13:24 EDT 2010
@@ -76,7 +76,7 @@
     // ssteward; static builds of pdftk (Windows, gcc 3.3.1) would
     // omit this class because of its reference by reflection;
     // this treatment ensures that ld will include it
-    private static Class c1= gnu.java.locale.Calendar.class;
+    private static Class c1= java.util.Calendar.class;
 
     private static final int dateSpace[] = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0,
         Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0};
Index: pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile	Fri Sep 17 08:50:32 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile	Fri Sep 17 08:40:06 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile	Fri Sep 17 08:38:24 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/java_libs/com/lowagie/text/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/Makefile	Fri Sep 17 08:37:30 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/pdftk/Makefile.Generic
===================================================================
--- pdftk-1.41/pdftk/Makefile.Generic	(revision 1)
+++ pdftk-1.41/pdftk/Makefile.Generic	Fri Sep 17 11:24:02 EDT 2010
@@ -11,8 +11,8 @@
 # 	 								
 
 # tools
-TOOLPATH=
-VERSUFF=
+TOOLPATH= /opt/local/bin/
+VERSUFF= -mp-4.5
 CXX= $(TOOLPATH)g++$(VERSUFF)
 export GCJ= $(TOOLPATH)gcj$(VERSUFF)
 export GCJH= $(TOOLPATH)gcjh$(VERSUFF)
@@ -24,11 +24,11 @@
 # ASK_ABOUT_WARNINGS to true; otherwise: false; override this default
 # with the dont_ask or do_ask command-line options
 CPPFLAGS= -O2 -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers
-CXXFLAGS= -lgcj
+CXXFLAGS= -lgcj /opt/local/lib/libiconv.2.dylib
 
 # itext compiler flags
 # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4)
-export GCJFLAGS= -O2
+export GCJFLAGS= -O2 -w
 
 #
 export ARFLAGS= rs
Index: pdftk-1.41/java_libs/remove_symbols
===================================================================
--- pdftk-1.41/java_libs/remove_symbols	Thu Sep 16 17:20:12 EDT 2010
+++ pdftk-1.41/java_libs/remove_symbols	Thu Sep 16 17:20:12 EDT 2010
@@ -0,0 +1,1 @@
+__ZGr8_$_dummy
\ No newline at end of file
Index: pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile	Fri Sep 17 08:47:58 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/pdftk/Makefile.Base
===================================================================
--- pdftk-1.41/pdftk/Makefile.Base	(revision 1)
+++ pdftk-1.41/pdftk/Makefile.Base	Tue Sep 21 11:50:42 EDT 2010
@@ -31,22 +31,10 @@
 afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm)
 afm_objects= $(patsubst %.afm, %.o, $(afms))
 
-# older versions of libgcj might not have the MD5 algorithm,
-# so I added it here; these *_local java files were grabbed from
-# libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1
-#
-# gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1
-#
-libgcj_local_libs = \
-$(java_libs_root)/java_local/security/security.a \
-$(java_libs_root)/gnu_local/java/security/provider/provider.a \
-$(java_libs_root)/gnu_local/java/security/security.a \
-$(java_libs_root)/gnu/gcj/convert/convert.a
-
 # this must already be set according to your platform Makefile;
 # we're just appending to it, here
 #
-CPPFLAGS += -DPDFTK_VER=\"1.41\"
+CPPFLAGS += -DPDFTK_VER=\"1.41-r2\"
 
 all : java_libs pdftk
 
Index: pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile	Fri Sep 17 08:57:50 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets
Index: pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile
===================================================================
--- pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile	(revision 1)
+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile	Thu Sep 16 18:04:52 EDT 2010
@@ -17,6 +17,7 @@
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	nmedit -R "$(java_libs_root)/remove_symbols" $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,8 +26,7 @@
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="$(java_libs_root):." $*;
 
 ##
 # targets