aboutsummaryrefslogtreecommitdiff
path: root/biology/garlic
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-07-17 10:13:06 +0000
committerJohn Marino <marino@FreeBSD.org>2014-07-17 10:13:06 +0000
commitdbb41fc2bf5a9bbd66bdd6e2b354684cd39b6ecd (patch)
treea1f35f5d25f43abfc39918602c9c298030e62360 /biology/garlic
parent1782e04167f191c599a06785fc53f975520ef75e (diff)
downloadports-dbb41fc2bf5a9bbd66bdd6e2b354684cd39b6ecd.tar.gz
ports-dbb41fc2bf5a9bbd66bdd6e2b354684cd39b6ecd.zip
biology/garlic: Stage properly to unbreak
The main problem was the WRKDIR is not within STAGEDIR. Fix this while moving all the directory creation steps into one. While here set TAR to use switches as outlined in its man page. Also, the permission setting in stagedir is not necessary, so it's simply been removed.
Notes
Notes: svn path=/head/; revision=362131
Diffstat (limited to 'biology/garlic')
-rw-r--r--biology/garlic/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/biology/garlic/Makefile b/biology/garlic/Makefile
index 3e987d01a3b4..ad588d46c7c9 100644
--- a/biology/garlic/Makefile
+++ b/biology/garlic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= garlic
PORTVERSION= 1.6
+PORTREVISION= 1
CATEGORIES= biology
MASTER_SITES= http://www.zucic.org/sources/garlic-${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -36,19 +37,16 @@ post-patch:
s|%%CFLAGS%%|${CFLAGS}|g' ${WRKSRC}/Makefile
do-install:
- ${MKDIR} ${STAGEDIR}${DATADIR}
+ @${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR} \
+ ${STAGEDIR}${DOCSDIR} ${WRKDIR}/doc
${INSTALL_PROGRAM} ${WRKSRC}/garlic ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/.garlicrc ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/residues.pdb ${STAGEDIR}${DATADIR}
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/*.pdb ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/*.script ${STAGEDIR}${EXAMPLESDIR}
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- @${MKDIR} ${STAGEDIR}${WRKDIR}/doc
- (cd ${WRKDIR}/doc ; ${TAR} xfz ${DISTDIR}/${DISTNAME}-doc${EXTRACT_SUFX} )
+ (cd ${WRKDIR}/doc ; \
+ ${TAR} -xzf ${DISTDIR}/${DISTNAME}-doc${EXTRACT_SUFX} )
${TAR} -C ${WRKDIR}/doc/${DISTNAME} -cf - . | \
${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -
- ${FIND} ${STAGEDIR}${DOCSDIR} | ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
- ${FIND} ${STAGEDIR}${DOCSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
.include <bsd.port.mk>