Remove option scmgit-gui from devel/scmgit-base (++pkgrevision). Separate

"gitk" into individual package devel/scmgit-gitk.  Approved by wiz@.
Tested on RHEL.

8 files changed, 127 insertions, 100 deletions

diff --git a/devel/Makefile b/devel/Makefile
index b85da3f60c7..5a07af0d370 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1650 2012/09/16 08:15:06 taca Exp $
+# $NetBSD: Makefile,v 1.1651 2012/09/16 21:50:16 cheusov Exp $
 #
 
 COMMENT=	Development utilities
@@ -1517,6 +1517,7 @@ SUBDIR+=	scmcvs
 SUBDIR+=	scmgit
 SUBDIR+=	scmgit-base
 SUBDIR+=	scmgit-docs
+SUBDIR+=	scmgit-gitk
 SUBDIR+=	scons
 SUBDIR+=	sdcc
 SUBDIR+=	semantic
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 19dcfc3093d..c9c2ac89d56 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2012/06/18 20:50:39 gdt Exp $
+# $NetBSD: Makefile,v 1.49 2012/09/16 21:50:16 cheusov Exp $
 
 .include "../../devel/scmgit/Makefile.common"
 
 PKGNAME=	scmgit-base-${GIT_VERSION}
+PKGREVISION=	1
 COMMENT=	GIT Tree History Storage Tool (base package)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -32,7 +33,9 @@ CONFIGURE_ARGS+=	--with-curl=${BUILDLINK_PREFIX.curl}
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ARGS+=	--without-tcltk
 
 BUILD_TARGET=		all
 
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index b6778451bd2..b6c917f0dc3 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.34 2012/09/04 12:17:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.35 2012/09/16 21:50:16 cheusov Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
 bin/git-shell
 bin/git-upload-archive
 bin/git-upload-pack
