3 files changed, 23 insertions, 20 deletions

diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 1ae06c048856..89f2a63bdddf 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -6,28 +6,29 @@
 #
 
 PORTNAME=	javamail
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4
 CATEGORIES=	java mail
 MASTER_SITES=	#
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}_01
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 
-MAINTAINER=	java@freebsd.org
-COMMENT=	A set of abstract Java classes that model a mail system
+MAINTAINER=	nemoliu@gmail.com
+COMMENT=	A Reference Implementation of JSR 919
 
 RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf
 
 USE_ZIP=	YES
 USE_JAVA=	YES
+JAVA_VERSION=	1.4+
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}_01
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
-NO_CDROM=	"See the license"
-DOWNLOAD_URL=	http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=javamail-1.3.3-fr-oth-JPR&SiteId=JSC&TransactionId=noreg
+NO_CDROM=	See the license
+DOWNLOAD_URL=	http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=javamail-1.4-oth-JPR&SiteId=JSC&TransactionId=noreg
 
 .if !defined(NOPORTDOCS)
 DOCFILES1=	JavaMail-1.1-changes.txt JavaMail-1.2-changes.txt \
-		JavaMail-1.2.pdf JavaMail-1.2.ps JavaMail-1.3-changes.txt \
-		Providers.pdf Providers.ps javadocs
+		JavaMail-1.4.pdf JavaMail-1.3-changes.txt \
+		JavaMail-1.4-changes.txt Providers.pdf javadocs
 DOCFILES2=	CHANGES.txt LICENSE.txt NOTES.txt README.txt SSLNOTES.txt \
 		distributionREADME.txt
 PORTDOCS=	${DOCFILES1} ${DOCFILES2}
@@ -38,7 +39,7 @@ PLIST_FILES=	${JARFILES:S,^,%%JAVAJARDIR%%/,}
 
 .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
+IGNORE=		you must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again
 .endif
 
 do-install:
diff --git a/java/javamail/distinfo b/java/javamail/distinfo
index eda50f5ba80c..617e15ac759d 100644
--- a/java/javamail/distinfo
+++ b/java/javamail/distinfo
@@ -1,3 +1,3 @@
-MD5 (javamail-1_3_3_01.zip) = 54d3d6d17d5ec7ba760d0a9183e5fe1d
-SHA256 (javamail-1_3_3_01.zip) = 764a0315a286304e9287b4c9dcfce828b6afcbf262930f40b473589a5cb5f105
-SIZE (javamail-1_3_3_01.zip) = 2388460
+MD5 (javamail-1_4.zip) = 4541a84c4d329291fe87b57fde276b0e
+SHA256 (javamail-1_4.zip) = c9f5f51bf0913c4c7c0913e9ad69eaf33fb69c34dae6bd047806d72d16ce0d12
+SIZE (javamail-1_4.zip) = 2447698
diff --git a/java/javamail/pkg-descr b/java/javamail/pkg-descr
index 6484758efc2d..081da6ca960c 100644
--- a/java/javamail/pkg-descr
+++ b/java/javamail/pkg-descr
@@ -1,8 +1,10 @@
-The JavaMail(TM) API provides a set of abstract classes that model a mail
-system. The API provides a platform independent and protocol independent
-framework to build Java technology-based mail and messaging applications.
-The JavaMail API is implemented as a Java platform standard extension. Sun
-provides this royalty-free reference implementation, in binary form, that
-developers will be able to use and ship.
+The JavaMail API provides a platform-independent and protocol-independent
+framework to build mail and messaging applications. The JavaMail API is
+implemented as a Java platform optional package and is also available as
+part of the Java platform, Enterprise Edition. All Java EE application
+servers, including GlassFish, provide an implementation of the JavaMail
+API. The JavaMail implementation in GlassFish is the source code from wh
+-ich the JavaMail reference implementation is built. Many other applica
+-tion servers use the same JavaMail reference implementation.
 
-WWW: http://www.javasoft.com/products/javamail/index.html
+WWW: http://java.sun.com/products/javamail/