diff options
| author | glarkin <glarkin@FreeBSD.org> | 2013-07-19 23:15:47 +0800 |
|---|---|---|
| committer | glarkin <glarkin@FreeBSD.org> | 2013-07-19 23:15:47 +0800 |
| commit | 46b6c40e60d1b8bc05bc11526aa9f924acd18ed1 (patch) | |
| tree | c867abdf03c526e2f5252bd9d532f0e797b19a4f | |
| parent | 391d5fb354382dc00a6686a0c3db30d1727d8a2f (diff) | |
| download | freebsd-ports-gnome-46b6c40e60d1b8bc05bc11526aa9f924acd18ed1.tar.gz freebsd-ports-gnome-46b6c40e60d1b8bc05bc11526aa9f924acd18ed1.tar.zst freebsd-ports-gnome-46b6c40e60d1b8bc05bc11526aa9f924acd18ed1.zip | |
- Fixed build on 10-CURRENT where /usr/bin/cpp is supplied by clang. The
port now explicitly uses cpp46 which is supplied by the gcc dependency.
PR: ports/177275
PR: ports/177974
Submitted by: Beeblebrox <zaphod@berentweb.com>
Submitted by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
| -rw-r--r-- | print/pdftk/Makefile | 9 | ||||
| -rw-r--r-- | print/pdftk/files/patch-java__Makefile | 21 |
2 files changed, 28 insertions, 2 deletions
diff --git a/print/pdftk/Makefile b/print/pdftk/Makefile index 524f0e023d7f..edc06a900990 100644 --- a/print/pdftk/Makefile +++ b/print/pdftk/Makefile @@ -9,10 +9,14 @@ MASTER_SITES= http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ \ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= glarkin@FreeBSD.org -COMMENT= A simple tool for doing everyday things with PDF documents +COMMENT= Simple tool for doing everyday things with PDF documents USE_ZIP= yes +BUILD_DEPENDS= gcj${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \ + gcjh${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \ + cpp${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} + # Get gcc version suffix without the dot in USE_GCC CSUFF= ${_USE_GCC:S/.//} @@ -29,7 +33,8 @@ PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-dist WRKSRC= ${PATCH_WRKSRC}/${PORTNAME} MAKEFILE= Makefile.FreeBSD -MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSUFF} OBJCOPY=${OBJCOPY} LANG=C +MAKE_ENV= GCJ=gcj${CSUFF} GCJH=gcjh${CSUFF} GCPP=cpp${CSUFF} \ + OBJCOPY=${OBJCOPY} LANG=C LC_CTYPE=C MAN1= ${PORTNAME}.1 PLIST_FILES= bin/pdftk diff --git a/print/pdftk/files/patch-java__Makefile b/print/pdftk/files/patch-java__Makefile new file mode 100644 index 000000000000..e9cb53df9e9d --- /dev/null +++ b/print/pdftk/files/patch-java__Makefile @@ -0,0 +1,21 @@ +--- ./java/Makefile.orig 2013-07-18 14:58:41.000000000 -0400 ++++ ./java/Makefile 2013-07-18 14:59:08.000000000 -0400 +@@ -21,9 +21,9 @@ + # preprocess this file so it might include our local copies of library objects: libgcj_local + com/lowagie/text/pdf/PdfEncryption.java : com/lowagie/text/pdf/PdfEncryption.java.c + ifdef USE_LOCAL_LIBGCJ +- cpp -C -P -DPDFTK_JAVA_LOCAL com/lowagie/text/pdf/PdfEncryption.java.c com/lowagie/text/pdf/PdfEncryption.java ++ ${GCPP} -C -P -DPDFTK_JAVA_LOCAL com/lowagie/text/pdf/PdfEncryption.java.c com/lowagie/text/pdf/PdfEncryption.java + else +- cpp -C -P com/lowagie/text/pdf/PdfEncryption.java.c com/lowagie/text/pdf/PdfEncryption.java ++ ${GCPP} -C -P com/lowagie/text/pdf/PdfEncryption.java.c com/lowagie/text/pdf/PdfEncryption.java + endif + + # +@@ -102,4 +102,4 @@ + libgcj_local_clean : + $(MAKE) -iC "$(JAVALIBPATH)/gnu_local/java/security" clean; + $(MAKE) -iC "$(JAVALIBPATH)/gnu_local/java/security/provider" clean; +- $(MAKE) -iC "$(JAVALIBPATH)/java_local/security" clean; +\ No newline at end of file ++ $(MAKE) -iC "$(JAVALIBPATH)/java_local/security" clean; |