aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2014-01-21 16:43:00 +0000
committerAlex Dupre <ale@FreeBSD.org>2014-01-21 16:43:00 +0000
commit2c1734e1c58ea1beba8ccf2676ca41409601dd12 (patch)
treebeafd36017b50c78e12e029cd31f3f8a30d206bf
parent95d5fc2f666c561740263facb26f8254cc9a9295 (diff)
downloadports-2c1734e1c58ea1beba8ccf2676ca41409601dd12.tar.gz
ports-2c1734e1c58ea1beba8ccf2676ca41409601dd12.zip
Notes
-rw-r--r--java/javamail/Makefile23
-rw-r--r--java/javamail/distinfo4
-rw-r--r--java/javamail/files/patch-build.xml11
3 files changed, 12 insertions, 26 deletions
diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 35b269c2e927..977e3780b634 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= javamail
-PORTVERSION= 1.4.7
+PORTVERSION= 1.5.1
CATEGORIES= java mail
-MASTER_SITES= https://kenai.com/downloads/javamail/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-src
+MASTER_SITES= https://java.net/projects/javamail/downloads/download/source/
+DISTNAME= javaxmail-${PORTVERSION}-src
MAINTAINER= ale@FreeBSD.org
COMMENT= A Reference Implementation of JSR 919
@@ -13,14 +13,12 @@ COMMENT= A Reference Implementation of JSR 919
LICENSE= GPLv2 CDDL
LICENSE_COMB= dual
-BUILD_DEPENDS= ${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf
-RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:${PORTSDIR}/java/jaf
+OPTIONS_DEFINE= DOCS EXAMPLES
USE_ZIP= YES
USE_JAVA= YES
JAVA_VERSION= 1.6+
USE_ANT= YES
-MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
WRKSRC= ${WRKDIR}
@@ -29,7 +27,6 @@ PLIST_FILES= %%JAVAJARDIR%%/mail.jar
PORTDOCS= *
PORTEXAMPLES= *
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDOCS}
@@ -38,22 +35,22 @@ ALL_TARGET= all docs
do-install:
@${ECHO_MSG} -n ">> Install JAR files in ${JAVAJARDIR}..."
- @${INSTALL_DATA} ${WRKSRC}/target/release/mail.jar ${JAVAJARDIR}/
+ @${INSTALL_DATA} ${WRKSRC}/target/release/mail.jar ${STAGEDIR}${JAVAJARDIR}/
@${ECHO_MSG} " [ DONE ]"
.if ${PORT_OPTIONS:MDOCS}
@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
- @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC}/target/release && ${FIND} *.txt \
- | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+ | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
@cd ${WRKSRC}/target/release/docs && ${FIND} *.txt javadocs \
- | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+ | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
@${ECHO_MSG} " [ DONE ]"
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
- @${MKDIR} ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@cd ${WRKSRC}/demo && ${FIND} src \
- | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
+ | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} > /dev/null 2>&1
@${ECHO_MSG} " [ DONE ]"
.endif
diff --git a/java/javamail/distinfo b/java/javamail/distinfo
index 260ae848ba9a..ad9b0bf01e0f 100644
--- a/java/javamail/distinfo
+++ b/java/javamail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (javamail-1.4.7-src.zip) = b96c7fc70985693e2c150dcab385760fc6fb66a751dcd17b89a1db40c9bf2957
-SIZE (javamail-1.4.7-src.zip) = 1448724
+SHA256 (javaxmail-1.5.1-src.zip) = 86d443f6954db70576cd5f8e1e30e70412b6825391b959fd2359236fb12b2ca3
+SIZE (javaxmail-1.5.1-src.zip) = 1510490
diff --git a/java/javamail/files/patch-build.xml b/java/javamail/files/patch-build.xml
deleted file mode 100644
index 9c8a1aba1bc4..000000000000
--- a/java/javamail/files/patch-build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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