Provide compat MIN(), fixes SunOS. Patch from Sebastian Wiedenroth.

3 files changed, 22 insertions, 2 deletions

diff --git a/devel/libstree/Makefile b/devel/libstree/Makefile
index d84ecdcc649..ed8fbad93b5 100644
--- a/devel/libstree/Makefile
+++ b/devel/libstree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/04/06 14:22:39 rodent Exp $
+# $NetBSD: Makefile,v 1.11 2013/12/10 12:01:15 jperkin Exp $
 #
 
 DISTNAME=	libstree-0.4.0
@@ -14,4 +14,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc/html
 
+CFLAGS.SunOS+=	-Du_int32_t=uint32_t
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libstree/distinfo b/devel/libstree/distinfo
index bd1ac9034fe..79058b7c20f 100644
--- a/devel/libstree/distinfo
+++ b/devel/libstree/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:19 agc Exp $
+$NetBSD: distinfo,v 1.4 2013/12/10 12:01:15 jperkin Exp $
 
 SHA1 (libstree-0.4.0.tar.gz) = b6df1ff749d8d402deaf73a918bb10efffc8dd08
 RMD160 (libstree-0.4.0.tar.gz) = 92e0e999a20ee02510e5bc1d2cd243132d034b74
 Size (libstree-0.4.0.tar.gz) = 253700 bytes
+SHA1 (patch-src_lst__string.c) = 7a368536570c54d34d06f4629dd3e8a32820a143
diff --git a/devel/libstree/patches/patch-src_lst__string.c b/devel/libstree/patches/patch-src_lst__string.c
new file mode 100644
index 00000000000..514382e5f64
--- /dev/null
+++ b/devel/libstree/patches/patch-src_lst__string.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lst__string.c,v 1.1 2013/12/10 12:01:15 jperkin Exp $
+
+Provide compat MIN()
+
+--- src/lst_string.c.orig	2004-01-13 14:14:26.000000000 +0000
++++ src/lst_string.c
+@@ -26,6 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE
+ #  include <config.h>
+ #endif
+ 
++#ifndef MIN
++#define MIN(a,b) (((a)<(b))?(a):(b))
++#endif
++
+ #include <sys/param.h>
+ 
+ #include "lst_string.h"