Add the 'scmgit-gui' option. If enabled, the GUI in Tcl/Tk will be

build, otherwise not. Use the PLIST_VARS stuff to handle the PLIST file.

Enabled by default to respect previous behaviour.

3 files changed, 74 insertions, 57 deletions

diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index ac496f83032..ec0fa0560bf 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/15 05:09:07 bjs Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/21 16:34:45 xtraeme Exp $
 #
 
 .include "${.CURDIR}/../scmgit/Makefile.common"
@@ -11,7 +11,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=		git-[0-9]*		# misc/git
 
 USE_LANGUAGES=		c99
-USE_TOOLS+=		perl:run sh:run wish:run msgfmt
+USE_TOOLS+=		perl:run sh:run msgfmt
 
 CFLAGS.NetBSD+=	 	-D_NETBSD_SOURCE
 
@@ -19,7 +19,6 @@ CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl:Q}
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat:Q}
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv:Q}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+=	--with-tcltk=${WISH:Q}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
 
 BUILD_TARGET=		all
@@ -31,6 +30,7 @@ REPLACE_PERL+=		*.perl */*.perl */*/*.perl
 
 #.include "../../mk/emacs.mk" # XXX TODO (see patch-ad)
 
+.include "options.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 07c5f407abe..611fd207a33 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/21 01:09:51 bjs Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/21 16:34:45 xtraeme Exp $
 bin/git
-bin/gitk
+${PLIST.gui}bin/gitk
 libexec/git-core/git
 libexec/git-core/git-add
 libexec/git-core/git-add--interactive
@@ -20,7 +20,7 @@ libexec/git-core/git-checkout
 libexec/git-core/git-checkout-index
 libexec/git-core/git-cherry
 libexec/git-core/git-cherry-pick
-libexec/git-core/git-citool
+${PLIST.gui}libexec/git-core/git-citool
 libexec/git-core/git-clean
 libexec/git-core/git-clone
 libexec/git-core/git-commit
@@ -50,7 +50,7 @@ libexec/git-core/git-fsck-objects
 libexec/git-core/git-gc
 libexec/git-core/git-get-tar-commit-id
 libexec/git-core/git-grep
-libexec/git-core/git-gui
+${PLIST.gui}libexec/git-core/git-gui
 libexec/git-core/git-hash-object
 libexec/git-core/git-http-fetch
 libexec/git-core/git-http-push
@@ -152,56 +152,56 @@ share/git-core/templates/hooks/pre-rebase
 share/git-core/templates/hooks/prepare-commit-msg
 share/git-core/templates/hooks/update
 share/git-core/templates/info/exclude
-share/git-gui/lib/about.tcl
-share/git-gui/lib/blame.tcl
-share/git-gui/lib/branch.tcl
-share/git-gui/lib/branch_checkout.tcl
-share/git-gui/lib/branch_create.tcl
-share/git-gui/lib/branch_delete.tcl
-share/git-gui/lib/branch_rename.tcl
-share/git-gui/lib/browser.tcl
-share/git-gui/lib/checkout_op.tcl
-share/git-gui/lib/choose_font.tcl
-share/git-gui/lib/choose_repository.tcl
-share/git-gui/lib/choose_rev.tcl
-share/git-gui/lib/class.tcl
-share/git-gui/lib/commit.tcl
-share/git-gui/lib/console.tcl
-share/git-gui/lib/database.tcl
-share/git-gui/lib/date.tcl
-share/git-gui/lib/diff.tcl
-share/git-gui/lib/encoding.tcl
-share/git-gui/lib/error.tcl
-share/git-gui/lib/git-gui.ico
-share/git-gui/lib/index.tcl
-share/git-gui/lib/logo.tcl
-share/git-gui/lib/merge.tcl
-share/git-gui/lib/msgs/de.msg
-share/git-gui/lib/msgs/fr.msg
-share/git-gui/lib/msgs/hu.msg
-share/git-gui/lib/msgs/it.msg
-share/git-gui/lib/msgs/ja.msg
-share/git-gui/lib/msgs/ru.msg
-share/git-gui/lib/msgs/sv.msg
-share/git-gui/lib/msgs/zh_cn.msg
-share/git-gui/lib/option.tcl
-share/git-gui/lib/remote.tcl
-share/git-gui/lib/remote_branch_delete.tcl
-share/git-gui/lib/shortcut.tcl
-share/git-gui/lib/spellcheck.tcl
-share/git-gui/lib/status_bar.tcl
-share/git-gui/lib/tclIndex
-share/git-gui/lib/transport.tcl
-share/git-gui/lib/win32.tcl
-share/git-gui/lib/win32_shortcut.js
-share/gitk/lib/msgs/de.msg
-share/gitk/lib/msgs/it.msg
-@dirrm share/gitk/lib/msgs
-@dirrm share/gitk/lib
-@dirrm share/gitk
-@dirrm share/git-gui/lib/msgs
-@dirrm share/git-gui/lib
-@dirrm share/git-gui
+${PLIST.gui}share/git-gui/lib/about.tcl
+${PLIST.gui}share/git-gui/lib/blame.tcl
+${PLIST.gui}share/git-gui/lib/branch.tcl
+${PLIST.gui}share/git-gui/lib/branch_checkout.tcl
+${PLIST.gui}share/git-gui/lib/branch_create.tcl
+${PLIST.gui}share/git-gui/lib/branch_delete.tcl
+${PLIST.gui}share/git-gui/lib/branch_rename.tcl
+${PLIST.gui}share/git-gui/lib/browser.tcl
+${PLIST.gui}share/git-gui/lib/checkout_op.tcl
+${PLIST.gui}share/git-gui/lib/choose_font.tcl
+${PLIST.gui}share/git-gui/lib/choose_repository.tcl
+${PLIST.gui}share/git-gui/lib/choose_rev.tcl
+${PLIST.gui}share/git-gui/lib/class.tcl
+${PLIST.gui}share/git-gui/lib/commit.tcl
+${PLIST.gui}share/git-gui/lib/console.tcl
+${PLIST.gui}share/git-gui/lib/database.tcl
+${PLIST.gui}share/git-gui/lib/date.tcl
+${PLIST.gui}share/git-gui/lib/diff.tcl
+${PLIST.gui}share/git-gui/lib/encoding.tcl
+${PLIST.gui}share/git-gui/lib/error.tcl
+${PLIST.gui}share/git-gui/lib/git-gui.ico
+${PLIST.gui}share/git-gui/lib/index.tcl
+${PLIST.gui}share/git-gui/lib/logo.tcl
+${PLIST.gui}share/git-gui/lib/merge.tcl
+${PLIST.gui}share/git-gui/lib/msgs/de.msg
+${PLIST.gui}share/git-gui/lib/msgs/fr.msg
+${PLIST.gui}share/git-gui/lib/msgs/hu.msg
+${PLIST.gui}share/git-gui/lib/msgs/it.msg
+${PLIST.gui}share/git-gui/lib/msgs/ja.msg
+${PLIST.gui}share/git-gui/lib/msgs/ru.msg
+${PLIST.gui}share/git-gui/lib/msgs/sv.msg
+${PLIST.gui}share/git-gui/lib/msgs/zh_cn.msg
+${PLIST.gui}share/git-gui/lib/option.tcl
+${PLIST.gui}share/git-gui/lib/remote.tcl
+${PLIST.gui}share/git-gui/lib/remote_branch_delete.tcl
+${PLIST.gui}share/git-gui/lib/shortcut.tcl
+${PLIST.gui}share/git-gui/lib/spellcheck.tcl
+${PLIST.gui}share/git-gui/lib/status_bar.tcl
+${PLIST.gui}share/git-gui/lib/tclIndex
+${PLIST.gui}share/git-gui/lib/transport.tcl
+${PLIST.gui}share/git-gui/lib/win32.tcl
+${PLIST.gui}share/git-gui/lib/win32_shortcut.js
+${PLIST.gui}share/gitk/lib/msgs/de.msg
+${PLIST.gui}share/gitk/lib/msgs/it.msg
+${PLIST.gui}@dirrm share/gitk/lib/msgs
+${PLIST.gui}@dirrm share/gitk/lib
+${PLIST.gui}@dirrm share/gitk
+${PLIST.gui}@dirrm share/git-gui/lib/msgs
+${PLIST.gui}@dirrm share/git-gui/lib
+${PLIST.gui}@dirrm share/git-gui
 @dirrm share/git-core/templates/info
 @dirrm share/git-core/templates/hooks
 @exec ${MKDIR} %D/share/git-core/templates/branches
diff --git a/devel/scmgit-base/options.mk b/devel/scmgit-base/options.mk
new file mode 100644
index 00000000000..f1ab5ead79e
--- /dev/null
+++ b/devel/scmgit-base/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2008/04/21 16:34:45 xtraeme Exp $
+#
+PKG_OPTIONS_VAR=	PKG_OPTIONS.scmgit
+PKG_SUPPORTED_OPTIONS=	scmgit-gui
+PKG_SUGGESTED_OPTIONS=	scmgit-gui
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		gui
+
+.if !empty(PKG_OPTIONS:Mscmgit-gui)
+PLIST.gui=		yes
+USE_TOOLS+=		wish:run
+CONFIGURE_ARGS+=	--with-tcltk=${WISH:Q}
+.else
+CONFIGURE_ARGS+=	--without-tcltk
+.endif