From owner-svn-ports-all@freebsd.org Sat Jan 16 15:37:29 2016 Return-Path: Delivered-To: svn-ports-all@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 CDE18A8569F; Sat, 16 Jan 2016 15:37:29 +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 A767E13A7; Sat, 16 Jan 2016 15:37:29 +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 u0GFbS1s009208; Sat, 16 Jan 2016 15:37:28 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0GFbSUU009206; Sat, 16 Jan 2016 15:37:28 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601161537.u0GFbSUU009206@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 15:37:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406232 - head/www/nibbleblog 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.20 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: Sat, 16 Jan 2016 15:37:29 -0000 Author: pawel Date: Sat Jan 16 15:37:28 2016 New Revision: 406232 URL: https://svnweb.freebsd.org/changeset/ports/406232 Log: - Move options block to preoper place, use helpers - Add NO_ARCH - Convert deprecated @dirrm to @dir Approved by: portmgr blanket Modified: head/www/nibbleblog/Makefile head/www/nibbleblog/pkg-plist Modified: head/www/nibbleblog/Makefile ============================================================================== --- head/www/nibbleblog/Makefile Sat Jan 16 15:30:56 2016 (r406231) +++ head/www/nibbleblog/Makefile Sat Jan 16 15:37:28 2016 (r406232) @@ -13,24 +13,19 @@ COMMENT= Lightweight blog system for gen RUN_DEPENDS= pear:${PORTSDIR}/devel/pear -OPTIONS_DEFINE= APACHE LIGHTTPD -OPTIONS_DEFAULT= APACHE - USES= cpe zip NO_BUILD= yes +NO_ARCH= yes USE_PHP= session filter xml simplexml gd PKGMESSAGE= ${MASTERDIR}/pkg-message PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" SUB_FILES= pkg-message -.include +OPTIONS_DEFINE= APACHE LIGHTTPD +OPTIONS_DEFAULT= APACHE -.if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ -.endif -.if ${PORT_OPTIONS:MLIGHTTPD} -RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd -.endif +APACHE_USE= APACHE_RUN=22+ +LIGHTTPD_RUN_DEPENDS= lighttpd:${PORTSDIR}/www/lighttpd do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} Modified: head/www/nibbleblog/pkg-plist ============================================================================== --- head/www/nibbleblog/pkg-plist Sat Jan 16 15:30:56 2016 (r406231) +++ head/www/nibbleblog/pkg-plist Sat Jan 16 15:37:28 2016 (r406232) @@ -140,44 +140,44 @@ %%WWWDIR%%/templates/default/post.php %%WWWDIR%%/templates/default/screenshot.png %%WWWDIR%%/variables.php -@dirrm %%WWWDIR%%/templates/default/css/img -@dirrm %%WWWDIR%%/templates/default/css -@dirrm %%WWWDIR%%/templates/default/containers -@dirrm %%WWWDIR%%/templates/default -@dirrm %%WWWDIR%%/templates -@dirrm %%WWWDIR%%/plugins/tags/lang -@dirrm %%WWWDIR%%/plugins/tags -@dirrm %%WWWDIR%%/plugins/links/lang -@dirrm %%WWWDIR%%/plugins/links -@dirrm %%WWWDIR%%/plugins/categories/lang -@dirrm %%WWWDIR%%/plugins/categories -@dirrm %%WWWDIR%%/plugins/adsense/lang -@dirrm %%WWWDIR%%/plugins/adsense -@dirrm %%WWWDIR%%/plugins/about/lang -@dirrm %%WWWDIR%%/plugins/about -@dirrm %%WWWDIR%%/plugins -@dirrm %%WWWDIR%%/lang -@dirrmtry %%WWWDIR%%/content -@dirrm %%WWWDIR%%/ajax -@dirrm %%WWWDIR%%/admin/themes/default/ui-themes/smoothness/images -@dirrm %%WWWDIR%%/admin/themes/default/ui-themes/smoothness -@dirrm %%WWWDIR%%/admin/themes/default/ui-themes -@dirrm %%WWWDIR%%/admin/themes/default/img/icons -@dirrm %%WWWDIR%%/admin/themes/default/img/elrte -@dirrm %%WWWDIR%%/admin/themes/default/img/elfinder -@dirrm %%WWWDIR%%/admin/themes/default/img -@dirrm %%WWWDIR%%/admin/themes/default -@dirrm %%WWWDIR%%/admin/themes -@dirrm %%WWWDIR%%/admin/kernel -@dirrm %%WWWDIR%%/admin/js/jquery-ui -@dirrm %%WWWDIR%%/admin/js/jquery -@dirrm %%WWWDIR%%/admin/js/jcrop -@dirrm %%WWWDIR%%/admin/js/elrte -@dirrm %%WWWDIR%%/admin/js -@dirrm %%WWWDIR%%/admin/includes -@dirrm %%WWWDIR%%/admin/html -@dirrm %%WWWDIR%%/admin/ajax -@dirrm %%WWWDIR%%/admin -@dirrmtry %%WWWDIR%% +@dir %%WWWDIR%%/templates/default/css/img +@dir %%WWWDIR%%/templates/default/css +@dir %%WWWDIR%%/templates/default/containers +@dir %%WWWDIR%%/templates/default +@dir %%WWWDIR%%/templates +@dir %%WWWDIR%%/plugins/tags/lang +@dir %%WWWDIR%%/plugins/tags +@dir %%WWWDIR%%/plugins/links/lang +@dir %%WWWDIR%%/plugins/links +@dir %%WWWDIR%%/plugins/categories/lang +@dir %%WWWDIR%%/plugins/categories +@dir %%WWWDIR%%/plugins/adsense/lang +@dir %%WWWDIR%%/plugins/adsense +@dir %%WWWDIR%%/plugins/about/lang +@dir %%WWWDIR%%/plugins/about +@dir %%WWWDIR%%/plugins +@dir %%WWWDIR%%/lang +@dir %%WWWDIR%%/content +@dir %%WWWDIR%%/ajax +@dir %%WWWDIR%%/admin/themes/default/ui-themes/smoothness/images +@dir %%WWWDIR%%/admin/themes/default/ui-themes/smoothness +@dir %%WWWDIR%%/admin/themes/default/ui-themes +@dir %%WWWDIR%%/admin/themes/default/img/icons +@dir %%WWWDIR%%/admin/themes/default/img/elrte +@dir %%WWWDIR%%/admin/themes/default/img/elfinder +@dir %%WWWDIR%%/admin/themes/default/img +@dir %%WWWDIR%%/admin/themes/default +@dir %%WWWDIR%%/admin/themes +@dir %%WWWDIR%%/admin/kernel +@dir %%WWWDIR%%/admin/js/jquery-ui +@dir %%WWWDIR%%/admin/js/jquery +@dir %%WWWDIR%%/admin/js/jcrop +@dir %%WWWDIR%%/admin/js/elrte +@dir %%WWWDIR%%/admin/js +@dir %%WWWDIR%%/admin/includes +@dir %%WWWDIR%%/admin/html +@dir %%WWWDIR%%/admin/ajax +@dir %%WWWDIR%%/admin +@dir %%WWWDIR%% @owner root @group wheel