diff options
| author | glewis <glewis@FreeBSD.org> | 2011-06-06 06:56:39 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2011-06-06 06:56:39 +0800 |
| commit | 4537673ed4f620304b54680dd93838c2f3295be1 (patch) | |
| tree | a54f58455c5fed4d8d03db8d453694366166fd47 /lang | |
| parent | 287f4e7f3e387a2c4c33700a995acf2eb172e856 (diff) | |
| download | freebsd-ports-gnome-4537673ed4f620304b54680dd93838c2f3295be1.tar.gz freebsd-ports-gnome-4537673ed4f620304b54680dd93838c2f3295be1.tar.zst freebsd-ports-gnome-4537673ed4f620304b54680dd93838c2f3295be1.zip | |
. Specify a modern version of Java.
. Rename jconsole to j-jconsole to prevent conflict and remove CONFLICTS.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/linux-j/Makefile | 13 | ||||
| -rw-r--r-- | lang/linux-j/files/j-jconsole.sh.in (renamed from lang/linux-j/files/jconsole.sh.in) | 2 | ||||
| -rw-r--r-- | lang/linux-j/pkg-message | 2 | ||||
| -rw-r--r-- | lang/linux-j/pkg-plist | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile index a9df6e69e32e..8f09119014a1 100644 --- a/lang/linux-j/Makefile +++ b/lang/linux-j/Makefile @@ -19,27 +19,24 @@ COMMENT= A general purpose programming language RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper -# Java 1.5 JDKs install ${PREFIX}/bin/jconsole -CONFLICTS= diablo-jdk-1.5.0* jdk-1.5.0* linux-sun-jdk-1.5.0* - USE_LINUX= yes USE_JAVA= yes -JAVA_VERSION= 1.3 1.4 +JAVA_VERSION= 1.5+ ONLY_FOR_ARCHS= i386 NO_WRKSUBDIR= yes NO_BUILD= yes -MAN1= jconsole.1 +MAN1= j-jconsole.1 -SUB_FILES= jconsole.sh jw.sh +SUB_FILES= j-jconsole.sh jw.sh SUB_LIST= PORTVERSION=${PORTVERSION:S/b//g} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/jconsole.sh ${PREFIX}/bin/jconsole + ${INSTALL_SCRIPT} ${WRKSRC}/j-jconsole.sh ${PREFIX}/bin/j-jconsole ${INSTALL_SCRIPT} ${WRKSRC}/jw.sh ${PREFIX}/bin/jw - ${INSTALL_MAN} ${WRKSRC}/j${PORTVERSION:S/b//g}/system/extras/help/man/${MAN1} ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/j${PORTVERSION:S/b//g}/system/extras/help/man/jconsole.1 ${PREFIX}/man/man1/${MAN1} @${MKDIR} ${PREFIX}/lib/j cd ${WRKSRC}/j${PORTVERSION:S/b//g} && \ ${TAR} -cf - system user profile.ijs j.jar | \ diff --git a/lang/linux-j/files/jconsole.sh.in b/lang/linux-j/files/j-jconsole.sh.in index 42c96248c195..b7e2600f3734 100644 --- a/lang/linux-j/files/jconsole.sh.in +++ b/lang/linux-j/files/j-jconsole.sh.in @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD$ +# $FreeBSD: /tmp/pcvs/ports/lang/linux-j/files/j-jconsole.sh.in,v 1.1 2011-06-05 22:56:39 glewis Exp $ JPATHj%%PORTVERSION%%=%%PREFIX%%/lib/j export JPATHj%%PORTVERSION%% diff --git a/lang/linux-j/pkg-message b/lang/linux-j/pkg-message index b32a45f28c31..91c2024c1600 100644 --- a/lang/linux-j/pkg-message +++ b/lang/linux-j/pkg-message @@ -1,2 +1,2 @@ Try J by running "jw" -For more information see "man jconsole". +For more information see "man j-jconsole". diff --git a/lang/linux-j/pkg-plist b/lang/linux-j/pkg-plist index 1215704d6748..427bd61259d4 100644 --- a/lang/linux-j/pkg-plist +++ b/lang/linux-j/pkg-plist @@ -1,5 +1,5 @@ @comment $FreeBSD$ -bin/jconsole +bin/j-jconsole bin/jw lib/j/j.jar lib/j/jconsole |