Revision: 129035 https://trac.macports.org/changeset/129035 Author: ryandesign@macports.org Date: 2014-12-04 06:53:38 -0800 (Thu, 04 Dec 2014) Log Message: ----------- pdftk: update to 2.02 (#37580); add zlib dependency; remove gcc42 variant (#34275); default to gcc47 variant; fix homepage; fix livecheck Modified Paths: -------------- trunk/dports/textproc/pdftk/Portfile Removed Paths: ------------- trunk/dports/textproc/pdftk/files/patch-gcj-4.2-and-older.diff Modified: trunk/dports/textproc/pdftk/Portfile =================================================================== --- trunk/dports/textproc/pdftk/Portfile 2014-12-04 13:11:52 UTC (rev 129034) +++ trunk/dports/textproc/pdftk/Portfile 2014-12-04 14:53:38 UTC (rev 129035) @@ -4,12 +4,12 @@ PortSystem 1.0 name pdftk -version 1.44 +version 2.02 categories textproc graphics pdf maintainers ryandesign platforms darwin license GPL-2+ -homepage http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ +homepage https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ master_sites ${homepage} use_zip yes use_configure no @@ -35,14 +35,14 @@ Uncompress and Re-Compress Page Streams \ Repair Corrupted PDF (Where Possible) -checksums sha1 7cb137dcba885caff32ff96b7e11c9dc4ce2cba7 \ - rmd160 cacd286759005f002f5a46c0af28d3a1aaad73eb +checksums rmd160 4d9e75abc4a966041bd0be7b1db13bb73819d2ae \ + sha256 118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1 distname ${name}-${version}-src worksrcdir ${name}-${version}-dist -depends_lib \ - port:libiconv +depends_lib port:libiconv \ + port:zlib build.dir ${worksrcpath}/${name} @@ -54,18 +54,6 @@ set versuff "" -pre-configure { - if {![file exists ${prefix}/bin/gcj${versuff}]} { - return -code error " - -Cannot build ${name} because ${prefix}/bin/gcj${versuff} -is missing, possibly because of this gcc bug: - -http://trac.macports.org/ticket/13553 -" - } -} - pre-build { build.args-append VERSUFF=${versuff} } @@ -81,36 +69,20 @@ ${destroot}${prefix}/share/man/man1 } -variant gcc42 conflicts gcc45 gcc47 description {Build using gcc42} { - patchfiles-append patch-gcj-4.2-and-older.diff - configure.compiler macports-gcc-4.2 - depends_build-append port:fastjar - set versuff -mp-4.2 -} - -variant gcc45 conflicts gcc42 gcc47 description {Build using gcc45} { +variant gcc45 conflicts gcc47 description {Build using gcc45} { configure.compiler macports-gcc-4.5 set versuff -mp-4.5 } -variant gcc47 conflicts gcc42 gcc45 description {Build using gcc47} { +variant gcc47 conflicts gcc45 description {Build using gcc47} { configure.compiler macports-gcc-4.7 set versuff -mp-4.7 } -if {![variant_isset gcc42] && ![variant_isset gcc45] && ![variant_isset gcc47]} { - if {${os.platform} eq "darwin"} { - if {${os.major} < 10} { - default_variants +gcc42 - } elseif {${os.major} < 11} { - default_variants +gcc45 - } else { - default_variants +gcc47 - } - } else { - default_variants +gcc45 - } +if {![variant_isset gcc45] && ![variant_isset gcc47]} { + default_variants +gcc47 } livecheck.type regex +livecheck.url https://www.pdflabs.com/docs/install-pdftk-on-redhat-or-centos/ livecheck.regex ${name}-(\[0-9.\]+)-src${extract.suffix} Deleted: trunk/dports/textproc/pdftk/files/patch-gcj-4.2-and-older.diff =================================================================== --- trunk/dports/textproc/pdftk/files/patch-gcj-4.2-and-older.diff 2014-12-04 13:11:52 UTC (rev 129034) +++ trunk/dports/textproc/pdftk/files/patch-gcj-4.2-and-older.diff 2014-12-04 14:53:38 UTC (rev 129035) @@ -1,12 +0,0 @@ ---- pdftk/Makefile.OSX-10.6.orig 2010-10-13 08:09:52.000000000 -0500 -+++ pdftk/Makefile.OSX-10.6 2010-10-13 08:10:48.000000000 -0500 -@@ -35,3 +35,3 @@ - export GCJH= $(TOOLPATH)gcjh$(VERSUFF) --export GJAR= $(TOOLPATH)gjar$(VERSUFF) -+export GJAR= $(TOOLPATH)fastjar - export LIBGCJ= @PREFIX@/share/java/libgcj-$(shell $(GCJ) -dumpversion).jar -@@ -75,3 +75,3 @@ - export CXXFLAGS= -Wall -Wextra -Weffc++ -O2 --export GCJFLAGS= -Wall -fsource=1.3 -O2 -+export GCJFLAGS= -Wall -fno-assert -O2 - export GCJHFLAGS= -force