Index: print/pdftk/Makefile =================================================================== RCS file: /home/pcvs/ports/print/pdftk/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- print/pdftk/Makefile 23 Feb 2010 21:53:05 -0000 1.29 +++ print/pdftk/Makefile 19 Apr 2010 14:51:26 -0000 @@ -7,7 +7,7 @@ PORTNAME= pdftk PORTVERSION= 1.41 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= http://www.pdfhacks.com/pdftk/ \ http://www.accesspdf.com/pdftk/ @@ -24,18 +24,20 @@ # Get gcc version suffix without the dot in USE_GCC CSUFF= ${_USE_GCC:S/.//} -USE_GCC= 4.2 +USE_GCC= 4.5 USE_GMAKE= yes USE_ICONV= yes +USE_LDCONFIG= ${PREFIX}/lib/gcc${CSUFF} # gcj/libgcj don't exist on some platforms ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= GNU gcj does not exist on this platform WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} MAKEFILE= Makefile.Generic -MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSUFF} +MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSUFF} OBJCOPY=${OBJCOPY} MAN1= ${PORTNAME}.1 PLIST_FILES= bin/pdftk @@ -52,8 +54,8 @@ #Based on info found via Google USENET Search: Adam McDougall, Gerald Pfeifer # - @${REINPLACE_CMD} -e "s|GCJFLAGS=|GCJFLAGS= -L${LOCALBASE}/lib|g" ${WRKSRC}/Makefile.Generic - @${REINPLACE_CMD} -e "s|CXXFLAGS= -lgcj|CXXFLAGS= -lgcj ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -liconv -lz -L${LOCALBASE}/lib|g" \ + @${REINPLACE_CMD} -e "s|GCJFLAGS=|GCJFLAGS= -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" ${WRKSRC}/Makefile.Generic + @${REINPLACE_CMD} -e "s|CXXFLAGS= -lgcj|CXXFLAGS= -lgcj ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} -liconv -lz -L${LOCALBASE}/lib -Wl,-rpath=${LOCALBASE}/lib/gcc${CSUFF} -w|g" \ ${WRKSRC}/Makefile.Generic @${REINPLACE_CMD} -e "s|//SID import com.lowagie.text.ImgRaw;|import com.lowagie.text.ImgRaw;|g" \ ${WRKSRC}/../java_libs/com/lowagie/text/pdf/codec/PngImage.java Index: print/pdftk/files/patch-Makefile.Generic =================================================================== RCS file: print/pdftk/files/patch-Makefile.Generic diff -N print/pdftk/files/patch-Makefile.Generic --- print/pdftk/files/patch-Makefile.Generic 30 Dec 2009 23:54:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- ./Makefile.Generic.orig 2009-12-10 15:50:42.000000000 -0500 -+++ ./Makefile.Generic 2009-12-10 15:50:42.000000000 -0500 -@@ -28,7 +28,7 @@ - - # itext compiler flags - # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4) --export GCJFLAGS= -L/usr/local/lib -O2 -+export GCJFLAGS= -L/usr/local/lib -O2 -w - - # - export ARFLAGS= rs Index: print/pdftk/files/patch-java_libs__com__lowagie__bc__asn1__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__bc__asn1__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__bc__asn1__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__bc__asn1__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/com/lowagie/bc/asn1/Makefile.orig 2006-07-27 19:18:06.000000000 -0400 ++++ ./java_libs/com/lowagie/bc/asn1/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__com__lowagie__text__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/com/lowagie/text/Makefile.orig 2006-07-26 17:14:34.000000000 -0400 ++++ ./java_libs/com/lowagie/text/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../.. -d ../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__com__lowagie__text__markup__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__markup__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__markup__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__markup__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/com/lowagie/text/markup/Makefile.orig 2006-07-26 17:14:54.000000000 -0400 ++++ ./java_libs/com/lowagie/text/markup/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/com/lowagie/text/pdf/Makefile.orig 2006-07-26 17:15:10.000000000 -0400 ++++ ./java_libs/com/lowagie/text/pdf/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__PdfDate.java =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__PdfDate.java diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__PdfDate.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__PdfDate.java 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,11 @@ +--- ./java_libs/com/lowagie/text/pdf/PdfDate.java.orig 2006-07-26 19:56:42.000000000 -0400 ++++ ./java_libs/com/lowagie/text/pdf/PdfDate.java 2010-04-08 18:13:54.000000000 -0400 +@@ -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: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,36 @@ +--- ./java_libs/com/lowagie/text/pdf/codec/Makefile.orig 2006-07-26 17:15:20.000000000 -0400 ++++ ./java_libs/com/lowagie/text/pdf/codec/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,13 +11,15 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ +- ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ ++ + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< + +@@ -25,13 +27,14 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../../.. -d ../../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) ++ ++$(headers): $(classes) + + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); Index: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__postscript__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__postscript__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__postscript__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__postscript__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,37 @@ +--- ./java_libs/com/lowagie/text/pdf/codec/postscript/Makefile.orig 2006-07-27 19:21:06.000000000 -0400 ++++ ./java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,13 +11,15 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ +- ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ ++ + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< + +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../../../.. -d ../../../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__wmf__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__wmf__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__wmf__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__codec__wmf__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,37 @@ +--- ./java_libs/com/lowagie/text/pdf/codec/wmf/Makefile.orig 2006-07-26 17:15:32.000000000 -0400 ++++ ./java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,13 +11,15 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ +- ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ ++ + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< + +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../../../.. -d ../../../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__fonts__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__fonts__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__fonts__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__pdf__fonts__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,37 @@ +--- ./java_libs/com/lowagie/text/pdf/fonts/Makefile.orig 2006-07-26 17:15:48.000000000 -0400 ++++ ./java_libs/com/lowagie/text/pdf/fonts/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,6 +11,7 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + # font metric files, included as resources + afms= $(wildcard *.afm) +@@ -21,6 +22,7 @@ + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -34,8 +36,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) --classpath="../../../../.." -d ../../../../.. $(package).$*; + + ## + # targets +@@ -45,6 +46,8 @@ + + all : $(library) $(headers) $(afm_objects) + ++$(headers) : $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__com__lowagie__text__xml__xmp__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__com__lowagie__text__xml__xmp__Makefile diff -N print/pdftk/files/patch-java_libs__com__lowagie__text__xml__xmp__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__com__lowagie__text__xml__xmp__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/com/lowagie/text/xml/xmp/Makefile.orig 2006-07-26 20:53:34.000000000 -0400 ++++ ./java_libs/com/lowagie/text/xml/xmp/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../../.. -d ../../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__gnu__gcj__convert__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__gnu__gcj__convert__Makefile diff -N print/pdftk/files/patch-java_libs__gnu__gcj__convert__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__gnu__gcj__convert__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/gnu/gcj/convert/Makefile.orig 2006-07-26 17:13:44.000000000 -0400 ++++ ./java_libs/gnu/gcj/convert/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__gnu_local__java__security__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__gnu_local__java__security__Makefile diff -N print/pdftk/files/patch-java_libs__gnu_local__java__security__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__gnu_local__java__security__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/gnu_local/java/security/Makefile.orig 2006-07-26 17:11:32.000000000 -0400 ++++ ./java_libs/gnu_local/java/security/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../.. -d ../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__gnu_local__java__security__provider__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__gnu_local__java__security__provider__Makefile diff -N print/pdftk/files/patch-java_libs__gnu_local__java__security__provider__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__gnu_local__java__security__provider__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/gnu_local/java/security/provider/Makefile.orig 2006-07-26 17:13:22.000000000 -0400 ++++ ./java_libs/gnu_local/java/security/provider/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); + Index: print/pdftk/files/patch-java_libs__java_local__security__Makefile =================================================================== RCS file: print/pdftk/files/patch-java_libs__java_local__security__Makefile diff -N print/pdftk/files/patch-java_libs__java_local__security__Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ print/pdftk/files/patch-java_libs__java_local__security__Makefile 19 Apr 2010 14:51:26 -0000 @@ -0,0 +1,35 @@ +--- ./java_libs/java_local/security/Makefile.orig 2006-07-26 17:13:04.000000000 -0400 ++++ ./java_libs/java_local/security/Makefile 2010-04-08 18:13:54.000000000 -0400 +@@ -11,12 +11,14 @@ + objects= $(patsubst %.java, %.o, $(sources)) + headers= $(patsubst %.java, %.h, $(sources)) + classes= $(patsubst %.java, %.class, $(sources)) ++package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u) + + ## + # implicit rules for creating A from B + + %.o : %.java + $(GCJ) $(GCJFLAGS) -c $< -o $@ ++ ${OBJCOPY} -L '_ZGr8_$$_dummy' $@ + + %.class : %.java + $(GCJ) $(GCJFLAGS) -C $< +@@ -25,14 +27,15 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; +- $(RM) $< ++ $(GCJH) -classpath ../.. -d ../.. $(package).$*; + + ## + # targets + + all : $(library) $(headers) + ++$(headers): $(classes) ++ + $(library) : $(objects) + $(AR) $(ARFLAGS) $(library) $(objects); +