From owner-svn-ports-head@FreeBSD.ORG Thu Jul 17 10:13:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC950B09; Thu, 17 Jul 2014 10:13:06 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F54325EB; Thu, 17 Jul 2014 10:13:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6HAD6up086210; Thu, 17 Jul 2014 10:13:06 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6HAD6W7086209; Thu, 17 Jul 2014 10:13:06 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407171013.s6HAD6W7086209@svn.freebsd.org> From: John Marino Date: Thu, 17 Jul 2014 10:13:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362131 - head/biology/garlic X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2014 10:13:06 -0000 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