Provide compat MIN(), fixes SunOS. Patch from Sebastian Wiedenroth.diff -r1.10 -r1.11 pkgsrc/devel/libstree/Makefile
(jperkin)
@@ -1,17 +1,19 @@ | @@ -1,17 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.10 2013/04/06 14:22:39 rodent Exp $ | 1 | # $NetBSD: Makefile,v 1.11 2013/12/10 12:01:15 jperkin Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= libstree-0.4.0 | 4 | DISTNAME= libstree-0.4.0 | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 1 | |
6 | CATEGORIES= devel | 6 | CATEGORIES= devel | |
7 | MASTER_SITES= http://www.icir.org/christian/downloads/ | 7 | MASTER_SITES= http://www.icir.org/christian/downloads/ | |
8 | 8 | |||
9 | MAINTAINER= gson@NetBSD.org | 9 | MAINTAINER= gson@NetBSD.org | |
10 | HOMEPAGE= http://www.icir.org/christian/libstree/ | 10 | HOMEPAGE= http://www.icir.org/christian/libstree/ | |
11 | COMMENT= Suffix tree library | 11 | COMMENT= Suffix tree library | |
12 | 12 | |||
13 | GNU_CONFIGURE= yes | 13 | GNU_CONFIGURE= yes | |
14 | USE_LIBTOOL= yes | 14 | USE_LIBTOOL= yes | |
15 | CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html | 15 | CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html | |
16 | 16 | |||
17 | CFLAGS.SunOS+= -Du_int32_t=uint32_t | |||
18 | ||||
17 | .include "../../mk/bsd.pkg.mk" | 19 | .include "../../mk/bsd.pkg.mk" |
@@ -1,5 +1,6 @@ | @@ -1,5 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2005/02/23 22:24:19 agc Exp $ | 1 | $NetBSD: distinfo,v 1.4 2013/12/10 12:01:15 jperkin Exp $ | |
2 | 2 | |||
3 | SHA1 (libstree-0.4.0.tar.gz) = b6df1ff749d8d402deaf73a918bb10efffc8dd08 | 3 | SHA1 (libstree-0.4.0.tar.gz) = b6df1ff749d8d402deaf73a918bb10efffc8dd08 | |
4 | RMD160 (libstree-0.4.0.tar.gz) = 92e0e999a20ee02510e5bc1d2cd243132d034b74 | 4 | RMD160 (libstree-0.4.0.tar.gz) = 92e0e999a20ee02510e5bc1d2cd243132d034b74 | |
5 | Size (libstree-0.4.0.tar.gz) = 253700 bytes | 5 | Size (libstree-0.4.0.tar.gz) = 253700 bytes | |
6 | SHA1 (patch-src_lst__string.c) = 7a368536570c54d34d06f4629dd3e8a32820a143 |
$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"