diff options
| author | rillig <rillig@pkgsrc.org> | 2006-09-07 22:21:06 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-09-07 22:21:06 +0000 |
| commit | 03d98bf309cdf585ea60bfaad33f012d01e4ab75 (patch) | |
| tree | 803d25643831e33a7292c7cc4fa1454b705d1da8 | |
| parent | 6deed59b6e41d21c941f9cf92c3026b0621470f4 (diff) | |
| download | pkgsrc-03d98bf309cdf585ea60bfaad33f012d01e4ab75.tar.gz | |
Fixed the issue with subprocess.py, which is included in the package if the
Python version does not exist.
| -rw-r--r-- | devel/scmgit/Makefile | 15 | ||||
| -rw-r--r-- | devel/scmgit/PLIST | 3 |
2 files changed, 15 insertions, 3 deletions
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 |