diff options
39 files changed, 8 insertions, 76 deletions
diff --git a/archivers/jzip.org/Makefile b/archivers/jzip.org/Makefile index 78c4b0c1ed9b..f5992c424074 100644 --- a/archivers/jzip.org/Makefile +++ b/archivers/jzip.org/Makefile @@ -11,8 +11,6 @@ DISTNAME= ${PORTNAME}${PORTVERSION}.src MAINTAINER= ports@FreeBSD.org COMMENT= WinZip like program written in Java -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= zip PLIST_FILES= %%JAVAJARDIR%%/jzip.org.jar bin/${PORTNAME} USE_JAVA= yes diff --git a/comms/esmska/Makefile b/comms/esmska/Makefile index e62f12eca510..3fb2e41ce885 100644 --- a/comms/esmska/Makefile +++ b/comms/esmska/Makefile @@ -9,8 +9,6 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= gamato@users.sf.net COMMENT= Program for sending SMS over the Internet -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile index 07d6235e106e..0f1869681cc1 100644 --- a/databases/isql-viewer/Makefile +++ b/databases/isql-viewer/Makefile @@ -16,8 +16,7 @@ EXTRACT_ONLY= # none MAINTAINER= ports@FreeBSD.org COMMENT= JDBC 2.x compliant database front end -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper \ - ${JYTHON_PREFIX}/${JYTHON_JAR}:${PORTSDIR}/lang/jython \ +RUN_DEPENDS= ${JYTHON_PREFIX}/${JYTHON_JAR}:${PORTSDIR}/lang/jython \ ${JAVALIBDIR}/postgresql.jar:${PORTSDIR}/databases/postgresql-jdbc \ ${JAVALIBDIR}/mysql-connector-java.jar:${PORTSDIR}/databases/mysql-connector-java diff --git a/deskutils/freemind/Makefile b/deskutils/freemind/Makefile index d8bbad86fb0e..53ff09bb63fc 100644 --- a/deskutils/freemind/Makefile +++ b/deskutils/freemind/Makefile @@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/license BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USES= zip:infozip USE_JAVA= yes diff --git a/deskutils/openproj/Makefile b/deskutils/openproj/Makefile index b934512afd93..cd248f3c1dfa 100644 --- a/deskutils/openproj/Makefile +++ b/deskutils/openproj/Makefile @@ -8,8 +8,6 @@ MASTER_SITES= SF/${PORTNAME}/OpenProj%20Binaries/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Free, open source Project Manager -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 4e9398902552..adb1963a8452 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -15,8 +15,6 @@ COMMENT= Java- and XML-based build tool, conceptually similar to make LICENSE= APACHE20 -RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper - OPTIONS_DEFINE= DOCS ANT_DISTFILE= ${PORTNAME}-${PORTVERSION}-bin.tar.bz2 diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile index ea4bbd25bb45..3b013ee6809c 100644 --- a/devel/argouml/Makefile +++ b/devel/argouml/Makefile @@ -21,8 +21,6 @@ LICENSE= EPL PORTSCOUT= limitw:1,even \ site:${MASTER_SITES:S/argouml-${PORTVERSION}\///} -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= yes USE_JAVA= yes diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile index 884e1ea11098..0279f5fbbe93 100644 --- a/devel/flex-sdk/Makefile +++ b/devel/flex-sdk/Makefile @@ -9,8 +9,6 @@ DISTNAME= flex_sdk_${PORTVERSION}_mpl MAINTAINER= kuriyama@FreeBSD.org COMMENT= Adobe Flex SDK -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper - CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.* USES= zip USE_JAVA= YES diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile index f375aac12a19..6a6ed2ca3058 100644 --- a/devel/flex-sdk35/Makefile +++ b/devel/flex-sdk35/Makefile @@ -11,8 +11,6 @@ PKGNAMESUFFIX= 3 MAINTAINER= ports@FreeBSD.org COMMENT= Adobe Flex SDK -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper - CONFLICTS= ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.* USES= zip USE_JAVA= YES diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile index 11e7674330a2..c446fdbdbb99 100644 --- a/devel/ireport/Makefile +++ b/devel/ireport/Makefile @@ -10,8 +10,6 @@ DISTNAME= iReport-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A visual report builder/designer for JasperReports -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= dos2unix USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/devel/java-findbugs/Makefile b/devel/java-findbugs/Makefile index f2404594c148..ec963c4aef0a 100644 --- a/devel/java-findbugs/Makefile +++ b/devel/java-findbugs/Makefile @@ -10,8 +10,6 @@ PKGNAMEPREFIX= java- MAINTAINER= glewis@FreeBSD.org COMMENT= Find Bugs in Java Programs -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - LICENSE= LGPL21 USE_JAVA= yes NO_BUILD= yes diff --git a/devel/obfuscatejs/Makefile b/devel/obfuscatejs/Makefile index 8eda5c7438b9..260a6b925e5a 100644 --- a/devel/obfuscatejs/Makefile +++ b/devel/obfuscatejs/Makefile @@ -15,8 +15,6 @@ EXTRACT_ONLY= MAINTAINER= ports@FreeBSD.org COMMENT= JavaScript code obfuscator -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - NO_BUILD= yes USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/devel/svnkit/Makefile b/devel/svnkit/Makefile index ad3723a1c6de..1b383a2e08fc 100644 --- a/devel/svnkit/Makefile +++ b/devel/svnkit/Makefile @@ -10,8 +10,6 @@ DISTNAME= org.tmatesoft.svn_${PORTVERSION}.standalone MAINTAINER= ports@FreeBSD.org COMMENT= The only pure Java Subversion client library in the world -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - OPTIONS_DEFINE= DOCS USES= zip diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile index 3e9b91ab9d69..b85e61853aa5 100644 --- a/editors/jedit/Makefile +++ b/editors/jedit/Makefile @@ -14,8 +14,6 @@ COMMENT= Powerful programmer's text editor written in Java LICENSE= GPLv2 -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - OPTIONS_DEFINE= MACROS DOCS MACROS_DESC= Install default set of macros (highly recommended) diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile index 449118b392fc..decdd67ee2c2 100644 --- a/editors/omegaT/Makefile +++ b/editors/omegaT/Makefile @@ -13,8 +13,6 @@ COMMENT= Powerful translation memory application written in Java LICENSE= GPLv2 -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= zip USE_ANT= yes USE_JAVA= yes diff --git a/ftp/dmachine/Makefile b/ftp/dmachine/Makefile index 6f37fb0d0b90..1d448c99072a 100644 --- a/ftp/dmachine/Makefile +++ b/ftp/dmachine/Makefile @@ -9,8 +9,6 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Non interactive, non graphical, batch download manager -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - OPTIONS_DEFINE= DOCS USE_JAVA= yes diff --git a/ftp/jftp/Makefile b/ftp/jftp/Makefile index 0e405171bd80..49066b82462f 100644 --- a/ftp/jftp/Makefile +++ b/ftp/jftp/Makefile @@ -13,8 +13,6 @@ COMMENT= Java Network Browser LICENSE= GPLv2 -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - JAVA_VERSION= 1.6+ NO_BUILD= yes USE_JAVA= yes diff --git a/games/jtans/Makefile b/games/jtans/Makefile index f0f188eca350..f1e06f038a04 100644 --- a/games/jtans/Makefile +++ b/games/jtans/Makefile @@ -14,8 +14,6 @@ COMMENT= Ancient puzzle LICENSE= GPLv2 # or later; got from website -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty diff --git a/games/pcgen/Makefile b/games/pcgen/Makefile index 2d0babf7927d..4703959807a2 100644 --- a/games/pcgen/Makefile +++ b/games/pcgen/Makefile @@ -9,8 +9,6 @@ DISTNAME= pcgen${PORTVERSION:S/.//g}_full MAINTAINER= ports@FreeBSD.org COMMENT= Java-based RPG character generator and maintenance program -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= zip WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g} USE_JAVA= yes diff --git a/graphics/aoi/Makefile b/graphics/aoi/Makefile index 470a0f5e0fcd..d55e849f2d04 100644 --- a/graphics/aoi/Makefile +++ b/graphics/aoi/Makefile @@ -16,7 +16,6 @@ COMMENT= Open source Java written 3D modelling and rendering studio LICENSE= GPLv2 LIB_DEPENDS= libjogl.so:${PORTSDIR}/graphics/jogl -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper USES= dos2unix zip DOS2UNIX_FILES= ../AoI_Manual/*.html diff --git a/graphics/jalbum/Makefile b/graphics/jalbum/Makefile index 40ef51c546ae..77afea621215 100644 --- a/graphics/jalbum/Makefile +++ b/graphics/jalbum/Makefile @@ -10,8 +10,6 @@ DISTNAME= jAlbum${PORTVERSION} MAINTAINER= tdb@FreeBSD.org COMMENT= Web photo album generator -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - WRKSRC= ${WRKDIR}/jAlbum USES= zip diff --git a/graphics/tintfu/Makefile b/graphics/tintfu/Makefile index 2161623ad83c..6606b8964e0d 100644 --- a/graphics/tintfu/Makefile +++ b/graphics/tintfu/Makefile @@ -12,8 +12,6 @@ EXTRACT_SUFX= .jar MAINTAINER= ports@FreeBSD.org COMMENT= GraphViz .dot file editor -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # empty diff --git a/java/proguard/Makefile b/java/proguard/Makefile index 93584815cfe2..af904c9923a7 100644 --- a/java/proguard/Makefile +++ b/java/proguard/Makefile @@ -13,8 +13,6 @@ COMMENT= Java class file shrinker, optimizer, and obfuscator LICENSE= GPLv2 -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - OPTIONS_DEFINE= DOCS EXAMPLES USE_JAVA= yes diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile index 516e7796351b..c450cbb346db 100644 --- a/lang/linux-j/Makefile +++ b/lang/linux-j/Makefile @@ -18,8 +18,6 @@ LICENSE_NAME= JSoftware End User License Agreement LICENSE_FILE= ${FILESDIR}/license.txt LICENSE_PERMS= auto-accept dist-mirror pkg-mirror -RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper - USE_LINUX= yes USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/math/plman/Makefile b/math/plman/Makefile index e99d18242bb7..b9e2735c10f2 100644 --- a/math/plman/Makefile +++ b/math/plman/Makefile @@ -12,8 +12,6 @@ DISTNAME= ${PORTNAME}${PORTVERSION:C/\./_/g} MAINTAINER= nivit@FreeBSD.org COMMENT= Propositional Logic sentence shell/interpreter -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - NO_BUILD= yes USES= zip diff --git a/multimedia/projectx/Makefile b/multimedia/projectx/Makefile index 3c35d456046e..16a78c3e632d 100644 --- a/multimedia/projectx/Makefile +++ b/multimedia/projectx/Makefile @@ -11,8 +11,6 @@ DISTFILES= ProjectX_${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= nox@FreeBSD.org COMMENT= DVB (mpeg) cutting/demux tool -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= zip:infozip USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/net-im/convey/Makefile b/net-im/convey/Makefile index 75bf8e1aebe3..dab1185aec6b 100644 --- a/net-im/convey/Makefile +++ b/net-im/convey/Makefile @@ -12,8 +12,6 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= nivit@FreeBSD.org COMMENT= Instant Message (IM) program using the Jabber protocol -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USE_ANT= yes USE_JAVA= yes diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile index 66761b454969..e85f575988b7 100644 --- a/net-im/openfire/Makefile +++ b/net-im/openfire/Makefile @@ -13,8 +13,7 @@ COMMENT= Enterprise instant messaging server LICENSE= APACHE20 -RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper \ - ${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j +RUN_DEPENDS= ${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j OPTIONS_DEFINE= DOCS PLUGINS OPTIONS_DEFAULT=PLUGINS diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile index 8a582ccb12dc..231997a756d4 100644 --- a/net/mpich2/Makefile +++ b/net/mpich2/Makefile @@ -99,8 +99,6 @@ IGNORE= WITH_JAVA requires WITH_X11 CONFIGURE_ARGS+= --with-java="${JAVA_HOME}" USE_JAVA= yes JAVA_VERSION= 1.6+ -BUILD_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper -RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper PLIST_SUB+= JAVA="" PLX11= "" BIN2STRIP+= rlog_check_timeorder rlog_print diff --git a/sysutils/jdiskreport/Makefile b/sysutils/jdiskreport/Makefile index 7d0362fc2138..bfbf6cbe66c1 100644 --- a/sysutils/jdiskreport/Makefile +++ b/sysutils/jdiskreport/Makefile @@ -10,8 +10,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S,.,_,g} MAINTAINER= jon@witchspace.com COMMENT= Java program to graphically display disk usage statistics -RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper - USES= zip USE_JAVA= YES JAVA_VERSION= 1.6+ diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile index 665492a74a8e..8d1f3fc18cc5 100644 --- a/textproc/crimson/Makefile +++ b/textproc/crimson/Makefile @@ -3,7 +3,7 @@ PORTNAME= crimson PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc java MASTER_SITES= http://xml.apache.org/dist/crimson/ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= girgen@partitur.se COMMENT= Implements the Java API for XML Processing (JAXP) -RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper +USE_JAVA= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} JAVAVM?= ${LOCALBASE}/bin/javavm diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile index ab210b1abfe3..40b09e956274 100644 --- a/textproc/jarnal/Makefile +++ b/textproc/jarnal/Makefile @@ -13,8 +13,6 @@ COMMENT= Tool to take notes, annotate documents (including PDF), and more LICENSE= GPLv2 -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile index 462a9b71edb9..b94ec0e11f40 100644 --- a/textproc/jaxup/Makefile +++ b/textproc/jaxup/Makefile @@ -12,8 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java XUpdate engine BUILD_DEPENDS= ${JAR_DEPENDS} -RUN_DEPENDS= ${JAR_DEPENDS} \ - java:${PORTSDIR}/java/javavmwrapper +RUN_DEPENDS= ${JAR_DEPENDS} JAR_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \ ${JAVALIBDIR}/jaxen-full.jar:${PORTSDIR}/java/jaxen \ diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile index 4bb9453e8160..3d1f4e60650b 100644 --- a/textproc/jdictionary/Makefile +++ b/textproc/jdictionary/Makefile @@ -11,8 +11,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S,.,_,} MAINTAINER= jmohacsi@bsd.hu COMMENT= Platform independent, plugin based dictionary -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/textproc/nux/Makefile b/textproc/nux/Makefile index a2faefb7ed8e..c0aada8744b2 100644 --- a/textproc/nux/Makefile +++ b/textproc/nux/Makefile @@ -26,8 +26,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MXQUERY_TOOL} -RUN_DEPENDS+= ${JAVALIBDIR}/java-getopt.jar:${PORTSDIR}/java/java-getopt \ - classpath:${PORTSDIR}/java/javavmwrapper +RUN_DEPENDS+= ${JAVALIBDIR}/java-getopt.jar:${PORTSDIR}/java/java-getopt .endif PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile index 87fa049a7f4b..01670c1a472f 100644 --- a/textproc/saxon-devel/Makefile +++ b/textproc/saxon-devel/Makefile @@ -14,8 +14,6 @@ DISTFILES= ${PORTNAME}b${PORTVERSION:S,.,-,g}j.zip:binary \ MAINTAINER= ports@FreeBSD.org COMMENT= XSLT 2.0 / XPath 2.0 / XQuery 1.0 processor for Java -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - OPTIONS_DEFINE= JDOM DOM4J XOM DOCS JDOM_DESC= Jdom support DOM4J_DESC= dom4j support diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile index 0754009b55f4..9cdc87c25d59 100644 --- a/textproc/saxon/Makefile +++ b/textproc/saxon/Makefile @@ -12,8 +12,6 @@ COMMENT= XSLT 1.0 processor for Java LICENSE= MPL -RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper - USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile index 5d4c3cf42b04..9dccd80f2e57 100644 --- a/textproc/xincluder/Makefile +++ b/textproc/xincluder/Makefile @@ -12,8 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Java-based XInclude processors RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \ - ${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j \ - java:${PORTSDIR}/java/javavmwrapper + ${JAVALIBDIR}/xercesImpl.jar:${PORTSDIR}/textproc/xerces-j USE_JAVA= yes JAVA_VERSION= 1.6+ diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile index f3b84eca6df6..67bf1910898f 100644 --- a/textproc/xt/Makefile +++ b/textproc/xt/Makefile @@ -12,8 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= XSL Transformations (XSLT) implementation in Java RUN_DEPENDS= ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j \ - ${JAVALIBDIR}/xp.jar:${PORTSDIR}/textproc/xp \ - ${LOCALBASE}/bin/classpath:${PORTSDIR}/java/javavmwrapper + ${JAVALIBDIR}/xp.jar:${PORTSDIR}/textproc/xp USE_JAVA= YES JAVA_VERSION= 1.6+ |