git-cinnabar: finish package

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: git-cinnabar: finish package
From: Thomas Klausner <wiz%gatalith.at@localhost>
Date: Sat, 29 Apr 2023 21:44:40 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sat Apr 29 23:44:40 2023 +0200
Changeset:	2c1062231c9bc5957b6ed7edd67e9178cc1fbbc3

Modified Files:
	git-cinnabar/Makefile
	git-cinnabar/PLIST
	git-cinnabar/distinfo
Removed Files:
	git-cinnabar/TODO

Log Message:
git-cinnabar: finish package

Thanks to pin@ for help!

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

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

diffstat:
 git-cinnabar/Makefile | 16 +++++++++----
 git-cinnabar/PLIST    |  6 ++---
 git-cinnabar/TODO     | 63 ---------------------------------------------------
 git-cinnabar/distinfo |  3 +++
 4 files changed, 18 insertions(+), 70 deletions(-)

diffs:
diff --git a/git-cinnabar/Makefile b/git-cinnabar/Makefile
index c8f2f8643b..ce0b31d15b 100644
--- a/git-cinnabar/Makefile
+++ b/git-cinnabar/Makefile
@@ -10,16 +10,24 @@ HOMEPAGE=	https://github.com/glandium/git-cinnabar/
 COMMENT=	Remote helper to use mercurial repositories with git
 LICENSE=	mpl-2.0 AND gnu-gpl-v2
 
-.include "cargo-depends.mk"
-
 DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
+GITHUB_SUBMODULES=	git-for-windows git v2.40.0.windows.1 git-core
+
 USE_TOOLS+=	gmake pkg-config
 
 RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.curl}/lib
 
