From owner-svn-ports-head@FreeBSD.ORG Fri Jul 19 15:15:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 181CD705; Fri, 19 Jul 2013 15:15:48 +0000 (UTC) (envelope-from glarkin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EEC8CF39; Fri, 19 Jul 2013 15:15:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6JFFlsd022471; Fri, 19 Jul 2013 15:15:47 GMT (envelope-from glarkin@svn.freebsd.org) Received: (from glarkin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6JFFlIV022469; Fri, 19 Jul 2013 15:15:47 GMT (envelope-from glarkin@svn.freebsd.org) Message-Id: <201307191515.r6JFFlIV022469@svn.freebsd.org> From: Greg Larkin Date: Fri, 19 Jul 2013 15:15:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323303 - in head/print/pdftk: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jul 2013 15:15:48 -0000 Author: glarkin Date: Fri Jul 19 15:15:47 2013 New Revision: 323303 URL: http://svnweb.freebsd.org/changeset/ports/323303 Log: - 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 Submitted by: Oliver Hartmann Added: head/print/pdftk/files/patch-java__Makefile (contents, props changed) Modified: head/print/pdftk/Makefile Modified: head/print/pdftk/Makefile ============================================================================== --- head/print/pdftk/Makefile Fri Jul 19 15:12:46 2013 (r323302) +++ head/print/pdftk/Makefile Fri Jul 19 15:15:47 2013 (r323303) @@ -9,10 +9,14 @@ MASTER_SITES= http://www.pdflabs.com/too 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}-${PO 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 Added: head/print/pdftk/files/patch-java__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/pdftk/files/patch-java__Makefile Fri Jul 19 15:15:47 2013 (r323303) @@ -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;