svn commit: r337273 - head/biology/boinc-simap
Rene Ladan
rene at FreeBSD.org
Mon Dec 23 18:03:16 UTC 2013
Author: rene
Date: Mon Dec 23 18:03:15 2013
New Revision: 337273
URL: http://svnweb.freebsd.org/changeset/ports/337273
Log:
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
Modified:
head/biology/boinc-simap/Makefile
head/biology/boinc-simap/pkg-plist
Modified: head/biology/boinc-simap/Makefile
==============================================================================
--- head/biology/boinc-simap/Makefile Mon Dec 23 17:54:29 2013 (r337272)
+++ head/biology/boinc-simap/Makefile Mon Dec 23 18:03:15 2013 (r337273)
@@ -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: head/biology/boinc-simap/pkg-plist
==============================================================================
--- head/biology/boinc-simap/pkg-plist Mon Dec 23 17:54:29 2013 (r337272)
+++ head/biology/boinc-simap/pkg-plist Mon Dec 23 18:03:15 2013 (r337273)
@@ -1,5 +1,9 @@
+ at owner %%BOINC_CLIENT_USER%%
+ at 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%%
+ at dirrmtry projects
+ at exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/
More information about the svn-ports-all
mailing list