From owner-svn-ports-branches@FreeBSD.ORG Tue Dec 24 12:46:45 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 34DE06B6; Tue, 24 Dec 2013 12:46:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 202C11E6C; Tue, 24 Dec 2013 12:46:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCkitt083310; Tue, 24 Dec 2013 12:46:44 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCkidx083308; Tue, 24 Dec 2013 12:46:44 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241246.rBOCkidx083308@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:46:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337341 - branches/2014Q1/biology/boinc-simap X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 12:46:45 -0000 Author: mat Date: Tue Dec 24 12:46:44 2013 New Revision: 337341 URL: http://svnweb.freebsd.org/changeset/ports/337341 Log: MFH: r337273 Several fixes: - install files as the BOINC user/group, this ensures that work units can be downloaded and sent - try to remove ~boinc/projects if empty - do not specify -o and -g parameters to ${INSTALL}, this ensures the package can be built as user - only extract the hmmer binary from the hmmer distribution file, this ensures correct permissions when modifying app_info.xml as user - Bump PORTREVISION Reviewed by: bapt Approved by: portmgr (implicit) Modified: branches/2014Q1/biology/boinc-simap/Makefile branches/2014Q1/biology/boinc-simap/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/biology/boinc-simap/Makefile ============================================================================== --- branches/2014Q1/biology/boinc-simap/Makefile Tue Dec 24 12:45:37 2013 (r337340) +++ branches/2014Q1/biology/boinc-simap/Makefile Tue Dec 24 12:46:44 2013 (r337341) @@ -3,7 +3,7 @@ PORTNAME= boinc-simap PORTVERSION= ${SIMAP_VERSION}.${HMMER_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= biology MASTER_SITES= http://boincsimap.org/boincsimap/download/ DISTNAME= ${SIMAP_BINARY} ${HMMER_BINARY} @@ -29,9 +29,13 @@ SIMAP_BINARY= simap_${SIMAP_VERSION}_${M SIMAP_VERSION= 5.10 HMMER_BINARY= hmmer_${HMMER_VERSION}_${MACH}-pc-freebsd HMMER_VERSION= 5.09 +EXTRACT_AFTER_ARGS+= --include=${HMMER_BINARY} PLIST_SUB= SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} \ - SIMAP_SITE=${SIMAP_SITE} BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} + SIMAP_SITE=${SIMAP_SITE} \ + BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ + BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ + BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} ONLY_FOR_ARCHS= i386 amd64 @@ -64,16 +68,12 @@ do-extract: ${DISTDIR}/${HMMER_BINARY} ${EXTRACT_AFTER_ARGS}) do-install: - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects - ${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} - ${INSTALL_DATA} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKDIR}/app_info.xml \ + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} + ${INSTALL_DATA} ${WRKDIR}/app_info.xml \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} .for APP in ${DISTNAME} - ${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKDIR}/${APP} \ + ${INSTALL_PROGRAM} ${WRKDIR}/${APP} \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE} .endfor Modified: branches/2014Q1/biology/boinc-simap/pkg-plist ============================================================================== --- branches/2014Q1/biology/boinc-simap/pkg-plist Tue Dec 24 12:45:37 2013 (r337340) +++ branches/2014Q1/biology/boinc-simap/pkg-plist Tue Dec 24 12:46:44 2013 (r337341) @@ -1,5 +1,9 @@ +@owner %%BOINC_CLIENT_USER%% +@group %%BOINC_CLIENT_GROUP%% @cwd %%BOINC_CLIENT_HOME%% projects/%%SIMAP_SITE%%/app_info.xml projects/%%SIMAP_SITE%%/%%SIMAP_BINARY%% projects/%%SIMAP_SITE%%/%%HMMER_BINARY%% @dirrmtry projects/%%SIMAP_SITE%% +@dirrmtry projects +@exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/