3 files changed, 21 insertions, 27 deletions

diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile
index 101fb2b511be..5b55bc1b05e7 100644
--- a/dns/dnsjava/Makefile
+++ b/dns/dnsjava/Makefile
@@ -2,39 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	dnsjava
-PORTVERSION=	2.1.8
+PORTVERSION=	2.1.9
+DISTVERSIONPREFIX=	v
 CATEGORIES=	dns java
-MASTER_SITES=	http://www.dnsjava.org/download/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Implementation of DNS in Java
 
-BROKEN=		unfetchable
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USE_GITHUB=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	7+
 USE_ANT=	yes
 ALL_TARGET=	jar
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-SAMPLE_FILES=	examples.html USAGE dig.java jnamed.java lookup.java update.java
-OTHERDOCS=	README Changelog
+SAMPLE_FILES=	EXAMPLES.md USAGE dig.java jnamed.java lookup.java update.java
+OTHERDOCS=	README.md Changelog
 DOCS_ALL_TARGET=	docs
 
-.include <bsd.port.pre.mk>
-
-.if ${JAVA_PORT_VERSION:M*6*}
-PLIST_SUB+=	JDK6=""
-.else
-PLIST_SUB+=	JDK6="@comment "
-.endif
-.if ${JAVA_PORT_VERSION:M*8*}
-PLIST_SUB+=	JDK8=""
-.else
-PLIST_SUB+=	JDK8="@comment "
-.endif
+post-patch:
+	@${REINPLACE_CMD} "s/2\.1\.8/${PORTVERSION}/" ${WRKSRC}/build.xml
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
@@ -49,4 +42,4 @@ do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${SAMPLE_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/dnsjava/distinfo b/dns/dnsjava/distinfo
index b6b81a42619d..6049840e0996 100644
--- a/dns/dnsjava/distinfo
+++ b/dns/dnsjava/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484487160
-SHA256 (dnsjava-2.1.8.tar.gz) = 7802baceb509df5888679c1b09ce64fd3618e0617bc171193137f43a3594d9c4
-SIZE (dnsjava-2.1.8.tar.gz) = 460532
+TIMESTAMP = 1573394280
+SHA256 (dnsjava-dnsjava-v2.1.9_GH0.tar.gz) = de66cb3e41b8d979fe7a3266457c5e9a56c976c4d8ca7da439293e8c1cdd06d4
+SIZE (dnsjava-dnsjava-v2.1.9_GH0.tar.gz) = 210488
diff --git a/dns/dnsjava/pkg-plist b/dns/dnsjava/pkg-plist
index 623a50a944c4..69b964b2b7ac 100644
--- a/dns/dnsjava/pkg-plist
+++ b/dns/dnsjava/pkg-plist
@@ -1,5 +1,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/allclasses-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/allclasses-noframe.html
 %%PORTDOCS%%%%DOCSDIR%%/constant-values.html
@@ -16,6 +16,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Address.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/CAARecord.Flags.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/CAARecord.html
+%%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/CDNSKEYRecord.html
+%%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/CDSRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/CERTRecord.CertificateType.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/CERTRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/CNAMERecord.html
@@ -172,14 +174,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/overview-summary.html
 %%PORTDOCS%%%%DOCSDIR%%/overview-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/package-list
-%%JDK6%%%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif
-%%JDK8%%%%PORTDOCS%%%%DOCSDIR%%/script.js
+%%PORTDOCS%%%%DOCSDIR%%/script.js
 %%PORTDOCS%%%%DOCSDIR%%/serialized-form.html
 %%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/EXAMPLES.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/USAGE
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dig.java
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/jnamed.java
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lookup.java
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/update.java
-share/java/classes/dnsjava.jar
+%%JAVAJARDIR%%/dnsjava.jar