-${PLIST.gui}bin/gitk
 ${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
 lib/perl5/vendor_perl/${PKGMANDIR}/man3/Git.3
 ${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py
@@ -44,7 +43,6 @@ libexec/git-core/git-checkout
 libexec/git-core/git-checkout-index
 libexec/git-core/git-cherry
 libexec/git-core/git-cherry-pick
-${PLIST.gui}libexec/git-core/git-citool
 libexec/git-core/git-clean
 libexec/git-core/git-clone
 libexec/git-core/git-column
@@ -80,8 +78,6 @@ libexec/git-core/git-fsck-objects
 libexec/git-core/git-gc
 libexec/git-core/git-get-tar-commit-id
 libexec/git-core/git-grep
-${PLIST.gui}libexec/git-core/git-gui
-${PLIST.gui}libexec/git-core/git-gui--askpass
 libexec/git-core/git-hash-object
 libexec/git-core/git-help
 libexec/git-core/git-http-backend
@@ -215,73 +211,6 @@ share/examples/scmgit/templates/hooks/pre-rebase.sample
 share/examples/scmgit/templates/hooks/prepare-commit-msg.sample
 share/examples/scmgit/templates/hooks/update.sample
 share/examples/scmgit/templates/info/exclude
-${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.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/${WISH_APP}
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl
-${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns
-${PLIST.gui}share/git-gui/lib/git-gui.ico
-${PLIST.macosx}share/git-gui/lib/git-gui.tcl
-${PLIST.gui}share/git-gui/lib/index.tcl
-${PLIST.gui}share/git-gui/lib/line.tcl
-${PLIST.gui}share/git-gui/lib/logo.tcl
-${PLIST.gui}share/git-gui/lib/merge.tcl
-${PLIST.gui}share/git-gui/lib/mergetool.tcl
-${PLIST.gui}share/git-gui/lib/msgs/de.msg
-${PLIST.gui}share/git-gui/lib/msgs/el.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/nb.msg
-${PLIST.gui}share/git-gui/lib/msgs/pt_br.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_add.tcl
-${PLIST.gui}share/git-gui/lib/remote_branch_delete.tcl
-${PLIST.gui}share/git-gui/lib/search.tcl
-${PLIST.gui}share/git-gui/lib/shortcut.tcl
-${PLIST.gui}share/git-gui/lib/spellcheck.tcl
-${PLIST.gui}share/git-gui/lib/sshkey.tcl
-${PLIST.gui}share/git-gui/lib/status_bar.tcl
-${PLIST.gui}share/git-gui/lib/tclIndex
-${PLIST.gui}share/git-gui/lib/themed.tcl
-${PLIST.gui}share/git-gui/lib/tools.tcl
-${PLIST.gui}share/git-gui/lib/tools_dlg.tcl
-${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/es.msg
-${PLIST.gui}share/gitk/lib/msgs/fr.msg
-${PLIST.gui}share/gitk/lib/msgs/hu.msg
-${PLIST.gui}share/gitk/lib/msgs/it.msg
-${PLIST.gui}share/gitk/lib/msgs/ja.msg
-${PLIST.gui}share/gitk/lib/msgs/pt_br.msg
-${PLIST.gui}share/gitk/lib/msgs/ru.msg
-${PLIST.gui}share/gitk/lib/msgs/sv.msg
 @pkgdir share/examples/scmgit/templates/branches
 share/locale/da/LC_MESSAGES/git.mo
 share/locale/de/LC_MESSAGES/git.mo
diff --git a/devel/scmgit-base/options.mk b/devel/scmgit-base/options.mk
index 5b4ec013f98..07c31c4cfe4 100644
--- a/devel/scmgit-base/options.mk
+++ b/devel/scmgit-base/options.mk
@@ -1,33 +1,13 @@
-# $NetBSD: options.mk,v 1.5 2011/04/19 17:08:18 drochner Exp $
+# $NetBSD: options.mk,v 1.6 2012/09/16 21:50:16 cheusov Exp $
 #
 PKG_OPTIONS_VAR=	PKG_OPTIONS.scmgit
-PKG_SUPPORTED_OPTIONS=	scmgit-gui python
-PKG_SUGGESTED_OPTIONS=	scmgit-gui python
+PKG_SUPPORTED_OPTIONS=	python
+PKG_SUGGESTED_OPTIONS=	python
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gui
-PLIST_VARS+=		macosx
 PLIST_VARS+=		python
 
-.if !empty(PKG_OPTIONS:Mscmgit-gui)
-PLIST.gui=		yes
-USE_TOOLS+=		wish:run
-CONFIGURE_ARGS+=	--with-tcltk=${WISH:Q}
-.  if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework)
-.    if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app)
-WISH_APP=Wish
-.    else
-WISH_APP=Wish Shell
-.    endif
-PLIST_SUBST+= WISH_APP=${WISH_APP:Q}
-PLIST.macosx=		yes
-PRIVILEGED_STAGES+=	clean
-.  endif
-.else
-CONFIGURE_ARGS+=	--without-tcltk
-.endif
-
 .if !empty(PKG_OPTIONS:Mpython)
 PY_PATCHPLIST=	yes
 MAKE_FLAGS+=	PYTHON_PATH=${PYTHONBIN}
diff --git a/devel/scmgit-gitk/DESCR b/devel/scmgit-gitk/DESCR
new file mode 100644
index 00000000000..213a3960fd7
--- /dev/null
+++ b/devel/scmgit-gitk/DESCR
@@ -0,0 +1 @@
+This package installs gitk.
diff --git a/devel/scmgit-gitk/Makefile b/devel/scmgit-gitk/Makefile
new file mode 100644
index 00000000000..4b4b9d5551e
--- /dev/null
+++ b/devel/scmgit-gitk/Makefile
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1 2012/09/16 21:50:16 cheusov Exp $
+
+PKGNAME=	scmgit-gitk-${GIT_VERSION}
+COMMENT=	GIT Tree History Storage Tool (gitk)
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+CONFLICTS+=		scmgit-base<1.7.12nb1
+DEPENDS+=		scmgit-base>=1.7.12nb1:../../devel/scmgit-base
+
+USE_LANGUAGES=		c
+
+BUILD_DIRS=		git-gui gitk-git
+INSTALL_DIRS=		${BUILD_DIRS}
+MAKE_ENV+=		prefix=${PREFIX}
+
+PATCHDIR=		${.CURDIR}/../../devel/scmgit-base/patches
+DISTINFO_FILE=		${.CURDIR}/../../devel/scmgit-base/distinfo
+
+USE_TOOLS+=		wish:run
+CONFIGURE_ARGS+=	--with-tcltk=${WISH:Q}
+
+INSTALLATION_DIRS+=	bin
+PLIST_VARS+=		macosx
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin" && exists(/System/Library/Frameworks/Tk.framework)
+.  if exists(/System/Library/Frameworks/Tk.framework/Resources/Wish.app)
+WISH_APP=Wish
+.  else
+WISH_APP=Wish Shell
+.  endif
+PLIST_SUBST+= WISH_APP=${WISH_APP:Q}
+PLIST.macosx=		yes
+.endif
+
+.include "../../devel/scmgit/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/scmgit-gitk/PLIST b/devel/scmgit-gitk/PLIST
new file mode 100644
index 00000000000..dd59f483707
--- /dev/null
+++ b/devel/scmgit-gitk/PLIST
@@ -0,0 +1,73 @@
+@comment $NetBSD: PLIST,v 1.1 2012/09/16 21:50:16 cheusov Exp $
+bin/gitk
+libexec/git-core/git-citool
+libexec/git-core/git-gui
+libexec/git-core/git-gui--askpass
+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
+${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Info.plist
+${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/MacOS/${WISH_APP}
+${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/Scripts/AppMain.tcl
+${PLIST.macosx}share/git-gui/lib/Git Gui.app/Contents/Resources/git-gui.icns
+share/git-gui/lib/git-gui.ico
+${PLIST.macosx}share/git-gui/lib/git-gui.tcl
+share/git-gui/lib/index.tcl
+share/git-gui/lib/line.tcl
+share/git-gui/lib/logo.tcl
+share/git-gui/lib/merge.tcl
+share/git-gui/lib/mergetool.tcl
+share/git-gui/lib/msgs/de.msg
+share/git-gui/lib/msgs/el.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/nb.msg
+share/git-gui/lib/msgs/pt_br.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_add.tcl
+share/git-gui/lib/remote_branch_delete.tcl
+share/git-gui/lib/search.tcl
+share/git-gui/lib/shortcut.tcl
+share/git-gui/lib/spellcheck.tcl
+share/git-gui/lib/sshkey.tcl
+share/git-gui/lib/status_bar.tcl
+share/git-gui/lib/tclIndex
+share/git-gui/lib/themed.tcl
+share/git-gui/lib/tools.tcl
+share/git-gui/lib/tools_dlg.tcl
+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/es.msg
+share/gitk/lib/msgs/fr.msg
+share/gitk/lib/msgs/hu.msg
+share/gitk/lib/msgs/it.msg
+share/gitk/lib/msgs/ja.msg
+share/gitk/lib/msgs/pt_br.msg
+share/gitk/lib/msgs/ru.msg
+share/gitk/lib/msgs/sv.msg
+@pkgdir share/examples/scmgit/templates/branches
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index cf93fe8df3b..5a9e9dbf90e 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.22 2012/01/21 10:51:13 wiz Exp $
+# $NetBSD: Makefile.common,v 1.23 2012/09/16 21:50:16 cheusov Exp $
 #
 # used by devel/scmgit-base/Makefile
 # used by devel/scmgit-docs/Makefile
+# used by devel/scmgit-gitk/Makefile
 
 .include "../../devel/scmgit/Makefile.version"
 
@@ -20,12 +21,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PATCHDIR=	${.CURDIR}/../../devel/scmgit-base/patches
 DISTINFO_FILE=	${.CURDIR}/../../devel/scmgit-base/distinfo
 
-USE_TOOLS+=		gmake tar perl sh
+USE_TOOLS+=		gmake tar sh
 
 PKG_SYSCONFSUBDIR=	git
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-shell=${SH:Q}
 CONFIGURE_ARGS+=	TAR=${TAR:Q}
 CONFIGURE_ARGS+=	--mandir=${${PREFIX}/${PKGMANDIR}:L:Q}