Tue Dec 10 12:01:15 2013 UTC ()
Provide compat MIN(), fixes SunOS.  Patch from Sebastian Wiedenroth.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/devel/libstree/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/libstree/distinfo
diff -r0 -r1.1 pkgsrc/devel/libstree/patches/patch-src_lst__string.c

cvs diff -r1.10 -r1.11 pkgsrc/devel/libstree/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libstree/Makefile 2013/04/06 14:22:39 1.10
+++ pkgsrc/devel/libstree/Makefile 2013/12/10 12:01:15 1.11
@@ -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
4DISTNAME= libstree-0.4.0 4DISTNAME= libstree-0.4.0
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://www.icir.org/christian/downloads/ 7MASTER_SITES= http://www.icir.org/christian/downloads/
8 8
9MAINTAINER= gson@NetBSD.org 9MAINTAINER= gson@NetBSD.org
10HOMEPAGE= http://www.icir.org/christian/libstree/ 10HOMEPAGE= http://www.icir.org/christian/libstree/
11COMMENT= Suffix tree library 11COMMENT= Suffix tree library
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html 15CONFIGURE_ARGS+= --with-html-dir=${PREFIX:Q}/share/doc/html
16 16
 17CFLAGS.SunOS+= -Du_int32_t=uint32_t
 18
17.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/devel/libstree/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libstree/distinfo 2005/02/23 22:24:19 1.3
+++ pkgsrc/devel/libstree/distinfo 2013/12/10 12:01:15 1.4
@@ -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
3SHA1 (libstree-0.4.0.tar.gz) = b6df1ff749d8d402deaf73a918bb10efffc8dd08 3SHA1 (libstree-0.4.0.tar.gz) = b6df1ff749d8d402deaf73a918bb10efffc8dd08
4RMD160 (libstree-0.4.0.tar.gz) = 92e0e999a20ee02510e5bc1d2cd243132d034b74 4RMD160 (libstree-0.4.0.tar.gz) = 92e0e999a20ee02510e5bc1d2cd243132d034b74
5Size (libstree-0.4.0.tar.gz) = 253700 bytes 5Size (libstree-0.4.0.tar.gz) = 253700 bytes
 6SHA1 (patch-src_lst__string.c) = 7a368536570c54d34d06f4629dd3e8a32820a143

File Added: pkgsrc/devel/libstree/patches/patch-src_lst__string.c
$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"