From simon@comsys.ntu-kpi.kiev.ua  Tue Jun  5 13:07:08 2012
Return-Path: <simon@comsys.ntu-kpi.kiev.ua>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D7C33106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Jun 2012 13:07:08 +0000 (UTC)
	(envelope-from simon@comsys.ntu-kpi.kiev.ua)
Received: from comsys.kpi.ua (comsys.kpi.ua [77.47.192.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 614648FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Jun 2012 13:07:08 +0000 (UTC)
Received: from pm513-1.comsys.kpi.ua ([10.18.52.101] helo=pm513-1.comsys.ntu-kpi.kiev.ua)
	by comsys.kpi.ua with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.63)
	(envelope-from <simon@comsys.ntu-kpi.kiev.ua>)
	id 1SbtTX-0006Lf-1j
	for FreeBSD-gnats-submit@freebsd.org; Tue, 05 Jun 2012 16:07:07 +0300
Received: by pm513-1.comsys.ntu-kpi.kiev.ua (Postfix, from userid 1001)
	id 17B9F1CC34; Tue,  5 Jun 2012 16:07:06 +0300 (EEST)
Message-Id: <20120605130706.GA77822@pm513-1.comsys.ntu-kpi.kiev.ua>
Date: Tue, 5 Jun 2012 16:07:06 +0300
From: Andrey Simonenko <simon@comsys.ntu-kpi.kiev.ua>
To: FreeBSD-gnats-submit@freebsd.org
Subject: net/boinc-client new options framework support

>Number:         168714
>Category:       ports
>Synopsis:       net/boinc-client new options framework support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 05 13:10:13 UTC 2012
>Closed-Date:    Sun Jun 10 14:39:15 UTC 2012
>Last-Modified:  Sun Jun 10 14:40:10 UTC 2012
>Originator:     Andrey Simonenko
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
>Description:

Please update net/boinc-client to support new options framework.

Also I found one mistake when port installs graphics files
(to wrong directory) if MANAGER is 'off'.

Also I changed option's name ALT to LINUX.

>How-To-Repeat:
>Fix:
diff -ruN boinc-client.orig/Makefile boinc-client/Makefile
--- boinc-client.orig/Makefile	2012-06-01 14:16:26.000000000 +0300
+++ boinc-client/Makefile	2012-06-05 15:50:17.000000000 +0300
@@ -39,13 +39,16 @@
 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 @@
 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,7 +83,7 @@
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if !defined(WITHOUT_MANAGER)
+.if ${PORT_OPTIONS:MMANAGER}
 USE_XORG=	x11
 USE_WX=		2.8+
 USE_ICONV=	yes
@@ -97,7 +100,7 @@
 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,71 @@
 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)
+.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
 	${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
 

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Tue Jun 5 13:37:05 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168714 
Responsible-Changed-From-To: sylvio->pav 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Fri Jun 8 21:16:08 UTC 2012 
Responsible-Changed-Why:  
- Pass to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168714 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sun Jun 10 13:54:25 UTC 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168714 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168714: commit references a PR
Date: Sun, 10 Jun 2012 14:39:16 +0000 (UTC)

 pav         2012-06-10 14:39:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/boinc-client     Makefile 
     net/boinc-client/files patch-api__boinc_api.h 
   Log:
   - Fix header files integrity when X11 option is disabled
   - Fix header files to allow pure C client app to be built
   - OPTIONSng
   
   PR:             ports/168714, ports/168756
   Submitted by:   Alexey Shuvaev <bugsbeastie@gmail.com>, Andrey Simonenko <simon@comsys.ntu-kpi.kiev.ua>
   
   Revision  Changes    Path
   1.55      +44 -40    ports/net/boinc-client/Makefile
   1.2       +17 -10    ports/net/boinc-client/files/patch-api__boinc_api.h
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
