CVS commit: pkgsrc/devel/git-base

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jun 12 21:41:59 UTC 2023

Modified Files:
        pkgsrc/devel/git-base: distinfo options.mk
        pkgsrc/devel/git-base/patches: patch-config.mak.uname
            patch-gitk-git_Makefile patch-templates_Makefile
Added Files:
        pkgsrc/devel/git-base/patches: patch-cache.h patch-dir.h
            patch-dircompat.h

Log Message:
git-base: fix build on Solaris 11.4. Quell pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 pkgsrc/devel/git-base/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git-base/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/git-base/patches/patch-cache.h \
    pkgsrc/devel/git-base/patches/patch-dir.h \
    pkgsrc/devel/git-base/patches/patch-dircompat.h
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/git-base/patches/patch-config.mak.uname
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile \
    pkgsrc/devel/git-base/patches/patch-templates_Makefile

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-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.135 pkgsrc/devel/git-base/distinfo:1.136
--- pkgsrc/devel/git-base/distinfo:1.135        Fri Jun  9 12:05:14 2023
+++ pkgsrc/devel/git-base/distinfo      Mon Jun 12 21:41:59 2023
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.135 2023/06/09 12:05:14 riastradh Exp $
+$NetBSD: distinfo,v 1.136 2023/06/12 21:41:59 schmonz Exp $
 
 BLAKE2s (git-2.41.0.tar.xz) = 9386094f11cc329ebb801be45dad6f2de9c8d192e21ba2fbe37444821fcdb93b
 SHA512 (git-2.41.0.tar.xz) = a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0
 Size (git-2.41.0.tar.xz) = 7273624 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = bf8cf3ed8168241265b258a29d62210dc59a5f72
-SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
+SHA1 (patch-cache.h) = c86918cd97697208835f92c3b9d0bebd81b13dd8
+SHA1 (patch-config.mak.uname) = c5985af246310023f63c7b8a9cebef84f53769f7
 SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e
+SHA1 (patch-dir.h) = 37593de2f91933a5708996d1e575bd49fa290cc0
+SHA1 (patch-dircompat.h) = f0cf20a95f2144c0dee17a2aa45955c57141452d
 SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
-SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98
-SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0
+SHA1 (patch-gitk-git_Makefile) = 028fa483f20f40ae3ec81c2dc7bd2e412a7d17f0
+SHA1 (patch-templates_Makefile) = 0fe03748644aafbd0263c050242eba90ddba11c7

Index: pkgsrc/devel/git-base/options.mk
diff -u pkgsrc/devel/git-base/options.mk:1.5 pkgsrc/devel/git-base/options.mk:1.6
--- pkgsrc/devel/git-base/options.mk:1.5        Wed Apr 11 19:39:34 2018
+++ pkgsrc/devel/git-base/options.mk    Mon Jun 12 21:41:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2018/04/11 19:39:34 adam Exp $
+# $NetBSD: options.mk,v 1.6 2023/06/12 21:41:59 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.git
 PKG_SUPPORTED_OPTIONS= apple-common-crypto
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS=
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mapple-common-crypto)
-.  if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
+.  if ${MACHINE_PLATFORM:MDarwin-[0-8].*-*}
 PKG_FAIL_REASON+=      "apple-common-crypto not available on this system"
 .  endif
 CONFIGURE_ARGS+=       --without-openssl

Index: pkgsrc/devel/git-base/patches/patch-config.mak.uname
diff -u pkgsrc/devel/git-base/patches/patch-config.mak.uname:1.4 pkgsrc/devel/git-base/patches/patch-config.mak.uname:1.5
--- pkgsrc/devel/git-base/patches/patch-config.mak.uname:1.4    Mon Aug 25 07:49:08 2014
+++ pkgsrc/devel/git-base/patches/patch-config.mak.uname        Mon Jun 12 21:41:59 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-config.mak.uname,v 1.4 2014/08/25 07:49:08 adam Exp $
+$NetBSD: patch-config.mak.uname,v 1.5 2023/06/12 21:41:59 schmonz Exp $
+
+Use pkgsrc-provided tools on Solarish.
 
 --- config.mak.uname.orig      2014-08-15 22:26:55.000000000 +0000
 +++ config.mak.uname

