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
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/libfm/Makefile (expand / switch to unified diff)

--- 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,30 +1,33 @@ @@ -1,30 +1,33 @@
1# $NetBSD: Makefile,v 1.1 2016/05/22 22:10:03 youri Exp $ 1# $NetBSD: Makefile,v 1.2 2016/07/25 17:06:22 richard Exp $
2# 2#
3 3
4DISTNAME= libfm-1.2.4 4DISTNAME= libfm-1.2.4
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcmanfm/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://pcmanfm.sourceforge.net/ 10HOMEPAGE= http://pcmanfm.sourceforge.net/
11COMMENT= File management library 11COMMENT= File management library
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= intltool pkg-config 16USE_TOOLS+= intltool pkg-config
17 17
 18# needed for correct getgrgid_r() prototype
 19CPPFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
 20
18CONFIGURE_ARGS+= --with-gtk=2 21CONFIGURE_ARGS+= --with-gtk=2
19 22
20PKG_SYSCONFSUBDIR= xdg 23PKG_SYSCONFSUBDIR= xdg
21OWN_DIRS= ${PKG_SYSCONFDIR}/libfm 24OWN_DIRS= ${PKG_SYSCONFDIR}/libfm
22CONF_FILES+= share/examples/libfm/libfm.conf \ 25CONF_FILES+= share/examples/libfm/libfm.conf \
23 ${PKG_SYSCONFDIR}/libfm/libfm.conf 26 ${PKG_SYSCONFDIR}/libfm/libfm.conf
24 27
25# XXX: walk-around bug in build wrappers 28# XXX: walk-around bug in build wrappers
26# they try to copy $PREFIX/include/libfm to work dir and there link libfm -> libfm-1.0 is resolved 29# they try to copy $PREFIX/include/libfm to work dir and there link libfm -> libfm-1.0 is resolved
27# in the end a consumer of libfm cannot find nonexisting include/libfm 30# in the end a consumer of libfm cannot find nonexisting include/libfm
28post-install: 31post-install:
29 ${RUN} rm -f ${DESTDIR}${PREFIX}/include/libfm 32 ${RUN} rm -f ${DESTDIR}${PREFIX}/include/libfm
30 ${RUN} cp -r ${DESTDIR}${PREFIX}/include/libfm-1.0 ${DESTDIR}${PREFIX}/include/libfm 33 ${RUN} cp -r ${DESTDIR}${PREFIX}/include/libfm-1.0 ${DESTDIR}${PREFIX}/include/libfm
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/libfm/distinfo (expand / switch to unified diff)

--- 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,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.3 2016/05/22 22:48:37 youri Exp $ 1$NetBSD: distinfo,v 1.4 2016/07/25 17:06:22 richard Exp $
2 2
3SHA1 (libfm-1.2.4.tar.xz) = 2f8183389c8e74edb15c6c8ab260df5dd39f3b2d 3SHA1 (libfm-1.2.4.tar.xz) = 2f8183389c8e74edb15c6c8ab260df5dd39f3b2d
4RMD160 (libfm-1.2.4.tar.xz) = 7c8cb9da27b3f36607f00eb9069ef753bb77eab5 4RMD160 (libfm-1.2.4.tar.xz) = 7c8cb9da27b3f36607f00eb9069ef753bb77eab5
5SHA512 (libfm-1.2.4.tar.xz) = c609e822959f9fa83eaee6552906b6fd22d210f0802944816230b1932fc06632dc557b8998d2d065100212f79dffe13257587c744aba78592983681c8410dc24 5SHA512 (libfm-1.2.4.tar.xz) = c609e822959f9fa83eaee6552906b6fd22d210f0802944816230b1932fc06632dc557b8998d2d065100212f79dffe13257587c744aba78592983681c8410dc24
6Size (libfm-1.2.4.tar.xz) = 912164 bytes 6Size (libfm-1.2.4.tar.xz) = 912164 bytes
7SHA1 (patch-Makefile.in) = 74a134b3e0ad868ea18ac09c142f869219396a8a 7SHA1 (patch-Makefile.in) = 74a134b3e0ad868ea18ac09c142f869219396a8a
8SHA1 (patch-data_Makefile.in) = 810c5b93190f37d58609fbcd594b26fca4490311 8SHA1 (patch-data_Makefile.in) = 810c5b93190f37d58609fbcd594b26fca4490311
9SHA1 (patch-src_Makefile.in) = 64bb2b66a683feaa3949d395620f6a2bedf860ff 9SHA1 (patch-src_Makefile.in) = 64bb2b66a683feaa3949d395620f6a2bedf860ff
10SHA1 (patch-src_actions_Makefile.in) = e814f5252c231aa1c76cf2c1783f02b1a0b636ec 10SHA1 (patch-src_actions_Makefile.in) = e814f5252c231aa1c76cf2c1783f02b1a0b636ec
11SHA1 (patch-src_modules_Makefile.in) = 0429f7f7c12cd1655452166e20365f3b0b1bcb81 11SHA1 (patch-src_modules_Makefile.in) = 0429f7f7c12cd1655452166e20365f3b0b1bcb81
 12SHA1 (patch-src_modules_vfs-search.c) = 29f236815ac9f5188ab624fa6ca2f3eb28e96993
File Added: pkgsrc/sysutils/libfm/patches/patch-src_modules_vfs-search.c
$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 */