6 files changed, 64 insertions, 14 deletions

diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index 946621f6a661..f2040323d2c2 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	frost
-PORTVERSION=	1.2
+PORTVERSION=	1.2.0.6
 CATEGORIES=	net java
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR=	jtcfrost
-MASTER_SITES=	http://jtcfrost.sourceforge.net/
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	jtcfrost
+DISTNAME=	${PORTNAME}-wot-071203-${PORTVERSION}
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	File-sharing tool for FreeNet with Usenet like forum support
@@ -24,18 +23,28 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
 JAVAVM=		${LOCALBASE}/bin/javavm
+SHARE_DIR=	share/${PORTNAME}
 JAR_DIR=	share/java/jar/${PORTNAME}
 JAR_FILE=	frost.jar
+JAR_FILES=	frost/frost.jar frost/lib/fecImpl.jar \
+		frost/lib/genChkImpl.jar frost/lib/xercesImpl.jar \
+		frost/lib/xml-apis.jar frost/lib/xmlParserAPIs.jar \
+		convert/converter.jar
 
-DOC_FILES=	doc/Frost.tex doc/authors.txt doc/gpl.txt doc/notes.txt \
+DOC_FILES=	doc/Frost.tex doc/authors.txt doc/gpl.txt \
 		help/faq.txt help/history.txt
 
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
 		s|%%JAVAVM%%|${JAVAVM}|; \
 		s|%%JAR_DIR%%|${JAR_DIR}|; \
-		s|%%JAR_FILE%%|${JAR_FILE}|" \
+		s|%%JAR_FILE%%|${JAR_FILE}|; \
+		s|%%SHARE_DIR%%|${SHARE_DIR}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|; \
+		s|%%JAVAVM%%|${JAVAVM}|; \
+		s|%%JAR_DIR%%|${JAR_DIR}|;" \
+		${FILESDIR}/wrapper-convert.sh > ${WRKDIR}/wrapper-convert.sh
 
 do-install:
 # docs
@@ -45,10 +54,20 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
-# jar
+# jars
 	@${MKDIR} ${PREFIX}/${JAR_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/${JAR_FILE} ${PREFIX}/${JAR_DIR}
+.for jar in ${JAR_FILES}
+	@${INSTALL_DATA} ${WRKDIR}/${jar} ${PREFIX}/${JAR_DIR}
+.endfor
+# default boards
+	@${MKDIR} ${PREFIX}/${SHARE_DIR}
+	@${INSTALL_DATA} ${WRKSRC}/config/boards.xml.default \
+		${PREFIX}/${SHARE_DIR}
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
+	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper-convert.sh ${PREFIX}/bin/frost-convert
+
+post-install:
+	@${CAT} ${PKGMESSAGE} | ${SED} -e "s,%%PREFIX%%,${PREFIX},g"
 
 .include <bsd.port.mk>
diff --git a/net-p2p/frost/distinfo b/net-p2p/frost/distinfo
index a07130d9e366..7c77689ab086 100644
--- a/net-p2p/frost/distinfo
+++ b/net-p2p/frost/distinfo
@@ -1 +1 @@
-MD5 (frost.zip) = 420da830fcb40877417119d2bdfa500c
+MD5 (frost-wot-071203-upd6.zip) = 8d5a8ec22b1b814d8b7fd43529d42e5d
diff --git a/net-p2p/frost/files/wrapper-convert.sh b/net-p2p/frost/files/wrapper-convert.sh
new file mode 100644
index 000000000000..83705c0b39bf
--- /dev/null
+++ b/net-p2p/frost/files/wrapper-convert.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+PREFIX="%%PREFIX%%"
+JAVAVM="%%JAVAVM%%"
+JAR_DIR="%%JAR_DIR%%"
+CLASSPATH="${PREFIX}/${JAR_DIR}/converter.jar"
+
+exec ${JAVAVM} -cp ${CLASSPATH} converter
diff --git a/net-p2p/frost/files/wrapper.sh b/net-p2p/frost/files/wrapper.sh
index e4dd1b7628d1..c5c67e25f5ae 100644
--- a/net-p2p/frost/files/wrapper.sh
+++ b/net-p2p/frost/files/wrapper.sh
@@ -4,12 +4,19 @@ PREFIX="%%PREFIX%%"
 JAVAVM="%%JAVAVM%%"
 JAR_DIR="%%JAR_DIR%%"
 JAR_FILE="%%JAR_FILE%%"
+SHARE_DIR="%%SHARE_DIR%%"
 HOME_DIR=${HOME}/.frost
+CLASSPATH="${PREFIX}/${JAR_DIR}/${JAR_FILE}:${PREFIX}/${JAR_DIR}/fecImpl.jar:${PREFIX}/${JAR_DIR}/genChkImpl.jar:${PREFIX}/${JAR_DIR}/xercesImpl.jar:${PREFIX}/${JAR_DIR}/xml-apis.jar:${PREFIX}/${JAR_DIR}/xmlParserAPIs.jar:$CLASSPATH"
 
-if [ ! -d ${HOME_DIR} ]
+if [ ! -d ${HOME_DIR}/config ]
 then
-	mkdir -p ${HOME_DIR}
+	mkdir -p ${HOME_DIR}/config
+fi
+
+if [ ! -e ${HOME_DIR}/config/boards.xml.default ]
+then
+	cp ${PREFIX}/${SHARE_DIR}/boards.xml.default ${HOME_DIR}/config/
 fi
 
 cd ${HOME_DIR} &&
-	exec ${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}"
+	exec ${JAVAVM} -cp $CLASSPATH frost.frost "${@}"
diff --git a/net-p2p/frost/pkg-message b/net-p2p/frost/pkg-message
new file mode 100644
index 000000000000..af867970478a
--- /dev/null
+++ b/net-p2p/frost/pkg-message
@@ -0,0 +1,7 @@
+*********************************************
+You can use %%PREFIX%%/bin/frost-convert
+to convert your old Frost-WOT identities file
+to the new format. The identities file to be
+converted must be in your current work
+directory for the tool to find it.
+*********************************************
diff --git a/net-p2p/frost/pkg-plist b/net-p2p/frost/pkg-plist
index 6cc5f49e9845..a6949c124446 100644
--- a/net-p2p/frost/pkg-plist
+++ b/net-p2p/frost/pkg-plist
@@ -1,10 +1,19 @@
 bin/frost
+bin/frost-convert
+share/java/jar/frost/frost.jar
+share/java/jar/frost/fecImpl.jar
+share/java/jar/frost/genChkImpl.jar
+share/java/jar/frost/xercesImpl.jar
+share/java/jar/frost/xml-apis.jar
+share/java/jar/frost/xmlParserAPIs.jar
+share/java/jar/frost/converter.jar
+share/frost/boards.xml.default
 %%PORTDOCS%%%%DOCSDIR%%/Frost.tex
 %%PORTDOCS%%%%DOCSDIR%%/authors.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.txt
 %%PORTDOCS%%%%DOCSDIR%%/gpl.txt
 %%PORTDOCS%%%%DOCSDIR%%/history.txt
-%%PORTDOCS%%%%DOCSDIR%%/notes.txt
 @dirrm share/java/jar/frost
+@dirrm share/frost
 @unexec rmdir %D/share/java/jar 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%