From: Sascha Wildner <saw@online.de>
Date: Thu, 20 Sep 2012 20:45:13 +0000 (+0200)
Subject: nrelease: Remove the obsolete -scmgit-gui option from the build.
X-Git-Tag: v3.2.0~99
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/1f8639a7296b966a1852e78c8d24371d98aaf935

nrelease: Remove the obsolete -scmgit-gui option from the build.

Its presence was breaking snapshot building.

It is no longer necessary to prevent gitk from being built along
with git using '-scmgit-gui', because pkgsrc now has a separate
scmgit-gitk package for it.

Since we used to build our GUI distribution without -scmgit-gui
(meaning with gitk), add scmgit-gitk to the GUI build.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 2f4418492e..9ffec810b4 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -71,7 +71,7 @@ PKGSRC_OPTIONS+=	MAKE_JOBS=${MAKE_JOBS}
 PKGSRC_OPTIONS+=	WRKOBJDIR=/usr/pkgobj
 PKGSRC_OPTIONS+=	PKG_DEFAULT_OPTIONS='dri inet6'
 .if !make(gui)
-PKGSRC_OPTIONS+=	PKG_OPTIONS.scmgit='-python -scmgit-gui'
+PKGSRC_OPTIONS+=	PKG_OPTIONS.scmgit='-python'
 .endif
 
 # Even though buildiso wipes the packages, our check target has to run
@@ -147,7 +147,8 @@ PKGSRC_PACKAGES+=	meta-pkgs/modular-xorg-libs \
 			fonts/terminus-font \
 			net/rsync \
 			time/asclock \
-			misc/screen
+			misc/screen \
+			devel/scmgit-gitk
 .endif
 
 ROOTSKELS+=		${.CURDIR}/gui