From owner-svn-ports-head@FreeBSD.ORG Mon Jun 9 16:36:44 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 8431D991; Mon, 9 Jun 2014 16:36:44 +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 717C228DB; Mon, 9 Jun 2014 16:36:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59Gai0b009146; Mon, 9 Jun 2014 16:36:44 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59GaiJa009145; Mon, 9 Jun 2014 16:36:44 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201406091636.s59GaiJa009145@svn.freebsd.org> From: Kurt Jaeger Date: Mon, 9 Jun 2014 16:36:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357183 - head/devel/magit 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: Mon, 09 Jun 2014 16:36:44 -0000 Author: pi Date: Mon Jun 9 16:36:43 2014 New Revision: 357183 URL: http://svnweb.freebsd.org/changeset/ports/357183 QAT: https://qat.redports.org/buildarchive/r357183/ Log: devel/magit: fix possible 'run dependency on git breakage' with an option Thanks for Thomas Gellekum for the bug report and review of the patch. PR: ports/189494 Submitted-By: Yasuhiro KIMURA (yasu@utahime.org) Approved-By: maintainer (timeout), mentors (implicit) Modified: head/devel/magit/Makefile Modified: head/devel/magit/Makefile ============================================================================== --- head/devel/magit/Makefile Mon Jun 9 16:25:18 2014 (r357182) +++ head/devel/magit/Makefile Mon Jun 9 16:36:43 2014 (r357183) @@ -16,8 +16,6 @@ COMMENT= Interface to Git for Emacs LICENSE= GFDL GPLv3 LICENSE_COMB= multi -RUN_DEPENDS= git>0:${PORTSDIR}/devel/git - USES= gmake USE_EMACS= YES INFO= magit @@ -28,4 +26,9 @@ MAKE_ENV+= ELISPDIR=${STAGEDIR}${PREFIX} INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} PLIST_SUB+= ELISPDIR=${ELISPDIR} +OPTIONS_DEFINE= GIT_SUBVERSION +GIT_SUBVERSION_DESC= Use devel/git-subversion as backend +GIT_SUBVERSION_RUN_DEPENDS= git-subversion>0:${PORTSDIR}/devel/git-subversion +GIT_SUBVERSION_RUN_DEPENDS_OFF= git>0:${PORTSDIR}/devel/git + .include