pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mk/git-package.mk: support older branches



Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%joyent.com@localhost>
Pushed By:	jperkin
Date:		Fri Oct 2 12:48:21 2015 +0100
Changeset:	dd9442f4328cc99d454317f2f2077662ed40e59b

Modified Files:
	mk/git-package.mk

Log Message:
mk/git-package.mk: support older branches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dd9442f4328cc99d454317f2f2077662ed40e59b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mk/git-package.mk | 4 ++++
 1 file changed, 4 insertions(+)

diffs:
diff --git a/mk/git-package.mk b/mk/git-package.mk
index df594be9b0..f5c51a6376 100644
--- a/mk/git-package.mk
+++ b/mk/git-package.mk
@@ -27,7 +27,11 @@
 .if !defined(_PKG_MK_GIT_PACKAGE_MK)
 _PKG_MK_GIT_PACKAGE_MK=	# defined
 
+.if exists(../../devel/git/Makefile)
 BUILD_DEPENDS+=		git-base>=1.6.4:../../devel/git-base
+.else
+BUILD_DEPENDS+=		scmgit-base>=1.6.4:../../devel/scmgit-base
+.endif
 
 #
 # defaults for user-visible input variables


Home | Main Index | Thread Index | Old Index