From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 30 02:40:08 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 74C74106566B for ; Thu, 30 Jul 2009 02:40:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4C0D78FC19 for ; Thu, 30 Jul 2009 02:40:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6U2e8BA032356 for ; Thu, 30 Jul 2009 02:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6U2e8DE032355; Thu, 30 Jul 2009 02:40:08 GMT (envelope-from gnats) Resent-Date: Thu, 30 Jul 2009 02:40:08 GMT Resent-Message-Id: <200907300240.n6U2e8DE032355@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, "Jason E. Hale" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6A861065673 for ; Thu, 30 Jul 2009 02:35:15 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qy0-f191.google.com (mail-qy0-f191.google.com [209.85.221.191]) by mx1.freebsd.org (Postfix) with ESMTP id 9D41B8FC14 for ; Thu, 30 Jul 2009 02:35:15 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: by qyk29 with SMTP id 29so1657303qyk.3 for ; Wed, 29 Jul 2009 19:35:15 -0700 (PDT) Received: by 10.224.29.8 with SMTP id o8mr427235qac.31.1248921315113; Wed, 29 Jul 2009 19:35:15 -0700 (PDT) Received: from mocha.verizon.net (c-24-3-41-151.hsd1.oh.comcast.net [24.3.41.151]) by mx.google.com with ESMTPS id 6sm2141276qwd.12.2009.07.29.19.35.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 29 Jul 2009 19:35:14 -0700 (PDT) Message-Id: <4a7106e2.c6c1f10a.1a25.ffffbbee@mx.google.com> Date: Wed, 29 Jul 2009 19:35:14 -0700 (PDT) From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137252: [UPDATE] net-p2p/phex: Update to 3.4.2.116, maintain X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2009 02:40:08 -0000 >Number: 137252 >Category: ports >Synopsis: [UPDATE] net-p2p/phex: Update to 3.4.2.116, maintain >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: Thu Jul 30 02:40:07 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 7.2-RELEASE i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Mon May 4 04:03:46 EDT 2009 root@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA7 i386 JDK 1.6.0 >Description: - Update net-p2p/phex to version 3.4.2.116 - Clean up and simplify Makefile - Use pkg-plist since new version installs almost twice as many files - Convert wrapper script to a SUB_FILES style - Take maintainership >How-To-Repeat: - Use attached diff. - Delete files/wrapper.sh >Fix: --- 2009-07-29-phex.diff begins here --- 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 - -JAR_FILE= ${PORTNAME}.jar - -.include +.include 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%% --- 2009-07-29-phex.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: