[pkgsrc/trunk]: pkgsrc/devel/scmgit Fixed the issue with subprocess.py, which...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/631de16ffe0f
branches:  trunk
changeset: 518387:631de16ffe0f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Sep 07 22:21:06 2006 +0000

description:
Fixed the issue with subprocess.py, which is included in the package if the
Python version does not exist.

diffstat:

 devel/scmgit/Makefile |  15 +++++++++++++--
 devel/scmgit/PLIST    |   3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r 8a29992390eb -r 631de16ffe0f devel/scmgit/Makefile
--- a/devel/scmgit/Makefile     Thu Sep 07 22:12:15 2006 +0000
+++ b/devel/scmgit/Makefile     Thu Sep 07 22:21:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/09/02 23:18:05 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2006/09/07 22:21:06 rillig Exp $
 #
 
 DISTNAME=      git-1.4.1
@@ -24,11 +24,22 @@
 MAKE_ENV+=     SHELL_PATH=${SH:Q}
 BUILD_TARGET=  all doc
 INSTALL_TARGET=        install install-doc
+MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
+
+.include "../../lang/python/application.mk"
+
+NEEDS_SUBPROCESS_PY!= \
+       if ok=`${PYTHONBIN} -c 'import subprocess; print "OK"' 2>/dev/null` \
+       && ${TEST} "$$ok" = "OK"; then echo "no"; else echo "yes"; fi
+.if ${NEEDS_SUBPROCESS_PY} == "yes"
+PLIST_SUBST+=  IF_NEEDS_SUBPROCESS_PY=""
+.else
+PLIST_SUBST+=  IF_NEEDS_SUBPROCESS_PY="@comment "
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8a29992390eb -r 631de16ffe0f devel/scmgit/PLIST
--- a/devel/scmgit/PLIST        Thu Sep 07 22:12:15 2006 +0000
+++ b/devel/scmgit/PLIST        Thu Sep 07 22:21:06 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/09/06 09:08:55 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/09/07 22:21:06 rillig Exp $
 bin/git
 bin/git-add
 bin/git-am
@@ -240,6 +240,7 @@
 man/man1/gitk.1
 man/man7/git.7
 share/git-core/python/gitMergeCommon.py
+${IF_NEEDS_SUBPROCESS_PY}share/git-core/python/subprocess.py
 share/git-core/templates/description
 share/git-core/templates/hooks/applypatch-msg
 share/git-core/templates/hooks/commit-msg