Web lists-archives.com

[PATCH git] Separate git-p4 subpackage




This removes the python2 dependency from the main git package:

https://cygwin.com/ml/cygwin/2017-06/msg00135.html
---
 git.cygport | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/git.cygport b/git.cygport
index bc63458..679ab3f 100644
--- a/git.cygport
+++ b/git.cygport
@@ -9,7 +9,7 @@ inherit perl
 
 NAME="git"
 VERSION=2.12.3
-RELEASE=1
+RELEASE=2
 CATEGORY="Devel"
 SUMMARY="Distributed version control system"
 DESCRIPTION="Git is a free and open source distributed version control system
@@ -59,11 +59,11 @@ DEPEND="
 
 BASH_COMPLETION_DIR="$(pkg-config --variable=completionsdir bash-completion)"
 
-PKG_NAMES="git gitk gitweb git-cvs git-email git-gui git-svn"
+PKG_NAMES="git gitk gitweb git-cvs git-email git-gui git-p4 git-svn"
 git_REQUIRES="cygutils less openssh rsync"
 git_CONTENTS="--exclude=gitk* --exclude=git-cvs* --exclude=git-*email*
 	--exclude=git-gui* --exclude=git-svn* --exclude=SVN* --exclude=Git.SVN.*
-	--exclude=git-instaweb* --exclude=gitweb*
+	--exclude=git-instaweb* --exclude=gitweb* --exclude=*p4*
 	usr/bin/ usr/libexec/git-core/ ${PERL_VENDORLIB#/} ${PYTHON_SITELIB#/} usr/share/"
 git_OBSOLETES="git-completion"
 gitk_SUMMARY="Git repository browser"
@@ -85,6 +85,10 @@ git_gui_SUMMARY="Graphical interface for Git version control system"
 git_gui_REQUIRES="git gitk"
 git_gui_CONTENTS="usr/libexec/git-core/git-gui* usr/share/doc/git/html/git-gui*
 	usr/share/git-gui/ usr/share/man/man1/git-gui.1*"
+git_p4_SUMMARY="Perforce compatibility support for Git version control system"
+git_p4_REQUIRES="git"
+git_p4_CONTENTS="usr/libexec/git-core/git-p4 usr/libexec/git-core/mergetools/p4merge
+	usr/share/doc/git/html/git-p4* usr/share/man/man1/git-p4.1*"
 git_svn_SUMMARY="Subversion compatibility support for Git version control system"
 git_svn_CONTENTS="usr/libexec/git-core/git-svn ${PERL_VENDORLIB#/}/Git/SVN*
 	usr/share/doc/git/html/git-svn* usr/share/man/man1/git-svn.1*
-- 
2.12.3


--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple