Index: head/dns/dnsjava/Makefile
===================================================================
--- head/dns/dnsjava/Makefile	(revision 517235)
+++ head/dns/dnsjava/Makefile	(revision 517236)
@@ -1,52 +1,45 @@
 # Created by: Herve Quiroz <hq@FreeBSD.org>
 # $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>
+post-patch:
+	@${REINPLACE_CMD} "s/2\.1\.8/${PORTVERSION}/" ${WRKSRC}/build.xml
 
-.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
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${TAR} -C ${WRKSRC}/doc -cf - . | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
 	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${SAMPLE_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/dns/dnsjava/distinfo
===================================================================
--- head/dns/dnsjava/distinfo	(revision 517235)
+++ head/dns/dnsjava/distinfo	(revision 517236)
@@ -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
Index: head/dns/dnsjava/pkg-plist
===================================================================
--- head/dns/dnsjava/pkg-plist	(revision 517235)
+++ head/dns/dnsjava/pkg-plist	(revision 517236)
@@ -1,185 +1,186 @@
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/deprecated-list.html
 %%PORTDOCS%%%%DOCSDIR%%/help-doc.html
 %%PORTDOCS%%%%DOCSDIR%%/index-all.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/A6Record.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/AAAARecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/AFSDBRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/APLRecord.Element.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/APLRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ARecord.html
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Cache.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ClientSubnetOption.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Compression.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Credibility.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DClass.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DHCIDRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DLVRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNAMERecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSInput.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSKEYRecord.Flags.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSKEYRecord.Protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSKEYRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSOutput.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.Algorithm.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.DNSSECException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.IncompatibleKeyException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.KeyMismatchException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.MalformedKeyException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.NoSignatureException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.SignatureExpiredException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.SignatureNotYetValidException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.SignatureVerificationException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.UnsupportedAlgorithmException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DSRecord.Digest.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/DSRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/EDNSOption.Code.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/EDNSOption.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ExtendedFlags.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ExtendedResolver.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Flags.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/GPOSRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Generator.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/GenericEDNSOption.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/HINFORecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Header.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/IPSECKEYRecord.Algorithm.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/IPSECKEYRecord.Gateway.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/IPSECKEYRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ISDNRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/InvalidDClassException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/InvalidTTLException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/InvalidTypeException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/KEYRecord.Flags.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/KEYRecord.Protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/KEYRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/KXRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/LOCRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Lookup.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/MBRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/MDRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/MFRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/MGRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/MINFORecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/MRRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/MXRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Master.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Message.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NAPTRRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSAPRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSAP_PTRRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3PARAMRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3Record.Digest.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3Record.Flags.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3Record.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSECRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSIDOption.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NSRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NULLRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NXTRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Name.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/NameTooLongException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/OPENPGPKEYRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/OPTRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Opcode.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Options.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/PTRRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/PXRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/PacketLogger.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/RPRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/RRSIGRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/RRset.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/RTRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Rcode.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Record.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/RelativeNameException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Resolver.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ResolverConfig.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ResolverListener.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ReverseMap.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SIG0.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SIGRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SMIMEARecord.CertificateUsage.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SMIMEARecord.MatchingType.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SMIMEARecord.Selector.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SMIMEARecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SOARecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SPFRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SRVRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SSHFPRecord.Algorithm.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SSHFPRecord.Digest.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SSHFPRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Section.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Serial.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SetResponse.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/SimpleResolver.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TKEYRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.CertificateUsage.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.MatchingType.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.Selector.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TSIG.StreamVerifier.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TSIG.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TSIGRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TTL.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TXTRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/TextParseException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Tokenizer.Token.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Tokenizer.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Type.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/UNKRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/URIRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Update.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/WKSRecord.Protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/WKSRecord.Service.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/WKSRecord.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/WireParseException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/X25Record.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/Zone.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferException.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferIn.Delta.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferIn.ZoneTransferHandler.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferIn.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/package-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/package-summary.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/package-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/DNSJavaNameService.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/DNSJavaNameServiceDescriptor.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/package-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/package-summary.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/package-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base16.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base32.Alphabet.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base32.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base64.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/hexdump.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/package-frame.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/package-summary.html
 %%PORTDOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/package-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/overview-frame.html
 %%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