From owner-svn-ports-all@FreeBSD.ORG Tue Dec 24 12:48:53 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 8951D890; Tue, 24 Dec 2013 12:48:53 +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 753C41E84; Tue, 24 Dec 2013 12:48:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBOCmrhQ083758; Tue, 24 Dec 2013 12:48:53 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBOCmroM083756; Tue, 24 Dec 2013 12:48:53 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312241248.rBOCmroM083756@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 24 Dec 2013 12:48:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337343 - branches/2014Q1/astro/boinc-astropulse X-SVN-Group: ports-branches 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: Tue, 24 Dec 2013 12:48:53 -0000 Author: mat Date: Tue Dec 24 12:48:52 2013 New Revision: 337343 URL: http://svnweb.freebsd.org/changeset/ports/337343 Log: MFH: r337300 - Ensure correct ownership of installed files and directories in ~boinc - Enable package building as user - Use option helpers - Bump PORTREVISION Approved by: portmgr (implicit) Modified: branches/2014Q1/astro/boinc-astropulse/Makefile branches/2014Q1/astro/boinc-astropulse/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/astro/boinc-astropulse/Makefile ============================================================================== --- branches/2014Q1/astro/boinc-astropulse/Makefile Tue Dec 24 12:47:41 2013 (r337342) +++ branches/2014Q1/astro/boinc-astropulse/Makefile Tue Dec 24 12:48:52 2013 (r337343) @@ -3,7 +3,7 @@ PORTNAME= boinc-astropulse PORTVERSION= 6.01 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= astropulse-svn-1702 # modified archive, see leftout in top directory @@ -31,8 +31,6 @@ CFLAGS+= -O2 -I${LOCALBASE}/include/boin CFLAGS+= -march=${CPUTYPE} .endif -NEED_ROOT= yes - # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile BOINC_CLIENT_USER?= boinc BOINC_CLIENT_GROUP?= nobody @@ -41,18 +39,18 @@ BOINC_CLIENT_HOME?= /var/db/boinc 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="" -.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} == amd64 || ${ARCH} == i386 @@ -79,22 +77,20 @@ SUB_LIST= AP_BINARY=${AP_BINARY} \ BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} PLIST_SUB+= AP_BINARY=${AP_BINARY} \ SETI_SITE=${SETI_SITE} \ - BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} + BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \ + BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \ + BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP} 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}/${AP_BINARY} \ + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects + ${INSTALL} -d ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE} + ${INSTALL_PROGRAM} ${WRKSRC}/${AP_BINARY} \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ .if ${PORT_OPTIONS:MX11} - ${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \ - ${WRKSRC}/ap_graphics \ + ${INSTALL_PROGRAM} ${WRKSRC}/ap_graphics \ ${STAGEDIR}${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/ .endif Modified: branches/2014Q1/astro/boinc-astropulse/pkg-plist ============================================================================== --- branches/2014Q1/astro/boinc-astropulse/pkg-plist Tue Dec 24 12:47:41 2013 (r337342) +++ branches/2014Q1/astro/boinc-astropulse/pkg-plist Tue Dec 24 12:48:52 2013 (r337343) @@ -1,4 +1,8 @@ -@cwd %%BOINC_CLIENT_HOME%%/projects -%%SETI_SITE%%/%%AP_BINARY%% -%%X11%%%%SETI_SITE%%/ap_graphics -@dirrmtry %%SETI_SITE%% +@owner %%BOINC_CLIENT_USER%% +@group %%BOINC_CLIENT_GROUP%% +@cwd %%BOINC_CLIENT_HOME%% +projects/%%SETI_SITE%%/%%AP_BINARY%% +%%X11%%projects/%%SETI_SITE%%/ap_graphics +@dirrmtry projects/%%SETI_SITE%% +@dirrmtry projects +@exec chown -R %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% projects/