Build fixes for Darwin.

4 files changed, 20 insertions, 9 deletions

diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile
index d8b74f44173..43d324be593 100644
--- a/sysutils/rsyslog/Makefile
+++ b/sysutils/rsyslog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/03/14 11:12:22 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/22 16:52:14 jperkin Exp $
 #
 
 BUILDLINK_DEPMETHOD.libestr=	full
@@ -36,6 +36,8 @@ RSYSLOG_SYSMOD=		imklog
 CFLAGS+=		-march=i586
 .endif
 
+BUILDLINK_TRANSFORM.Darwin+=	rm:-luuid
+
 BUILD_DEFS+=		VARBASE RSYSLOG_PIDDIR RSYSLOG_WRKDIR
 RSYSLOG_PIDDIR?=	${VARBASE}/run
 RSYSLOG_WRKDIR?=	${VARBASE}/lib/rsyslog
@@ -49,6 +51,11 @@ SUBST_VARS.paths=	RSYSLOG_PIDDIR RSYSLOG_SYSMOD
 SUBST_SED.paths=	-e "s|/etc|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.paths=	Setting default paths and options.
 
+SUBST_CLASSES.Darwin+=	ldargs
+SUBST_STAGE.ldargs=	pre-configure
+SUBST_FILES.ldargs=	tools/Makefile.in
+SUBST_SED.ldargs=	-e '/whole-archive.*librsyslog/d'
+
 RCD_SCRIPTS=		rsyslogd
 
 CONF_FILES+=		share/examples/rsyslog/rsyslog.conf 			\
diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo
index c5dddca57bb..cd8ee36f329 100644
--- a/sysutils/rsyslog/distinfo
+++ b/sysutils/rsyslog/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2016/04/21 09:16:43 fhajny Exp $
+$NetBSD: distinfo,v 1.17 2016/04/22 16:52:14 jperkin Exp $
 
 SHA1 (rsyslog-8.18.0.tar.gz) = aea11258e2d25986c13541d2077f4913f28ce34e
 RMD160 (rsyslog-8.18.0.tar.gz) = 4b12d52db40a5cceff23ee71c5789f4902c73b5f
@@ -9,10 +9,10 @@ SHA1 (patch-platform_redhat_rsyslog.conf) = b2fc1dbeb2b679b82d6c1a86ec1e4e72ef46
 SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be
 SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e
 SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da
-SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c
+SHA1 (patch-plugins_mmexternal_mmexternal.c) = 09b8007f44abc9a20fed884a132e734c8b613fb4
 SHA1 (patch-plugins_ommysql_ommysql.c) = d3a1d3837d64a38a8e3064c30fb95bf3efb70877
 SHA1 (patch-plugins_ompgsql_ompgsql.c) = 549197b89efed1e8f45f536f58dafd67df3d462d
-SHA1 (patch-runtime_lookup.c) = f4551d19792fedea7944d395df3c491363bbbcf1
+SHA1 (patch-runtime_lookup.c) = cedb0531ff00063d44467029beba852ce4fbc0be
 SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437
 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341
 SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f
diff --git a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
index 92c2fb952df..d40847150f0 100644
--- a/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
+++ b/sysutils/rsyslog/patches/patch-plugins_mmexternal_mmexternal.c
@@ -1,14 +1,14 @@
-$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.3 2015/08/26 00:55:33 fhajny Exp $
+$NetBSD: patch-plugins_mmexternal_mmexternal.c,v 1.4 2016/04/22 16:52:14 jperkin Exp $
 
 Fix build on BSD.
---- plugins/mmexternal/mmexternal.c.orig	2015-08-10 10:24:49.000000000 +0000
+--- plugins/mmexternal/mmexternal.c.orig	2016-03-02 11:12:44.000000000 +0000
 +++ plugins/mmexternal/mmexternal.c
 @@ -31,7 +31,7 @@
  #include <errno.h>
  #include <unistd.h>
  #include <fcntl.h>
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) || defined(__APPLE__)
  #include <sys/wait.h>
  #else
  #include <wait.h>
diff --git a/sysutils/rsyslog/patches/patch-runtime_lookup.c b/sysutils/rsyslog/patches/patch-runtime_lookup.c
index 9fece36a0d7..9cf6170c9cd 100644
--- a/sysutils/rsyslog/patches/patch-runtime_lookup.c
+++ b/sysutils/rsyslog/patches/patch-runtime_lookup.c
@@ -1,13 +1,17 @@
-$NetBSD: patch-runtime_lookup.c,v 1.1 2016/03/13 08:15:59 tnn Exp $
+$NetBSD: patch-runtime_lookup.c,v 1.2 2016/04/22 16:52:14 jperkin Exp $
+
+Handle Darwin's pthread_setname_np().
 
 --- runtime/lookup.c.orig	2016-03-07 06:47:55.000000000 +0000
 +++ runtime/lookup.c
-@@ -926,8 +926,12 @@ lookupTableDefProcessCnf(struct cnfobj *
+@@ -926,8 +926,14 @@ lookupTableDefProcessCnf(struct cnfobj *
  	strcpy(reloader_thd_name, reloader_prefix);
  	strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu->name);
  	reloader_thd_name[thd_name_len - 1] = '\0';
 +#if defined(__NetBSD__)
 +	pthread_setname_np(lu->reloader, "%s", reloader_thd_name);
++#elif defined(__APPLE__)
++	pthread_setname_np(reloader_thd_name);
 +#else
  	pthread_setname_np(lu->reloader, reloader_thd_name);
  #endif