From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 4 09:10:23 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16DAB37B40E for ; Mon, 4 Aug 2003 09:10:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D070643FA3 for ; Mon, 4 Aug 2003 09:10:17 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h74GAHUp057894 for ; Mon, 4 Aug 2003 09:10:17 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h74GAHjU057893; Mon, 4 Aug 2003 09:10:17 -0700 (PDT) Resent-Date: Mon, 4 Aug 2003 09:10:17 -0700 (PDT) Resent-Message-Id: <200308041610.h74GAHjU057893@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Stefan Walter Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BE9837B407; Mon, 4 Aug 2003 09:01:31 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.184]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB10D43F75; Mon, 4 Aug 2003 09:01:28 -0700 (PDT) (envelope-from sw@gegenunendlich.de) Received: from [212.227.126.206] (helo=mrelayng.kundenserver.de) by moutng.kundenserver.de with esmtp (Exim 3.35 #1) id 19jhm4-0003U3-00; Mon, 04 Aug 2003 18:01:28 +0200 Received: from [80.142.196.144] (helo=kyuzo.dunkelkammer.void) by mrelayng.kundenserver.de with asmtp (Exim 3.35 #1) id 19jhm3-0000YI-00; Mon, 04 Aug 2003 18:01:27 +0200 Received: by kyuzo.dunkelkammer.void (Postfix, from userid 1002) id 160938817; Mon, 4 Aug 2003 18:01:25 +0200 (CEST) Message-Id: <20030804160125.160938817@kyuzo.dunkelkammer.void> Date: Mon, 4 Aug 2003 18:01:25 +0200 (CEST) From: Stefan Walter To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Mario Sergio Fujikawa Ferreira Subject: ports/55249: Update port: net/frost to Frost-WOT-upd6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Stefan Walter List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2003 16:10:23 -0000 >Number: 55249 >Category: ports >Synopsis: Update port: net/frost to Frost-WOT-upd6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 04 09:10:17 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Stefan Walter >Release: FreeBSD 5.1-RELEASE i386 >Organization: >Environment: System: FreeBSD kyuzo.dunkelkammer.void 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Sat Jul 19 11:01:42 CEST 2003 root@kyuzo.dunkelkammer.void:/usr/src/sys/i386/compile/KYUZO i386 >Description: - Update to Frost-WOT-upd6 - renamed variable $JAVAVM in files/wrapper.sh, as it caused an infinite loop in the javavmwrapper script - added file: files/wrapper-convert.sh >How-To-Repeat: Install the port. >Fix: --- frost-upd6.patch begins here --- diff -urN frost.old/Makefile frost/Makefile --- frost.old/Makefile Fri May 2 10:09:29 2003 +++ frost/Makefile Mon Aug 4 17:05:13 2003 @@ -6,12 +6,11 @@ # PORTNAME= frost -PORTVERSION= 1.2 -CATEGORIES= net java -#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -#MASTER_SITE_SUBDIR= jtcfrost -MASTER_SITES= http://jtcfrost.sourceforge.net/ -DISTNAME= ${PORTNAME} +PORTVERSION= upd6 +CATEGORIES= net java security +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 @@ 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 @@ @${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 diff -urN frost.old/distinfo frost/distinfo --- frost.old/distinfo Fri May 2 10:09:29 2003 +++ frost/distinfo Mon Aug 4 17:05:13 2003 @@ -1 +1 @@ -MD5 (frost.zip) = 420da830fcb40877417119d2bdfa500c +MD5 (frost-wot-071203-upd6.zip) = 8d5a8ec22b1b814d8b7fd43529d42e5d diff -urN frost.old/files/wrapper-convert.sh frost/files/wrapper-convert.sh --- frost.old/files/wrapper-convert.sh Thu Jan 1 01:00:00 1970 +++ frost/files/wrapper-convert.sh Mon Aug 4 17:05:13 2003 @@ -0,0 +1,8 @@ +#!/bin/sh + +PREFIX="%%PREFIX%%" +JAVAVM_CALL="%%JAVAVM%%" +JAR_DIR="%%JAR_DIR%%" +CLASSPATH="${PREFIX}/${JAR_DIR}/converter.jar" + +exec ${JAVAVM_CALL} -cp ${CLASSPATH} converter diff -urN frost.old/files/wrapper.sh frost/files/wrapper.sh --- frost.old/files/wrapper.sh Fri May 2 10:09:29 2003 +++ frost/files/wrapper.sh Mon Aug 4 17:42:59 2003 @@ -1,15 +1,22 @@ #!/bin/sh PREFIX="%%PREFIX%%" -JAVAVM="%%JAVAVM%%" +JAVAVM_CALL="%%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_CALL} -cp $CLASSPATH frost.frost "${@}" diff -urN frost.old/pkg-message frost/pkg-message --- frost.old/pkg-message Thu Jan 1 01:00:00 1970 +++ frost/pkg-message Mon Aug 4 17:05:13 2003 @@ -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 -urN frost.old/pkg-plist frost/pkg-plist --- frost.old/pkg-plist Fri May 2 10:09:29 2003 +++ frost/pkg-plist Mon Aug 4 17:05:13 2003 @@ -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%% --- frost-upd6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: