summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorbjs <bjs>2008-06-14 16:21:03 +0000
committerbjs <bjs>2008-06-14 16:21:03 +0000
commit99e143d136d9ff6d00aae1e8f107c0337ceae7ae (patch)
tree467813105462304404511953ff1a569505efe316 /devel
parent346f7120c29e30fd9d45b6f30817ad694ec56499 (diff)
downloadpkgsrc-99e143d136d9ff6d00aae1e8f107c0337ceae7ae.tar.gz
Seperate out declaration of ${GIT_VERSION} into its own file, included
by Makefile.common and Makefile. Add empty declarations of missing variables in Makefile and remove inclusion of Makefile.common there. This package should now build properly.
Diffstat (limited to 'devel')
-rw-r--r--devel/scmgit/Makefile9
-rw-r--r--devel/scmgit/Makefile.common6
-rw-r--r--devel/scmgit/Makefile.version3
3 files changed, 12 insertions, 6 deletions
diff --git a/devel/scmgit/Makefile b/devel/scmgit/Makefile
index 81cc44643ed..00972d2cd82 100644
--- a/devel/scmgit/Makefile
+++ b/devel/scmgit/Makefile
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.25 2008/05/26 10:50:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2008/06/14 16:21:03 bjs Exp $
-.include "Makefile.common"
+.include "../../devel/scmgit/Makefile.version"
+DISTNAME= # empty
PKGNAME= scmgit-${GIT_VERSION}
-CATEGORIES+= meta-pkgs
+CATEGORIES+= meta-pkgs devel
+DISTFILES= # empty
+MASTER_SITES= http://www.kernel.org/pub/software/scm/git/
MAINTAINER= bjs@NetBSD.org
COMMENT= GIT version control suite meta-package
diff --git a/devel/scmgit/Makefile.common b/devel/scmgit/Makefile.common
index 6c8cc3e552c..e9a4770443f 100644
--- a/devel/scmgit/Makefile.common
+++ b/devel/scmgit/Makefile.common
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.common,v 1.10 2008/04/25 16:40:47 bjs Exp $
+# $NetBSD: Makefile.common,v 1.11 2008/06/14 16:21:03 bjs Exp $
#
# used by devel/scmgit-base/Makefile
# used by devel/scmgit-docs/Makefile
+.include "../../devel/scmgit/Makefile.version"
+
DISTNAME= git-${GIT_VERSION}
CATEGORIES= devel scm
MASTER_SITES?= http://www.kernel.org/pub/software/scm/git/
@@ -12,8 +14,6 @@ HOMEPAGE?= http://git.or.cz/
PKG_DESTDIR_SUPPORT= user-destdir
-GIT_VERSION= 1.5.5.1
-
.include "../../mk/bsd.fast.prefs.mk"
PATCHDIR= ${.CURDIR}/../../devel/scmgit-base/patches
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
new file mode 100644
index 00000000000..92d21a3e83e
--- /dev/null
+++ b/devel/scmgit/Makefile.version
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.version,v 1.1 2008/06/14 16:21:03 bjs Exp $
+#
+GIT_VERSION= 1.5.5.1