Index: pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile
diff -u pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile:1.1 pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile:1.2
--- pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile:1.1   Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile       Mon Jun 12 21:41:59 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-gitk-git_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $
+$NetBSD: patch-gitk-git_Makefile,v 1.2 2023/06/12 21:41:59 schmonz Exp $
+
+Install pkgsrcfully.
 
 --- gitk-git/Makefile.orig     2017-02-24 19:17:39.000000000 +0000
 +++ gitk-git/Makefile
Index: pkgsrc/devel/git-base/patches/patch-templates_Makefile
diff -u pkgsrc/devel/git-base/patches/patch-templates_Makefile:1.1 pkgsrc/devel/git-base/patches/patch-templates_Makefile:1.2
--- pkgsrc/devel/git-base/patches/patch-templates_Makefile:1.1  Fri Nov  8 12:24:31 2019
+++ pkgsrc/devel/git-base/patches/patch-templates_Makefile      Mon Jun 12 21:41:59 2023
@@ -1,4 +1,6 @@
-$NetBSD: patch-templates_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $
+$NetBSD: patch-templates_Makefile,v 1.2 2023/06/12 21:41:59 schmonz Exp $
+
+Install pkgsrcfully.
 
 --- templates/Makefile.orig    2010-10-22 03:49:16.000000000 +0000
 +++ templates/Makefile

Added files:

Index: pkgsrc/devel/git-base/patches/patch-cache.h
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-cache.h:1.1
--- /dev/null   Mon Jun 12 21:41:59 2023
+++ pkgsrc/devel/git-base/patches/patch-cache.h Mon Jun 12 21:41:59 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-cache.h,v 1.1 2023/06/12 21:41:59 schmonz Exp $
+
+Include compat definitions to fix Solaris 11.4 build.
+
+--- cache.h.orig       2023-06-12 21:28:27.007644652 +0000
++++ cache.h
+@@ -7,6 +7,7 @@
+ #include "pathspec.h"
+ #include "object.h"
+ #include "statinfo.h"
++#include "dircompat.h"
+ 
+ /*
+  * Basic data structures for the directory cache
Index: pkgsrc/devel/git-base/patches/patch-dir.h
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-dir.h:1.1
--- /dev/null   Mon Jun 12 21:41:59 2023
+++ pkgsrc/devel/git-base/patches/patch-dir.h   Mon Jun 12 21:41:59 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-dir.h,v 1.1 2023/06/12 21:41:59 schmonz Exp $
+
+Extract compat definitions for easy inclusion elsewhere.
+
+--- dir.h.orig 2023-06-12 21:25:12.673262635 +0000
++++ dir.h
+@@ -641,18 +641,6 @@ static inline int starts_with_dot_dot_sl
+       return path_match_flags(path, what | PATH_MATCH_NATIVE);
+ }
+ 
+-#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
+-#define DTYPE(de)     ((de)->d_type)
+-#else
+-#undef DT_UNKNOWN
+-#undef DT_DIR
+-#undef DT_REG
+-#undef DT_LNK
+-#define DT_UNKNOWN    0
+-#define DT_DIR                1
+-#define DT_REG                2
+-#define DT_LNK                3
+-#define DTYPE(de)     DT_UNKNOWN
+-#endif
++#include "dircompat.h"
+ 
+ #endif
Index: pkgsrc/devel/git-base/patches/patch-dircompat.h
diff -u /dev/null pkgsrc/devel/git-base/patches/patch-dircompat.h:1.1
--- /dev/null   Mon Jun 12 21:41:59 2023
+++ pkgsrc/devel/git-base/patches/patch-dircompat.h     Mon Jun 12 21:41:59 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-dircompat.h,v 1.1 2023/06/12 21:41:59 schmonz Exp $
+
+Extract compat definitions for easy inclusion elsewhere.
+
+--- dircompat.h.orig   2023-06-12 21:24:40.055455063 +0000
++++ dircompat.h
+@@ -0,0 +1,18 @@
++#ifndef DIRCOMPAT_H
++#define DIRCOMPAT_H
++
++#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
++#define DTYPE(de)     ((de)->d_type)
++#else
++#undef DT_UNKNOWN
++#undef DT_DIR
++#undef DT_REG
++#undef DT_LNK
++#define DT_UNKNOWN    0
++#define DT_DIR                1
++#define DT_REG                2
++#define DT_LNK                3
++#define DTYPE(de)     DT_UNKNOWN
++#endif
++
++#endif