From 07636da3cebeb7b5ffb26d6c8672b07eeeecaec0 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 7 Sep 2006 22:21:06 +0000
Subject: Fixed the issue with subprocess.py, which is included in the package
 if the Python version does not exist.

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

(limited to 'devel')

diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index 279b9a6632e..1727c9a7fbe 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -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+=	PYTHON_PATH=${PYTHONBIN:Q}
 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 --git a/devel/scmgit/PLIST b/devel/scmgit/PLIST
index ea743b7515a..b5ff7921cb2 100644
--- a/devel/scmgit/PLIST
+++ b/devel/scmgit/PLIST
@@ -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/git-write-tree.1
 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
-- 
cgit v1.2.3