[Midnightbsd-cvs] mports [20849] trunk/net/boinc-client/files: fix build of boinc
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Nov 13 18:40:41 EST 2015
Revision: 20849
http://svnweb.midnightbsd.org/mports/?rev=20849
Author: laffer1
Date: 2015-11-13 18:40:40 -0500 (Fri, 13 Nov 2015)
Log Message:
-----------
fix build of boinc
Modified Paths:
--------------
trunk/net/boinc-client/files/boinc-client.in
trunk/net/boinc-client/files/pkg-install.in
Removed Paths:
-------------
trunk/net/boinc-client/files/patch-api__boinc_api.h
trunk/net/boinc-client/files/patch-client-hostinfo_unix.cpp
trunk/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp
trunk/net/boinc-client/files/patch-clientgui-stdwx.h
trunk/net/boinc-client/files/patch-zip-unzip-extract.c
Modified: trunk/net/boinc-client/files/boinc-client.in
===================================================================
--- trunk/net/boinc-client/files/boinc-client.in 2015-11-13 23:34:51 UTC (rev 20848)
+++ trunk/net/boinc-client/files/boinc-client.in 2015-11-13 23:40:40 UTC (rev 20849)
@@ -1,5 +1,7 @@
#!/bin/sh
#
+# $FreeBSD: head/net/boinc-client/files/boinc-client.in 325145 2013-08-21 14:45:47Z rene $
+#
# PROVIDE: boinc-client
# REQUIRE: LOGIN
# KEYWORD: shutdown
@@ -22,7 +24,7 @@
pidfile="/var/run/${name}.pid"
boinc_client_user=%%BOINC_CLIENT_USER%%
-command_args="--daemon --dir \"%%BOINC_CLIENT_HOME%%\""
+command_args="--daemon %%OPTION_NO_GUI_RPC%% %%OPTION_NO_NET_INFO%% --dir \"%%BOINC_CLIENT_HOME%%\""
start_cmd=boinc_client_start
stop_postcmd=boinc_client_poststop
Deleted: trunk/net/boinc-client/files/patch-api__boinc_api.h
===================================================================
--- trunk/net/boinc-client/files/patch-api__boinc_api.h 2015-11-13 23:34:51 UTC (rev 20848)
+++ trunk/net/boinc-client/files/patch-api__boinc_api.h 2015-11-13 23:40:40 UTC (rev 20849)
@@ -1,18 +0,0 @@
---- api/boinc_api.h.orig 2012-04-13 09:59:23.000000000 +0200
-+++ api/boinc_api.h 2012-06-06 14:40:16.000000000 +0200
-@@ -83,7 +83,6 @@
-
- extern int boinc_init(void);
- extern int boinc_finish(int status);
--extern int boinc_temporary_exit(int delay, const char* reason=NULL);
- extern int boinc_get_init_data_p(struct APP_INIT_DATA*);
- extern int boinc_parse_init_data_file(void);
- extern int boinc_send_trickle_up(char* variety, char* text);
-@@ -139,6 +138,7 @@
- double cpu_time, double checkpoint_cpu_time, double _fraction_done,
- int other_pid, double bytes_sent, double bytes_received
- );
-+extern int boinc_temporary_exit(int delay, const char* reason=NULL);
-
- /////////// API ENDS HERE
-
Deleted: trunk/net/boinc-client/files/patch-client-hostinfo_unix.cpp
===================================================================
--- trunk/net/boinc-client/files/patch-client-hostinfo_unix.cpp 2015-11-13 23:34:51 UTC (rev 20848)
+++ trunk/net/boinc-client/files/patch-client-hostinfo_unix.cpp 2015-11-13 23:40:40 UTC (rev 20849)
@@ -1,32 +0,0 @@
---- client/hostinfo_unix.cpp.orig 2012-04-09 14:00:43.000000000 +0300
-+++ client/hostinfo_unix.cpp 2012-04-09 15:42:49.000000000 +0300
-@@ -584,9 +584,10 @@
-
- void use_cpuid(HOST_INFO& host) {
- u_int p[4];
-- int hasMMX, hasSSE, hasSSE2, hasSSE3, has3DNow, has3DNowExt = 0;
-+ int hasMMX, hasSSE, hasSSE2, hasSSE3, has3DNow, has3DNowExt;
- char capabilities[256];
-
-+ hasMMX = hasSSE = hasSSE2 = hasSSE3 = has3DNow = has3DNowExt = 0;
- do_cpuid(0x0, p);
-
- if (p[0] >= 0x1) {
-@@ -1285,7 +1286,7 @@
- m_nbytes = (double)sysconf(_SC_PAGESIZE) * (double)sysconf(_SC_PHYS_PAGES);
- if (m_nbytes < 0) {
- msg_printf(NULL, MSG_INTERNAL_ERROR,
-- "RAM size not measured correctly: page size %d, #pages %d",
-+ "RAM size not measured correctly: page size %ld, #pages %ld",
- sysconf(_SC_PAGESIZE), sysconf(_SC_PHYS_PAGES)
- );
- }
-@@ -1311,7 +1312,7 @@
- int mem_size;
- getsysinfo( GSI_PHYSMEM, (caddr_t) &mem_size, sizeof( mem_size));
- m_nbytes = 1024.* (double)mem_size;
--#elif defined(HW_PHYSMEM)
-+#elif defined(__OpenBSD__)
- // for OpenBSD
- mib[0] = CTL_HW;
- int mem_size;
Deleted: trunk/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp
===================================================================
--- trunk/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp 2015-11-13 23:34:51 UTC (rev 20848)
+++ trunk/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp 2015-11-13 23:40:40 UTC (rev 20849)
@@ -1,12 +0,0 @@
---- 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,9 @@
- #endif
-
- #if !(defined(_WIN32) || (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
-+#if !defined(NO_PER_THREAD_LOCALE)
- #include <xlocale.h>
-+#endif
- //#include "gui_rpc_client.h"
- #endif
-
Deleted: trunk/net/boinc-client/files/patch-clientgui-stdwx.h
===================================================================
--- trunk/net/boinc-client/files/patch-clientgui-stdwx.h 2015-11-13 23:34:51 UTC (rev 20848)
+++ trunk/net/boinc-client/files/patch-clientgui-stdwx.h 2015-11-13 23:40:40 UTC (rev 20849)
@@ -1,11 +0,0 @@
---- clientgui/stdwx.h.orig 2012-04-09 14:00:42.000000000 +0300
-+++ clientgui/stdwx.h 2012-04-09 15:55:46.000000000 +0300
-@@ -164,7 +164,7 @@
- // Standard Libraries
- //
- #ifndef __APPLE__
--#include <malloc.h>
-+#include <stdlib.h>
- #endif
-
- // C headers
Deleted: trunk/net/boinc-client/files/patch-zip-unzip-extract.c
===================================================================
--- trunk/net/boinc-client/files/patch-zip-unzip-extract.c 2015-11-13 23:34:51 UTC (rev 20848)
+++ trunk/net/boinc-client/files/patch-zip-unzip-extract.c 2015-11-13 23:40:40 UTC (rev 20849)
@@ -1,11 +0,0 @@
---- zip/unzip/extract.c.orig 2012-04-09 13:58:50.000000000 +0300
-+++ zip/unzip/extract.c 2012-09-12 14:05:07.000000000 +0300
-@@ -218,7 +218,7 @@
- static ZCONST char Far InvalidComprData[] = "invalid compressed data to ";
- static ZCONST char Far Inflate[] = "inflate_boinc";
-
--extern int inflate_boinc(__G__ is_defl64);
-+extern int inflate_boinc(__GPRO__ int is_defl64);
-
- #ifndef SFX
- static ZCONST char Far Explode[] = "explode";
Modified: trunk/net/boinc-client/files/pkg-install.in
===================================================================
--- trunk/net/boinc-client/files/pkg-install.in 2015-11-13 23:34:51 UTC (rev 20848)
+++ trunk/net/boinc-client/files/pkg-install.in 2015-11-13 23:40:40 UTC (rev 20849)
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $MidnightBSD:$
+# $FreeBSD: head/net/boinc-client/files/pkg-install.in 325489 2013-08-27 21:37:47Z rene $
#
PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
@@ -8,31 +8,21 @@
user=%%BOINC_CLIENT_USER%%
group=%%BOINC_CLIENT_GROUP%%
home="%%BOINC_CLIENT_HOME%%"
-shell=/bin/sh
+option_manager=%%OPTION_MANAGER%%
+option_user=%%OPTION_USER%%
case $2 in
-PRE-INSTALL)
- if ! pw usershow ${user} 2>/dev/null 1>&2; then
- if ! pw useradd ${user} -g ${group} -c "BOINC client user" \
- -d "${home}" -s ${shell}; then
- echo "Failed to create user \"${user}\"." >&2
- exit 1
- else
- echo "User \"${user}\" created successfully:"
+POST-INSTALL)
+ if [ -n "${option_user}" ] ; then
+ if [ -n "${option_manager}" -a ! -e "${home}/skins" -a ! -L "${home}/skins" ]; then
+ ln -s "%%PREFIX%%/share/boinc/skins" "${home}/skins"
fi
- else
- echo "Using existent user \"${user}\":"
+ if [ ! -e "${home}/ca-bundle.crt" -a ! -L "${home}/ca-bundle.crt" ]; then
+ ln -s "%%LOCALBASE%%/share/certs/ca-root-nss.crt" "${home}/ca-bundle.crt"
+ fi
+ echo "Adjusting file ownership in \"${home}\" to ${user}:${group}"
+ chown -hR ${user}:${group} "${home}"
fi
- pw usershow ${user}
- mkdir -m u=rwx,go= -p "${home}"
- if [ ! -e "${home}/skins" -a ! -L "${home}/skins" ]; then
- ln -s "%%PREFIX%%/share/boinc/skins" "${home}/skins"
- fi
- if [ ! -e "${home}/ca-bundle.crt" -a ! -L "${home}/ca-bundle.crt" ]; then
- ln -s "%%LOCALBASE%%/share/certs/ca-root-nss.crt" "${home}/ca-bundle.crt"
- fi
- echo "Adjusting file ownership in \"${home}\" to ${user}:${group}"
- chown -hR ${user}:${group} "${home}"
;;
esac
More information about the Midnightbsd-cvs
mailing list