CVS commit: pkgsrc/devel

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jun 14 14:13:34 UTC 2024

Modified Files:
        pkgsrc/devel: Makefile
        pkgsrc/devel/git-cinnabar: Makefile
Added Files:
        pkgsrc/devel/git-cinnabar: Makefile.common
        pkgsrc/devel/py-hg-cinnabarclone: DESCR Makefile PLIST

Log Message:
devel/py-hg-cinnabarclone: Import hg extension from git-cinnabar.

This simple server-side hg extension can advertise bundles to speed
up `git clone' with git-cinnabar.

Single Python file distributed as part of git-cinnabar -- need not
pull in all of git-cinnabar (and Rust) on the server to run.

Not 100% sure if this use of PY_COMPILE_ALL/PY_COMPILE_O_ALL is
appropriate -- review and/or tweaks welcome.


To generate a diff of this commit:
cvs rdiff -u -r1.4304 -r1.4305 pkgsrc/devel/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/git-cinnabar/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/git-cinnabar/Makefile.common
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-hg-cinnabarclone/DESCR \
    pkgsrc/devel/py-hg-cinnabarclone/Makefile \
    pkgsrc/devel/py-hg-cinnabarclone/PLIST

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

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.4304 pkgsrc/devel/Makefile:1.4305
--- pkgsrc/devel/Makefile:1.4304        Thu Jun 13 05:27:29 2024
+++ pkgsrc/devel/Makefile       Fri Jun 14 14:13:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4304 2024/06/13 05:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4305 2024/06/14 14:13:33 riastradh Exp $
 #
 
 COMMENT=       Development utilities
@@ -2633,6 +2633,7 @@ SUBDIR+=  py-hatch-nodejs-version
 SUBDIR+=       py-hatch-vcs
 SUBDIR+=       py-hatchling
 SUBDIR+=       py-hexbytes
+SUBDIR+=       py-hg-cinnabarclone
 SUBDIR+=       py-hg-evolve
 SUBDIR+=       py-hg-fastimport
 SUBDIR+=       py-hg-git

Index: pkgsrc/devel/git-cinnabar/Makefile
diff -u pkgsrc/devel/git-cinnabar/Makefile:1.11 pkgsrc/devel/git-cinnabar/Makefile:1.12
--- pkgsrc/devel/git-cinnabar/Makefile:1.11     Wed May 29 16:32:02 2024
+++ pkgsrc/devel/git-cinnabar/Makefile  Fri Jun 14 14:13:33 2024
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2024/05/29 16:32:02 adam Exp $
+# $NetBSD: Makefile,v 1.12 2024/06/14 14:13:33 riastradh Exp $
+
+# does not contain the git submodules, please update GITHUB_SUBMODULES below
+.include "Makefile.common"
 
-DISTNAME=      git-cinnabar-0.6.3
 PKGREVISION=   2
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=glandium/}
-# does not contain the git submodules, please update GITHUB_SUBMODULES below
-GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/glandium/git-cinnabar/
 COMMENT=       Remote helper to use mercurial repositories with git
-LICENSE=       mpl-2.0 AND gnu-gpl-v2
 
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
 

Added files:

Index: pkgsrc/devel/git-cinnabar/Makefile.common
diff -u /dev/null pkgsrc/devel/git-cinnabar/Makefile.common:1.1
--- /dev/null   Fri Jun 14 14:13:34 2024
+++ pkgsrc/devel/git-cinnabar/Makefile.common   Fri Jun 14 14:13:33 2024
@@ -0,0 +1,16 @@
+#      $NetBSD: Makefile.common,v 1.1 2024/06/14 14:13:33 riastradh Exp $
+#
+
+# used by devel/git-cinnabar/Makefile
+# used by devel/py-hg-cinnabarclone/Makefile
+
+VERSION=       0.6.3
+DISTNAME=      git-cinnabar-${VERSION}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=glandium/}
+GITHUB_PROJECT=        git-cinnabar
+GITHUB_TAG=    ${PKGVERSION_NOREV}
+
+HOMEPAGE=      https://github.com/glandium/git-cinnabar/
+LICENSE=       mpl-2.0 AND gnu-gpl-v2
+
+DISTINFO_FILE= ${.CURDIR}/../../devel/git-cinnabar/distinfo

Index: pkgsrc/devel/py-hg-cinnabarclone/DESCR
diff -u /dev/null pkgsrc/devel/py-hg-cinnabarclone/DESCR:1.1
--- /dev/null   Fri Jun 14 14:13:34 2024
+++ pkgsrc/devel/py-hg-cinnabarclone/DESCR      Fri Jun 14 14:13:33 2024
@@ -0,0 +1,5 @@
+"cinnabarclone" is a mercurial server-side extension used to advertise
+the existence of pre-generated, externally hosted git repository or
+bundle providing git-cinnabar metadata corresponding to the mercurial
+repository.  Cloning from such a git repository can be faster than
+cloning from mercurial directly.
Index: pkgsrc/devel/py-hg-cinnabarclone/Makefile
diff -u /dev/null pkgsrc/devel/py-hg-cinnabarclone/Makefile:1.1
--- /dev/null   Fri Jun 14 14:13:34 2024
+++ pkgsrc/devel/py-hg-cinnabarclone/Makefile   Fri Jun 14 14:13:33 2024
@@ -0,0 +1,33 @@
+#      $NetBSD: Makefile,v 1.1 2024/06/14 14:13:33 riastradh Exp $
+#
+
+.include "../../devel/git-cinnabar/Makefile.common"
+
+PKGNAME=       ${PYPKGPREFIX}-hg-cinnabarclone-${VERSION}
+CATEGORIES=    devel
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+COMMENT=       Mercurial extension to accelerate git-cinnabar clone
+
+DEPENDS+=      ${PYPKGPREFIX}-mercurial>=6.0:../../devel/py-mercurial
+
+USE_LANGUAGES= # none
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+
+PLIST_SUBST+=  PYSITELIB=${PYSITELIB:Q}
+PLIST_SUBST+=  PYVERS=${PYVERSSUFFIX:S/.//}
+
+INSTALLATION_DIRS+=    ${PYSITELIB}/hgext3rd
+
+do-install:
+       ${INSTALL_DATA} ${WRKSRC:Q}/mercurial/cinnabarclone.py \
+               ${DESTDIR:Q}${PREFIX:Q}/${PYSITELIB:Q}/hgext3rd
+       ${PY_COMPILE_ALL} ${DESTDIR:Q}${PREFIX:Q}/${PYSITELIB:Q}/hgext3rd
+       ${PY_COMPILE_O_ALL} ${DESTDIR:Q}${PREFIX:Q}/${PYSITELIB:Q}/hgext3rd
+
+.include "../../lang/python/pyversion.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/py-hg-cinnabarclone/PLIST
diff -u /dev/null pkgsrc/devel/py-hg-cinnabarclone/PLIST:1.1
--- /dev/null   Fri Jun 14 14:13:34 2024
+++ pkgsrc/devel/py-hg-cinnabarclone/PLIST      Fri Jun 14 14:13:33 2024
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2024/06/14 14:13:33 riastradh Exp $
+${PYSITELIB}/hgext3rd/cinnabarclone.py
+${PYSITELIB}/hgext3rd/__pycache__/cinnabarclone.cpython-${PYVERS}.pyc
+${PYSITELIB}/hgext3rd/__pycache__/cinnabarclone.cpython-${PYVERS}.opt-1.pyc