From owner-svn-ports-head@freebsd.org Sat Jan 16 23:32:41 2016 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 9819BA85AA3; Sat, 16 Jan 2016 23:32:41 +0000 (UTC) (envelope-from pawel@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 6AE6C119C; Sat, 16 Jan 2016 23:32:41 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0GNWeXM055790; Sat, 16 Jan 2016 23:32:40 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0GNWeti055789; Sat, 16 Jan 2016 23:32:40 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601162332.u0GNWeti055789@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sat, 16 Jan 2016 23:32:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406283 - head/databases/vfront 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: Sat, 16 Jan 2016 23:32:41 -0000 Author: pawel Date: Sat Jan 16 23:32:40 2016 New Revision: 406283 URL: https://svnweb.freebsd.org/changeset/ports/406283 Log: - Remove deprecated @dirrm usage, convert to @dir - Add LICENSE_FILE, NO_ARCH - Use options helpers Approved by: portmgr blanket Modified: head/databases/vfront/Makefile Modified: head/databases/vfront/Makefile ============================================================================== --- head/databases/vfront/Makefile Sat Jan 16 23:06:07 2016 (r406282) +++ head/databases/vfront/Makefile Sat Jan 16 23:32:40 2016 (r406283) @@ -9,8 +9,10 @@ MAINTAINER= crees@FreeBSD.org COMMENT= Simple frontend for database data entry LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/license NO_BUILD= yes +NO_ARCH= yes PLIST= ${WRKDIR}/pkg-plist USE_PHP= yes @@ -19,17 +21,9 @@ OPTIONS_MULTI= database OPTIONS_MULTI_database= MYSQL PGSQL OPTIONS_DEFAULT= MYSQL PGSQL -.include - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysqli -USE_MYSQL= yes -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -USES+= pgsql -.endif +MYSQL_USE= MYSQL=yes PHP=mysqli +PGSQL_USES= pgsql +PGSQL_USE= PHP=pgsql post-patch: ${REINPLACE_CMD} -i '' -e \ @@ -40,9 +34,8 @@ post-patch: pre-install: (cd ${WRKSRC} && \ ${FIND} * -type f | ${SED} 's,^,%%WWWDIR%%/,' > ${PLIST} && \ - ${FIND} * -type d | ${SORT} -r | \ - ${SED} 's,^,@dirrmtry %%WWWDIR%%/,' >> ${PLIST}) - @${ECHO_CMD} '@dirrmtry %%WWWDIR%%' >> ${PLIST} + ${FIND} * -type d -empty | ${SORT} -r | \ + ${SED} 's,^,@dir %%WWWDIR%%/,' >> ${PLIST}) @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN} %D/%%WWWDIR%%' >> ${PLIST} @${ECHO_CMD} '@exec ${CHMOD} 700 %D/%%WWWDIR%%/conf' >> ${PLIST}