Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Nov 2020 17:19:50 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r554306 - head/devel/git
Message-ID:  <202011061719.0A6HJoaP020277@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: garga
Date: Fri Nov  6 17:19:49 2020
New Revision: 554306
URL: https://svnweb.freebsd.org/changeset/ports/554306

Log:
  devel/git: Fix options for flavors
  
  Only change OPTIONS_FILE when flavor is not empty or default.  It fixes a
  problem saving options on poudriere for default flavor
  
  Reported by:	madpilot

Modified:
  head/devel/git/Makefile

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Fri Nov  6 17:18:44 2020	(r554305)
+++ head/devel/git/Makefile	Fri Nov  6 17:19:49 2020	(r554306)
@@ -74,7 +74,9 @@ OPTIONS_EXCLUDE=	GUI SVN GITWEB CONTRIB P4 CVS PERL
 
 OPTIONS_SUB=	yes
 
+.if !empty(FLAVOR) && ${FLAVOR:U} != default
 OPTIONS_FILE=		${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options
+.endif
 
 CONTRIB_DESC=	Install contributed scripts
 CURL_DESC=	Install curl support (provides HTTPS transport)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011061719.0A6HJoaP020277>