From owner-svn-ports-head@freebsd.org  Fri Oct 16 18:13:30 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E287A17603;
 Fri, 16 Oct 2015 18:13:30 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B66C596D;
 Fri, 16 Oct 2015 18:13:29 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9GIDSIA022710;
 Fri, 16 Oct 2015 18:13:28 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9GIDSop022708;
 Fri, 16 Oct 2015 18:13:28 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201510161813.t9GIDSop022708@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Fri, 16 Oct 2015 18:13:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399495 - in head/print/pdf-renderer: . 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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Oct 2015 18:13:30 -0000

Author: swills
Date: Fri Oct 16 18:13:28 2015
New Revision: 399495
URL: https://svnweb.freebsd.org/changeset/ports/399495

Log:
  print/pdf-renderer: fix build with openjdk8
  
  PR:		203123
  Approved by:	maintainer timeout (ale, >2 weeks)

Added:
  head/print/pdf-renderer/files/extra-patch-swinglabs-build-impl.xml   (contents, props changed)
Modified:
  head/print/pdf-renderer/Makefile

Modified: head/print/pdf-renderer/Makefile
==============================================================================
--- head/print/pdf-renderer/Makefile	Fri Oct 16 17:17:38 2015	(r399494)
+++ head/print/pdf-renderer/Makefile	Fri Oct 16 18:13:28 2015	(r399495)
@@ -13,7 +13,7 @@ COMMENT=	100% Java PDF renderer and view
 
 LICENSE=	LGPL21
 
-USES=		zip
+USES=		dos2unix zip
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -26,6 +26,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
+DOS2UNIX_FILES=	swinglabs-build-impl.xml
 
 .include <bsd.port.options.mk>
 
@@ -33,6 +34,12 @@ OPTIONS_DEFINE=	DOCS
 ALL_TARGET+=	javadoc
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION:M1.8.*}
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-swinglabs-build-impl.xml
+.endif
+
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${INSTALL_DATA} ${WRKSRC}/dist/PDFRenderer.jar \
@@ -46,4 +53,4 @@ do-install:
 	@${ECHO_MSG} " [DONE]"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/print/pdf-renderer/files/extra-patch-swinglabs-build-impl.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/pdf-renderer/files/extra-patch-swinglabs-build-impl.xml	Fri Oct 16 18:13:28 2015	(r399495)
@@ -0,0 +1,11 @@
+--- swinglabs-build-impl.xml.orig	2011-09-15 11:34:02 UTC
++++ swinglabs-build-impl.xml
+@@ -211,7 +211,7 @@ ${build.branch} ${RELEASE_DSTAMP_LONG} $
+                  version="${javadoc.version}" 	
+                  windowtitle="${javadoc.windowtitle}"
+                  private="${javadoc.private}"
+-                 additionalparam="${javadoc.additionalparam}"
++                 additionalparam="${javadoc.additionalparam} -Xdoclint:none"
+                  failonerror="true" useexternalfile="false"
+                  verbose="${javadoc.verbose}"
+                  maxmemory="1024M"