Date: Thu, 17 Jul 2014 10:13:06 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362131 - head/biology/garlic Message-ID: <201407171013.s6HAD6W7086209@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Jul 17 10:13:06 2014 New Revision: 362131 URL: http://svnweb.freebsd.org/changeset/ports/362131 QAT: https://qat.redports.org/buildarchive/r362131/ Log: 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. Modified: head/biology/garlic/Makefile Modified: head/biology/garlic/Makefile ============================================================================== --- head/biology/garlic/Makefile Thu Jul 17 10:06:25 2014 (r362130) +++ head/biology/garlic/Makefile Thu Jul 17 10:13:06 2014 (r362131) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407171013.s6HAD6W7086209>