2 files changed, 61 insertions, 50 deletions

diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index c4e712ebf2c0..3b13825db518 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	boinc-client
 PORTVERSION=	7.0.25
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
@@ -39,13 +39,16 @@ USE_RC_SUBR=	boinc-client
 CONFIGURE_ARGS=	--disable-server
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-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
+NO_OPTIONS_SORT=	yes
+OPTIONS_DEFINE=		CLIENT MANAGER X11 LINUX USER SKINS OPTIMIZE
+OPTIONS_DEFAULT=	CLIENT MANAGER X11 USER
+CLIENT_DESC=		Build BOINC client
+MANAGER_DESC=		Build BOINC manager GUI
+X11_DESC=		Build graphics API
+LINUX_DESC=		Accept Linux science applications
+USER_DESC=		Create/check BOINC client user
+SKINS_DESC=		Install more skins for BOINC manager
+OPTIMIZE_DESC=		Enable compiler optimization flags
 
 .include <bsd.port.pre.mk>
 
@@ -63,16 +66,16 @@ pre-extract:
 BROKEN=		Does not install on ia64, powerpc, or sparc64
 .endif
 
-.if !defined(WITHOUT_MANAGER)
-. if defined(WITHOUT_CLIENT)
-.  undef WITHOUT_CLIENT
+.if ${PORT_OPTIONS:MMANAGER}
+. if empty(PORT_OPTIONS:MCLIENT)
+PORT_OPTIONS+=	CLIENT
 . endif
-. if defined(WITHOUT_X11)
-.  undef WITHOUT_X11
+. if empty(PORT_OPTIONS:MX11)
+PORT_OPTIONS+=	X11
 . endif
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_GL=		glut
 LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 PLIST_SUB+=	X11=""
@@ -80,13 +83,13 @@ PLIST_SUB+=	X11=""
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if !defined(WITHOUT_MANAGER)
+.if ${PORT_OPTIONS:MMANAGER}
 USE_XORG=	x11
 USE_WX=		2.8+
 USE_ICONV=	yes
 WX_CONF_ARGS=	absolute
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify \
+		sqlite3:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=--with-sqlite3-prefix=${LOCALBASE}
 . if ${OSVERSION} < 900506 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000002)
 CPPFLAGS+=	-DNO_PER_THREAD_LOCALE
@@ -97,7 +100,7 @@ CONFIGURE_ARGS+=--disable-manager --with-wx-config=false --without-x
 PLIST_SUB+=	BOINC_MANAGER="@comment "
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 PLIST_SUB+=	BOINC_CLIENT=""
@@ -106,71 +109,72 @@ CONFIGURE_ARGS+=--disable-client
 PLIST_SUB+=	BOINC_CLIENT="@comment "
 .endif
 
-.if defined(WITHOUT_NLS) || defined(WITHOUT_MANAGER)
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS} && ${PORT_OPTIONS:MMANAGER}
 PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_ALT)
+.if ${PORT_OPTIONS:MLINUX}
 CONFIGURE_ARGS+=--with-boinc-alt-platform=i686-pc-linux-gnu
 USE_LINUX=	yes
 .endif
 
-.if defined(WITH_SKINS)
+.if ${PORT_OPTIONS:MSKINS}
 PLIST_SUB+=	SKINS=""
 .else
 PLIST_SUB+=	SKINS="@comment "
 .endif
 
-.if !defined(WITHOUT_USER)
+.if ${PORT_OPTIONS:MUSER}
 PLIST_SUB+=	USER=""
 .else
 PLIST_SUB+=	USER="@comment "
 .endif
 
-.if defined(WITH_OPTIMIZE)
+.if ${PORT_OPTIONS:MOPTIMIZE}
 CONFIGURE_ARGS+=--enable-optimize
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|client/scripts||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lcrypto -ldl|-lcrypto|' ${WRKSRC}/configure
-.if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} -e 's| locale||' ${WRKSRC}/Makefile.in
-.else
+.if ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's|$$$$mydir/$$$$ldir|&/LC_MESSAGES|' ${WRKSRC}/locale/Makefile.in
+.else
+	@${REINPLACE_CMD} -e 's| locale||' ${WRKSRC}/Makefile.in
 .endif
-.if defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 	@${REINPLACE_CMD} -e 's|@BUILD_GRAPHICS_API_TRUE@|#&|' ${WRKSRC}/api/Makefile.in
 .endif
 
 post-install:
-.if !defined(WITHOUT_MANAGER)
+.if ${PORT_OPTIONS:MMANAGER}
 	${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
+. if ${PORT_OPTIONS:MSKINS}
+	${CP} -R ${WRKSRC}/clientgui/skins ${PREFIX}/share/boinc
+. else
+	${MKDIR} ${PREFIX}/share/boinc/skins
+	${CP} -R ${WRKSRC}/clientgui/skins/Default ${PREFIX}/share/boinc/skins
+. endif
 .endif
 	${INSTALL_DATA} ${WRKSRC}/config.h ${PREFIX}/include/boinc
 	${INSTALL_DATA} ${WRKSRC}/lib/std_fixes.h ${PREFIX}/include/boinc
-.if !defined(WITHOUT_X11)
+	${INSTALL_DATA} ${WRKSRC}/api/reduce.h ${PREFIX}/include/boinc
+.if ${PORT_OPTIONS:MX11}
 . for name in api/boinc_gl.h api/graphics_api.h api/graphics_data.h \
-	api/reduce.h api/txf_util.h
+	api/txf_util.h
 	${INSTALL_DATA} ${WRKSRC}/${name} ${PREFIX}/include/boinc
 . endfor
-. if defined(WITHOUT_MANAGER)
+. if empty(PORT_OPTIONS:MMANAGER)
 	${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)
+.if ${PORT_OPTIONS:MUSER}
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
diff --git a/net/boinc-client/files/patch-api__boinc_api.h b/net/boinc-client/files/patch-api__boinc_api.h
index 2eadb977e8e1..b93910d0a735 100644
--- a/net/boinc-client/files/patch-api__boinc_api.h
+++ b/net/boinc-client/files/patch-api__boinc_api.h
@@ -1,11 +1,18 @@
---- api/boinc_api.h.orig	2012-04-20 16:15:13.000000000 +0200
-+++ api/boinc_api.h	2012-04-20 16:17:11.000000000 +0200
-@@ -29,6 +29,8 @@
- extern "C" {
- #endif
+--- 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
  
-+#include <cstddef>
-+
- // parameters passed to the BOINC runtime system
- //
- typedef struct BOINC_OPTIONS {