diff options
| -rw-r--r-- | net/boinc-client/Makefile | 11 | ||||
| -rw-r--r-- | net/boinc-client/files/boinc.sh.in | 2 | ||||
| -rw-r--r-- | net/boinc-client/files/patch-api-boinc_api.C | 59 | ||||
| -rw-r--r-- | net/boinc-client/files/patch-clientgui-ViewWork.cpp | 11 | ||||
| -rw-r--r-- | net/boinc-client/pkg-plist | 8 |
5 files changed, 81 insertions, 10 deletions
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index c71f9696dc21..29776d5105a1 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -1,12 +1,13 @@ -# New ports collection makefile for: boinc -# Date created: 01 October 2004 -# Whom: J.R. Oldroyd <fbsd@opal.com> +# New ports collection makefile for: boinc +# Date created: 01 October 2004 +# Whom: J.R. Oldroyd <fbsd@opal.com> # # $FreeBSD$ # PORTNAME= boinc-client PORTVERSION= 4.68.20050601 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://boinc.berkeley.edu/source/nightly/ \ ${MASTER_SITE_LOCAL} @@ -51,9 +52,9 @@ BOINC_BINARY= boinc-client PLIST_SUB= BOINC_BINARY="${BOINC_BINARY}" BOINC_HOME="${BOINC_HOME}" \ BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}" .if !defined(WITHOUT_X11) -PLIST_SUB+= GUI="" +PLIST_SUB+= BOINC_GUI="" .else -PLIST_SUB+= GUI="@comment " +PLIST_SUB+= BOINC_GUI="@comment " .endif SUB_FILES= bin-boinc.sh boinc.1 boinc.sh pkg-install diff --git a/net/boinc-client/files/boinc.sh.in b/net/boinc-client/files/boinc.sh.in index 81fe8fc5460b..4c87c3e7c7f8 100644 --- a/net/boinc-client/files/boinc.sh.in +++ b/net/boinc-client/files/boinc.sh.in @@ -4,7 +4,7 @@ # PROVIDE: boinc # REQUIRE: LOGIN -# KEYWORD: FreeBSD +# KEYWORD: FreeBSD shutdown . %%RC_SUBR%% diff --git a/net/boinc-client/files/patch-api-boinc_api.C b/net/boinc-client/files/patch-api-boinc_api.C new file mode 100644 index 000000000000..da4f179c703c --- /dev/null +++ b/net/boinc-client/files/patch-api-boinc_api.C @@ -0,0 +1,59 @@ +--- api/boinc_api.C.orig Mon May 23 03:50:50 2005 ++++ api/boinc_api.C Wed Jun 8 16:52:34 2005 +@@ -59,7 +59,7 @@ + + #ifndef _WIN32 + static pthread_t timer_thread_handle; +-static pthread_t worker_thread; ++static void * timer_thread(); + static struct rusage worker_thread_ru; + #endif + +@@ -534,14 +534,6 @@ + } + } + +-#ifndef _WIN32 +-static void timer_signal_handler(int) { +- if (pthread_equal(pthread_self(), worker_thread)) { +- getrusage(RUSAGE_SELF, &worker_thread_ru); +- } +-} +- +-#endif + + #ifdef _WIN32 + static void CALLBACK worker_timer( +@@ -619,6 +611,7 @@ + while(1) { + usleep((useconds_t)(TIMER_PERIOD*1000000)); + worker_timer(0); ++ getrusage(RUSAGE_SELF, &worker_thread_ru); + } + /*NOTREACHED*/ + } +@@ -659,24 +652,6 @@ + retval = pthread_create(&timer_thread_handle, NULL, timer_thread, NULL); + if (retval) { + perror("set_worker_timer(): pthread_create(): %d"); +- } +- worker_thread = pthread_self(); +- +- struct sigaction sa; +- itimerval value; +- sa.sa_handler = timer_signal_handler; +- sa.sa_flags = SA_RESTART; +- retval = sigaction(SIGALRM, &sa, NULL); +- if (retval) { +- perror("boinc set_worker_timer() sigaction"); +- return retval; +- } +- value.it_value.tv_sec = TIMER_PERIOD; +- value.it_value.tv_usec = 0; +- value.it_interval = value.it_value; +- retval = setitimer(ITIMER_REAL, &value, NULL); +- if (retval) { +- perror("boinc set_worker_timer() setitimer"); + } + #endif + return retval; diff --git a/net/boinc-client/files/patch-clientgui-ViewWork.cpp b/net/boinc-client/files/patch-clientgui-ViewWork.cpp new file mode 100644 index 000000000000..d44e95d9a4d7 --- /dev/null +++ b/net/boinc-client/files/patch-clientgui-ViewWork.cpp @@ -0,0 +1,11 @@ +--- clientgui/ViewWork.cpp.orig Sun May 29 03:12:00 2005 ++++ clientgui/ViewWork.cpp Wed Jun 8 15:30:28 2005 +@@ -569,7 +569,7 @@ + strBuffer.Clear(); + + RESULT* rp = pDoc->result(item); +- if (rp->active_task) { ++ if (! rp->active_task) { + if(rp->state < RESULT_COMPUTE_ERROR) + strBuffer.Printf(wxT("%.2f%%"), 0.0); + else diff --git a/net/boinc-client/pkg-plist b/net/boinc-client/pkg-plist index 7fa12b3e8ce7..a276c4504a02 100644 --- a/net/boinc-client/pkg-plist +++ b/net/boinc-client/pkg-plist @@ -1,5 +1,5 @@ bin/boinc -%%GUI%%bin/boincmgr +%%BOINC_GUI%%bin/boincmgr include/BOINC/acct_mgr_client.h include/BOINC/app_ipc.h include/BOINC/base64.h @@ -44,9 +44,9 @@ include/BOINC/x_opengl.h lib/boinc/%%BOINC_BINARY%% lib/libboinc.a lib/libboinc_api.a -%%GUI%%lib/libboinc_graphics_api.a -%%GUI%%lib/libboinc_graphics_impl.a -%%GUI%%lib/libboinc_graphics_lib.a +%%BOINC_GUI%%lib/libboinc_graphics_api.a +%%BOINC_GUI%%lib/libboinc_graphics_impl.a +%%BOINC_GUI%%lib/libboinc_graphics_lib.a lib/librsaeuro.a lib/libboinc_zip.a @dirrm include/BOINC |