Update javamail to 1.4.4 release, now open sourced!

Feature safe:	yes

3 files changed, 33 insertions, 38 deletions

diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 9c3b55979b0c..a12a3bc81a30 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	javamail
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.4
 CATEGORIES=	java mail
-MASTER_SITES=	#
+MASTER_SITES=	http://kenai.com/downloads/javamail/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Reference Implementation of JSR 919
@@ -18,54 +19,38 @@ RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf
 USE_ZIP=	YES
 USE_JAVA=	YES
 JAVA_VERSION=	1.4+
+USE_ANT=	YES
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD=	yes
-NO_CDROM=	See the license
-DOWNLOAD_URL=	https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=javamail-${PORTVERSION}-oth-JPR@CDS-CDS_Developer
+WRKSRC=		${WRKDIR}
 
 .if !defined(NOPORTDOCS)
-DOCFILES1=	JavaMail-1.1-changes.txt JavaMail-1.2-changes.txt \
-		JavaMail-1.4.pdf JavaMail-1.3-changes.txt \
-		JavaMail-1.4-changes.txt Providers.pdf javadocs
-DOCFILES2=	CHANGES.txt COMPAT.txt COPYRIGHT.txt LICENSE.txt NOTES.txt \
-		NTLMNOTES.txt README.txt SSLNOTES.txt distributionREADME.txt
-PORTDOCS=	${DOCFILES1} ${DOCFILES2}
+ALL_TARGET=	all docs
 .endif
 
-JARFILES=	mail.jar dsn.jar imap.jar mailapi.jar pop3.jar smtp.jar
-PLIST_FILES=	${JARFILES:S,^,%%JAVAJARDIR%%/,}
+PLIST_FILES=	%%JAVAJARDIR%%/mail.jar
 
-.include <bsd.port.pre.mk>
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
-IGNORE=		you must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again
-.endif
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing demo in ${EXAMPLESDIR}..."
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC} && ${FIND} demo \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
-	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}..."
-	@${INSTALL_DATA} ${WRKSRC}/mail.jar ${JAVAJARDIR}/
-	@cd ${WRKSRC}/lib && ${INSTALL_DATA} dsn.jar imap.jar mailapi.jar pop3.jar smtp.jar ${JAVAJARDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/target/release/mail.jar ${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/docs && ${FIND} ${DOCFILES1} \
+	@cd ${WRKSRC}/target/release && ${FIND} *.txt \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
-	@cd ${WRKSRC} && ${FIND} ${DOCFILES2} \
+	@cd ${WRKSRC}/target/release/docs && ${FIND} *.txt javadocs \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
 .endif
+.if !defined(NOPORTEXAMPLES)
+	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
+	@${MKDIR} ${EXAMPLESDIR}
+	@cd ${WRKSRC}/demo && ${FIND} src \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
+	@${ECHO_MSG} " [ DONE ]"
+.endif
 
-post-install:
-	@${FIND} -s ${WRKSRC}/demo -not -type d 2>/dev/null \
-	  | ${SED} -ne 's,^${WRKSRC},${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC}/demo -type d 2>/dev/null \
-	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${ECHO_CMD} '@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}' >> ${TMPPLIST}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/java/javamail/distinfo b/java/javamail/distinfo
index 43000eca5062..f71d74a961f3 100644
--- a/java/javamail/distinfo
+++ b/java/javamail/distinfo
@@ -1,3 +1,2 @@
-MD5 (javamail-1.4.3.zip) = c745421e2b5d4226da742d040abdb818
-SHA256 (javamail-1.4.3.zip) = 76f5aa2d7289b292072788aa1899c11374f30ca12ae80f4b580f7c3c5e789d10
-SIZE (javamail-1.4.3.zip) = 2866826
+SHA256 (javamail-1.4.4-src.zip) = b74e9a9fc66d5913335d74c853c5a37dc1e07f1528786d661553cc9d6741dfc4
+SIZE (javamail-1.4.4-src.zip) = 1320641
diff --git a/java/javamail/files/patch-build.xml b/java/javamail/files/patch-build.xml
new file mode 100644
index 000000000000..9c8a1aba1bc4
--- /dev/null
+++ b/java/javamail/files/patch-build.xml
@@ -0,0 +1,11 @@
+--- build.xml.orig	2011-02-16 12:51:06.000000000 +0100
++++ build.xml	2011-02-16 12:51:22.000000000 +0100
+@@ -436,8 +436,6 @@
+         <mkdir dir="${release.docs.dir}"/>
+         <copy todir="${release.docs.dir}">
+             <fileset dir="${basedir}/doc/spec" includes="*.txt" />
+-            <fileset dir="${spec.dir}"
+-		    includes="JavaMail-1.4.pdf,Providers.pdf" />
+         </copy>
+ 	<!--
+ 	    To allow us to generate javadocs that only include some