Attachment 54223 Details for Bug 82054 – file.diff

[patch] file.diff

file.diff (text/plain), 4.62 KB, created by J.R. Oldroyd on 2005-06-08 22:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J.R. Oldroyd

Created: 2005-06-08 22:10:12 UTC

Size: 4.62 KB

patch

obsolete

>diff -ruN /usr/ports/net/boinc-client/Makefile net/boinc-client/Makefile
>--- /usr/ports/net/boinc-client/Makefile	Thu Jun  2 18:07:22 2005
>+++ net/boinc-client/Makefile	Wed Jun  8 16:07:03 2005
>@@ -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: ports/net/boinc-client/Makefile,v 1.12 2005/06/02 21:08:23 pav Exp $
> #
> 
> 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 @@
> 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 -ruN /usr/ports/net/boinc-client/files/boinc.sh.in net/boinc-client/files/boinc.sh.in
>--- /usr/ports/net/boinc-client/files/boinc.sh.in	Thu Jun  2 17:08:23 2005
>+++ net/boinc-client/files/boinc.sh.in	Wed Jun  8 16:06:21 2005
>@@ -4,7 +4,7 @@
> 
> # PROVIDE: boinc
> # REQUIRE: LOGIN
>-# KEYWORD: FreeBSD
>+# KEYWORD: FreeBSD shutdown
> 
> . %%RC_SUBR%%
> 
>diff -ruN /usr/ports/net/boinc-client/files/patch-api-boinc_api.C net/boinc-client/files/patch-api-boinc_api.C
>--- /usr/ports/net/boinc-client/files/patch-api-boinc_api.C	Wed Dec 31 19:00:00 1969
>+++ net/boinc-client/files/patch-api-boinc_api.C	Wed Jun  8 16:54:09 2005
>@@ -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 -ruN /usr/ports/net/boinc-client/files/patch-clientgui-ViewWork.cpp net/boinc-client/files/patch-clientgui-ViewWork.cpp
>--- /usr/ports/net/boinc-client/files/patch-clientgui-ViewWork.cpp	Wed Dec 31 19:00:00 1969
>+++ net/boinc-client/files/patch-clientgui-ViewWork.cpp	Wed Jun  8 15:34:25 2005
>@@ -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 -ruN /usr/ports/net/boinc-client/pkg-plist net/boinc-client/pkg-plist
>--- /usr/ports/net/boinc-client/pkg-plist	Thu Jun  2 18:07:23 2005
>+++ net/boinc-client/pkg-plist	Wed Jun  8 15:36:18 2005
>@@ -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 @@
> 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

Actions: View | Diff

Attachments on bug 82054: 54223