Index: head/net/boinc-client/Makefile =================================================================== --- head/net/boinc-client/Makefile (revision 160733) +++ head/net/boinc-client/Makefile (revision 160734) @@ -1,72 +1,72 @@ # New ports collection makefile for: boinc # Date created: 01 October 2004 # Whom: J.R. Oldroyd # # $FreeBSD$ # PORTNAME= boinc-client -PORTVERSION= 5.2.15 +PORTVERSION= 5.4.7 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} 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_GNOME= gnometarget GNU_CONFIGURE= yes BOINC_USER?= boinc BOINC_GROUP?= nobody BOINC_HOME?= /var/db/boinc PLIST_SUB= BOINC_HOME="${BOINC_HOME}" BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}" SUB_FILES= pkg-install SUB_LIST= BOINC_HOME="${BOINC_HOME}" BOINC_USER="${BOINC_USER}" BOINC_GROUP="${BOINC_GROUP}" USE_RC_SUBR= boinc.sh CONFIGURE_ARGS= --disable-server CONFIGURE_ENV= CPPFLAGS=-I${X11BASE}/include CXXFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -O3" CFLAGS="${CFLAGS} -O3" OPTIONS= X11 "Build Boinc Manager GUI" on .include .if !defined(WITHOUT_X11) CONFIGURE_ARGS+= --with-wx-config=wxgtk2-2.6-config .else CONFIGURE_ARGS+= --with-wx-config=false .endif .if !defined(WITHOUT_X11) LIB_DEPENDS+= iconv:${PORTSDIR}/converters/libiconv \ wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \ jpeg:${PORTSDIR}/graphics/jpeg \ glut:${PORTSDIR}/graphics/libglut .endif .if !defined(WITHOUT_X11) PLIST_SUB+= BOINC_GUI="" .else PLIST_SUB+= BOINC_GUI="@comment " .endif .if ${OSVERSION} < 500000 BROKEN= Does not compile. Consider upgrading your FreeBSD to at least 5.X .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.C \ ${WRKSRC}/clientgui/MainDocument.cpp post-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/net/boinc-client/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.17 \ No newline at end of property +1.18 \ No newline at end of property Index: head/net/boinc-client/distinfo =================================================================== --- head/net/boinc-client/distinfo (revision 160733) +++ head/net/boinc-client/distinfo (revision 160734) @@ -1,3 +1,3 @@ -MD5 (boinc-client-5.2.15.tar.bz2) = 37eb7dbd2eb2c2d6becb0026e58d22d6 -SHA256 (boinc-client-5.2.15.tar.bz2) = 6cd4ae648c57ac05977820a1c4c8126abb5284361f62fdd06656b07b37b25325 -SIZE (boinc-client-5.2.15.tar.bz2) = 1987217 +MD5 (boinc-client-5.4.7.tar.bz2) = 21fe0ae1b0bca052bd4c7ee7367abad9 +SHA256 (boinc-client-5.4.7.tar.bz2) = 72064628d874f5fb198b170ca11ce61dcd5d505fad051bdf3c674e6a6e8cf169 +SIZE (boinc-client-5.4.7.tar.bz2) = 2511303 Property changes on: head/net/boinc-client/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/net/boinc-client/files/patch-fix_anonymous_platform_attach =================================================================== --- head/net/boinc-client/files/patch-fix_anonymous_platform_attach (revision 160733) +++ head/net/boinc-client/files/patch-fix_anonymous_platform_attach (revision 160734) @@ -1,43 +1,18 @@ ---- client/cs_account.C.orig Mon Oct 3 20:05:58 2005 -+++ client/cs_account.C Wed Mar 8 18:41:37 2006 -@@ -346,7 +346,7 @@ - } - - int CLIENT_STATE::add_project(const char* master_url, const char* _auth) { -- char path[256], canonical_master_url[256], auth[256]; -+ char path[256], canonical_master_url[256], auth[256], dir[256]; - PROJECT* project; - FILE* f; - int retval; -@@ -366,7 +366,7 @@ - return ERR_AUTHENTICATOR; - } - -- // check if this project is already running -+ // check if we're already attached to this project +--- client/cs_account.C.orig Fri Mar 3 22:34:00 2006 ++++ client/cs_account.C Wed Apr 12 10:58:15 2006 +@@ -403,7 +403,14 @@ // - if (lookup_project(canonical_master_url)) { - msg_printf(0, MSG_ERROR, "Already attached to %s", canonical_master_url); -@@ -392,8 +392,21 @@ - if (retval) return retval; - - // remove any old files -+ // (unless PROJECT/app_info.xml is found, so that -+ // people using anonymous platform don't have to get apps again) - // -- retval = remove_project_dir(*project); -+ get_project_dir(project, dir); -+ sprintf(path, "%s/%s", dir, APP_INFO_FILE_NAME); + get_project_dir(project, dir); + sprintf(path, "%s/%s", dir, APP_INFO_FILE_NAME); +- if (!boinc_file_exists(path)) { + if (boinc_file_exists(path)) { + project->anonymous_platform = true; + f = fopen(path, "r"); + if (f) { + parse_app_info(project, f); + fclose(f); + } + } else { -+ retval = remove_project_dir(*project); -+ } + retval = remove_project_dir(*project); + } - retval = make_project_dir(*project); - if (retval) return retval; Property changes on: head/net/boinc-client/files/patch-fix_anonymous_platform_attach ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/boinc-client/files/patch-prefer_new_libs_over_installed =================================================================== --- head/net/boinc-client/files/patch-prefer_new_libs_over_installed (revision 160733) +++ head/net/boinc-client/files/patch-prefer_new_libs_over_installed (revision 160734) @@ -1,22 +1,22 @@ --- client/Makefile.in.orig Tue Mar 7 15:06:10 2006 +++ client/Makefile.in Wed Mar 15 13:56:33 2006 @@ -336,7 +336,7 @@ AM_CFLAGS = $(AM_CPPFLAGS) AM_CXXFLAGS = $(AM_CPPFLAGS) -AM_LDFLAGS = -+AM_LDFLAGS = -L$(top_srcdir)/lib -L$(top_srcdir)/api -L$(top_srcdir)/db -L$(top_srcdir)/client -L$(top_srcdir)/tools -L$(top_srcdir)/sched ++AM_LDFLAGS = -L$(top_srcdir)/lib -L$(top_srcdir)/api -L$(top_srcdir)/client # dependencies to make sure libs gets compiled before # programs linking to them: --- clientgui/Makefile.in.orig Tue Mar 7 15:06:12 2006 +++ clientgui/Makefile.in Wed Mar 15 14:27:36 2006 @@ -354,7 +354,7 @@ AM_CFLAGS = $(AM_CPPFLAGS) AM_CXXFLAGS = $(AM_CPPFLAGS) -AM_LDFLAGS = -+AM_LDFLAGS = -L$(top_srcdir)/lib -L$(top_srcdir)/api -L$(top_srcdir)/db -L$(top_srcdir)/client -L$(top_srcdir)/tools -L$(top_srcdir)/sched ++AM_LDFLAGS = -L$(top_srcdir)/lib -L$(top_srcdir)/api -L$(top_srcdir)/client # dependencies to make sure libs gets compiled before # programs linking to them: Property changes on: head/net/boinc-client/files/patch-prefer_new_libs_over_installed ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property