CVS commit: pkgsrc/devel/git-cinnabar

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Dec 12 16:14:00 UTC 2024

Modified Files:
        pkgsrc/devel/git-cinnabar: Makefile Makefile.common

Log Message:
devel/git-cinnabar: Move GITHUB_SUBMODULES to Makefile.common.

This makes no difference for devel/git-cinnabar, and unbreaks
devel/py-hg-cinnabarclone by making the new patch under git-core/
apply.  This patch isn't needed for py-hg-cinnabarclone but it'll be
easier to maintain, I think, if we have all the git-cinnabar in one
place.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/git-cinnabar/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/git-cinnabar/Makefile.common

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

Modified files:

Index: pkgsrc/devel/git-cinnabar/Makefile
diff -u pkgsrc/devel/git-cinnabar/Makefile:1.19 pkgsrc/devel/git-cinnabar/Makefile:1.20
--- pkgsrc/devel/git-cinnabar/Makefile:1.19     Thu Dec  5 13:59:31 2024
+++ pkgsrc/devel/git-cinnabar/Makefile  Thu Dec 12 16:13:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2024/12/05 13:59:31 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2024/12/12 16:13:59 riastradh Exp $
 
 # does not contain the git submodules, please update GITHUB_SUBMODULES below
 .include "Makefile.common"
@@ -10,8 +10,6 @@ COMMENT=      Remote helper to use mercurial 
 
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
 
-GITHUB_SUBMODULES=     git-for-windows git v2.46.2.windows.1 git-core
-
 USE_TOOLS+=    gmake pkg-config
 
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.curl}/lib

Index: pkgsrc/devel/git-cinnabar/Makefile.common
diff -u pkgsrc/devel/git-cinnabar/Makefile.common:1.2 pkgsrc/devel/git-cinnabar/Makefile.common:1.3
--- pkgsrc/devel/git-cinnabar/Makefile.common:1.2       Thu Dec  5 01:19:26 2024
+++ pkgsrc/devel/git-cinnabar/Makefile.common   Thu Dec 12 16:13:59 2024
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.2 2024/12/05 01:19:26 riastradh Exp $
+#      $NetBSD: Makefile.common,v 1.3 2024/12/12 16:13:59 riastradh Exp $
 #
 
 # used by devel/git-cinnabar/Makefile
@@ -14,5 +14,7 @@ WRKSRC=               ${WRKDIR}/${DISTNAME}
 HOMEPAGE=      https://github.com/glandium/git-cinnabar/
 LICENSE=       mpl-2.0 AND gnu-gpl-v2
 
+GITHUB_SUBMODULES=     git-for-windows git v2.46.2.windows.1 git-core
+
 DISTINFO_FILE= ${.CURDIR}/../../devel/git-cinnabar/distinfo
 PATCHDIR=      ${.CURDIR}/../../devel/git-cinnabar/patches