aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--archivers/javatar/Makefile4
-rw-r--r--java/Makefile1
-rw-r--r--java/bouncycastle/Makefile8
-rw-r--r--java/bouncycastle15/Makefile7
-rw-r--r--java/jaf/Makefile44
-rw-r--r--java/jaf/distinfo2
-rw-r--r--java/jaf/pkg-descr11
-rw-r--r--www/jmeter/Makefile3
9 files changed, 10 insertions, 71 deletions
diff --git a/MOVED b/MOVED
index 2d0a32b303c8..01879b85cb51 100644
--- a/MOVED
+++ b/MOVED
@@ -10330,3 +10330,4 @@ net/wpa_gui|net/wpa_supplicant_gui|2018-07-12|Rename to wpa_supplicant_gui for e
lang/gcc47|lang/gcc6|2018-07-15|Has expired: Unsupported by upstream. Use GCC 6 or newer instead.
net-p2p/transmission-qt4|net-p2p/transmission-qt@qt4|2018-07-15|Moved into flavored version
net-p2p/transmission-qt5|net-p2p/transmission-qt@qt5|2018-07-15|Moved into flavored version
+java/jaf||2018-07-16|Included in JRE since 1.6 version
diff --git a/archivers/javatar/Makefile b/archivers/javatar/Makefile
index dc54822f8512..b6b17a164abb 100644
--- a/archivers/javatar/Makefile
+++ b/archivers/javatar/Makefile
@@ -3,15 +3,13 @@
PORTNAME= javatar
PORTVERSION= 2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers java
MASTER_SITES= http://www.gjt.org/download/time/java/tar/
MAINTAINER= ale@FreeBSD.org
COMMENT= Java tar archive I/O package
-RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:java/jaf
-
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/java/Makefile b/java/Makefile
index 448b5329580a..d43e0b19fad6 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -37,7 +37,6 @@
SUBDIR += intellij-rubymine
SUBDIR += intellij-ultimate
SUBDIR += jad
- SUBDIR += jaf
SUBDIR += jai
SUBDIR += jakarta-bcel
SUBDIR += jakarta-commons-beanutils
diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile
index f01e4ba7ae5e..ea5443b5d2cd 100644
--- a/java/bouncycastle/Makefile
+++ b/java/bouncycastle/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bouncycastle
PORTVERSION= 1.45
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= java security
MASTER_SITES= http://downloads.bouncycastle.org/java/ \
http://polydistortion.net/bc/download/ \
@@ -13,11 +13,9 @@ DISTNAME= crypto-${JARVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= Cleanroom build of Java Cryptography Extensions
-BUILD_DEPENDS= ${JAVALIBDIR}/activation.jar:java/jaf \
- ${JAVALIBDIR}/mail.jar:java/javamail \
+BUILD_DEPENDS= ${JAVALIBDIR}/mail.jar:java/javamail \
${JAVALIBDIR}/junit.jar:java/junit
-RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:java/jaf \
- ${JAVALIBDIR}/mail.jar:java/javamail
+RUN_DEPENDS= ${JAVALIBDIR}/mail.jar:java/javamail
OPTIONS_DEFINE= DOCS
diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile
index dc6d0a41fde0..25ffbe8facee 100644
--- a/java/bouncycastle15/Makefile
+++ b/java/bouncycastle15/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bouncycastle
PORTVERSION= 1.60
+PORTREVISION= 1
CATEGORIES= java security
MASTER_SITES= http://www.bouncycastle.org/download/ \
http://polydistortion.net/bc/download/
@@ -14,11 +15,9 @@ COMMENT= Cleanroom build of Java Cryptography Extensions
LICENSE= MIT
-BUILD_DEPENDS= ${JAVALIBDIR}/activation.jar:java/jaf \
- ${JAVALIBDIR}/mail.jar:java/javamail \
+BUILD_DEPENDS= ${JAVALIBDIR}/mail.jar:java/javamail \
${JAVALIBDIR}/junit.jar:java/junit
-RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:java/jaf \
- ${JAVALIBDIR}/mail.jar:java/javamail
+RUN_DEPENDS= ${JAVALIBDIR}/mail.jar:java/javamail
OPTIONS_DEFINE= DOCS ZIPSRC
OPTIONS_DEFAULT= ZIPSRC
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
deleted file mode 100644
index 2dda06213716..000000000000
--- a/java/jaf/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Created by: Jose Marques
-# $FreeBSD$
-
-PORTNAME= jaf
-DISTVERSION= 1_1_1
-CATEGORIES= java devel
-MASTER_SITES= #
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= JavaBeansTM Activation Framework
-
-USES= zip
-USE_JAVA= YES
-JAVA_VERSION= 1.6+
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD= yes
-NO_CDROM= See the license
-DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-java-plat-419418.html\#jaf-1.1.1-fcs-oth-JPR
-
-PORTDOCS= *
-PORTEXAMPLES= *
-
-PLIST_FILES= %%JAVAJARDIR%%/activation.jar
-
-OPTIONS_DEFINE= DOCS EXAMPLES
-
-.include <bsd.port.pre.mk>
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE= you must manually fetch the distribution from ${DOWNLOAD_URL} and place it in ${DISTDIR} then run make again
-.endif
-
-do-install:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- (cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
- ${INSTALL_DATA} ${WRKSRC}/activation.jar ${STAGEDIR}${JAVAJARDIR}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt README.txt RELNOTES.txt \
- ${STAGEDIR}${DOCSDIR})
- (cd ${WRKSRC}/docs && ${INSTALL_DATA} JAF-1.1.pdf JAF-1.1.ps \
- JAF-1.1-changes.txt ${STAGEDIR}${DOCSDIR})
- (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} javadocs ${STAGEDIR}${DOCSDIR})
-
-.include <bsd.port.post.mk>
diff --git a/java/jaf/distinfo b/java/jaf/distinfo
deleted file mode 100644
index c64ac3b98a32..000000000000
--- a/java/jaf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (jaf-1_1_1.zip) = af88f65f4a8cd6a80efa699111639c7065adf8dccd4d63ead02275468b83803b
-SIZE (jaf-1_1_1.zip) = 379593
diff --git a/java/jaf/pkg-descr b/java/jaf/pkg-descr
deleted file mode 100644
index 674068257112..000000000000
--- a/java/jaf/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-With the JavaBeansTM Activation Framework standard extension, developers
-who use JavaTM technology can take advantage of standard services to
-determine the type of an arbitrary piece of data, encapsulate access to
-it, discover the operations available on it, and to instantiate the
-appropriate bean to perform said operation(s). For example, if a browser
-obtained a JPEG image, this framework would enable the browser to identify
-that stream of data as an JPEG image, and from that type, the browser
-could locate and instantiate an object that could manipulate, or view that
-image.
-
-WWW: http://java.sun.com/products/javabeans/jaf/
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index a059ef9fbef8..b6634b66eec0 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= apache-jmeter
PORTVERSION= 2.11
+PORTREVISION= 1
CATEGORIES= www benchmarks java
MASTER_SITES= APACHE/jmeter/binaries
@@ -14,7 +15,7 @@ LICENSE= APACHE20
# These are JAR-files installed by other ports. The list should keep
# growing until all Java applications install just their own JARs -- not
# the 3rd-party ones:
-RUN_DEPENDS= ${JAVALIBDIR}/activation.jar:java/jaf \
+RUN_DEPENDS= \
${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec \
${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections \