Mon Jun 12 21:41:59 2023 UTC ()
git-base: fix build on Solaris 11.4. Quell pkglint while here.


(schmonz)
diff -r1.135 -r1.136 pkgsrc/devel/git-base/distinfo
diff -r1.5 -r1.6 pkgsrc/devel/git-base/options.mk
diff -r0 -r1.1 pkgsrc/devel/git-base/patches/patch-cache.h
diff -r0 -r1.1 pkgsrc/devel/git-base/patches/patch-dir.h
diff -r0 -r1.1 pkgsrc/devel/git-base/patches/patch-dircompat.h
diff -r1.4 -r1.5 pkgsrc/devel/git-base/patches/patch-config.mak.uname
diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile
diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-templates_Makefile
cvs diff -r1.135 -r1.136 pkgsrc/devel/git-base/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/git-base/distinfo 2023/06/09 12:05:14 1.135
+++ pkgsrc/devel/git-base/distinfo 2023/06/12 21:41:59 1.136
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: distinfo,v 1.135 2023/06/09 12:05:14 riastradh Exp $ 1$NetBSD: distinfo,v 1.136 2023/06/12 21:41:59 schmonz Exp $
2 2
3BLAKE2s (git-2.41.0.tar.xz) = 9386094f11cc329ebb801be45dad6f2de9c8d192e21ba2fbe37444821fcdb93b 3BLAKE2s (git-2.41.0.tar.xz) = 9386094f11cc329ebb801be45dad6f2de9c8d192e21ba2fbe37444821fcdb93b
4SHA512 (git-2.41.0.tar.xz) = a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0 4SHA512 (git-2.41.0.tar.xz) = a215bc6d89afbddd56adac901c24ea2b7f98a37bf6a6a2756893947012ffaa850e76247a3445a5ab13ab5a462f39986fec33eed086148aba5eb554dc1799fee0
5Size (git-2.41.0.tar.xz) = 7273624 bytes 5Size (git-2.41.0.tar.xz) = 7273624 bytes
6SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa 6SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
7SHA1 (patch-Makefile) = bf8cf3ed8168241265b258a29d62210dc59a5f72 7SHA1 (patch-Makefile) = bf8cf3ed8168241265b258a29d62210dc59a5f72
8SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 8SHA1 (patch-cache.h) = c86918cd97697208835f92c3b9d0bebd81b13dd8
 9SHA1 (patch-config.mak.uname) = c5985af246310023f63c7b8a9cebef84f53769f7
9SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e 10SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e
 11SHA1 (patch-dir.h) = 37593de2f91933a5708996d1e575bd49fa290cc0
 12SHA1 (patch-dircompat.h) = f0cf20a95f2144c0dee17a2aa45955c57141452d
10SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7 13SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
11SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98 14SHA1 (patch-gitk-git_Makefile) = 028fa483f20f40ae3ec81c2dc7bd2e412a7d17f0
12SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 15SHA1 (patch-templates_Makefile) = 0fe03748644aafbd0263c050242eba90ddba11c7
cvs diff -r1.5 -r1.6 pkgsrc/devel/git-base/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/git-base/options.mk 2018/04/11 19:39:34 1.5
+++ pkgsrc/devel/git-base/options.mk 2023/06/12 21:41:59 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.5 2018/04/11 19:39:34 adam Exp $ 1# $NetBSD: options.mk,v 1.6 2023/06/12 21:41:59 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.git 3PKG_OPTIONS_VAR= PKG_OPTIONS.git
4PKG_SUPPORTED_OPTIONS= apple-common-crypto 4PKG_SUPPORTED_OPTIONS= apple-common-crypto
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mapple-common-crypto) 9.if !empty(PKG_OPTIONS:Mapple-common-crypto)
10. if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 10. if ${MACHINE_PLATFORM:MDarwin-[0-8].*-*}
11PKG_FAIL_REASON+= "apple-common-crypto not available on this system" 11PKG_FAIL_REASON+= "apple-common-crypto not available on this system"
12. endif 12. endif
13CONFIGURE_ARGS+= --without-openssl 13CONFIGURE_ARGS+= --without-openssl
14.else 14.else
15CONFIGURE_ARGS+= --with-openssl=${SSLBASE} 15CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
16.include "../../security/openssl/buildlink3.mk" 16.include "../../security/openssl/buildlink3.mk"
17MAKE_FLAGS+= NO_APPLE_COMMON_CRYPTO=1 17MAKE_FLAGS+= NO_APPLE_COMMON_CRYPTO=1
18.endif 18.endif
File Added: pkgsrc/devel/git-base/patches/patch-cache.h
$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
File Added: pkgsrc/devel/git-base/patches/patch-dir.h
$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
File Added: pkgsrc/devel/git-base/patches/patch-dircompat.h
$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
cvs diff -r1.4 -r1.5 pkgsrc/devel/git-base/patches/patch-config.mak.uname (expand / switch to unified diff)

