| Hi Adam, it seems you last touched pkgsrc/devel/git-base/patches/patch-Makefile. Removing TAR makes things fail on OS X. There is also a problem with -lintl not finding the lib. The attached patch fixes those two problems. In the ‚install‘ phase, PLIST has the wrong paths, and I don’t know (yet) what is messed up there, but maybe you can tell if there attached patch helps, or take it form there - I haven’t followed pkgsrc for too long to commit this now. - Hubert |
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git-base/distinfo,v
retrieving revision 1.128
diff -u -r1.128 distinfo
--- distinfo 12 Dec 2022 22:03:23 -0000 1.128
+++ distinfo 19 Dec 2022 22:49:32 -0000
@@ -4,7 +4,7 @@
SHA512 (git-2.38.2.tar.xz) = 797c1cee61ff07b6f8502b1819d9797282aa82e33d023dffb4d395376b7a621d518017eaf38d05c6e5aba1372f2731985c53fcb46d43168b67b5bc8febedc6bc
Size (git-2.38.2.tar.xz) = 7090572 bytes
SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
-SHA1 (patch-Makefile) = 683a2fdf69c3cb5814fcc59360be2eba91cb88a7
+SHA1 (patch-Makefile) = b0cb5cdd22d1744b0aebaa162350383ad523ffba
SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
SHA1 (patch-contrib_completion_git-completion.zsh) = 695c78c8be7cc2a3792d1c428ebc5739b049852e
SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
Index: patches/patch-Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git-base/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Makefile
--- patches/patch-Makefile 7 Oct 2022 10:10:05 -0000 1.6
+++ patches/patch-Makefile 19 Dec 2022 22:49:32 -0000
@@ -1,13 +1,18 @@
-$NetBSD: patch-Makefile,v 1.6 2022/10/07 10:10:05 adam Exp $
+$NetBSD$
Do not override compiler/linker flags.
Provide proper path for Perl module.
Do not install git-p4 (requires Python).
Fix tar operations.
---- Makefile.orig 2022-10-02 23:02:46.000000000 +0000
+To build on Mac OS X:
+ - keep TAR
+ - add -L to find -lintl
+
+
+--- Makefile.orig 2022-12-11 00:41:52.000000000 +0000
+++ Makefile
-@@ -549,7 +549,7 @@ mergetoolsdir = $(gitexecdir)/mergetools
+@@ -550,7 +550,7 @@ mergetoolsdir = $(gitexecdir)/mergetools
sharedir = $(prefix)/share
gitwebdir = $(sharedir)/gitweb
gitwebstaticdir = $(gitwebdir)/static
@@ -16,7 +21,7 @@
localedir = $(sharedir)/locale
template_dir = share/git-core/templates
htmldir = $(prefix)/share/doc/git-doc
-@@ -570,13 +570,9 @@ perllibdir_relative = $(patsubst $(prefi
+@@ -571,13 +571,10 @@ perllibdir_relative = $(patsubst $(prefi
export prefix bindir sharedir sysconfdir perllibdir localedir
# Set our default programs
@@ -24,13 +29,13 @@
-AR = ar
RM = rm -f
DIFF = diff
--TAR = tar
+ TAR = tar
FIND = find
-INSTALL = install
TCL_PATH = tclsh
TCLTK_PATH = wish
XGETTEXT = xgettext
-@@ -683,7 +679,6 @@ clean-python-script:
+@@ -684,7 +681,6 @@ clean-python-script:
SCRIPTS = $(SCRIPT_SH_GEN) \
$(SCRIPT_PERL_GEN) \
@@ -38,7 +43,25 @@
git-instaweb
ETAGS_TARGET = TAGS
-@@ -2191,8 +2186,8 @@ ifdef DEFAULT_HELP_FORMAT
+@@ -1575,7 +1571,7 @@ ifndef NO_ICONV
+ ICONV_LINK =
+ endif
+ ifdef NEEDS_LIBINTL_BEFORE_LIBICONV
+- ICONV_LINK += -lintl
++ ICONV_LINK += -L${LOCALBASE}/lib -lintl
+ endif
+ EXTLIBS += $(ICONV_LINK) -liconv
+ endif
+@@ -1588,7 +1584,7 @@ ifdef NEEDS_LIBGEN
+ endif
+ ifndef NO_GETTEXT
+ ifndef LIBC_CONTAINS_LIBINTL
+- EXTLIBS += -lintl
++ EXTLIBS += -L${LOCALBASE}/lib -lintl
+ endif
+ endif
+ ifdef NEEDS_SOCKET
+@@ -2193,8 +2189,8 @@ ifdef DEFAULT_HELP_FORMAT
BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
endif
@@ -49,7 +72,7 @@
export DIFF TAR INSTALL DESTDIR SHELL_PATH
-@@ -3261,12 +3256,12 @@ endif
+@@ -3263,12 +3259,12 @@ endif
ifndef NO_GETTEXT
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
(cd po/build/locale && $(TAR) cf - .) | \
@@ -64,7 +87,7 @@
endif
ifndef NO_TCLTK
$(MAKE) -C gitk-git install
-@@ -3333,7 +3328,7 @@ install-man: install-man-perl
+@@ -3335,7 +3331,7 @@ install-man: install-man-perl
install-man-perl: man-perl
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
(cd perl/build/man/man3 && $(TAR) cf - .) | \