-#do-build:
-#	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE}
+INSTALLATION_DIRS+=	libexec/git-core share/doc/git-cinnabar
+
+CHECK_WRKREF_SKIP+=	libexec/git-core/*
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/target/release/git-cinnabar ${DESTDIR}${PREFIX}/libexec/git-core
+	cd ${DESTDIR}${PREFIX}/libexec/git-core && ${LN} git-cinnabar git-remote-hg
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/git-cinnabar
+
+.include "cargo-depends.mk"
 
 .include "../../lang/rust/cargo.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/git-cinnabar/PLIST b/git-cinnabar/PLIST
index 92ba51a2d7..1b4abe56e7 100644
--- a/git-cinnabar/PLIST
+++ b/git-cinnabar/PLIST
@@ -1,4 +1,4 @@
 @comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+libexec/git-core/git-cinnabar
+libexec/git-core/git-remote-hg
+share/doc/git-cinnabar/README.md
diff --git a/git-cinnabar/TODO b/git-cinnabar/TODO
deleted file mode 100644
index db0fdb899f..0000000000
--- a/git-cinnabar/TODO
+++ /dev/null
@@ -1,63 +0,0 @@
-Fails to build:
-
-https://github.com/glandium/git-cinnabar/issues/313
-
-error: failed to run custom build command for `git-cinnabar v0.6.1 (/scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1)`
-
-Caused by:
-  process didn't exit successfully: `/scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/target/release/build/git-cinnabar-1195f9ca7f690327/build-script-build` (exit status: 101)
-  --- stdout
-  OPT_LEVEL = Some("3")
-  TARGET = Some("x86_64-unknown-netbsd")
-  HOST = Some("x86_64-unknown-netbsd")
-  cargo:rerun-if-env-changed=CC_x86_64-unknown-netbsd
-  CC_x86_64-unknown-netbsd = None
-  cargo:rerun-if-env-changed=CC_x86_64_unknown_netbsd
-  CC_x86_64_unknown_netbsd = None
-  cargo:rerun-if-env-changed=HOST_CC
-  HOST_CC = None
-  cargo:rerun-if-env-changed=CC
-  CC = Some("gcc")
-  cargo:rerun-if-env-changed=CFLAGS_x86_64-unknown-netbsd
-  CFLAGS_x86_64-unknown-netbsd = None
-  cargo:rerun-if-env-changed=CFLAGS_x86_64_unknown_netbsd
-  CFLAGS_x86_64_unknown_netbsd = None
-  cargo:rerun-if-env-changed=HOST_CFLAGS
-  HOST_CFLAGS = None
-  cargo:rerun-if-env-changed=CFLAGS
-  CFLAGS = Some("-O2 -g -fPIC -D_FORTIFY_SOURCE=2 -fstack-clash-protection -I/usr/pkg/include")
-  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
-  CRATE_CC_NO_DEFAULTS = None
-  DEBUG = Some("false")
-  CARGO_CFG_TARGET_FEATURE = Some("fxsr,sse,sse2")
-  cargo:rerun-if-env-changed=CFLAGS_x86_64-unknown-netbsd
-  cargo:rerun-if-env-changed=CFLAGS_x86_64_unknown_netbsd
-  cargo:rerun-if-env-changed=CFLAGS
-  cargo:rerun-if-env-changed=TARGET_CFLAGS
-  cargo:rerun-if-env-changed=DEP_CURL_INCLUDE
-  cargo:rerun-if-env-changed=DEP_CURL_STATIC
-  cargo:rerun-if-env-changed=DEP_Z_INCLUDE
-  cargo:rerun-if-env-changed=CC_x86_64-unknown-netbsd
-  cargo:rerun-if-env-changed=CC_x86_64_unknown_netbsd
-  cargo:rerun-if-env-changed=CC
-  cargo:rerun-if-env-changed=CRATE_CC_NO_DEFAULTS
-  gmake[1]: Entering directory '/scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/target/release/build/git-cinnabar-57c10060bfb9abfb/out'
-  echo "ifndef FAKE_INCLUDE" > config.mak.uname
-  echo "#!/bin/sh" > detect-compiler
-  git -C /scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1 submodule sync
-  echo "include /scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/git-core/config.mak.uname" >> config.mak.uname
-  echo ". /scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/git-core/detect-compiler" >> detect-compiler
-  chmod +x detect-compiler
-  echo "endif" >> config.mak.uname
-  echo "ifndef FAKE_INCLUDE" > config.mak.dev
-  echo "include /scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/git-core/config.mak.dev" >> config.mak.dev
-  echo "endif" >> config.mak.dev
-  gmake[1]: Leaving directory '/scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/target/release/build/git-cinnabar-57c10060bfb9abfb/out'
-
-  --- stderr
-  fatal: not a git repository (or any parent up to mount point /)
-  Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
-  gmake[1]: *** [/scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/src/build.mk:17: /scratch/wip/git-cinnabar/work/git-cinnabar-0.6.1/git-core/Makefile] Error 128
-  thread 'main' panicked at 'assertion failed: cmd.env(\"MAKEFLAGS\",\n                    format!(\"-j {}\",\n                        env(\"CARGO_MAKEFLAGS\"))).current_dir(&out_dir).status().expect(\"Failed to execute GNU make\").success()', build.rs:229:5
-  note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
-warning: build failed, waiting for other jobs to finish...
diff --git a/git-cinnabar/distinfo b/git-cinnabar/distinfo
index 027f55ee55..ebd6ef84fe 100644
--- a/git-cinnabar/distinfo
+++ b/git-cinnabar/distinfo
@@ -120,6 +120,9 @@ Size (gimli-0.27.2.crate) = 721636 bytes
 BLAKE2s (git-cinnabar-0.6.1.tar.gz) = e7cfa6661c648d7b9ec92f1212d92c300cea82daab41f0b76b55041e15e5df46
 SHA512 (git-cinnabar-0.6.1.tar.gz) = b6ca9405ef1520f4b1c73203dc7ef3cbf2045190c65d2e6552bedb2e8dc0cba78798b40b6325bafeb444ed86f85267293070f61d2bf1d664d188b66d8a5132ad
 Size (git-cinnabar-0.6.1.tar.gz) = 196848 bytes
+BLAKE2s (git-for-windows-git-v2.40.0.windows.1.tar.gz) = db685a5baf0d5e95c4f4a965dda9cf351890a33c4cb318e799599da9b71015e7
+SHA512 (git-for-windows-git-v2.40.0.windows.1.tar.gz) = 6ef16f996b25893ece74b7c4fcd1ad0099ef3161b83e4a6d0f5579c4e3f08674483c411c2a9af145836543f16ed9d28dde9ba98807f6f474f951a793c17a18b4
+Size (git-for-windows-git-v2.40.0.windows.1.tar.gz) = 10795725 bytes
 BLAKE2s (git-version-0.3.5.crate) = c77abc64f9cb42e44668173fbe5b42fce46b8ced624ce2d9c7fea69fdf1feba9
 SHA512 (git-version-0.3.5.crate) = 7017d59ec7eef1d69c333ce8bcdee355dced8e912c4b5eabcb2abb93f6075ef3d1fd9486661d472c29787b75d7866fc49835d1faf5d06e42837c95c856398629
 Size (git-version-0.3.5.crate) = 3203 bytes
Prev by Date: git-cinnabar: Add some missing dependencies
Next by Date: git-cinnabar: remove, imported to pkgsrc/devel/git-cinnabar
Previous by Thread: git-cinnabar: Add some missing dependencies
Next by Thread: git-cinnabar: remove, imported to pkgsrc/devel/git-cinnabar
Indexes:
Home | Main Index | Thread Index | Old Index