From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 8 18:20:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 011B61065675 for ; Tue, 8 Apr 2008 18:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D14F88FC1C for ; Tue, 8 Apr 2008 18:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m38IK1A6026113 for ; Tue, 8 Apr 2008 18:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m38IK1xp026112; Tue, 8 Apr 2008 18:20:01 GMT (envelope-from gnats) Resent-Date: Tue, 8 Apr 2008 18:20:01 GMT Resent-Message-Id: <200804081820.m38IK1xp026112@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, bf Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3345F106567C for ; Tue, 8 Apr 2008 18:12:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 1C22C8FC1D for ; Tue, 8 Apr 2008 18:12:00 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m38IBidl079661 for ; Tue, 8 Apr 2008 18:11:44 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m38IBhPa079659; Tue, 8 Apr 2008 18:11:43 GMT (envelope-from nobody) Message-Id: <200804081811.m38IBhPa079659@www.freebsd.org> Date: Tue, 8 Apr 2008 18:11:43 GMT From: bf To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/122583: [PATCH]print/pdftk: update to 1.41 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Apr 2008 18:20:02 -0000 >Number: 122583 >Category: ports >Synopsis: [PATCH]print/pdftk: update to 1.41 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Apr 08 18:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: bf >Release: 7-STABLE i386 >Organization: - >Environment: >Description: A long overdue update to 1.41, released on 28 Nov. 2006. Fix WWW. Switch from old bundled gnu and java code to use lang/gccXX libraries and headers. The port still uses old bundled iText 1.X code, and could be improved by modifying it to use a more recent version. Cumulative summary of changes: * 1.41 - November 28, 2006 Fixed a bug that corrupted output PDF xref tables. This corruption was mild but universal. Most PDF tools can cope with the corrupted PDFs, but I recommend upgrading from 1.40 to 1.41 as soon as possible. This bug was introduced in version 1.40 - version 1.12 does not have this bug. Fixed a bug that prevented XFDF form data from being passed to pdftk via stdin. Commented out some unused code from pdftk.cc. * 1.40 - September 19, 2006 Added the stamp operation, a natural complement to the existing background operation. Added the page rotating patch provided by David Fabel & mdash thanks! Tweaked the patch so it handles a greater variety of input syntax. Added the generate_fdf patch provided Bernhard R. Link &mdash thanks! I actually rewrote the patch so it uses FDF features built into the iText library. Please let me know my changes break anything downstream. The fill_form operation can now take XFDF data as well as FDF data. This feature was sponsored by Vesaria - thanks! Added the drop_xfa option so pdftk could fill forms created with newer versions of Acrobat or Adobe Designer. Read more about this above. Added the keep_first_id and keep_final_id options for more PDF fun. Upgraded the iText library we use to itext-paulo rev. 155. This makes pdftk harder to compile on older versions of gcc. Added the -O2 optimizing switch to Makefile GCJFLAGS. This should make pdftk leaner and meaner, but could be dropped if your build acts funny (like segfaulting). Fixed a bug that caused pdftk to create bloated PDFs when input PDF pages had links on their pages. Added License-Adobe.txt to the fonts folder, as required for distribution of Adobe's AFM files. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN pdftk.orig/Makefile pdftk/Makefile --- pdftk.orig/Makefile 2007-01-22 04:08:02.000000000 -0500 +++ pdftk/Makefile 2008-04-08 13:25:11.068952216 -0400 @@ -6,59 +6,55 @@ # PORTNAME= pdftk -PORTVERSION= 1.12 -PORTREVISION= 1 +PORTVERSION= 1.41 CATEGORIES= print -MASTER_SITES= http://www.pdfhacks.com/pdftk/ \ - http://www.accesspdf.com/pdftk/ -DISTNAME= ${PORTNAME}-${PORTVERSION:R}.${PORTVERSION:E} +MASTER_SITES= http://www.pdfhacks.com/pdftk/ MAINTAINER= ports@FreeBSD.org COMMENT= A simple tool for doing everyday things with PDF documents -# gcj/libgcj don't exist on these platforms -NOT_FOR_ARCHS= amd64 ia64 sparc64 - -# Get gcc version suffix without the dot in USE_GCC -CSUFF= ${_USE_GCC:S/.//} - -# needs gcj -LIB_DEPENDS= gcj:${PORTSDIR}/lang/gcc${CSUFF} - -USE_GCC= 4.1+ +USE_BZIP2= yes USE_GMAKE= yes USE_ICONV= yes +USE_GCC= 4.2+ -WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME} - -MAKEFILE= Makefile.Generic -MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSUFF} +GCCVER?= ${_USE_GCC:S/.//} +LIB_DEPENDS+= gcj:${PORTSDIR}/lang/gcc${GCCVER} +#Ensure the lang/gccXX c++ compiler is used, not the compiler from the base system +CXX= g++${GCCVER} +CXXFLAGS+= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -fdollars-in-identifiers +GCJ= gcj${GCCVER} +GCJH= gcjh${GCCVER} +GCJJAR?= "`${LS} ${LOCALBASE}/share/java/libgcj-${_USE_GCC}*.jar`" +GCJFLAGS?= ${CFLAGS} +AR?= ar +ARFLAGS= rs +MAKE_ENV+= AR="${AR}" \ + ARFLAGS="${ARFLAGS}" \ + GCJ="${GCJ}" \ + GCJH="${GCJH}" \ + GCJFLAGS="${GCJFLAGS}" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" -MAN1= ${PORTNAME}.1 +MAN1= pdftk.1 PLIST_FILES= bin/pdftk -post-extract: - @${REINPLACE_CMD} -e "s|TOOLPATH=|TOOLPATH=${LOCALBASE}/bin/|g" ${WRKSRC}/Makefile.Generic - @${REINPLACE_CMD} -e "s|VERSUFF=|VERSUFF=${CSUFF}|g" ${WRKSRC}/Makefile.Generic - -#2005-10-29 - mjoyner@vbservices.net/mjoyner@ewc.edu -#as shipped, pdftk compiles fine with 3.4 gcj, as we currently only have 4.1 gcj available, -#fix things so that it will compile. (compile tested on 5.4-STABLE) -# -#The resulting binary from using the 4.1 compiler suite has *NOT* been regression tested! -#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" \ - ${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 - @${REINPLACE_CMD} -e "s|^..java_libs_root./gnu/gcj/convert/convert.a|# x-nay the convert.a|g" ${WRKSRC}/Makefile.Base - @${REINPLACE_CMD} -e "s|^..java_libs_root./gnu_local/java/security/security.a .|$$\(java_libs_root\)/gnu_local/java/security/security.a|g" ${WRKSRC}/Makefile.Base +#Remove the older bundled gnu and java code and instead use the lang/gccXX libraries and +#headers (this port still uses older bundled iText code, and should be modified to +#use a more recent version): + +post-patch: + cd ${WRKSRC}/java_libs && ${RM} -rf gnu gnu_local java_local + ${FIND} -x ${WRKSRC}/java_libs -name Makefile | \ + ${XARGS} ${REINPLACE_CMD} -e "s:%%GCJJAR%%:${GCJJAR}:g" + +do-build: + ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/java_libs itext + ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/pdftk -f Makefile.Base pdftk do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/../debian/${PORTNAME}.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/pdftk/pdftk ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/debian/pdftk.1 ${PREFIX}/man/man1 .include diff -ruN pdftk.orig/distinfo pdftk/distinfo --- pdftk.orig/distinfo 2006-01-24 01:38:30.000000000 -0500 +++ pdftk/distinfo 2008-04-08 13:01:42.972304178 -0400 @@ -1,3 +1,3 @@ -MD5 (pdftk-1.12.tar.gz) = 509d21706bbff59c00e063ea16855163 -SHA256 (pdftk-1.12.tar.gz) = 682811d4f54fd87fdf793cdcbe017ee723a176be2bade26d051f84a2d7501d12 -SIZE (pdftk-1.12.tar.gz) = 779882 +MD5 (pdftk-1.41.tar.bz2) = 7214230b937dc996d209c05b7b7b3518 +SHA256 (pdftk-1.41.tar.bz2) = 2e3bae2ecb3cabc64dec231b0192f302eaf347f1b1bdf1a9e991ea74c260b9ed +SIZE (pdftk-1.41.tar.bz2) = 756574 diff -ruN pdftk.orig/files/patch-java_libs+Makefile pdftk/files/patch-java_libs+Makefile --- pdftk.orig/files/patch-java_libs+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/Makefile.orig 2008-04-07 13:34:15.050372693 -0400 ++++ java_libs/Makefile 2008-04-07 18:16:05.908904556 -0400 +@@ -11,7 +11,7 @@ + java_libs_root= $(CURDIR) + + # append gcj flags +-export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)" ++export GCJFLAGS+= --encoding=UTF-8 --classpath=%%GCJJAR%%:"$(java_libs_root)" + + all : libgcj_local itext + diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+bc+asn1+Makefile pdftk/files/patch-java_libs+com+lowagie+bc+asn1+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+bc+asn1+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+bc+asn1+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/bc/asn1/Makefile.orig 2008-04-07 18:17:42.846452764 -0400 ++++ java_libs/com/lowagie/bc/asn1/Makefile 2008-04-07 18:21:22.419036709 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+Makefile pdftk/files/patch-java_libs+com+lowagie+text+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/Makefile.orig 2008-04-07 18:25:30.805261216 -0400 ++++ java_libs/com/lowagie/text/Makefile 2008-04-07 18:26:25.436391150 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+markup+Makefile pdftk/files/patch-java_libs+com+lowagie+text+markup+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+markup+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+markup+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/markup/Makefile.orig 2008-04-07 18:29:17.730256431 -0400 ++++ java_libs/com/lowagie/text/markup/Makefile 2008-04-07 18:30:27.906272378 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+Makefile pdftk/files/patch-java_libs+com+lowagie+text+pdf+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+pdf+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/pdf/Makefile.orig 2008-04-07 18:39:42.370028525 -0400 ++++ java_libs/com/lowagie/text/pdf/Makefile 2008-04-07 18:40:31.124821662 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+PdfEncryption.java pdftk/files/patch-java_libs+com+lowagie+text+pdf+PdfEncryption.java --- pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+PdfEncryption.java 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+pdf+PdfEncryption.java 2008-04-08 13:01:42.968304787 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/pdf/PdfEncryption.java.orig 2008-04-07 14:45:06.497854705 -0400 ++++ java_libs/com/lowagie/text/pdf/PdfEncryption.java 2008-04-07 14:47:00.096360940 -0400 +@@ -50,7 +50,7 @@ + + package com.lowagie.text.pdf; + +-import java_local.security.MessageDigest; // ssteward ++import java.security.MessageDigest; // ssteward + import com.lowagie.text.ExceptionConverter; + + /** diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+codec+Makefile pdftk/files/patch-java_libs+com+lowagie+text+pdf+codec+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+codec+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+pdf+codec+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/pdf/codec/Makefile.orig 2008-04-07 18:47:28.864752575 -0400 ++++ java_libs/com/lowagie/text/pdf/codec/Makefile 2008-04-07 18:48:01.290608655 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+codec+postscript+Makefile pdftk/files/patch-java_libs+com+lowagie+text+pdf+codec+postscript+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+codec+postscript+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+pdf+codec+postscript+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/pdf/codec/postscript/Makefile.orig 2008-04-07 18:50:23.362745756 -0400 ++++ java_libs/com/lowagie/text/pdf/codec/postscript/Makefile 2008-04-07 18:51:16.325781561 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+codec+wmf+Makefile pdftk/files/patch-java_libs+com+lowagie+text+pdf+codec+wmf+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+codec+wmf+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+pdf+codec+wmf+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/pdf/codec/wmf/Makefile.orig 2008-04-07 18:53:28.029318184 -0400 ++++ java_libs/com/lowagie/text/pdf/codec/wmf/Makefile 2008-04-07 18:54:16.604095425 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+fonts+Makefile pdftk/files/patch-java_libs+com+lowagie+text+pdf+fonts+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+pdf+fonts+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+pdf+fonts+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/pdf/fonts/Makefile.orig 2008-04-07 18:43:47.944098694 -0400 ++++ java_libs/com/lowagie/text/pdf/fonts/Makefile 2008-04-07 18:44:30.018503681 -0400 +@@ -34,7 +34,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-java_libs+com+lowagie+text+xml+xmp+Makefile pdftk/files/patch-java_libs+com+lowagie+text+xml+xmp+Makefile --- pdftk.orig/files/patch-java_libs+com+lowagie+text+xml+xmp+Makefile 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-java_libs+com+lowagie+text+xml+xmp+Makefile 2008-04-08 13:01:42.972304178 -0400 @@ -0,0 +1,11 @@ +--- java_libs/com/lowagie/text/xml/xmp/Makefile.orig 2008-04-07 18:34:38.308619324 -0400 ++++ java_libs/com/lowagie/text/xml/xmp/Makefile 2008-04-07 18:35:34.859859775 -0400 +@@ -25,7 +25,7 @@ + # the "$*" automatic variable, here + # + %.h : %.class +- $(GCJH) --classpath="." $*; ++ $(GCJH) --classpath=%%GCJJAR%%:"$(PWD)":"." $*; + $(RM) $< + + ## diff -ruN pdftk.orig/files/patch-pdftk+Makefile.Base pdftk/files/patch-pdftk+Makefile.Base --- pdftk.orig/files/patch-pdftk+Makefile.Base 1969-12-31 19:00:00.000000000 -0500 +++ pdftk/files/patch-pdftk+Makefile.Base 2008-04-08 13:01:42.968304787 -0400 @@ -0,0 +1,55 @@ +--- pdftk/Makefile.Base.orig 2008-04-08 07:53:55.734615869 -0400 ++++ pdftk/Makefile.Base 2008-04-08 12:58:09.060044938 -0400 +@@ -31,39 +31,22 @@ + 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\" +- +-all : java_libs pdftk +- +-java_libs : +- $(MAKE) -C $(java_libs_root) +- +-attachments.o : attachments.cc attachments.h pdftk.h $(itext_libs) $(libgcj_local_libs) +- $(CXX) attachments.cc -I$(java_libs_root) $(CPPFLAGS) -c ++CXXFLAGS += -DPDFTK_VER=\"1.41\" + +-report.o : report.cc report.h pdftk.h $(itext_libs) $(libgcj_local_libs) +- $(CXX) report.cc -I$(java_libs_root) $(CPPFLAGS) -c ++all : pdftk + +-pdftk.o : pdftk.cc pdftk.h attachments.h report.h $(itext_libs) $(libgcj_local_libs) +- $(CXX) pdftk.cc -I$(java_libs_root) $(CPPFLAGS) -c ++attachments.o : attachments.cc attachments.h pdftk.h $(itext_libs) ++ $(CXX) attachments.cc -I$(java_libs_root) $(CXXFLAGS) -c + +-pdftk : pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) +- $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk ++report.o : report.cc report.h pdftk.h $(itext_libs) ++ $(CXX) report.cc -I$(java_libs_root) $(CXXFLAGS) -c ++ ++pdftk.o : pdftk.cc pdftk.h attachments.h report.h $(itext_libs) ++ $(CXX) pdftk.cc -I$(java_libs_root) $(CXXFLAGS) -c ++ ++pdftk : pdftk.o attachments.o report.o $(itext_libs) $(afm_objects) ++ $(CXX) pdftk.o attachments.o report.o $(itext_libs) $(afm_objects) -I$(java_libs_root) \ ++ $(CXXFLAGS) -lgcj $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) -L$(LOCALBASE)/lib -liconv -o pdftk + + install: + /usr/bin/install pdftk /usr/local/bin diff -ruN pdftk.orig/pkg-descr pdftk/pkg-descr --- pdftk.orig/pkg-descr 2004-04-01 20:47:27.000000000 -0500 +++ pdftk/pkg-descr 2008-04-08 13:51:15.490551329 -0400 @@ -16,4 +16,4 @@ in a stand-alone C++ program. Specifically, it demonstrates how GCJ and CNI allow C++ code to use iText's (itext-paulo) Java classes. -WWW: http://www.accesspdf.com/pdftk/ +WWW: http://www.pdfhacks.com/pdftk/ >Release-Note: >Audit-Trail: >Unformatted: