pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/scmgit Seperate out declaration of ${GIT_VERSION...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/856757adecba
branches:  trunk
changeset: 543340:856757adecba
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Sat Jun 14 16:21:03 2008 +0000

description:
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:

 devel/scmgit/Makefile         |  11 +++++++----
 devel/scmgit/Makefile.common  |   6 +++---
 devel/scmgit/Makefile.version |   3 +++
 3 files changed, 13 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 692786a55d17 -r 856757adecba devel/scmgit/Makefile
--- a/devel/scmgit/Makefile     Sat Jun 14 14:48:01 2008 +0000
+++ b/devel/scmgit/Makefile     Sat Jun 14 16:21:03 2008 +0000
@@ -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 "../../devel/scmgit/Makefile.version"
 
-.include "Makefile.common"
-
+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@localhost
 COMMENT=       GIT version control suite meta-package
diff -r 692786a55d17 -r 856757adecba devel/scmgit/Makefile.common
--- a/devel/scmgit/Makefile.common      Sat Jun 14 14:48:01 2008 +0000
+++ b/devel/scmgit/Makefile.common      Sat Jun 14 16:21:03 2008 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-GIT_VERSION=           1.5.5.1
-
 .include "../../mk/bsd.fast.prefs.mk"
 
 PATCHDIR=      ${.CURDIR}/../../devel/scmgit-base/patches
diff -r 692786a55d17 -r 856757adecba devel/scmgit/Makefile.version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/scmgit/Makefile.version     Sat Jun 14 16:21:03 2008 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.version,v 1.1 2008/06/14 16:21:03 bjs Exp $
+#
+GIT_VERSION=   1.5.5.1



Home | Main Index | Thread Index | Old Index