5 files changed, 11 insertions, 33 deletions

diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index f2040323d2c2..a33d9b4a83bb 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	frost
-PORTVERSION=	1.2.0.6
+PORTVERSION=	1.2.0
+PORTEPOCH=	1
 CATEGORIES=	net java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jtcfrost
-DISTNAME=	${PORTNAME}-wot-071203-${PORTVERSION}
+DISTNAME=	${PORTNAME}-wot-${VERSION_DATE}
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	File-sharing tool for FreeNet with Usenet like forum support
@@ -19,17 +20,19 @@ USE_JAVA=	1.4+
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_BUILD_DEPENDS_JAVA=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
+#WRKSRC=		${WRKDIR}/${PORTNAME}
+NO_WRKSUBDIR=	yes
 PLIST_SUB=	JAR_DIR=${JAR_DIR}
 
+VERSION_DATE=	090603
+
 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
+JAR_FILES=	frost.jar lib/fecImpl.jar \
+		lib/genChkImpl.jar lib/xercesImpl.jar \
+		lib/xml-apis.jar lib/xmlParserAPIs.jar
 
 DOC_FILES=	doc/Frost.tex doc/authors.txt doc/gpl.txt \
 		help/faq.txt help/history.txt
@@ -41,10 +44,6 @@ post-patch:
 		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
@@ -65,9 +64,5 @@ do-install:
 		${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 7c77689ab086..dec618e2bb25 100644
--- a/net-p2p/frost/distinfo
+++ b/net-p2p/frost/distinfo
@@ -1 +1 @@
-MD5 (frost-wot-071203-upd6.zip) = 8d5a8ec22b1b814d8b7fd43529d42e5d
+MD5 (frost-wot-090603.zip) = b7f6b8de26caff027d889dad69476d5e
diff --git a/net-p2p/frost/files/wrapper-convert.sh b/net-p2p/frost/files/wrapper-convert.sh
deleted file mode 100644
index 83705c0b39bf..000000000000
--- a/net-p2p/frost/files/wrapper-convert.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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/pkg-message b/net-p2p/frost/pkg-message
deleted file mode 100644
index af867970478a..000000000000
--- a/net-p2p/frost/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-*********************************************
-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 a6949c124446..7a01a675b4fe 100644
--- a/net-p2p/frost/pkg-plist
+++ b/net-p2p/frost/pkg-plist
@@ -1,12 +1,10 @@
 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