Attachment 98365 Details for Bug 137252 – 2009-07-29-phex.diff

[patch] 2009-07-29-phex.diff

2009-07-29-phex.diff (text/plain), 4.18 KB, created by Jason E. Hale on 2009-07-30 03:40:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2009-07-30 03:40:07 UTC

Size: 4.18 KB

patch

obsolete

>diff -ruN phex.orig/Makefile phex/Makefile
>--- phex.orig/Makefile	2009-07-28 03:14:35.000000000 -0400
>+++ phex/Makefile	2009-07-29 21:54:37.000000000 -0400
>@@ -6,72 +6,33 @@
> #
> 
> PORTNAME=	phex
>-PORTVERSION=	3.2.6.106
>+PORTVERSION=	3.4.2.116
> CATEGORIES=	net-p2p java
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	${PORTNAME}
>+MASTER_SITES=	SF
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	bsdkaffee@gmail.com
> COMMENT=	A Java multi platform and spyware free gnutella client
> 
>-#WRKSRC= 	${WRKDIR}/${PORTNAME}/lib
>-
> USE_JAVA=	yes
> JAVA_VERSION=	1.5+
> USE_ZIP=	yes
> NO_BUILD=	yes
>-PLIST_SUB=	JAR_DIR=${JAR_DIR}
> 
>-JAVAVM=		${LOCALBASE}/bin/java
>-JAR_DIR=	${JAVAJARDIR:S,^${PREFIX}/,,}/${PORTNAME}
>+SUB_FILES=	${PORTNAME}.sh
>+SUB_LIST=	JAVA_VERSION=${JAVA_VERSION}
>+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
> 
>-DOC_FILES=	Phex_other.htm Phex_win.htm
>-JAR_FILES=	\
>-		MRJAdapter.jar \
>-		commons-collections-3.2.jar \
>-		commons-httpclient-3.0.1.jar \
>-		commons-logging.jar \
>-		forms-1.1.0.jar \
>-		looks-2.1.4.jar \
>-		phex.jar
>-
>-PORTDOCS=	${DOC_FILES}
>-
>-PLIST_FILES+=	bin/${PORTNAME}
>-
>-.for jar in ${JAR_FILES}
>-PLIST_FILES+=	%%JAR_DIR%%/${jar}
>-.endfor
>-
>-PLIST_DIRS+=	\
>-		%%JAR_DIR%%
>-
>-post-patch:
>-# remove trailing ^M
>-	@${REINPLACE_CMD} -E \
>-		-e 's!
>!!' ${WRKSRC}/docs/readme/*
>-	@${SED} -e  "s|%%JAR_DIR%%|${JAR_DIR}|; \
>-		s|%%JAR_FILE%%|${JAR_FILE}|; \
>-		s|%%JAVA_VERSION%%|${JAVA_VERSION}|; \
>-		s|%%JAVAVM%%|${JAVAVM}|;s|%%PREFIX%%|${PREFIX}|" \
>-		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
>+PORTDOCS=	Phex_other.htm \
>+		Undocumented.htm
> 
> do-install:
>-	@${MKDIR} ${PREFIX}/${JAR_DIR}
>-.for jar in ${JAR_FILES}
>-	@${INSTALL_DATA} ${WRKSRC}/lib/${jar} ${PREFIX}/${JAR_DIR}
>-.endfor
>-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME}
>-.ifndef(NOPORTDOCS)
>+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
>+	@${MKDIR} ${DATADIR}
>+	@${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}
>+.if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-.for doc in ${DOC_FILES}
>-	@${INSTALL_DATA} ${WRKSRC}/docs/readme/${doc} ${DOCSDIR}
>-.endfor
>+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/readme/|} ${DOCSDIR}
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-JAR_FILE=	${PORTNAME}.jar
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN phex.orig/distinfo phex/distinfo
>--- phex.orig/distinfo	2009-07-28 03:14:35.000000000 -0400
>+++ phex/distinfo	2009-07-29 20:47:04.000000000 -0400
>@@ -1,3 +1,3 @@
>-MD5 (phex_3.2.6.106.zip) = 58678a7c4f1181f09dc6cfe252ccdf30
>-SHA256 (phex_3.2.6.106.zip) = 9df0ad6e9a0e912c1272786e1eb97b17997c8b76fdd8954283be755540ad10c1
>-SIZE (phex_3.2.6.106.zip) = 5833853
>+MD5 (phex_3.4.2.116.zip) = 526c0720d6c1f5ba6ecc7e8cff45a305
>+SHA256 (phex_3.4.2.116.zip) = d22d0436639d464c82ddded9831dba96d2cab3446ee67cd6f8508a64efa2380c
>+SIZE (phex_3.4.2.116.zip) = 7989529
>diff -ruN phex.orig/files/phex.sh.in phex/files/phex.sh.in
>--- phex.orig/files/phex.sh.in	1969-12-31 19:00:00.000000000 -0500
>+++ phex/files/phex.sh.in	2009-07-29 20:47:04.000000000 -0400
>@@ -0,0 +1,5 @@
>+#!/bin/sh
>+
>+export JAVA_VERSION="%%JAVA_VERSION%%"
>+
>+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar phex.jar "${@}"
>diff -ruN phex.orig/files/wrapper.sh phex/files/wrapper.sh
>--- phex.orig/files/wrapper.sh	2009-07-28 03:14:35.000000000 -0400
>+++ phex/files/wrapper.sh	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>-#!/bin/sh
>-
>-export JAVA_VERSION
>-
>-PREFIX="%%PREFIX%%"
>-JAVA_VERSION="%%JAVA_VERSION%%"
>-JAVAVM="%%JAVAVM%%"
>-JAR_DIR="%%JAR_DIR%%"
>-JAR_FILE="%%JAR_FILE%%"
>-
>-${JAVAVM} -jar ${PREFIX}/${JAR_DIR}/${JAR_FILE} "${@}"
>diff -ruN phex.orig/pkg-plist phex/pkg-plist
>--- phex.orig/pkg-plist	1969-12-31 19:00:00.000000000 -0500
>+++ phex/pkg-plist	2009-07-29 21:39:30.000000000 -0400
>@@ -0,0 +1,15 @@
>+bin/phex
>+%%DATADIR%%/bcpg-jdk15-140.jar
>+%%DATADIR%%/bcprov-jdk15-140.jar
>+%%DATADIR%%/commons-collections-3.2.jar
>+%%DATADIR%%/commons-httpclient-3.0.1.jar
>+%%DATADIR%%/forms-1.1.0.jar
>+%%DATADIR%%/jcl-over-slf4j-1.5.6.jar
>+%%DATADIR%%/logback-classic-0.9.13.jar
>+%%DATADIR%%/logback-core-0.9.13.jar
>+%%DATADIR%%/looks-2.1.4.jar
>+%%DATADIR%%/mrjadapter-1.1.jar
>+%%DATADIR%%/phex.jar
>+%%DATADIR%%/slf4j-api-1.5.6.jar
>+%%DATADIR%%/xSocket-2.2.jar
>+@dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 137252: 98365