--- pkgsrc/devel/git-base/patches/patch-config.mak.uname 2014/08/25 07:49:08 1.4
+++ pkgsrc/devel/git-base/patches/patch-config.mak.uname 2023/06/12 21:41:59 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-config.mak.uname,v 1.4 2014/08/25 07:49:08 adam Exp $ 1$NetBSD: patch-config.mak.uname,v 1.5 2023/06/12 21:41:59 schmonz Exp $
 2
 3Use pkgsrc-provided tools on Solarish.
2 4
3--- config.mak.uname.orig 2014-08-15 22:26:55.000000000 +0000 5--- config.mak.uname.orig 2014-08-15 22:26:55.000000000 +0000
4+++ config.mak.uname 6+++ config.mak.uname
5@@ -104,7 +104,7 @@ endif 7@@ -104,7 +104,7 @@ endif
6 ifeq ($(uname_S),SunOS) 8 ifeq ($(uname_S),SunOS)
7 NEEDS_SOCKET = YesPlease 9 NEEDS_SOCKET = YesPlease
8 NEEDS_NSL = YesPlease 10 NEEDS_NSL = YesPlease
9- SHELL_PATH = /bin/bash 11- SHELL_PATH = /bin/bash
10+ SHELL_PATH = ${BASH} 12+ SHELL_PATH = ${BASH}
11 SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin 13 SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
12 HAVE_ALLOCA_H = YesPlease 14 HAVE_ALLOCA_H = YesPlease
13 NO_STRCASESTR = YesPlease 15 NO_STRCASESTR = YesPlease
14@@ -147,8 +147,6 @@ ifeq ($(uname_S),SunOS) 16@@ -147,8 +147,6 @@ ifeq ($(uname_S),SunOS)
cvs diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile (expand / switch to unified diff)

--- pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile 2019/11/08 12:24:31 1.1
+++ pkgsrc/devel/git-base/patches/patch-gitk-git_Makefile 2023/06/12 21:41:59 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-gitk-git_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ 1$NetBSD: patch-gitk-git_Makefile,v 1.2 2023/06/12 21:41:59 schmonz Exp $
 2
 3Install pkgsrcfully.
2 4
3--- gitk-git/Makefile.orig 2017-02-24 19:17:39.000000000 +0000 5--- gitk-git/Makefile.orig 2017-02-24 19:17:39.000000000 +0000
4+++ gitk-git/Makefile 6+++ gitk-git/Makefile
5@@ -50,10 +50,9 @@ endif 7@@ -50,10 +50,9 @@ endif
6 all:: gitk-wish $(ALL_MSGFILES) 8 all:: gitk-wish $(ALL_MSGFILES)
7  9
8 install:: all 10 install:: all
9- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' 11- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
10- $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk 12- $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
11- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)' 13- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
12- $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true 14- $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
13+ $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk 15+ $(BSD_INSTALL_SCRIPT) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
14+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)' 16+ $(BSD_INSTALL_DATA_DIR) '$(DESTDIR_SQ)$(msgsdir_SQ)'
cvs diff -r1.1 -r1.2 pkgsrc/devel/git-base/patches/patch-templates_Makefile (expand / switch to unified diff)

--- pkgsrc/devel/git-base/patches/patch-templates_Makefile 2019/11/08 12:24:31 1.1
+++ pkgsrc/devel/git-base/patches/patch-templates_Makefile 2023/06/12 21:41:59 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-templates_Makefile,v 1.1 2019/11/08 12:24:31 adam Exp $ 1$NetBSD: patch-templates_Makefile,v 1.2 2023/06/12 21:41:59 schmonz Exp $
 2
 3Install pkgsrcfully.
2 4
3--- templates/Makefile.orig 2010-10-22 03:49:16.000000000 +0000 5--- templates/Makefile.orig 2010-10-22 03:49:16.000000000 +0000
4+++ templates/Makefile 6+++ templates/Makefile
5@@ -8,7 +8,7 @@ INSTALL ?= install 7@@ -8,7 +8,7 @@ INSTALL ?= install
6 TAR ?= tar 8 TAR ?= tar
7 RM ?= rm -f 9 RM ?= rm -f
8 prefix ?= $(HOME) 10 prefix ?= $(HOME)
9-template_instdir ?= $(prefix)/share/git-core/templates 11-template_instdir ?= $(prefix)/share/git-core/templates
10+template_instdir = ${GIT_TEMPLATE_INSTDIR} 12+template_instdir = ${GIT_TEMPLATE_INSTDIR}
11 # DESTDIR= 13 # DESTDIR=
12  14
13 ifndef SHELL_PATH 15 ifndef SHELL_PATH
14@@ -39,7 +39,7 @@ boilerplates.made : $(bpsrc) 16@@ -39,7 +39,7 @@ boilerplates.made : $(bpsrc)