diff options
author | lioux <lioux@FreeBSD.org> | 2005-01-13 02:06:11 +0800 |
---|---|---|
committer | lioux <lioux@FreeBSD.org> | 2005-01-13 02:06:11 +0800 |
commit | cee69bc70debc6054347fd12f683df9400d9815f (patch) | |
tree | 844d3eb5e6f8605fd36ad949fcb406ca1cd921f2 /net/azureus | |
parent | 0a5ee63be210105c280c034d473c6524e73a84b3 (diff) | |
download | freebsd-ports-gnome-cee69bc70debc6054347fd12f683df9400d9815f.tar.gz freebsd-ports-gnome-cee69bc70debc6054347fd12f683df9400d9815f.tar.zst freebsd-ports-gnome-cee69bc70debc6054347fd12f683df9400d9815f.zip |
o Update to <bsd.java.mk> standard 2.0
- Install jars under JAVAJARDIR
- Make sure that the wrapper scripts runs the correct
JAVA_{VERSION,OS}
o Bump PORTREVISION due to jar location changes
Diffstat (limited to 'net/azureus')
-rw-r--r-- | net/azureus/Makefile | 13 | ||||
-rw-r--r-- | net/azureus/files/azureus | 11 |
2 files changed, 17 insertions, 7 deletions
diff --git a/net/azureus/Makefile b/net/azureus/Makefile index 2b51b33a8961..08bd0b5844d1 100644 --- a/net/azureus/Makefile +++ b/net/azureus/Makefile @@ -7,6 +7,7 @@ PORTNAME= azureus PORTVERSION= 2.2.0.2 +PORTREVISION= 1 CATEGORIES= net java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -29,17 +30,19 @@ JAVA_OS= native DATADIR= ${JAVASHAREDIR}/${PORTNAME} JARFILE= Azureus2.jar -PLIST_FILES= %%DATADIR%%/${JARFILE} bin/${PORTNAME} -PLIST_DIRS= %%DATADIR%% +PLIST_FILES= %%JAVAJARDIR%%/${JARFILE} bin/${PORTNAME} do-configure: ${SED} -e "s+%%PREFIX%%+${PREFIX}+" -e "s+%%LOCALBASE%%+${LOCALBASE}+" \ - -e "s+%%JAVA%%+${JAVA}+" -e "s+%%DATADIR%%+${DATADIR}+" \ + -e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \ + -e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \ + -e "s|%%JAVA_VERSION%%|${JAVA_VERSION}|" \ + -e "s|%%JAVA_OS%%|${JAVA_OS}|" \ ${FILESDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME} do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${DATADIR}/${JARFILE} + ${MKDIR} ${JAVAJARDIR} + ${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${JAVAJARDIR}/${JARFILE} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> diff --git a/net/azureus/files/azureus b/net/azureus/files/azureus index d5c0ffaf198b..5871a852c4f8 100644 --- a/net/azureus/files/azureus +++ b/net/azureus/files/azureus @@ -2,13 +2,20 @@ # # $FreeBSD$ +export JAVA_VERSION +export JAVA_OS + +# java +JAVA_VERSION="%%JAVA_VERSION%%" +JAVA_OS="%%JAVA_OS%%" + ECLIPSE_BASE=%%LOCALBASE%%/eclipse ECLIPSE_SWT=`find "${ECLIPSE_BASE}" -name '*swt.*' -type d | grep -e "plugins/org.eclipse.swt.[motif|gtk]" | head -n 1` ECLIPSE_WS=`echo "${ECLIPSE_SWT}" | sed -e "s+^${ECLIPSE_BASE}/plugins/org.eclipse.swt.++" -e "s+_.*$++"` ECLIPSE_SWT_JAR=${ECLIPSE_SWT}/ws/${ECLIPSE_WS} LIB_PATH=${ECLIPSE_SWT}/os/freebsd/x86/ -CLASS_PATH=:%%DATADIR%%/Azureus2.jar:${ECLIPSE_SWT_JAR}/swt-mozilla.jar:${ECLIPSE_SWT_JAR}/swt-pi.jar:${ECLIPSE_SWT_JAR}/swt.jar +CLASS_PATH=:%%JAVAJARDIR%%/Azureus2.jar:${ECLIPSE_SWT_JAR}/swt-mozilla.jar:${ECLIPSE_SWT_JAR}/swt-pi.jar:${ECLIPSE_SWT_JAR}/swt.jar if [ "${DEBUG}" ] then @@ -20,4 +27,4 @@ then echo "LIB_PATH = ${LIB_PATH}" fi -"%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=Linux" org.gudy.azureus2.ui.swt.Main +exec "%%JAVA%%" -cp "${CLASS_PATH}" "-Djava.library.path=${LIB_PATH}" "-Dos.name=Linux" org.gudy.azureus2.ui.swt.Main "${@}" |