From owner-svn-ports-all@FreeBSD.ORG Mon Dec 23 21:36:58 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 983204FD; Mon, 23 Dec 2013 21:36:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 844EA117C; Mon, 23 Dec 2013 21:36:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNLawrb055671; Mon, 23 Dec 2013 21:36:58 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNLawYn055669; Mon, 23 Dec 2013 21:36:58 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312232136.rBNLawYn055669@svn.freebsd.org> From: Rene Ladan Date: Mon, 23 Dec 2013 21:36:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337299 - head/astro/boinc-setiathome-v7 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Dec 2013 21:36:58 -0000 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 -.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 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 @@ -@cwd %%BOINC_CLIENT_HOME%%/projects -%%SETI_SITE%%/%%SETI_BINARY%% -%%X11%%%%SETI_SITE%%/seti_graphics -@dirrmtry %%SETI_SITE%% -@cwd %%PREFIX%% +@owner %%BOINC_CLIENT_USER%% +@group %%BOINC_CLIENT_GROUP%% +@cwd %%BOINC_CLIENT_HOME%% +projects/%%SETI_SITE%%/%%SETI_BINARY%% +%%X11%%projects/%%SETI_SITE%%/seti_graphics +@dirrmtry projects/%%SETI_SITE%% +@dirrmtry projects +@exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/