Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Sep 2021 01:11:14 GMT
From:      Kevin Bowling <kbowling@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c336760ec153 - main - net-im/prosody: fix failure when using libevent
Message-ID:  <202109110111.18B1BEOI025121@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c336760ec153c194f0b5193e9d901b7598c48297

commit c336760ec153c194f0b5193e9d901b7598c48297
Author:     Thomas Morper <thomas@beingboiled.info>
AuthorDate: 2021-09-11 01:10:42 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2021-09-11 01:10:42 +0000

    net-im/prosody: fix failure when using libevent
    
    PR:             257952
---
 net-im/prosody/Makefile                      |  5 +++--
 net-im/prosody/files/patch-util-src_pposix.c | 12 ++++++++++++
 net-im/prosody/files/patch-util-src_time.c   | 13 +++++++------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile
index 174bba916841..b61ae4c11ae8 100644
--- a/net-im/prosody/Makefile
+++ b/net-im/prosody/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	prosody
 PORTVERSION=	0.11.10
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://prosody.im/downloads/source/
 
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} \
 		${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR}
 LIB_DEPENDS=	libidn.so:dns/libidn
 
-USES=		compiler:c11 cpe gmake lua:52 shebangfix ssl
+USES=		cpe gmake lua:52 shebangfix ssl
 SHEBANG_FILES=	prosody prosodyctl tools/migration/prosody-migrator.lua
 LUA_PREMK=	yes
 HAS_CONFIGURE=	yes
@@ -31,7 +32,7 @@ CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--with-random=arc4random \
 		--c-compiler="${CC}" \
 		--cflags="${CFLAGS}" \
-		--add-cflags="-fPIC -std=c99 -I${LOCALBASE}/include -I${OPENSSLINC}" \
+		--add-cflags="-fPIC -I${LOCALBASE}/include -I${OPENSSLINC}" \
 		--linker="${CC}" \
 		--ldflags="${LDFLAGS}" \
 		--add-ldflags="-shared -L${LOCALBASE}/lib -L${OPENSSLLIB}" \
diff --git a/net-im/prosody/files/patch-util-src_pposix.c b/net-im/prosody/files/patch-util-src_pposix.c
new file mode 100644
index 000000000000..169c5962b4fc
--- /dev/null
+++ b/net-im/prosody/files/patch-util-src_pposix.c
@@ -0,0 +1,12 @@
+--- util-src/pposix.c.orig	2021-08-03 09:53:04 UTC
++++ util-src/pposix.c
+@@ -30,9 +30,6 @@
+ #define _DARWIN_C_SOURCE
+ #endif
+ #endif
+-#ifndef _POSIX_C_SOURCE
+-#define _POSIX_C_SOURCE 200809L
+-#endif
+ 
+ #include <stdlib.h>
+ #include <math.h>
diff --git a/net-im/prosody/files/patch-util-src_time.c b/net-im/prosody/files/patch-util-src_time.c
index 4339e8c3fb36..465372f39dff 100644
--- a/net-im/prosody/files/patch-util-src_time.c
+++ b/net-im/prosody/files/patch-util-src_time.c
@@ -1,9 +1,10 @@
---- util-src/time.c.orig	2020-01-02 09:49:37 UTC
+--- util-src/time.c.orig	2021-08-03 09:53:04 UTC
 +++ util-src/time.c
-@@ -1,5 +1,5 @@
- #ifndef _POSIX_C_SOURCE
+@@ -1,7 +1,3 @@
+-#ifndef _POSIX_C_SOURCE
 -#define _POSIX_C_SOURCE 199309L
-+#define _POSIX_C_SOURCE 200809L
- #endif
- 
+-#endif
+-
  #include <time.h>
+ #include <lua.h>
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109110111.18B1BEOI025121>