Fri Jan 3 17:31:25 2014 UTC ()
update PLIST with removed git-remote-helpers, and update option to use the
configure option --with-python=PATH


(richard)
diff -r1.2 -r1.3 pkgsrc/devel/git-base/PLIST
diff -r1.1 -r1.2 pkgsrc/devel/git-base/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/devel/git-base/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/git-base/PLIST 2013/12/04 12:51:06 1.2
+++ pkgsrc/devel/git-base/PLIST 2014/01/03 17:31:25 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2013/12/04 12:51:06 adam Exp $ 1@comment $NetBSD: PLIST,v 1.3 2014/01/03 17:31:25 richard Exp $
2bin/git 2bin/git
3bin/git-cvsserver 3bin/git-cvsserver
4bin/git-receive-pack 4bin/git-receive-pack
5bin/git-shell 5bin/git-shell
6bin/git-upload-archive 6bin/git-upload-archive
7bin/git-upload-pack 7bin/git-upload-pack
8${PERL5_SUB_INSTALLVENDORLIB}/Git.pm 8${PERL5_SUB_INSTALLVENDORLIB}/Git.pm
9${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm 9${PERL5_SUB_INSTALLVENDORLIB}/Git/I18N.pm
10${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.pm 10${PERL5_SUB_INSTALLVENDORLIB}/Git/IndexInfo.pm
11${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN.pm 11${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN.pm
12${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Editor.pm 12${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Editor.pm
13${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Fetcher.pm 13${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Fetcher.pm
14${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/GlobSpec.pm 14${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/GlobSpec.pm
@@ -17,42 +17,26 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Me @@ -17,42 +17,26 @@ ${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Me
17${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Migration.pm 17${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Migration.pm
18${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Prompt.pm 18${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Prompt.pm
19${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Ra.pm 19${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Ra.pm
20${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Utils.pm 20${PERL5_SUB_INSTALLVENDORLIB}/Git/SVN/Utils.pm
21${PERL5_SUB_INSTALLVENDORARCH}/auto/Git/.packlist 21${PERL5_SUB_INSTALLVENDORARCH}/auto/Git/.packlist
22${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git.3 22${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git.3
23${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::I18N.3 23${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::I18N.3
24${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Editor.3 24${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Editor.3
25${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Fetcher.3 25${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Fetcher.3
26${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Memoize::YAML.3 26${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Memoize::YAML.3
27${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Prompt.3 27${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Prompt.3
28${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Ra.3 28${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Ra.3
29${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Utils.3 29${PERL5_SUB_INSTALLVENDORMAN3DIR}/Git::SVN::Utils.3
30${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.py 
31${PLIST.python}${PYSITELIB}/git_remote_helpers/__init__.pyc 
32${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.py 
33${PLIST.python}${PYSITELIB}/git_remote_helpers/git/__init__.pyc 
34${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.py 
35${PLIST.python}${PYSITELIB}/git_remote_helpers/git/exporter.pyc 
36${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.py 
37${PLIST.python}${PYSITELIB}/git_remote_helpers/git/git.pyc 
38${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.py 
39${PLIST.python}${PYSITELIB}/git_remote_helpers/git/importer.pyc 
40${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.py 
41${PLIST.python}${PYSITELIB}/git_remote_helpers/git/non_local.pyc 
42${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.py 
43${PLIST.python}${PYSITELIB}/git_remote_helpers/git/repo.pyc 
44${PLIST.python}${PYSITELIB}/git_remote_helpers/util.py 
45${PLIST.python}${PYSITELIB}/git_remote_helpers/util.pyc 
46libexec/git-core/git 30libexec/git-core/git
47libexec/git-core/git-add 31libexec/git-core/git-add
48libexec/git-core/git-add--interactive 32libexec/git-core/git-add--interactive
49libexec/git-core/git-am 33libexec/git-core/git-am
50libexec/git-core/git-annotate 34libexec/git-core/git-annotate
51libexec/git-core/git-apply 35libexec/git-core/git-apply
52libexec/git-core/git-archimport 36libexec/git-core/git-archimport
53libexec/git-core/git-archive 37libexec/git-core/git-archive
54libexec/git-core/git-bisect 38libexec/git-core/git-bisect
55libexec/git-core/git-bisect--helper 39libexec/git-core/git-bisect--helper
56libexec/git-core/git-blame 40libexec/git-core/git-blame
57libexec/git-core/git-branch 41libexec/git-core/git-branch
58libexec/git-core/git-bundle 42libexec/git-core/git-bundle
cvs diff -r1.1 -r1.2 pkgsrc/devel/git-base/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/git-base/options.mk 2013/09/09 13:54:44 1.1
+++ pkgsrc/devel/git-base/options.mk 2014/01/03 17:31:25 1.2
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: options.mk,v 1.1 2013/09/09 13:54:44 wiz Exp $ 1# $NetBSD: options.mk,v 1.2 2014/01/03 17:31:25 richard Exp $
2# 2#
3PKG_OPTIONS_VAR= PKG_OPTIONS.git 3PKG_OPTIONS_VAR= PKG_OPTIONS.git
4PKG_SUPPORTED_OPTIONS= python 4PKG_SUPPORTED_OPTIONS= python
5# python is not suggested because upstream's INSTALL does not list python 5# python is not suggested because upstream's INSTALL does not list python
6# as a dependency and because all it does is install a python module, 6# as a dependency and because all it does is install a python module,
7# which does not seem worth the dependency for everyone else. 7# which does not seem worth the dependency for everyone else.
8PKG_SUGGESTED_OPTIONS= 8PKG_SUGGESTED_OPTIONS=
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12PLIST_VARS+= python 12PLIST_VARS+= python
13 13
14.if !empty(PKG_OPTIONS:Mpython) 14.if !empty(PKG_OPTIONS:Mpython)
15PY_PATCHPLIST= yes 15PY_PATCHPLIST= yes
16MAKE_FLAGS+= PYTHON_PATH=${PYTHONBIN} 16CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
17PLIST.python= yes 17PLIST.python= yes
18# not executable 18# not executable
19CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py 19CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py
20CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py 20CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py
21.include "../../lang/python/application.mk" 21.include "../../lang/python/application.mk"
22.include "../../lang/python/extension.mk" 22.include "../../lang/python/extension.mk"
23.else 23.else
24CONFIGURE_ARGS+= --without-python 24CONFIGURE_ARGS+= --without-python
25.endif 25.endif