svn commit: r337299 - head/astro/boinc-setiathome-v7

[Rene Ladan]

Author: rene
Date: Mon Dec 23 21:36:57 2013
New Revision: 337299
URL: http://svnweb.freebsd.org/changeset/ports/337299

Log:
  - Ensure correct ownership of installed files and directories in ~boinc
  - Enable package building as user
  - Use option helpers
  - Drop conflict with removed astro/boinc-setiathome-enhanced
  - Bump PORTREVISION
  
  Inspiration from:	biology/boinc-simap

Modified:
  head/astro/boinc-setiathome-v7/Makefile
  head/astro/boinc-setiathome-v7/pkg-plist

Modified: head/astro/boinc-setiathome-v7/Makefile
==============================================================================
--- head/astro/boinc-setiathome-v7/Makefile	Mon Dec 23 21:36:47 2013	(r337298)
+++ head/astro/boinc-setiathome-v7/Makefile	Mon Dec 23 21:36:57 2013	(r337299)
@@ -3,7 +3,7 @@
 
 PORTNAME=	boinc-setiathome-v7
 PORTVERSION=	7.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/
 DISTNAME=	setiathome-svn-1924 # modified archive, see leftout in top directory
@@ -23,8 +23,6 @@ USE_XZ=		yes
 USE_AUTOTOOLS=	autoconf:env automake:env
 GNU_CONFIGURE=	yes
 
-NEED_ROOT=	yes
-
 CFLAGS+=	-O2 -I${LOCALBASE}/include/boinc -I${LOCALBASE}/include \
 		-L${LOCALBASE}/lib
 .if defined(CPUTYPE)
@@ -40,19 +38,18 @@ OPTIONS_DEFINE=	X11
 
 X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 
+OPTIONS_SUB=	yes
+
+X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
+X11_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+X11_USE=		GL=gl,glu,glut \
+			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
+X11_CONFIGURE_ENABLE=	graphics
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-USE_GL=		gl glu glut
-USE_XORG=	ice sm x11 xau xcb xext xi xdamage xdmcp xfixes xmu xt xxf86vm
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
-PLIST_SUB+=	X11=""
-CONFLICTS=	boinc-setiathome-enhanced-[0-9]*
-.else
+.if ! ${PORT_OPTIONS:MX11}
 BUILD_DEPENDS+=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
-CONFIGURE_ARGS+=	--disable-graphics
-PLIST_SUB+=	X11="@comment "
 .endif
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
@@ -80,10 +77,12 @@ SUB_LIST=	SETI_BINARY=${SETI_BINARY} \
 		BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \
 		BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \
 		BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP}
-PLIST_SUB+=	SETI_BINARY=${SETI_BINARY} \
+PLIST_SUB+=	PREFIX=${PREFIX} \
+		SETI_BINARY=${SETI_BINARY} \
 		SETI_SITE=${SETI_SITE} \
 		BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \
-		PREFIX=${PREFIX}
+		BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \
+		BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP}
 
 # str_replace.h is included in newer versions of net/boinc-client,
 # but it is not needed on FreeBSD
@@ -99,17 +98,12 @@ pre-configure:
 	(cd ${WRKSRC} ; ./_autosetup)
 
 do-install:
-	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
-	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects
-	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
-	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
-	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
-	    ${WRKSRC}/client/${SETI_BINARY} \
+	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects
+	${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
+	${INSTALL_PROGRAM} ${WRKSRC}/client/${SETI_BINARY} \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
 .if ${PORT_OPTIONS:MX11}
-	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
-	    ${WRKSRC}/client/seti_graphics \
+	${INSTALL_PROGRAM} ${WRKSRC}/client/seti_graphics \
 	    ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
 .endif
-
 .include <bsd.port.mk>

Modified: head/astro/boinc-setiathome-v7/pkg-plist
==============================================================================
--- head/astro/boinc-setiathome-v7/pkg-plist	Mon Dec 23 21:36:47 2013	(r337298)
+++ head/astro/boinc-setiathome-v7/pkg-plist	Mon Dec 23 21:36:57 2013	(r337299)
@@ -1,5 +1,8 @@
- at cwd %%BOINC_CLIENT_HOME%%/projects
-%%SETI_SITE%%/%%SETI_BINARY%%
-%%X11%%%%SETI_SITE%%/seti_graphics
- at dirrmtry %%SETI_SITE%%
- at cwd %%PREFIX%%
+ at owner %%BOINC_CLIENT_USER%%
+ at group %%BOINC_CLIENT_GROUP%%
+ at cwd %%BOINC_CLIENT_HOME%%
+projects/%%SETI_SITE%%/%%SETI_BINARY%%
+%%X11%%projects/%%SETI_SITE%%/seti_graphics
+ at dirrmtry projects/%%SETI_SITE%%
+ at dirrmtry projects
+ at exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/