diff options
| author | lioux <lioux@FreeBSD.org> | 2004-12-31 19:14:19 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2004-12-31 19:14:19 +0800 |
| commit | 20836ba57494eea8f6346da868c89daa657a4e78 (patch) | |
| tree | 73f1a3e6991bad4fa81ad28247e00527bf6ba4c0 /net/edonkey-gui-java | |
| parent | 38f3242dc921d6292b34293a767b5b2af8b99375 (diff) | |
| download | freebsd-ports-gnome-20836ba57494eea8f6346da868c89daa657a4e78.tar.gz freebsd-ports-gnome-20836ba57494eea8f6346da868c89daa657a4e78.tar.zst freebsd-ports-gnome-20836ba57494eea8f6346da868c89daa657a4e78.zip | |
o Update to <bsd.java.mk> standard 2.0
o Bump PORTREVISION due to jar location changes
Prompted by: hq
Diffstat (limited to 'net/edonkey-gui-java')
| -rw-r--r-- | net/edonkey-gui-java/Makefile | 23 | ||||
| -rw-r--r-- | net/edonkey-gui-java/files/wrapper.sh | 4 | ||||
| -rw-r--r-- | net/edonkey-gui-java/pkg-plist | 4 |
3 files changed, 14 insertions, 17 deletions
diff --git a/net/edonkey-gui-java/Makefile b/net/edonkey-gui-java/Makefile index 30b02bfa4b3e..a28adc59193d 100644 --- a/net/edonkey-gui-java/Makefile +++ b/net/edonkey-gui-java/Makefile @@ -7,7 +7,7 @@ PORTNAME= edonkey PORTVERSION= 1.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net java MASTER_SITES= http://www.edonkey2000.com/files/ PKGNAMESUFFIX= -gui-java @@ -20,25 +20,26 @@ COMMENT= Java GUI to eDonkey2000 'core' command line client RUN_DEPENDS= donkey:${PORTSDIR}/net/linux-edonkey-core -USE_JAVA= 1.3+ +USE_JAVA= yes +JAVA_VERSION= 1.3+ NO_BUILD= yes -NO_BUILD_DEPENDS_JAVA= yes -PLIST_SUB= JAR_DIR=${JAR_DIR} \ - JAR_FILE=${JAR_FILE} \ - WRAPPER=${PORTNAME}${PKGNAMESUFFIX} JAVAVM= ${LOCALBASE}/bin/java -JAR_DIR= share/java/jar/${PORTNAME} + +PLIST_FILES= \ + bin/${PORTNAME}${PKGNAMESUFFIX} \ + %%JAVAJARDIR%%/${PORTNAME}${PKGNAMESUFFIX}.jar post-patch: - @${SED} -e "s|%%JAR_DIR%%|${JAR_DIR}|;s|%%JAR_FILE%%|${JAR_FILE}|; \ - s|%%JAVA_VERSION%%|${USE_JAVA}|; \ + @${SED} -e "s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \ + s|%%JAR_FILE%%|${PORTNAME}${PKGNAMESUFFIX}.jar|; \ + s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \ s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \ ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh do-install: - @${MKDIR} ${PREFIX}/${JAR_DIR} - @${INSTALL_DATA} ${DISTDIR}/${JAR_FILE} ${PREFIX}/${JAR_DIR} + @${INSTALL_DATA} ${DISTDIR}/${JAR_FILE} \ + ${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} .include <bsd.port.pre.mk> diff --git a/net/edonkey-gui-java/files/wrapper.sh b/net/edonkey-gui-java/files/wrapper.sh index 9f50395b16ae..25ab673cce3e 100644 --- a/net/edonkey-gui-java/files/wrapper.sh +++ b/net/edonkey-gui-java/files/wrapper.sh @@ -5,7 +5,7 @@ export JAVA_VERSION PREFIX="%%PREFIX%%" JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM="%%JAVAVM%%" -JAR_DIR="%%JAR_DIR%%" +JAVAJARDIR="%%JAVAJARDIR%%" JAR_FILE="%%JAR_FILE%%" -${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}" +${JAVAVM} -jar ${PREFIX}/${JAVAJARDIR}/${JAR_FILE} "${@}" diff --git a/net/edonkey-gui-java/pkg-plist b/net/edonkey-gui-java/pkg-plist deleted file mode 100644 index 56dd8a2dfa18..000000000000 --- a/net/edonkey-gui-java/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/%%WRAPPER%% -%%JAR_DIR%%/%%JAR_FILE%% -@dirrm %%JAR_DIR%% -@unexec rmdir %D/share/java/jar 2>/dev/null || true |