From ff50eabc3e20d6f898a29a3509063a51233f7005 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Sat, 19 Apr 2014 16:18:49 +0200
Subject: [PATCH] Step 2: base tools: devel/git-base

---
 devel/git-base/Makefile                 |  4 ++++
 devel/git-base/distinfo                 |  3 +++
 devel/git-base/patches/patch-zz-minix-a | 11 +++++++++
 devel/git-base/patches/patch-zz-minix-b | 31 +++++++++++++++++++++++++
 devel/git-base/patches/patch-zz-minix-c | 14 +++++++++++
 5 files changed, 63 insertions(+)
 create mode 100644 devel/git-base/patches/patch-zz-minix-a
 create mode 100644 devel/git-base/patches/patch-zz-minix-b
 create mode 100644 devel/git-base/patches/patch-zz-minix-c

diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index 51d475e4d..cda958fe7 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -87,6 +87,10 @@ SUBST_FILES.fix-cd-P+=	t/test-lib.sh
 SUBST_MESSAGE.fix-cd-P=	Fixing cd arguments.
 SUBST_STAGE.fix-cd-P=	pre-build
 SUBST_SED.fix-cd-P=	-e "s/cd -P/cd/g"
+
+.if ${OS_VARIANT} == "Minix"
+CONFIGURE_ENV+=		ac_cv_search_clock_gettime=no
+.endif # ${OS_VARIANT} == "Minix"
 .endif
 
 LDFLAGS.SunOS+=		-lintl -lnsl
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index dee1881be..f530dfc18 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -12,3 +12,6 @@ SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7
 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f
+SHA1 (patch-zz-minix-a) = 7bf6ca4176f53bfd00ee663b66851a5331073c5d
+SHA1 (patch-zz-minix-b) = 8ea47209f833fb59cc58fe332bd6e4315551e5af
+SHA1 (patch-zz-minix-c) = 62167e44a1d4762fa30f6374bd5a403e33e1d488
diff --git a/devel/git-base/patches/patch-zz-minix-a b/devel/git-base/patches/patch-zz-minix-a
new file mode 100644
index 000000000..10884ce6e
--- /dev/null
+++ b/devel/git-base/patches/patch-zz-minix-a
@@ -0,0 +1,11 @@
+--- compat/nedmalloc/malloc.c.h.orig	Fri Apr 18 16:10:39 2014
++++ compat/nedmalloc/malloc.c.h	Fri Apr 18 16:12:29 2014
+@@ -1323,7 +1323,7 @@ int mspace_mallopt(int, int);
+ #ifndef LACKS_UNISTD_H
+ #include <unistd.h>     /* for sbrk, sysconf */
+ #else /* LACKS_UNISTD_H */
+-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__minix)
+ extern void*     sbrk(ptrdiff_t);
+ #endif /* FreeBSD etc */
+ #endif /* LACKS_UNISTD_H */
diff --git a/devel/git-base/patches/patch-zz-minix-b b/devel/git-base/patches/patch-zz-minix-b
new file mode 100644
index 000000000..ad74ff2b1
--- /dev/null
+++ b/devel/git-base/patches/patch-zz-minix-b
@@ -0,0 +1,31 @@
+--- config.mak.uname.orig	Sun Oct  4 00:20:19 2015
++++ config.mak.uname	Sun Oct  4 00:24:50 2015
+@@ -412,18 +412,20 @@
+ 	endif
+ endif
+ ifeq ($(uname_S),Minix)
++	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
++		NEEDS_LIBICONV = YesPlease
++	endif
++	BASIC_CFLAGS += -I/usr/pkg/include
++	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
++	USE_ST_TIMESPEC = YesPlease
++	NO_MKSTEMPS = YesPlease
++	HAVE_PATHS_H = YesPlease
++# MINIX Deviation from NetBSD
++#	HAVE_BSD_SYSCTL = YesPlease
+ 	NO_IPV6 = YesPlease
+-	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
+-	NO_NSEC = YesPlease
+-	NEEDS_LIBGEN =
+ 	NEEDS_CRYPTO_WITH_SSL = YesPlease
+ 	NEEDS_IDN_WITH_CURL = YesPlease
+ 	NEEDS_SSL_WITH_CURL = YesPlease
+-	NEEDS_RESOLV =
+-	NO_HSTRERROR = YesPlease
+-	NO_MMAP = YesPlease
+-	NO_CURL =
+-	NO_EXPAT =
+ endif
+ ifeq ($(uname_S),NONSTOP_KERNEL)
+ 	# Needs some C99 features, "inline" is just one of them.
diff --git a/devel/git-base/patches/patch-zz-minix-c b/devel/git-base/patches/patch-zz-minix-c
new file mode 100644
index 000000000..dd6c2eedd
--- /dev/null
+++ b/devel/git-base/patches/patch-zz-minix-c
@@ -0,0 +1,14 @@
+--- progress.c.orig	Sun Oct  4 00:40:24 2015
++++ progress.c	Sun Oct  4 00:41:58 2015
+@@ -75,7 +75,11 @@
+ static int is_foreground_fd(int fd)
+ {
+ 	int tpgrp = tcgetpgrp(fd);
++#if defined(__minix)
++	return tpgrp < 0 || tpgrp == getpid();
++#else
+ 	return tpgrp < 0 || tpgrp == getpgid(0);
++#endif /* defined(__minix) */
+ }
+ 
+ static int display(struct progress *progress, unsigned n, const char *done)