Mon Jul 25 17:06:22 2016 UTC ()
SunOS needs some TLC by defining CPPFLAGS+= -D_POSIX_PTHREAD_SEMANTICS
in order to get the correct prototype for getgrgid_r and needs to derive
the GNU extension FNM_CASEFOLD from FNM_IGNORECASE found in fnmatch.h
(richard)
diff -r1.1 -r1.2 pkgsrc/sysutils/libfm/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/libfm/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/libfm/patches/patch-src_modules_vfs-search.c
--- pkgsrc/sysutils/libfm/Makefile 2016/05/22 22:10:03 1.1
+++ pkgsrc/sysutils/libfm/Makefile 2016/07/25 17:06:22 1.2
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/05/22 22:10:03 youri Exp $
+# $NetBSD: Makefile,v 1.2 2016/07/25 17:06:22 richard Exp $
#
DISTNAME= libfm-1.2.4
@@ -14,6 +14,9 @@
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= intltool pkg-config
+
+# needed for correct getgrgid_r() prototype
+CPPFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
CONFIGURE_ARGS+= --with-gtk=2
--- pkgsrc/sysutils/libfm/distinfo 2016/05/22 22:48:37 1.3
+++ pkgsrc/sysutils/libfm/distinfo 2016/07/25 17:06:22 1.4
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2016/05/22 22:48:37 youri Exp $
+$NetBSD: distinfo,v 1.4 2016/07/25 17:06:22 richard Exp $
SHA1 (libfm-1.2.4.tar.xz) = 2f8183389c8e74edb15c6c8ab260df5dd39f3b2d
RMD160 (libfm-1.2.4.tar.xz) = 7c8cb9da27b3f36607f00eb9069ef753bb77eab5
@@ -9,3 +9,4 @@
SHA1 (patch-src_Makefile.in) = 64bb2b66a683feaa3949d395620f6a2bedf860ff
SHA1 (patch-src_actions_Makefile.in) = e814f5252c231aa1c76cf2c1783f02b1a0b636ec
SHA1 (patch-src_modules_Makefile.in) = 0429f7f7c12cd1655452166e20365f3b0b1bcb81
+SHA1 (patch-src_modules_vfs-search.c) = 29f236815ac9f5188ab624fa6ca2f3eb28e96993
$NetBSD: patch-src_modules_vfs-search.c,v 1.1 2016/07/25 17:06:22 richard Exp $
SunOS needs to derive the GNU extension FNM_CASEFOLD from FNM_IGNORECASE
instead of vice versa as in *BSD.
--- src/modules/vfs-search.c.orig 2016-02-20 22:09:54.000000000 +0000
+++ src/modules/vfs-search.c
@@ -37,6 +37,9 @@
#define _GNU_SOURCE /* for FNM_CASEFOLD in fnmatch.h, a GNU extension */
#include <fnmatch.h>
+#ifndef FNM_CASEFOLD
+#define FNM_CASEFOLD FNM_IGNORECASE
+#endif
#if __GNUC__ >= 4
#pragma GCC diagnostic ignored "-Wcomment" /* for comments below */