12 files changed, 687 insertions, 147 deletions

diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 84dca7889d6e..fd952d89a88a 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	boinc-client
-PORTVERSION=	6.4.5
-PORTREVISION=	7
+PORTVERSION=	7.0.25
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
@@ -15,52 +14,101 @@ MASTER_SITE_SUBDIR=	pav
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Berkeley Open Infrastructure for Network Computing client
 
-LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-
-USE_BZIP2=	yes
+USE_XZ=		yes
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+USE_DOS2UNIX=	yes
+DOS2UNIX_REGEX=	.*\.(cpp|h)
 
-BOINC_USER?=	boinc
-BOINC_GROUP?=	nobody
-BOINC_HOME?=	/var/db/boinc
+BOINC_CLIENT_USER?=	boinc
+BOINC_CLIENT_GROUP?=	nobody
+BOINC_CLIENT_HOME?=	/var/db/boinc
 
-PLIST_SUB=	BOINC_HOME="${BOINC_HOME}" BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
+PLIST_SUB=	BOINC_CLIENT_HOME="${BOINC_CLIENT_HOME}" \
+		BOINC_CLIENT_USER="${BOINC_CLIENT_USER}"
 
 SUB_FILES=	pkg-install
-SUB_LIST=	BOINC_HOME="${BOINC_HOME}" BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}"
+SUB_LIST=	BOINC_CLIENT_HOME="${BOINC_CLIENT_HOME}" \
+		BOINC_CLIENT_USER="${BOINC_CLIENT_USER}" \
+		BOINC_CLIENT_GROUP="${BOINC_CLIENT_GROUP}" \
+		PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}"
 
-USE_RC_SUBR=	boinc.sh
+USE_RC_SUBR=	boinc-client
 
 CONFIGURE_ARGS=	--disable-server
 CPPFLAGS+=	-I${LOCALBASE}/include
-CXXFLAGS:=	${CXXFLAGS:N-O*:N-f*} -O3
-CFLAGS:=	${CFLAGS:N-O*:N-f*} -O3
-CONFIGURE_ENV=	CXXFLAGSS="${CXXFLAGS}"
 
-OPTIONS=	X11 "Build Boinc Manager GUI" on \
-		ALT "Accept Linux science applications" off
+OPTIONS=	CLIENT "Build BOINC client" on \
+		MANAGER "Build BOINC manager GUI" on \
+		X11 "Build graphics API" on \
+		ALT "Accept Linux science applications" off \
+		USER "Create/check BOINC client user" on \
+		SKINS "Install more skins for BOINC manager" off \
+		OPTIMIZE "Enable compiler optimization flags" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(BOINC_USER) || defined(BOINC_GROUP) || defined(BOINC_HOME)
+pre-extract:
+	@${ECHO_MSG}
+	@${ECHO_MSG} "===> The following variables were renamed:"
+	@${ECHO_MSG} "===>     BOINC_USER BOINC_GROUP BOINC_HOME"
+	@${ECHO_MSG} "===> Use new names of similar variables."
+	@${ECHO_MSG}
+	@exit 1
+.endif
+
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
 BROKEN=		Does not install on ia64, powerpc, or sparc64
 .endif
 
+.if !defined(WITHOUT_MANAGER)
+. if defined(WITHOUT_CLIENT)
+.  undef WITHOUT_CLIENT
+. endif
+. if defined(WITHOUT_X11)
+.  undef WITHOUT_X11
+. endif
+.endif
+
 .if !defined(WITHOUT_X11)
 USE_GL=		glut
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=	X11=""
+.else
+PLIST_SUB+=	X11="@comment "
+.endif
+
+.if !defined(WITHOUT_MANAGER)
 USE_XORG=	x11
-USE_WX=		2.6+
+USE_WX=		2.8+
+USE_ICONV=	yes
 WX_CONF_ARGS=	absolute
-CPPFLAGS+=		-I${LOCALBASE}/include
+LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+CONFIGURE_ARGS+=--with-sqlite3-prefix=${LOCALBASE}
+. if ${OSVERSION} < 1000002
+CPPFLAGS+=	-DNO_PER_THREAD_LOCALE
+. endif
+PLIST_SUB+=	BOINC_MANAGER=""
+.else
+CONFIGURE_ARGS+=--disable-manager --with-wx-config=false --without-x
+PLIST_SUB+=	BOINC_MANAGER="@comment "
+.endif
 
