diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2013-12-24 02:03:15 +0800 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2013-12-24 02:03:15 +0800 |
| commit | 652c8e10fe29b9e8cad003c716f1674d85cb19d8 (patch) | |
| tree | e29d4ea65a2c0ec5d1c1347780826289ba71e552 /biology | |
| parent | 3ea497e122f68ecd7392d7362a6fb444e2138b53 (diff) | |
| download | freebsd-ports-gnome-652c8e10fe29b9e8cad003c716f1674d85cb19d8.tar.gz freebsd-ports-gnome-652c8e10fe29b9e8cad003c716f1674d85cb19d8.tar.zst freebsd-ports-gnome-652c8e10fe29b9e8cad003c716f1674d85cb19d8.zip | |
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
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/boinc-simap/Makefile | 20 | ||||
| -rw-r--r-- | biology/boinc-simap/pkg-plist | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/biology/boinc-simap/Makefile b/biology/boinc-simap/Makefile index c147f6754a0d..c1b971a60e79 100644 --- a/biology/boinc-simap/Makefile +++ b/biology/boinc-simap/Makefile @@ -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}_${MACH}-pc-freebsd 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 diff --git a/biology/boinc-simap/pkg-plist b/biology/boinc-simap/pkg-plist index 8b17e9ed000c..3001e8d190be 100644 --- a/biology/boinc-simap/pkg-plist +++ b/biology/boinc-simap/pkg-plist @@ -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/ |