Attachment 34925 Details for Bug 56560 – frost-20030906.patch

[patch] frost-20030906.patch

frost-20030906.patch (text/plain), 4.02 KB, created by Stefan Walter on 2003-09-07 17:30:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Walter

Created: 2003-09-07 17:30:07 UTC

Size: 4.02 KB

patch

obsolete

>diff -urN frost.old/Makefile frost/Makefile
>--- frost.old/Makefile	Sun Sep  7 17:01:04 2003
>+++ frost/Makefile	Sun Sep  7 17:46:40 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=	20030906
>+CATEGORIES=	net java security
>+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>+MASTER_SITE_SUBDIR=	jtcfrost
>+DISTNAME=	${PORTNAME}-wot-090603
> 
> MAINTAINER=	lioux@FreeBSD.org
> COMMENT=	File-sharing tool for FreeNet with Usenet like forum support
>@@ -20,21 +19,26 @@
> USE_ZIP=	yes
> NO_BUILD=	yes
> NO_BUILD_DEPENDS_JAVA=	yes
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>+WRKSRC=		${WRKDIR}
> 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.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 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
> 
> do-install:
>@@ -42,12 +46,18 @@
> .ifndef(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> .for doc in ${DOC_FILES}
>-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKDIR}/${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} ${WRKDIR}/config/boards.xml.default \
>+		${PREFIX}/${SHARE_DIR}
> # wrapper
> 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
> 
>diff -urN frost.old/distinfo frost/distinfo
>--- frost.old/distinfo	Sun Sep  7 17:01:04 2003
>+++ frost/distinfo	Sun Sep  7 17:07:31 2003
>@@ -1 +1 @@
>-MD5 (frost.zip) = 420da830fcb40877417119d2bdfa500c
>+MD5 (frost-wot-090603.zip) = b7f6b8de26caff027d889dad69476d5e
>diff -urN frost.old/files/wrapper.sh frost/files/wrapper.sh
>--- frost.old/files/wrapper.sh	Sun Sep  7 17:01:04 2003
>+++ frost/files/wrapper.sh	Sun Sep  7 17:01:33 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-plist frost/pkg-plist
>--- frost.old/pkg-plist	Sun Sep  7 17:01:04 2003
>+++ frost/pkg-plist	Sun Sep  7 17:18:58 2003
>@@ -1,10 +1,17 @@
> bin/frost
>+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/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%%

Actions: View | Diff

Attachments on bug 56560: 34925