net/boinc-client :

- update to 7.0.65 [1] Unlike the PR, keep the SKINS option and the extra skins, and do not pregenerate autotools files. - work around a build conflict with archivers/libzip in port Makefile [2] - pre-emptively fix build with libc++ - change MASTERSITE from Pav's to my site - comment out the BROKEN message for sparc64/ia64/powerpc (for now) - regenerate patches using 'make makepatch' astro/boinc-{setiathome-enhanced,astropulse} : - remove obsolete calls to functions removed from libboinc to prevent breakage PR: ports/176724 [1] Submitted by: Andrey Simonenko <simon@comsys.ntu-kpi.kiev.ua> [1] Submitted by: zi@ [2]
svn path=/head/; revision=327546
2024-11-25 00:51:21 +00:00 · 2013-09-18 13:48:19 +00:00 · 2013-09-18 13:48:19 +00:00 · 7f6ba9d599 · 2021-03-31 03:12:20 +00:00
commit 7f6ba9d599
parent 2fd32f51c3
18 changed files with 214 additions and 180 deletions
--- a/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp
+++ b/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp
@ -0,0 +1,10 @@
+--- ap_client_main.cpp.orig	2012-08-14 02:07:20.000000000 +0200
+++ ap_client_main.cpp	2013-08-06 18:41:38.000000000 +0200
+@@ -1288,7 +1288,6 @@
+                * used to inform the core client GUI of the % complete.
+                */
+               boinc_fraction_done(state.frac_done);
+-	      boinc_ops_cumulative(state.frac_done*FLOPS_PER_DM*(state.dm_hi-state.dm_low)*log((float)state.fft_len)/log(32768.0),0);
+               debug_loop(5, 2, debug_loop_msg);
+   
+               /* This is the size of the power array.
--- a/astro/boinc-astropulse/files/patch-client__ap_fold.cpp
+++ b/astro/boinc-astropulse/files/patch-client__ap_fold.cpp
@ -0,0 +1,10 @@
+--- ap_fold.cpp.orig	2009-04-01 02:11:24.000000000 +0200
+++ ap_fold.cpp	2013-08-06 18:42:02.000000000 +0200
+@@ -283,7 +283,6 @@
+        * used to inform the core client GUI of the % complete.
+        */
+       boinc_fraction_done(state.frac_done);
+-      boinc_ops_cumulative(state.frac_done*FLOPS_PER_DM*(state.dm_hi-state.dm_low)*log((double)state.fft_len)/log(32768.0),0);
+ 
+       freq_count++;
+       /* Report to stdout if we have reached a new "milestone" frequency. */
--- a/astro/boinc-setiathome-enhanced/files/patch-client__analyzeFuncs.cpp
+++ b/astro/boinc-setiathome-enhanced/files/patch-client__analyzeFuncs.cpp
@ -0,0 +1,10 @@
+--- client/analyzeFuncs.cpp.orig	2008-07-31 02:02:10.000000000 +0200
+++ client/analyzeFuncs.cpp	2013-08-06 18:48:46.000000000 +0200
+@@ -415,7 +415,6 @@
+         fftlen    = ChirpFftPairs[icfft].FftLen;
+         chirprate = ChirpFftPairs[icfft].ChirpRate;
+         chirprateind = ChirpFftPairs[icfft].ChirpRateInd;
+-        boinc_fpops_cumulative((SETUP_FLOPS+analysis_state.FLOP_counter)*LOAD_STORE_ADJUSTMENT);
+         // boinc_worker_timer();
+ #ifdef DEBUG
+         double ptime=static_cast<double>((unsigned)clock())/CLOCKS_PER_SEC+
--- a/astro/boinc-setiathome-enhanced/files/patch-client__seti.h
+++ b/astro/boinc-setiathome-enhanced/files/patch-client__seti.h
@ -0,0 +1,11 @@
+--- client/seti.h.orig	2009-01-26 18:01:09.000000000 +0100
+++ client/seti.h	2013-08-06 18:48:50.000000000 +0200
+@@ -35,8 +35,6 @@
+ #include <vector>
+ #include "boinc_api.h"
+ 
+-#define boinc_fpops_cumulative(x) boinc_ops_cumulative(x,0)
+-
+ extern APP_INIT_DATA app_init_data;
+ 
+ #include "analyze.h"
--- a/astro/boinc-setiathome-enhanced/files/patch-client__worker.cpp
+++ b/astro/boinc-setiathome-enhanced/files/patch-client__worker.cpp
@ -0,0 +1,18 @@
+--- client/worker.cpp.orig	2008-07-31 02:02:10.000000000 +0200
+++ client/worker.cpp	2013-08-06 18:48:48.000000000 +0200
+@@ -153,7 +153,6 @@
+     retval = seti_do_work();
+     if (retval) SETIERROR(retval,"from seti_do_work() in worker()");
+ 
+-    boinc_fpops_cumulative((SETUP_FLOPS+analysis_state.FLOP_counter)*LOAD_STORE_ADJUSTMENT);
+     boinc_finish(retval);
+   }
+   catch (seti_error e) {
+@@ -165,7 +164,6 @@
+ 	remaining=0;
+ 	boinc_fraction_done(progress);
+         checkpoint(true);      // force a checkpoint
+-        boinc_fpops_cumulative((SETUP_FLOPS+analysis_state.FLOP_counter)*LOAD_STORE_ADJUSTMENT);
+         boinc_finish(0);
+         exit(0);            // an overflow is not an app error
+     } else {
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@ -2,21 +2,20 @@
 # $FreeBSD$

 PORTNAME=	boinc-client
-PORTVERSION=	7.0.28
-PORTREVISION=	3
+PORTVERSION=	7.0.65
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	pav
+MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/

 MAINTAINER=	rene@FreeBSD.org
 COMMENT=	Berkeley Open Infrastructure for Network Computing client

+USES=		gmake pkgconfig
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USE_AUTOTOOLS=	autoconf:env automake:env libtoolize:env
 USE_LDCONFIG=	yes
 USE_DOS2UNIX=	yes
-DOS2UNIX_REGEX=	.*\.(cpp|h)
+DOS2UNIX_REGEX=	.*\.xpm

 USERS=		boinc
 GROUPS=		boinc
@ -55,9 +54,9 @@ NO_NET_INFO_DESC=	Do not send host address and name to servers

 .include <bsd.port.options.mk>

-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not install on ia64, powerpc, or sparc64
-.endif
+#.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+#BROKEN=		Does not install on ia64, powerpc, or sparc64
+#.endif

 .if ${PORT_OPTIONS:MMANAGER}
 PORT_OPTIONS+=	CLIENT X11
@ -132,16 +131,34 @@ PLIST_SUB+=	X11="@comment "

 PORT_OPTIONS:=	${PORT_OPTIONS:O:u}

-post-patch:
+# avoid build conflict with archivers/libzip
+post-extract:
+	${MV} ${WRKSRC}/zip/unzip/zip.h ${WRKSRC}/zip/unzip/boinczip.h
+	${MV} ${WRKSRC}/zip/zip/zip.h ${WRKSRC}/zip/zip/boinczip.h
+	${REINPLACE_CMD} -e 's|zip/zip.h|zip/boinczip.h|' \
+	    ${WRKSRC}/zip/boinc_zip.cpp
+	${REINPLACE_CMD} -e 's|"zip.h"|"boinczip.h"|' \
+	    ${WRKSRC}/zip/unzip/crc32.c ${WRKSRC}/zip/unzip/ttyio.c \
+	    ${WRKSRC}/zip/zip/deflate.c ${WRKSRC}/zip/zip/trees.c \
+	    ${WRKSRC}/zip/zip/unix/z_unix.c ${WRKSRC}/zip/zip/util.c \
+	    ${WRKSRC}/zip/zip/z_fileio.c ${WRKSRC}/zip/zip/z_globals.c \
+	    ${WRKSRC}/zip/zip/zip.c ${WRKSRC}/zip/zip/zipfile.c \
+	    ${WRKSRC}/zip/zip/zipup.c
+
+pre-configure:
+	(cd ${WRKSRC} ; ./_autosetup)
+
+post-configure:
 	@${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-lcrypto -ldl|-lcrypto|' ${WRKSRC}/configure
 .if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|$$$$mydir/$$$$ldir|&/LC_MESSAGES|' ${WRKSRC}/locale/Makefile.in
+	@${REINPLACE_CMD} -e 's|$$$$mydir/$$$$ldir|&/LC_MESSAGES|' \
+	    ${WRKSRC}/locale/Makefile.in
 .else
 	@${REINPLACE_CMD} -e 's| locale||' ${WRKSRC}/Makefile.in
 .endif
 .if ! ${PORT_OPTIONS:MX11}
-	@${REINPLACE_CMD} -e 's|@BUILD_GRAPHICS_API_TRUE@|#&|' ${WRKSRC}/api/Makefile.in
+	@${REINPLACE_CMD} -e 's|@BUILD_GRAPHICS_API_TRUE@|#&|' \
+	    ${WRKSRC}/api/Makefile.in
 .endif

 post-install:
@ -156,21 +173,26 @@ post-install:
 	    ${PREFIX}/share/pixmaps
 . endfor
 . if ${PORT_OPTIONS:MSKINS}
-	${CP} -R ${WRKSRC}/clientgui/skins ${PREFIX}/share/boinc
+	(cd ${WRKSRC}/clientgui && \
+	${COPYTREE_SHARE} skins ${PREFIX}/share/boinc/ )
 . else
 	${MKDIR} ${PREFIX}/share/boinc/skins
-	${CP} -R ${WRKSRC}/clientgui/skins/Default ${PREFIX}/share/boinc/skins
+	(cd ${WRKSRC}/clientgui/skins && \
+	${COPYTREE_SHARE} Default ${PREFIX}/share/boinc/skins/ )
 . endif
 .endif
-. for name in config.h api/reduce.h lib/shmem.h lib/std_fixes.h
+. for name in config.h project_specific_defines.h api/reduce.h lib/shmem.h \
+	lib/std_fixes.h
 	${INSTALL_DATA} ${WRKSRC}/${name} ${PREFIX}/include/boinc
 . endfor
 .if ${PORT_OPTIONS:MX11}
 . for name in api/boinc_gl.h api/graphics_api.h api/graphics_data.h \
-	api/txf_util.h
+	api/ttfont.h
 	${INSTALL_DATA} ${WRKSRC}/${name} ${PREFIX}/include/boinc
 . endfor
-	${CP} -R ${WRKSRC}/api/txf ${PREFIX}/share/boinc
+	${MKDIR} ${PREFIX}/share/boinc/ttf
+	(cd ${WRKSRC}/api/ttf/liberation-fonts-ttf-2.00.0 && \
+	    ${COPYTREE_SHARE} \*.ttf ${PREFIX}/share/boinc/ttf/ )
 .endif

 .include <bsd.port.mk>
--- a/net/boinc-client/distinfo
+++ b/net/boinc-client/distinfo
@ -1,2 +1,2 @@
-SHA256 (boinc-client-7.0.28.tar.xz) = a8d208b7145e911e856db4d4cdcfa843e26b445a948c11e40ad03ae3fdd657fa
-SIZE (boinc-client-7.0.28.tar.xz) = 4529336
+SHA256 (boinc-client-7.0.65.tar.xz) = 5ee526924a4939c83e5860afcb10c388fe6253157ffab1f90e87750280da3f90
+SIZE (boinc-client-7.0.65.tar.xz) = 26393968
--- a/net/boinc-client/files/patch-api__boinc_api.cpp
+++ b/net/boinc-client/files/patch-api__boinc_api.cpp
@ -1,6 +1,6 @@
--- api/boinc_api.cpp.old	2013-05-17 14:10:37.000000000 +0300
-+++ api/boinc_api.cpp	2013-05-17 14:10:49.000000000 +0300
-@@ -111,7 +111,7 @@
+--- ./api/boinc_api.cpp.orig	2013-07-24 15:13:28.000000000 +0000
+++ ./api/boinc_api.cpp	2013-09-17 21:16:00.000000000 +0000
+@@ -120,7 +120,7 @@
     // CPPFLAGS=-DGETRUSAGE_IN_TIMER_THREAD
 #endif
 
--- a/net/boinc-client/files/patch-api__boinc_api.h
+++ b/net/boinc-client/files/patch-api__boinc_api.h
@ -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
- 
--- a/net/boinc-client/files/patch-client-hostinfo_unix.cpp
+++ b/net/boinc-client/files/patch-client-hostinfo_unix.cpp
@ -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; 
--- a/net/boinc-client/files/patch-client__client_msgs.h
+++ b/net/boinc-client/files/patch-client__client_msgs.h
@ -1,5 +1,5 @@
--- client/client_msgs.h.old	2013-05-17 14:13:10.000000000 +0300
-+++ client/client_msgs.h	2013-05-17 14:13:20.000000000 +0300
+--- ./client/client_msgs.h.orig	2013-07-24 15:13:28.000000000 +0000
+++ ./client/client_msgs.h	2013-09-17 21:16:00.000000000 +0000
@@ -73,6 +73,6 @@
     __attribute__ ((format (printf, 4, 5)))
 ;
--- a/net/boinc-client/files/patch-clientgui-stdwx.h
+++ b/net/boinc-client/files/patch-clientgui-stdwx.h
@ -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
--- a/net/boinc-client/files/patch-clientgui__AsyncRPC.cpp
+++ b/net/boinc-client/files/patch-clientgui__AsyncRPC.cpp
@ -1,12 +1,12 @@
 --- 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
+@@ -31,7 +31,9 @@
+ #include "util.h"
 
 #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"
+ #include "gui_rpc_client.h"
 #endif
 
--- a/net/boinc-client/files/patch-lib__diagnostics.cpp
+++ b/net/boinc-client/files/patch-lib__diagnostics.cpp
@ -0,0 +1,10 @@
+--- ./lib/diagnostics.cpp.orig	2013-07-24 15:13:29.000000000 +0000
+++ ./lib/diagnostics.cpp	2013-09-17 21:40:56.000000000 +0000
+@@ -41,6 +41,7 @@
+ #include <cstdarg>
+ #include <cstdlib>
+ #include <unistd.h>
+#include <time.h>
+ #endif
+ 
+ #ifdef _USING_FCGI_
--- a/net/boinc-client/files/patch-lib__gui_rpc_client_print.cpp
+++ b/net/boinc-client/files/patch-lib__gui_rpc_client_print.cpp
@ -0,0 +1,10 @@
+--- ./lib/gui_rpc_client_print.cpp.orig	2013-07-24 15:13:29.000000000 +0000
+++ ./lib/gui_rpc_client_print.cpp	2013-09-17 21:43:21.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <sys/un.h>
+ #include <cstdio>
+ #include <unistd.h>
+#include <time.h>
+ #include <cstdlib>
+ #include <cstring>
+ #endif
--- a/net/boinc-client/files/patch-lib__str_util.cpp
+++ b/net/boinc-client/files/patch-lib__str_util.cpp
@ -0,0 +1,10 @@
+--- ./lib/str_util.cpp.orig	2013-07-24 15:13:29.000000000 +0000
+++ ./lib/str_util.cpp	2013-09-17 21:45:40.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include <string>
+ #include <math.h>
+ #include <string.h>
+#include <time.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+ #endif
--- a/net/boinc-client/files/patch-zip-unzip-extract.c
+++ b/net/boinc-client/files/patch-zip-unzip-extract.c
@ -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";
--- a/net/boinc-client/pkg-plist
+++ b/net/boinc-client/pkg-plist
@ -3,6 +3,7 @@
 %%BOINC_CLIENT%%bin/boinccmd
 %%BOINC_CLIENT%%bin/switcher
 %%BOINC_MANAGER%%bin/boincmgr
+%%BOINC_MANAGER%%bin/boincscr
 include/boinc/app_ipc.h
 include/boinc/average.h
 include/boinc/base64.h
@ -38,6 +39,7 @@ include/boinc/notice.h
 include/boinc/parse.h
 include/boinc/prefs.h
 include/boinc/procinfo.h
+include/boinc/project_specific_defines.h
 include/boinc/proxy_info.h
 include/boinc/reduce.h
 include/boinc/shmem.h
@ -53,7 +55,7 @@ include/boinc/win_util.h
 %%X11%%include/boinc/boinc_gl.h
 %%X11%%include/boinc/graphics_api.h
 %%X11%%include/boinc/graphics_data.h
-%%X11%%include/boinc/txf_util.h
+%%X11%%include/boinc/ttfont.h
 lib/libboinc.a
 lib/libboinc.la
 lib/libboinc_api.a
@ -278,84 +280,76 @@ lib/libboinc_zip.so.7
 %%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/tabArea_bg.png
 %%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/wu_bg.png
 %%SKINS%%share/boinc/skins/Progress Thru Processors/skin.xml
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/arwLeft.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/arwLeftClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/arwRight.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/arwRightClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnAddProject.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnAddProjectClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnAdvancedView.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnCancel.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnCancelClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnChange.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnChangeClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnClear.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnClearClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnClose.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnCloseClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnCopy.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnCopyAll.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnCopyAllClicked.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnCopyClicked.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnHelp.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnHelpClicked.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnMessages.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnMessagesRed.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnPreferences.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnResume.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnSave.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnSaveClick.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/btnSnooze.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/conn_ind.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/default_stat_icon.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/dlgBackground.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/error_image.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/gauge_bg.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/gauge_progress_indicator.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/ico_workWU.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/proj_bg.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/project_image.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/simplegui_bg.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/spacer.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/state_ind_bg.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/tabArea_bg.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/wcg_about.ico
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/wcg_black_background.gif
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/wcg_pause.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/wcg_play.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/wcg_stop.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/wcg_wizard_bar.png
-%%SKINS%%share/boinc/skins/World Community Grid/graphic/wu_bg.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/arwLeft.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/arwLeftClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/arwRight.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/arwRightClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnAddProject.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnAddProjectClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnAdvancedView.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnCancel.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnCancelClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnChange.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnChangeClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnClear.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnClearClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnClose.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnCloseClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnCopy.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnCopyAll.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnCopyAllClicked.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnCopyClicked.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnHelp.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnHelpClicked.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnMessages.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnMessagesRed.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnPreferences.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnResume.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnSave.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnSaveClick.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/btnSnooze.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/conn_ind.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/default_stat_icon.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/dlgBackground.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/error_image.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/gauge_bg.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/gauge_progress_indicator.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/ico_workWU.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/proj_bg.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/project_image.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/simplegui_bg.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/spacer.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/state_ind_bg.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/tabArea_bg.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/wcg_about.ico
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/wcg_black_background.gif
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/wcg_pause.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/wcg_play.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/wcg_stop.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/wcg_wizard_bar.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/graphic/wu_bg.png
+%%SKINS%%share/boinc/skins/World Community Grid/Old/skin.xml
+%%SKINS%%share/boinc/skins/World Community Grid/Green_dot.png
+%%SKINS%%share/boinc/skins/World Community Grid/Red_dot.png
+%%SKINS%%share/boinc/skins/World Community Grid/Yellow_dot.png
+%%SKINS%%share/boinc/skins/World Community Grid/background_image.png
+%%SKINS%%share/boinc/skins/World Community Grid/wcg_about.ico
+%%SKINS%%share/boinc/skins/World Community Grid/wcg_pause.png
+%%SKINS%%share/boinc/skins/World Community Grid/wcg_play.png
+%%SKINS%%share/boinc/skins/World Community Grid/wcg_stop.png
 %%SKINS%%share/boinc/skins/World Community Grid/skin.xml
-%%X11%%share/boinc/txf/AvantGarde-Book.txf
-%%X11%%share/boinc/txf/AvantGarde-BookOblique.txf
-%%X11%%share/boinc/txf/AvantGarde-Demi.txf
-%%X11%%share/boinc/txf/AvantGarde-DemiOblique.txf
-%%X11%%share/boinc/txf/Bookman-Demi.txf
-%%X11%%share/boinc/txf/Bookman-DemiItalic.txf
-%%X11%%share/boinc/txf/Bookman-Light.txf
-%%X11%%share/boinc/txf/Bookman-LightItalic.txf
-%%X11%%share/boinc/txf/Courier-Bold.txf
-%%X11%%share/boinc/txf/Courier-BoldOblique.txf
-%%X11%%share/boinc/txf/Courier-Oblique.txf
-%%X11%%share/boinc/txf/Courier.txf
-%%X11%%share/boinc/txf/Helvetica-Bold.txf
-%%X11%%share/boinc/txf/Helvetica-BoldOblique.txf
-%%X11%%share/boinc/txf/Helvetica-Oblique.txf
-%%X11%%share/boinc/txf/Helvetica.txf
-%%X11%%share/boinc/txf/NewCenturySchlbk-Bold.txf
-%%X11%%share/boinc/txf/NewCenturySchlbk-BoldItalic.txf
-%%X11%%share/boinc/txf/NewCenturySchlbk-Italic.txf
-%%X11%%share/boinc/txf/NewCenturySchlbk-Roman.txf
-%%X11%%share/boinc/txf/Palatino-Bold.txf
-%%X11%%share/boinc/txf/Palatino-BoldItalic.txf
-%%X11%%share/boinc/txf/Palatino-Italic.txf
-%%X11%%share/boinc/txf/Palatino-Roman.txf
-%%X11%%share/boinc/txf/Times-Bold.txf
-%%X11%%share/boinc/txf/Times-BoldItalic.txf
-%%X11%%share/boinc/txf/Times-Italic.txf
-%%X11%%share/boinc/txf/Times-Roman.txf
-%%X11%%share/boinc/txf/ZapfChancery-MediumItalic.txf
+%%X11%%share/boinc/ttf/LiberationMono-Bold.ttf
+%%X11%%share/boinc/ttf/LiberationMono-BoldItalic.ttf
+%%X11%%share/boinc/ttf/LiberationMono-Italic.ttf
+%%X11%%share/boinc/ttf/LiberationMono-Regular.ttf
+%%X11%%share/boinc/ttf/LiberationSans-Bold.ttf
+%%X11%%share/boinc/ttf/LiberationSans-BoldItalic.ttf
+%%X11%%share/boinc/ttf/LiberationSans-Italic.ttf
+%%X11%%share/boinc/ttf/LiberationSans-Regular.ttf
+%%X11%%share/boinc/ttf/LiberationSerif-Bold.ttf
+%%X11%%share/boinc/ttf/LiberationSerif-BoldItalic.ttf
+%%X11%%share/boinc/ttf/LiberationSerif-Italic.ttf
+%%X11%%share/boinc/ttf/LiberationSerif-Regular.ttf
 %%NLS%%share/locale/ar/LC_MESSAGES/BOINC-Client.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/BOINC-Manager.mo
 %%NLS%%share/locale/be/LC_MESSAGES/BOINC-Client.mo
@ -441,10 +435,11 @@ lib/libboinc_zip.so.7
 %%SKINS%%@dirrm share/boinc/skins/People for a Smarter Planet
 %%SKINS%%@dirrm share/boinc/skins/Progress Thru Processors/graphic
 %%SKINS%%@dirrm share/boinc/skins/Progress Thru Processors
-%%SKINS%%@dirrm share/boinc/skins/World Community Grid/graphic
+%%SKINS%%@dirrm share/boinc/skins/World Community Grid/Old/graphic
+%%SKINS%%@dirrm share/boinc/skins/World Community Grid/Old
 %%SKINS%%@dirrm share/boinc/skins/World Community Grid
 %%BOINC_MANAGER%%@dirrm share/boinc/skins
-%%X11%%@dirrm share/boinc/txf
+%%X11%%@dirrm share/boinc/ttf
 %%X11%%@dirrm share/boinc
 %%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sv_SE