-USE_ICONV=	yes
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
+.if !defined(WITHOUT_CLIENT)
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+PLIST_SUB+=	BOINC_CLIENT=""
+.else
+CONFIGURE_ARGS+=--disable-client
+PLIST_SUB+=	BOINC_CLIENT="@comment "
+.endif
 
-PLIST_SUB+=	BOINC_GUI=""
+.if defined(WITHOUT_NLS) || defined(WITHOUT_MANAGER)
+PLIST_SUB+=	NLS="@comment "
 .else
-CONFIGURE_ARGS+=	--with-wx-config=false --without-x
-PLIST_SUB+=	BOINC_GUI="@comment "
+PLIST_SUB+=	NLS=""
 .endif
 
 .if defined(WITH_ALT)
@@ -68,25 +116,58 @@ CONFIGURE_ARGS+=--with-boinc-alt-platform=i686-pc-linux-gnu
 USE_LINUX=	yes
 .endif
 
+.if defined(WITH_SKINS)
+PLIST_SUB+=	SKINS=""
+.else
+PLIST_SUB+=	SKINS="@comment "
+.endif
+
+.if !defined(WITHOUT_USER)
+PLIST_SUB+=	USER=""
+.else
+PLIST_SUB+=	USER="@comment "
+.endif
+
+.if defined(WITH_OPTIMIZE)
+CONFIGURE_ARGS+=--enable-optimize
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|gui_rpc_auth.cfg|${BOINC_HOME}/gui_rpc_auth.cfg|g' \
-		${WRKSRC}/client/file_names.h ${WRKSRC}/lib/boinc_cmd.cpp \
-		${WRKSRC}/clientgui/MainDocument.cpp
-	@${REINPLACE_CMD} -e 's|../curl/ca-bundle.crt||' ${WRKSRC}/client/Makefile.in
-	@${REINPLACE_CMD} -e 's|ca-bundle.crt|${LOCALBASE}/share/certs/ca-root-nss.crt|' ${WRKSRC}/client/file_names.h
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/clientgui/stdwx.h
-	@${REINPLACE_CMD} -e 's| install-dist_pkgdataDATA||' ${WRKSRC}/clientgui/res/Makefile.in
-	@${REINPLACE_CMD} -e 's|boincmgr.16x16.png boincmgr.32x32.png boincmgr.48x48.png||' ${WRKSRC}/clientgui/res/Makefile.in
 	@${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.in
-
-# kill -O3 from clientgui build, it triggers some optimization bug and segfaults on runtime with -O3
-post-configure:
-	@${REINPLACE_CMD} -e 's|-O3 ||' ${WRKSRC}/clientgui/Makefile
+	@${REINPLACE_CMD} -e 's|-lcrypto -ldl|-lcrypto|' ${WRKSRC}/configure
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e 's| locale||' ${WRKSRC}/Makefile.in
+.else
+	@${REINPLACE_CMD} -e 's|$$$$mydir/$$$$ldir|&/LC_MESSAGES|' ${WRKSRC}/locale/Makefile.in
+.endif
+.if defined(WITHOUT_X11)
+	@${REINPLACE_CMD} -e 's|@BUILD_GRAPHICS_API_TRUE@|#&|' ${WRKSRC}/api/Makefile.in
+.endif
 
 post-install:
-.for file in boinc_gl graphics_api graphics_data reduce
-	${INSTALL_DATA} ${WRKSRC}/api/${file}.h ${PREFIX}/include/boinc/
-.endfor
+.if !defined(WITHOUT_MANAGER)
+	${MKDIR} ${LOCALBASE}/share/pixmaps
+. for name in 16 32 48
+	cd ${LOCALBASE}/share/pixmaps ; ${LN} -sf ${PREFIX}/share/boinc/boincmgr.${name}x${name}.png
+. endfor
+.endif
+.if !defined(WITHOUT_X11)
+. for name in api/boinc_gl.h api/txf_util.h
+	${INSTALL_DATA} ${WRKSRC}/${name} ${PREFIX}/include/boinc
+. endfor
+. if defined(WITHOUT_MANAGER)
+	${MKDIR} ${PREFIX}/share/boinc
+. endif
+	${CP} -R ${WRKSRC}/api/txf ${PREFIX}/share/boinc
+.endif
+.if defined(WITH_SKINS)
+	${CP} -R ${WRKSRC}/clientgui/skins ${PREFIX}/share/boinc
+.elif defined(WITH_MANAGER)
+	${MKDIR} ${PREFIX}/share/boinc/skins
+	${CP} -R ${WRKSRC}/clientgui/skins/Default ${PREFIX}/share/boinc/skins
+.endif
+.if !defined(WITHOUT_USER)
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/boinc-client/distinfo b/net/boinc-client/distinfo
index 715e84bf9037..8f0713f2c41b 100644
--- a/net/boinc-client/distinfo
+++ b/net/boinc-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (boinc-client-6.4.5.tar.bz2) = 057307b0ffbc0ce35c4240271e912b513fa0edfb4928d83038b30d8402f9b1f4
-SIZE (boinc-client-6.4.5.tar.bz2) = 4448407
+SHA256 (boinc-client-7.0.25.tar.xz) = b73dc1ab8e390e7f015964462dd4b02aa01f01ec1bb8dfcfb0faea8c4957bec5
+SIZE (boinc-client-7.0.25.tar.xz) = 4568300
diff --git a/net/boinc-client/files/boinc-client.in b/net/boinc-client/files/boinc-client.in
new file mode 100644
index 000000000000..9edab1342e57
--- /dev/null
+++ b/net/boinc-client/files/boinc-client.in
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: boinc-client
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable the BOINC client:
+#
+# boinc_client_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="boinc-client"
+rcvar=boinc_client_enable
+
+boinc_client_user=%%BOINC_CLIENT_USER%%
+boinc_client_home=%%BOINC_CLIENT_HOME%%
+boinc_client_flags="--daemon --dir ${boinc_client_home}"
+
+active_file="/var/run/${name}.active"
+
+load_rc_config $name
+: ${boinc_client_enable="NO"}
+
+start_cmd=boinc_client_start
+stop_cmd=boinc_client_stop
+
+boinc_client_start()
+{
+	if checkyesno boinc_client_enable; then
+		if [ -f ${active_file} ]; then
+			echo 1>&2 "${name} already running?"
+			return 1
+		fi
+		echo "Starting ${name}."
+		idprio 31 su - ${boinc_client_user} -c \
+		    "%%PREFIX%%/bin/boinc_client ${boinc_client_flags}"
+		touch ${active_file}
+	fi
+}
+
+boinc_client_stop()
+{
+	if [ ! -f ${active_file} ]; then
+		echo 1>&2 "${name} is not running."
+		return 1
+	fi
+	echo "Stopping ${name}."
+	su - ${boinc_client_user} -c \
+	    "cd ${boinc_client_home} && %%PREFIX%%/bin/boinccmd --quit"
+	rm ${active_file}
+}
+
+run_rc_command "$1"
diff --git a/net/boinc-client/files/boinc.sh.in b/net/boinc-client/files/boinc.sh.in
deleted file mode 100644
index 63f444d03b85..000000000000
--- a/net/boinc-client/files/boinc.sh.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-# PROVIDE: boinc
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="boinc"
-rcvar=boinc_enable
-
-boinc_user=%%BOINC_USER%%
-boinc_home=%%BOINC_HOME%%
-boinc_flags="--dir ${boinc_home}"
-program_file=boinc_client
-program_path=%%PREFIX%%/bin/${program_file}
-syslog_facility=daemon.err
-
-load_rc_config $name
-: ${boinc_enable="NO"}
-
-start_cmd=boinc_start
-stop_cmd=boinc_stop
-
-boinc_start() {
-	if checkyesno boinc_enable
-	then
-		if [ ! -x ${program_path} ]
-		then
-			logger -sp ${syslog_facility} -t ${program_file} \
-				"unable to start: ${program_path} is missing."
-			exit 72
-		fi
-		if ps axo ucomm | egrep ${program_file}; then
-			logger -sp ${syslog_facility} -t ${program_file} \
-			"unable to start: ${program_file} is already running."
-			exit 72
-		fi
-		echo "Starting BOINC client."
-		idprio 31 su - ${boinc_user} -c "${program_path} ${boinc_flags} >/dev/null &"
-	fi
-}
-
-boinc_stop() {
-	killall ${program_file} 2> /dev/null
-}
-
-run_rc_command "$1"
diff --git a/net/boinc-client/files/patch-client-hostinfo_unix.cpp b/net/boinc-client/files/patch-client-hostinfo_unix.cpp
new file mode 100644
index 000000000000..0dae9b406f87
--- /dev/null
+++ b/net/boinc-client/files/patch-client-hostinfo_unix.cpp
@@ -0,0 +1,32 @@
+--- 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; 
diff --git a/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp b/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp
new file mode 100644
index 000000000000..ad8f9d5bb6ed
--- /dev/null
+++ b/net/boinc-client/files/patch-clientgui-AsyncRPC.cpp
@@ -0,0 +1,16 @@
+--- 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 @@
+ #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
++#endif
+ //#include "gui_rpc_client.h"
+ #endif
+ 
diff --git a/net/boinc-client/files/patch-clientgui-stdwx.h b/net/boinc-client/files/patch-clientgui-stdwx.h
new file mode 100644
index 000000000000..c9cefec0568a
--- /dev/null
+++ b/net/boinc-client/files/patch-clientgui-stdwx.h
@@ -0,0 +1,11 @@
+--- 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
diff --git a/net/boinc-client/files/patch-hostinfo_unix.cpp b/net/boinc-client/files/patch-hostinfo_unix.cpp
deleted file mode 100644
index 39fb4e9b5729..000000000000
--- a/net/boinc-client/files/patch-hostinfo_unix.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- client/hostinfo_unix.cpp.orig	2008-12-28 11:11:26.000000000 +0100
-+++ client/hostinfo_unix.cpp	2008-12-29 00:51:32.000000000 +0100
-@@ -809,14 +809,6 @@
-     int mem_size;
-     getsysinfo( GSI_PHYSMEM, (caddr_t) &mem_size, sizeof( mem_size));
-     m_nbytes = 1024.* (double)mem_size;
--#elif defined(HW_PHYSMEM) 
--    // for OpenBSD
--    mib[0] = CTL_HW; 
--    int mem_size; 
--    mib[1] = HW_PHYSMEM; 
--    len = sizeof(mem_size); 
--    sysctl(mib, 2, &mem_size, &len, NULL, 0); 
--    m_nbytes = mem_size; 
- #elif defined(__FreeBSD__)
-     unsigned int mem_size;
-     mib[0] = CTL_HW;
diff --git a/net/boinc-client/files/pkg-install.in b/net/boinc-client/files/pkg-install.in
index 8acfe233d2db..b528ad7e985d 100644
--- a/net/boinc-client/files/pkg-install.in
+++ b/net/boinc-client/files/pkg-install.in
@@ -1,25 +1,36 @@
 #!/bin/sh
 
-username=%%BOINC_USER%%
-group=%%BOINC_GROUP%%
-home=%%BOINC_HOME%%
+PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
+
+user=%%BOINC_CLIENT_USER%%
+group=%%BOINC_CLIENT_GROUP%%
+home=%%BOINC_CLIENT_HOME%%
 shell=/bin/sh
 
 case $2 in
 POST-INSTALL)
