summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authordrochner <drochner>2011-04-19 17:08:18 +0000
committerdrochner <drochner>2011-04-19 17:08:18 +0000
commitc4eceabeaec64d7760136a24292892ebbb94ae59 (patch)
tree02b2525598bfbdf1dd890dab7916c0894d484550 /devel
parentc6209c74faea1cf0dae3dc1097ac67d10480c5f2 (diff)
downloadpkgsrc-c4eceabeaec64d7760136a24292892ebbb94ae59.tar.gz
-Python is optional, keep this in options.mk
-the files where the interpreter check fires are not executable, so just CHECK_INTERPRETER_SKIP them
Diffstat (limited to 'devel')
-rw-r--r--devel/scmgit-base/Makefile5
-rw-r--r--devel/scmgit-base/options.mk6
2 files changed, 6 insertions, 5 deletions
diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile
index 1e33f9ecbc9..fa148a31559 100644
--- a/devel/scmgit-base/Makefile
+++ b/devel/scmgit-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/04/19 10:58:57 roy Exp $
+# $NetBSD: Makefile,v 1.31 2011/04/19 17:08:18 drochner Exp $
.include "../../devel/scmgit/Makefile.common"
@@ -30,8 +30,6 @@ CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
BUILD_TARGET= all
-REPLACE_PYTHON+= */*.py */*/*.py
-
REPLACE_SH+= contrib/hooks/post-receive-email
REPLACE_SH+= contrib/hooks/pre-auto-gc-battery
@@ -92,7 +90,6 @@ SUBST_SED.fix-cd-P= -e "s/cd -P/cd/g"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/perl5/module.mk"
-.include "../../lang/python/application.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/devel/scmgit-base/options.mk b/devel/scmgit-base/options.mk
index 26354779882..5b4ec013f98 100644
--- a/devel/scmgit-base/options.mk
+++ b/devel/scmgit-base/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/12/23 23:42:40 abs Exp $
+# $NetBSD: options.mk,v 1.5 2011/04/19 17:08:18 drochner Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.scmgit
PKG_SUPPORTED_OPTIONS= scmgit-gui python
@@ -32,6 +32,10 @@ CONFIGURE_ARGS+= --without-tcltk
PY_PATCHPLIST= yes
MAKE_FLAGS+= PYTHON_PATH=${PYTHONBIN}
PLIST.python= yes
+# not executable
+CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/*.py
+CHECK_INTERPRETER_SKIP+= ${PYSITELIB}/git_remote_helpers/git/*.py
+.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.else
CONFIGURE_ARGS+= --without-python