3 files changed, 213 insertions, 38 deletions

diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile
index d2910ccb2b0b..ddeac9aec16b 100644
--- a/dns/dnsjava/Makefile
+++ b/dns/dnsjava/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	dnsjava
-# Date created:				2004-11-19
-# Whom:					Herve Quiroz <hq@FreeBSD.org>
-#
+# Created by: Herve Quiroz <hq@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	dnsjava
-PORTVERSION=	2.1.3
+PORTVERSION=	2.1.4
 CATEGORIES=	dns java
 MASTER_SITES=	http://www.dnsjava.org/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danilogondolfo@gmail.com
 COMMENT=	Implementation of DNS in Java
 
 USE_JAVA=	yes
@@ -18,45 +14,37 @@ JAVA_VERSION=	1.6+
 
 USE_ANT=	yes
 ALL_TARGET=	jar
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	docs
-.endif
 
-SAMPLE_FILES=	examples.html USAGE dig.java jnamed.java lookup.java update.java
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar ${SAMPLE_FILES:S,^,%%EXAMPLESDIR%%/,}
-PLIST_DIRS=	%%EXAMPLESDIR%%
-.if !defined(NOPORTDOCS)
-OTHERDOCS=	README Changelog
-PORTDOCS=	apidocs ${OTHERDOCS}
-.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
-.if ${JDK_API} != ""
-MAKE_ARGS+=	-Dj2se.javadoc="${JDK_API}"
+.if ${PORT_OPTIONS:MEXAMPLES}
+SAMPLE_FILES=	examples.html USAGE dig.java jnamed.java lookup.java update.java
+PLIST_SUB+=	EXAMPLES=""
+.else
+PLIST_SUB+=	EXAMPLES="@comment "
 .endif
 