-    if ! pw usershow ${username} >/dev/null 2>&1; then
-	if ! pw useradd ${username} -g ${group} -c BOINC -d ${home} -s ${shell}; then
+    if ! pw usershow ${user} >/dev/null 2>&1; then
+	if ! pw useradd ${user} -g ${group} -c "BOINC client user" -d ${home} -s ${shell}; then
 		err=$?
-		echo "WARNING: Unable to create user.  pw returned $err"
-		echo "You will need to create a boinc user and chown the boinc dir."
-		exit $err
+		echo "WARNING: Unable to create user ${user}.  pw returned ${err}"
+		echo "You will need to create a BOINC client user and"
+		echo "chown the BOINC client user directory."
+		exit ${err}
 	else
-		echo "boinc user created."
+		echo "BOINC client user created."
 	fi
     else
-	echo "boinc user found.  using existing boinc user."
+	echo "BOINC client user found.  Using found account."
+    fi
+    mkdir -p ${home}
+    if [ ! -e ${home}/skins -a ! -L ${home}/skins ]; then
+	ln -s %%PREFIX%%/share/boinc/skins ${home}/skins
+	chown -h ${user}:${group} ${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
+	chown -h ${user}:${group} ${home}/ca-bundle.crt
     fi
-    mkdir -p ${home} ${home}/projects
-    chown ${username}:${group} ${home} ${home}/projects
+    chown ${user}:${group} ${home}
     ;;
 esac
diff --git a/net/boinc-client/pkg-descr b/net/boinc-client/pkg-descr
index 370f550a3b5d..52fbc6a98784 100644
--- a/net/boinc-client/pkg-descr
+++ b/net/boinc-client/pkg-descr
@@ -1,8 +1,5 @@
 BOINC is a software platform for distributed computing using volunteer
-computer resources.
-
-Many different projects can use BOINC.  SETI@HOME, for example, has
-been redesigned to use BOINC and the astro/boinc-setiathome port
-supercedes the astro/setiathome port.
+computer resources.  This port contains BOINC API, libraries, client and
+manager GUI.
 
 WWW: http://boinc.berkeley.edu/
diff --git a/net/boinc-client/pkg-message b/net/boinc-client/pkg-message
index 803ff7fb2146..5af87b19f697 100644
--- a/net/boinc-client/pkg-message
+++ b/net/boinc-client/pkg-message
@@ -4,9 +4,4 @@ and install one or more projects.
 
 Refer to the BOINC web page at:
 	http://boinc.berkeley.edu/
-
-SETI@HOME is available in port astro/boinc-setiathome.
-Einstein@Home is available for i386 users in astro/boinc-einsteinathome port.
-
-Other projects are not known to work on FreeBSD at this moment.
 -------------------------------------------------------------------
diff --git a/net/boinc-client/pkg-plist b/net/boinc-client/pkg-plist
index d0499175f882..218157913b85 100644
--- a/net/boinc-client/pkg-plist
+++ b/net/boinc-client/pkg-plist
@@ -1,44 +1,451 @@
-bin/boinc_client
-bin/boinc_cmd
-bin/crypt_prog
-bin/switcher
-%%BOINC_GUI%%bin/boinc_gui
+%%BOINC_CLIENT%%bin/boinc
+%%BOINC_CLIENT%%bin/boinc_client
+%%BOINC_CLIENT%%bin/boinccmd
+%%BOINC_CLIENT%%bin/switcher
+%%BOINC_MANAGER%%bin/boincmgr
 include/boinc/app_ipc.h
+include/boinc/average.h
+include/boinc/base64.h
 include/boinc/boinc_api.h
 include/boinc/boinc_fcgi.h
-include/boinc/boinc_gl.h
+include/boinc/boinc_opencl.h
 include/boinc/boinc_win.h
 include/boinc/boinc_zip.h
+include/boinc/cal_boinc.h
+include/boinc/cc_config.h
+include/boinc/cert_sig.h
+include/boinc/cl_boinc.h
 include/boinc/common_defs.h
-include/boinc/config.h
 include/boinc/coproc.h
 include/boinc/crypt.h
 include/boinc/diagnostics.h
+include/boinc/diagnostics_win.h
 include/boinc/error_numbers.h
 include/boinc/filesys.h
 include/boinc/graphics2.h
-include/boinc/graphics_api.h
-include/boinc/graphics_data.h
 include/boinc/gui_rpc_client.h
 include/boinc/gutil.h
 include/boinc/hostinfo.h
-include/boinc/mac_address.h
+include/boinc/md5.h
+include/boinc/md5_file.h
+include/boinc/mem_usage.h
 include/boinc/mfile.h
 include/boinc/miofile.h
 include/boinc/msg_log.h
+include/boinc/network.h
+include/boinc/notice.h
 include/boinc/parse.h
 include/boinc/prefs.h
+include/boinc/procinfo.h
 include/boinc/proxy_info.h
-include/boinc/reduce.h
-include/boinc/std_fixes.h
+include/boinc/stackwalker_imports.h
+include/boinc/stackwalker_win.h
 include/boinc/str_util.h
-include/boinc/version.h
+include/boinc/svn_version.h
+include/boinc/url.h
 include/boinc/util.h
+include/boinc/version.h
+include/boinc/win_util.h
+%%X11%%include/boinc/boinc_gl.h
+%%X11%%include/boinc/txf_util.h
 lib/libboinc.a
+lib/libboinc.la
 lib/libboinc_api.a
-%%BOINC_GUI%%lib/libboinc_graphics2.a
+lib/libboinc_api.la
+lib/libboinc_api.so
+lib/libboinc_api.so.7
+lib/libboinc_crypt.a
+lib/libboinc_crypt.la
+lib/libboinc_opencl.a
+lib/libboinc_opencl.la
+lib/libboinc_opencl.so
+lib/libboinc_opencl.so.7
 lib/libboinc_zip.a
+lib/libboinc_zip.la
+lib/libboinc_zip.so
+lib/libboinc_zip.so.7
+%%X11%%lib/libboinc_graphics2.a
+%%X11%%lib/libboinc_graphics2.la
+%%X11%%lib/libboinc_graphics2.so
+%%X11%%lib/libboinc_graphics2.so.7
+%%BOINC_MANAGER%%share/boinc/boincmgr.16x16.png
+%%BOINC_MANAGER%%share/boinc/boincmgr.32x32.png
+%%BOINC_MANAGER%%share/boinc/boincmgr.48x48.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/arwLeft.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/arwLeftClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/arwRight.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/arwRightClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnAddProject.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnAddProjectClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnAdvancedView.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnCancel.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnCancelClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnChange.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnChangeClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnClear.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnClearClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnClose.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnCloseClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnCopy.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnCopyAll.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnCopyAllClicked.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnCopyClicked.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnHelp.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnHelpClicked.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnMessages.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnMessagesAlert.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnPreferences.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnResume.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnSave.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnSaveClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnSnooze.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnSynchronize.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/btnSynchronizeClick.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_about.ico
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_background.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_icon_play.gif
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_icon_play.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_pause.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_play.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_stop.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ce_wizard_bar.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/conn_ind.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/default_stat_icon.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/dlgBackground.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/error_image.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/gauge_bg.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/gauge_progress_indicator.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ico_workWU.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/ico_workWU_sus.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/proj_bg.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/project_image.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/simplegui_bg.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/spacer.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/state_ind_bg.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/tabArea_bg.png
+%%SKINS%%share/boinc/skins/Charity Engine/graphic/wu_bg.png
+%%SKINS%%share/boinc/skins/Charity Engine/skin.xml
+%%BOINC_MANAGER%%share/boinc/skins/Default/background_image.png
+%%BOINC_MANAGER%%share/boinc/skins/Default/skin.xml
+%%BOINC_MANAGER%%share/boinc/skins/Default/workunit_running_image.png
+%%BOINC_MANAGER%%share/boinc/skins/Default/workunit_suspended_image.png
+%%BOINC_MANAGER%%share/boinc/skins/Default/workunit_waiting_image.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/Thumbs.db
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/arwLeft.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/arwLeftClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/arwRight.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/arwRightClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnAddProject.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnAddProjectClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnAdvancedView.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnCancel.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnCancelClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnChange.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnChangeClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnClear.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnClearClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnClose.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnCloseClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnCopy.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnCopyAll.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnCopyAllClicked.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnCopyClicked.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnHelp.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnHelpClicked.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnMessages.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnMessagesOrange.gif
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnMessagesOrange.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnPreferences.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnResume.gif
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnResume.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnSave.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnSaveClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnSnooze.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnSynchronize.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/btnSynchronizeClick.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/conn_ind.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/default_stat_icon.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/dlgBackground.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/error_image.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gauge_bg.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gauge_progress_indicator.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gr_about.ico
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gr_background.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gr_icon_play.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gr_pause.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gr_play.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gr_stop.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/gr_wizard_bar.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/ico_workWU.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/ico_workWU_sus.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/proj_bg.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/project_image.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/simplegui_bg.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/spacer.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/state_ind_bg.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/tabArea_bg.png
+%%SKINS%%share/boinc/skins/GridRepublic/graphic/wu_bg.png
+%%SKINS%%share/boinc/skins/GridRepublic/skin.xml
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/advanced_link_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/attach_project_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/cancel_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/close_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/connecting_indicator_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/copy_all_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/copy_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/dialog_background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/error_indicator_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/gauge_bg.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/help_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/left_arrow_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/messages_alert_link_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/messages_link_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/preferences_link_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/project_area_background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/project_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/resume_link_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/right_arrow_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/save_button.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/spacer_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/state_indicator_background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/suspend_link_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/tabArea_bg.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/wcg_about.ico
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/wcg_pause.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/wcg_play.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/wcg_stop.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_active_tab.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_animation_background_image copy.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_animation_background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_area_background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_gauge_background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_gauge_progress_indicator_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_suspended_tab.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/graphic/workunit_tab_area_background_image.png
+%%SKINS%%share/boinc/skins/People for a Smarter Planet/skin.xml
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/arwLeft.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/arwLeftClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/arwRight.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/arwRightClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnAddProject.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnAddProjectClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnAdvancedView.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnCancel.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnCancelClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnChange.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnChangeClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnClear.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnClearClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnClose.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnCloseClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnCopy.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnCopyAll.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnCopyAllClicked.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnCopyClicked.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnHelp.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnHelpClicked.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnMessages.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnMessagesAlert.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnPreferences.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnResume.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnSave.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnSaveClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnSnooze.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnSynchronize.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/btnSynchronizeClick.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/conn_ind.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/default_stat_icon.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/dlgBackground.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/error_image.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/gauge_bg.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/gauge_progress_indicator.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ico_workWU.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ico_workWU_sus.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/proj_bg.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/project_image.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ptp_background.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ptp_icon_play.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ptp_pause.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ptp_play.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ptp_stop.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/ptp_wizard_bar.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/simplegui_bg.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/spacer.png
+%%SKINS%%share/boinc/skins/Progress Thru Processors/graphic/state_ind_bg.png
+%%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/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
+%%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
+%%NLS%%share/locale/be/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/da/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/da/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/de/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/de/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/el/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/el/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/es/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/es/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/it/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/it/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/BOINC-Manager.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/BOINC-Client.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/BOINC-Manager.mo
+%%BOINC_MANAGER%%share/pixmaps/boincmgr.16x16.png
+%%BOINC_MANAGER%%share/pixmaps/boincmgr.32x32.png
+%%BOINC_MANAGER%%share/pixmaps/boincmgr.48x48.png
 @dirrm include/boinc
-@unexec if [ -d %%BOINC_HOME%% ]; then echo "If you are deinstalling boinc completely, remove the %%BOINC_HOME%% directory."; fi
-@unexec if [ -d %%BOINC_HOME%% ]; then echo -n "Also, d"; else echo -n "D"; fi
-@unexec echo "on't forget to remove the \"%%BOINC_USER%%\" user."
+%%SKINS%%@dirrm share/boinc/skins/Charity Engine/graphic
+%%SKINS%%@dirrm share/boinc/skins/Charity Engine
+%%BOINC_MANAGER%%@dirrm share/boinc/skins/Default
+%%SKINS%%@dirrm share/boinc/skins/GridRepublic/graphic
+%%SKINS%%@dirrm share/boinc/skins/GridRepublic
+%%SKINS%%@dirrm share/boinc/skins/People for a Smarter Planet/graphic
+%%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
+%%BOINC_MANAGER%%@dirrm share/boinc/skins
+%%X11%%@dirrm share/boinc/txf
+%%X11%%@dirrm share/boinc
+%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv_SE
+%%USER%%@unexec if [ -d %%BOINC_CLIENT_HOME%% ]; then echo "If you are deinstalling boinc-client completely, remove the %%BOINC_CLIENT_HOME%% directory."; fi
+%%USER%%@unexec if [ -d %%BOINC_CLIENT_HOME%% ]; then echo -n "Also, d"; else echo -n "D"; fi
+%%USER%%@unexec echo "on't forget to remove the BOINC client user \"%%BOINC_CLIENT_USER%%\"."