svn commit: r398365 - in head/devel/umlgraph: . files

[Steve Wills]

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();
++    }
+ }