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/freenet | |
| 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/freenet')
| -rw-r--r-- | net/freenet/Makefile | 22 | ||||
| -rw-r--r-- | net/freenet/files/wrapper.sh | 7 | ||||
| -rw-r--r-- | net/freenet/pkg-plist | 7 |
3 files changed, 15 insertions, 21 deletions
diff --git a/net/freenet/Makefile b/net/freenet/Makefile index bd62830134b4..2b18ef07b873 100644 --- a/net/freenet/Makefile +++ b/net/freenet/Makefile @@ -7,7 +7,7 @@ PORTNAME= freenet PORTVERSION= 0.5.2.1.5100 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net java security MASTER_SITES= http://freenetproject.org/snapshots/ DISTNAME= ${PORTNAME}-20041209 @@ -16,14 +16,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= lioux@FreeBSD.org COMMENT= Peer-to-peer network aiming at anonymity and freedom of speech -USE_JAVA= 1.4+ +USE_JAVA= yes +JAVA_VERSION= 1.4+ NO_BUILD= yes -NO_BUILD_DEPENDS_JAVA= yes WRKSRC= ${WRKDIR}/${PORTNAME} -PLIST_SUB= JAR_DIR=${JAR_DIR} JAVAVM= ${LOCALBASE}/bin/java -JAR_DIR= share/java/jar/${PORTNAME} # DATA_FILES= seednodes.ref DOC_FILES= README @@ -35,12 +33,19 @@ SEED_FILE= seednodes.ref PORTDOCS= ${DOC_FILES} +PLIST_FILES= \ + bin/${PORTNAME:L} \ + %%DATADIR%%/seednodes.ref \ + %%JAVAJARDIR%%/freenet-ext.jar \ + %%JAVAJARDIR%%/freenet.jar +PLIST_DIRS= %%DATADIR%% + post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|; \ s|%%DATA_DIR%%|${DATADIR:S,^${PREFIX}/,,}|; \ - s|%%JAVA_VERSION%%|${USE_JAVA}|; \ + s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \ s|%%JAVAVM%%|${JAVAVM}|; \ - s|%%JAR_DIR%%|${JAR_DIR}|; \ + s|%%JAVAJARDIR%%|${JAVAJARDIR:S,^${PREFIX}/,,}|; \ s|%%JAR_FILES%%|${JAR_FILES}|; \ s|%%JAR_START%%|${JAR_START}|; \ s|%%SEED_FILE%%|${SEED_FILE}|" \ @@ -60,9 +65,8 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR} .endfor # jar - @${MKDIR} ${PREFIX}/${JAR_DIR} .for jar in ${JAR_FILES} - @${INSTALL_DATA} ${WRKSRC}/${jar} ${PREFIX}/${JAR_DIR} + @${INSTALL_DATA} ${WRKSRC}/${jar} ${JAVAJARDIR} .endfor # wrapper @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L} diff --git a/net/freenet/files/wrapper.sh b/net/freenet/files/wrapper.sh index 8d57ff0b023a..4c6a41452484 100644 --- a/net/freenet/files/wrapper.sh +++ b/net/freenet/files/wrapper.sh @@ -9,7 +9,7 @@ PREFIX="%%PREFIX%%" # java JAVA_VERSION="%%JAVA_VERSION%%" JAVAVM_CALL="%%JAVAVM%%" -JAR_DIR="%%JAR_DIR%%" +JAVAJARDIR="%%JAVAJARDIR%%" JAR_FILES="%%JAR_FILES%%" JAR_START="%%JAR_START%%" # data @@ -84,10 +84,7 @@ prepare_home_dir () { # link the jar files for jar in ${JAR_FILES} do - if [ ! -h ${HOME_DIR}/${jar} ] - then - ln -sf ${PREFIX}/${JAR_DIR}/${jar} ${HOME_DIR}/${jar} - fi + ln -sf ${PREFIX}/${JAVAJARDIR}/${jar} ${HOME_DIR}/${jar} done } diff --git a/net/freenet/pkg-plist b/net/freenet/pkg-plist deleted file mode 100644 index 8b19427a3989..000000000000 --- a/net/freenet/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/freenet -share/freenet/seednodes.ref -share/java/jar/freenet/freenet-ext.jar -share/java/jar/freenet/freenet.jar -@dirrm share/java/jar/freenet -@unexec rmdir %D/share/java/jar 2>/dev/null || true -@dirrm share/freenet |