summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2012-05-25 12:23:56 +0000
committerPav Lucistnik <pav@FreeBSD.org>2012-05-25 12:23:56 +0000
commit672adf10f5f32ea338f674335ed50d96b414b7b6 (patch)
tree10d23c52af89f95f727d75eace8d6e92f563d091 /net
parent- Add my locally made changes to icinga.in and ido2db.in, so icinga and ido2db (diff)
- Enable per thread locale on recent FreeBSD 9
PR: ports/168257 Submitted by: Andrey Simonenko <simon@comsys.ntu-kpi.kiev.ua>
Notes
Notes: svn path=/head/; revision=297401
Diffstat (limited to 'net')
-rw-r--r--net/boinc-client/Makefile2
-rw-r--r--net/boinc-client/files/patch-clientgui-AsyncRPC.cpp10
2 files changed, 4 insertions, 8 deletions
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 398a291d89ac..27b70a1b77ac 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -88,7 +88,7 @@ WX_CONF_ARGS= absolute
LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify \
sqlite3.8:${PORTSDIR}/databases/sqlite3
CONFIGURE_ARGS+=--with-sqlite3-prefix=${LOCALBASE}
-. if ${OSVERSION} < 1000002
+. if ${OSVERSION} < 900506 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000002)
CPPFLAGS+= -DNO_PER_THREAD_LOCALE
. endif
PLIST_SUB+= BOINC_MANAGER=""
diff --git a/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp b/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp
index ad8f9d5bb6ed..752e9fd2c8fb 100644
--- a/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp
+++ b/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp
@@ -1,15 +1,11 @@
--- clientgui/AsyncRPC.cpp.orig 2012-04-07 11:55:37.000000000 +0300
+++ clientgui/AsyncRPC.cpp 2012-04-07 11:56:14.000000000 +0300
-@@ -20,7 +20,12 @@
+@@ -20,7 +20,9 @@
#endif
#if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
--#include <xlocale.h>
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version >= 1000002
-+# include <xlocale.h>
-+# endif
++#if !defined(NO_PER_THREAD_LOCALE)
+ #include <xlocale.h>
+#endif
//#include "gui_rpc_client.h"
#endif