-post-extract:
-	@${RM} -rf ${WRKSRC}/doc
-	@${MKDIR} ${WRKSRC}/doc
+.if ${PORT_OPTIONS:MDOCS}
+ALL_TARGET+=	docs
+OTHERDOCS=	README Changelog
+PLIST_SUB+=	DOCS=""
+.else
+PLIST_SUB+=	DOCS="@comment "
+.endif
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
-	@${ECHO_MSG} " [ DONE ]"
-	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..."
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${SAMPLE_FILES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/doc \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/apidocs/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} ${WRKSRC}/doc/{} ${DOCSDIR}/apidocs/{} \;
-	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@${ECHO_MSG} " [ DONE ]"
+	${INSTALL_DATA} ${SAMPLE_FILES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}/
+.endif
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${TAR} -C ${WRKSRC}/doc -cf - . | ${TAR} -C ${DOCSDIR} -xf -
+	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/dns/dnsjava/distinfo b/dns/dnsjava/distinfo
index 2dadc003fb8e..a66c46b155f0 100644
--- a/dns/dnsjava/distinfo
+++ b/dns/dnsjava/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dnsjava-2.1.3.tar.gz) = b80bb1c479f0bdbdd1c9ad017d885407019539c35a4f014aa37acab14067c48e
-SIZE (dnsjava-2.1.3.tar.gz) = 1062313
+SHA256 (dnsjava-2.1.4.tar.gz) = bc0e16dafefaa018b3161ec7706c70beabca70b8d34aff771aa506a3caf324ff
+SIZE (dnsjava-2.1.4.tar.gz) = 1085795
diff --git a/dns/dnsjava/pkg-plist b/dns/dnsjava/pkg-plist
new file mode 100644
index 000000000000..ce71480cfec9
--- /dev/null
+++ b/dns/dnsjava/pkg-plist
@@ -0,0 +1,187 @@
+share/java/classes/dnsjava.jar
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/DNSJavaNameService.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/DNSJavaNameServiceDescriptor.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/package-frame.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/package-summary.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/spi/package-tree.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/HMAC.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base16.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base32.Alphabet.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base32.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/base64.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/hexdump.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/package-frame.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/package-summary.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/utils/package-tree.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/A6Record.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/AAAARecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/AFSDBRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/APLRecord.Element.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/APLRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ARecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Address.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/CERTRecord.CertificateType.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/CERTRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/CNAMERecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Cache.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ClientSubnetOption.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Compression.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Credibility.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DClass.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DHCIDRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DLVRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNAMERecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSInput.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSKEYRecord.Flags.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSKEYRecord.Protocol.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSKEYRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSOutput.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.Algorithm.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.DNSSECException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.IncompatibleKeyException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.KeyMismatchException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.MalformedKeyException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.SignatureExpiredException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.SignatureNotYetValidException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.SignatureVerificationException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DNSSEC.UnsupportedAlgorithmException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DSRecord.Digest.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/DSRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/EDNSOption.Code.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/EDNSOption.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ExtendedFlags.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ExtendedResolver.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Flags.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/GPOSRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Generator.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/GenericEDNSOption.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/HINFORecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Header.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/IPSECKEYRecord.Algorithm.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/IPSECKEYRecord.Gateway.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/IPSECKEYRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ISDNRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/InvalidDClassException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/InvalidTTLException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/InvalidTypeException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/KEYRecord.Flags.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/KEYRecord.Protocol.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/KEYRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/KXRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/LOCRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Lookup.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/MBRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/MDRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/MFRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/MGRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/MINFORecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/MRRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/MXRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Master.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Message.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NAPTRRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSAPRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSAP_PTRRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3PARAMRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3Record.Digest.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3Record.Flags.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSEC3Record.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSECRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSIDOption.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NSRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NULLRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NXTRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Name.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/NameTooLongException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/OPTRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Opcode.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Options.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/PTRRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/PXRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/RPRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/RRSIGRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/RRset.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/RTRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Rcode.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Record.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/RelativeNameException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Resolver.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ResolverConfig.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ResolverListener.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ReverseMap.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SIG0.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SIGRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SOARecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SPFRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SRVRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SSHFPRecord.Algorithm.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SSHFPRecord.Digest.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Section.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SSHFPRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Serial.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SetResponse.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/SimpleResolver.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TKEYRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.CertificateUsage.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.MatchingType.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.Selector.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TLSARecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TSIG.StreamVerifier.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TSIG.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TSIGRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TTL.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TXTRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/TextParseException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Tokenizer.Token.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Tokenizer.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Type.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/UNKRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Update.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/WKSRecord.Protocol.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/WKSRecord.Service.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/WKSRecord.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/WireParseException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/X25Record.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/Zone.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferException.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferIn.Delta.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferIn.ZoneTransferHandler.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/ZoneTransferIn.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/package-frame.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/package-summary.html
+%%DOCS%%%%DOCSDIR%%/org/xbill/DNS/package-tree.html
+%%DOCS%%%%DOCSDIR%%/resources/background.gif
+%%DOCS%%%%DOCSDIR%%/resources/tab.gif
+%%DOCS%%%%DOCSDIR%%/resources/titlebar.gif
+%%DOCS%%%%DOCSDIR%%/resources/titlebar_end.gif
+%%DOCS%%%%DOCSDIR%%/resources/inherit.gif
+%%DOCS%%%%DOCSDIR%%/allclasses-frame.html
+%%DOCS%%%%DOCSDIR%%/allclasses-noframe.html
+%%DOCS%%%%DOCSDIR%%/constant-values.html
+%%DOCS%%%%DOCSDIR%%/deprecated-list.html
+%%DOCS%%%%DOCSDIR%%/help-doc.html
+%%DOCS%%%%DOCSDIR%%/index-all.html
+%%DOCS%%%%DOCSDIR%%/index.html
+%%DOCS%%%%DOCSDIR%%/overview-frame.html
+%%DOCS%%%%DOCSDIR%%/overview-summary.html
+%%DOCS%%%%DOCSDIR%%/overview-tree.html
+%%DOCS%%%%DOCSDIR%%/package-list
+%%DOCS%%%%DOCSDIR%%/serialized-form.html
+%%DOCS%%%%DOCSDIR%%/stylesheet.css
+%%DOCS%%%%DOCSDIR%%/README
+%%DOCS%%%%DOCSDIR%%/Changelog
+%%EXAMPLES%%%%EXAMPLESDIR%%/examples.html
+%%EXAMPLES%%%%EXAMPLESDIR%%/USAGE
+%%EXAMPLES%%%%EXAMPLESDIR%%/dig.java
+%%EXAMPLES%%%%EXAMPLESDIR%%/jnamed.java
+%%EXAMPLES%%%%EXAMPLESDIR%%/lookup.java
+%%EXAMPLES%%%%EXAMPLESDIR%%/update.java
+%%DOCS%%@dirrm %%DOCSDIR%%/resources
+%%DOCS%%@dirrm %%DOCSDIR%%/org/xbill/DNS/utils
+%%DOCS%%@dirrm %%DOCSDIR%%/org/xbill/DNS/spi
+%%DOCS%%@dirrm %%DOCSDIR%%/org/xbill/DNS
+%%DOCS%%@dirrm %%DOCSDIR%%/org/xbill
+%%DOCS%%@dirrm %%DOCSDIR%%/org
+%%DOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%