From owner-svn-ports-head@freebsd.org Thu Oct 15 10:37:32 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B9E8A1550A; Thu, 15 Oct 2015 10:37:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBFFD3AF; Thu, 15 Oct 2015 10:37:31 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9FAbULH048289; Thu, 15 Oct 2015 10:37:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9FAbU01048287; Thu, 15 Oct 2015 10:37:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510151037.t9FAbU01048287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 15 Oct 2015 10:37:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399332 - head/www/phprecipebook X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2015 10:37:32 -0000 Author: amdmi3 Date: Thu Oct 15 10:37:30 2015 New Revision: 399332 URL: https://svnweb.freebsd.org/changeset/ports/399332 Log: - Add NO_ARCH - Switch to options helpers - Fix owner/group handling Approved by: portmgr blanket Modified: head/www/phprecipebook/Makefile head/www/phprecipebook/pkg-plist Modified: head/www/phprecipebook/Makefile ============================================================================== --- head/www/phprecipebook/Makefile Thu Oct 15 10:30:46 2015 (r399331) +++ head/www/phprecipebook/Makefile Thu Oct 15 10:37:30 2015 (r399332) @@ -14,26 +14,20 @@ LICENSE_FILE= ${WRKSRC}/docs/LICENSE.TXT WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes +NO_ARCH= yes USES= tar:tgz USE_PHP= xml WANT_PHP_WEB= yes SUB_FILES= pkg-message +PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL -.include - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -USE_MYSQL= yes -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -USES+= pgsql -.endif +MYSQL_USE= PHP=mysql MYSQL=yes +PGSQL_USE= PHP=pgsql +PGSQL_USES= pgsql post-extract: @${CHMOD} -R u+w ${WRKSRC} @@ -42,7 +36,4 @@ do-install: ${MV} ${WRKSRC}/custom_inc.php ${WRKSRC}/custom_inc.php.sample cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} -post-install: - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST} - .include Modified: head/www/phprecipebook/pkg-plist ============================================================================== --- head/www/phprecipebook/pkg-plist Thu Oct 15 10:30:46 2015 (r399331) +++ head/www/phprecipebook/pkg-plist Thu Oct 15 10:37:30 2015 (r399332) @@ -1,3 +1,5 @@ +@owner %%WWWOWN%% +@group %%WWWGRP%% @sample %%WWWDIR%%/custom_inc.php.sample %%WWWDIR%%/.buildpath %%WWWDIR%%/.project @@ -644,4 +646,5 @@ @dir %%WWWDIR%%/modules/settings @dir %%WWWDIR%%/modules @dir %%WWWDIR%% -@dir www +@owner +@group