Index: head/devel/umlgraph/Makefile =================================================================== --- head/devel/umlgraph/Makefile (revision 398626) +++ head/devel/umlgraph/Makefile (revision 398627) @@ -1,44 +1,36 @@ # Created by: Kevin Lo # $FreeBSD$ PORTNAME= umlgraph -PORTVERSION= 5.6 -PORTREVISION= 1 +PORTVERSION= 5.7.2 CATEGORIES= devel java -MASTER_SITES= http://www.umlgraph.org/ -DISTNAME= UMLGraph-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= https://github.com/dspinellis/UMLGraph/archive/ +DISTNAME= R${PORTVERSION:S/./_/g} MAINTAINER= kevlo@FreeBSD.org COMMENT= Automated drawing of UML diagrams LICENSE= BSD3CLAUSE -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/UMLGraph-${DISTNAME} USE_ANT= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 1.8 BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz \ pic2plot:${PORTSDIR}/graphics/plotutils RUN_DEPENDS:= ${BUILD_DEPENDS} PLIST_FILES= bin/umlgraph %%JAVAJARDIR%%/UmlGraph.jar -.include - -.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}|' \ - ${WRKSRC}/bin/umlgraph + ${WRKSRC}/umlgraph do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/lib/UmlGraph.jar ${STAGEDIR}${JAVAJARDIR}/ - ${INSTALL_SCRIPT} ${WRKSRC}/bin/umlgraph ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/umlgraph ${STAGEDIR}${PREFIX}/bin -.include +.include Index: head/devel/umlgraph/distinfo =================================================================== --- head/devel/umlgraph/distinfo (revision 398626) +++ head/devel/umlgraph/distinfo (revision 398627) @@ -1,2 +1,2 @@ -SHA256 (UMLGraph-5.6.tar.gz) = bd17dcd8074e03c3a2f08f0ccf81ec149904ab365cbeae254629c4a277740d59 -SIZE (UMLGraph-5.6.tar.gz) = 3718510 +SHA256 (R5_7_2.tar.gz) = b4b0c6236c792d9d4d75265c19f3021a7224d388c8995d06cf60785c8eebf22f +SIZE (R5_7_2.tar.gz) = 3200282 Index: head/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java =================================================================== --- head/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java (revision 398626) +++ head/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java (nonexistent) @@ -1,22 +0,0 @@ ---- 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(); -+ } - } Property changes on: head/devel/umlgraph/files/extra-patch-src_org_umlgraph_doclet_WrappedClassDoc.java ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/umlgraph/files/patch-umlgraph =================================================================== --- head/devel/umlgraph/files/patch-umlgraph (revision 398626) +++ head/devel/umlgraph/files/patch-umlgraph (revision 398627) @@ -1,11 +1,11 @@ ---- bin/umlgraph.orig 2011-01-09 02:38:50.000000000 +0800 -+++ bin/umlgraph 2011-02-14 18:43:16.000000000 +0800 -@@ -19,7 +19,7 @@ +--- umlgraph.orig 2015-10-04 22:55:25.647816000 +0800 ++++ umlgraph 2015-10-04 22:56:10.202755000 +0800 +@@ -18,7 +18,7 @@ BASE=$1 FILETYPE=$2 shift 2 - java -classpath "$UMLGRAPH_HOME/UmlGraph.jar:$JAVA_HOME/lib/tools.jar" \ + java -classpath "%%JAVAJARDIR%%/UmlGraph.jar:%%JAVA_HOME%%/lib/tools.jar" \ org.umlgraph.doclet.UmlGraph -package $* -output - $BASE.java | dot -T$FILETYPE -o$BASE.$FILETYPE fi