From owner-svn-ports-head@freebsd.org  Thu Oct  1 16:04:56 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 72F52A0C393;
 Thu,  1 Oct 2015 16:04:56 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 4975F1D76;
 Thu,  1 Oct 2015 16:04:56 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t91G4urr072354;
 Thu, 1 Oct 2015 16:04:56 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t91G4tTc072352;
 Thu, 1 Oct 2015 16:04:55 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201510011604.t91G4tTc072352@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: Thu, 1 Oct 2015 16:04:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r398365 - in head/devel/umlgraph: . 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: Thu, 01 Oct 2015 16:04:56 -0000

Author: swills
Date: Thu Oct  1 16:04:55 2015
New Revision: 398365
URL: https://svnweb.freebsd.org/changeset/ports/398365

Log:
  devel/umlgraph: fix build with OpenJDK7

Added:
  head/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java
     - copied unchanged from r398211, head/devel/umlgraph/files/patch-src_org_umlgraph_doclet_WrappedClassDoc.java
Deleted:
  head/devel/umlgraph/files/patch-src_org_umlgraph_doclet_WrappedClassDoc.java
Modified:
  head/devel/umlgraph/Makefile

Modified: head/devel/umlgraph/Makefile
==============================================================================
--- head/devel/umlgraph/Makefile	Thu Oct  1 16:00:53 2015	(r398364)
+++ head/devel/umlgraph/Makefile	Thu Oct  1 16:04:55 2015	(r398365)
@@ -25,6 +25,12 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PLIST_FILES=	bin/umlgraph %%JAVAJARDIR%%/UmlGraph.jar
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION:M1.8.*}
+EXTRA_PATCHES=  ${PATCHDIR}/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java
+.endif
+
 post-configure:
 	${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|; \
 		s|%%JAVAJARDIR%%|${JAVAJARDIR}|' \
@@ -35,4 +41,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/UmlGraph.jar ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/umlgraph ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Copied: head/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java (from r398211, head/devel/umlgraph/files/patch-src_org_umlgraph_doclet_WrappedClassDoc.java)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java	Thu Oct  1 16:04:55 2015	(r398365, copy of r398211, head/devel/umlgraph/files/patch-src_org_umlgraph_doclet_WrappedClassDoc.java)
@@ -0,0 +1,22 @@
+--- src/org/umlgraph/doclet/WrappedClassDoc.java.orig	2012-04-25 08:57:52 UTC
++++ src/org/umlgraph/doclet/WrappedClassDoc.java
+@@ -20,6 +20,7 @@
+ 
+ package org.umlgraph.doclet;
+ 
++import com.sun.javadoc.AnnotatedType;
+ import com.sun.javadoc.AnnotationDesc;
+ import com.sun.javadoc.AnnotationTypeDoc;
+ import com.sun.javadoc.ClassDoc;
+@@ -359,4 +360,11 @@ public class WrappedClassDoc implements 
+ 	return wrapped.typeParamTags();
+     }
+ 
++    public AnnotatedType asAnnotatedType() {
++	return wrapped.asAnnotatedType();
++    }
++
++    public Type getElementType() {
++	return wrapped.getElementType();
++    }
+ }