svn commit: r406232 - head/www/nibbleblog

[Pawel Pekala]

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 <bsd.port.options.mk>
+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
- at dirrm %%WWWDIR%%/templates/default/css/img
- at dirrm %%WWWDIR%%/templates/default/css
- at dirrm %%WWWDIR%%/templates/default/containers
- at dirrm %%WWWDIR%%/templates/default
- at dirrm %%WWWDIR%%/templates
- at dirrm %%WWWDIR%%/plugins/tags/lang
- at dirrm %%WWWDIR%%/plugins/tags
- at dirrm %%WWWDIR%%/plugins/links/lang
- at dirrm %%WWWDIR%%/plugins/links
- at dirrm %%WWWDIR%%/plugins/categories/lang
- at dirrm %%WWWDIR%%/plugins/categories
- at dirrm %%WWWDIR%%/plugins/adsense/lang
- at dirrm %%WWWDIR%%/plugins/adsense
- at dirrm %%WWWDIR%%/plugins/about/lang
- at dirrm %%WWWDIR%%/plugins/about
- at dirrm %%WWWDIR%%/plugins
- at dirrm %%WWWDIR%%/lang
- at dirrmtry %%WWWDIR%%/content
- at dirrm %%WWWDIR%%/ajax
- at dirrm %%WWWDIR%%/admin/themes/default/ui-themes/smoothness/images
- at dirrm %%WWWDIR%%/admin/themes/default/ui-themes/smoothness
- at dirrm %%WWWDIR%%/admin/themes/default/ui-themes
- at dirrm %%WWWDIR%%/admin/themes/default/img/icons
- at dirrm %%WWWDIR%%/admin/themes/default/img/elrte
- at dirrm %%WWWDIR%%/admin/themes/default/img/elfinder
- at dirrm %%WWWDIR%%/admin/themes/default/img
- at dirrm %%WWWDIR%%/admin/themes/default
- at dirrm %%WWWDIR%%/admin/themes
- at dirrm %%WWWDIR%%/admin/kernel
- at dirrm %%WWWDIR%%/admin/js/jquery-ui
- at dirrm %%WWWDIR%%/admin/js/jquery
- at dirrm %%WWWDIR%%/admin/js/jcrop
- at dirrm %%WWWDIR%%/admin/js/elrte
- at dirrm %%WWWDIR%%/admin/js
- at dirrm %%WWWDIR%%/admin/includes
- at dirrm %%WWWDIR%%/admin/html
- at dirrm %%WWWDIR%%/admin/ajax
- at dirrm %%WWWDIR%%/admin
- at dirrmtry %%WWWDIR%%
+ at dir %%WWWDIR%%/templates/default/css/img
+ at dir %%WWWDIR%%/templates/default/css
+ at dir %%WWWDIR%%/templates/default/containers
+ at dir %%WWWDIR%%/templates/default
+ at dir %%WWWDIR%%/templates
+ at dir %%WWWDIR%%/plugins/tags/lang
+ at dir %%WWWDIR%%/plugins/tags
+ at dir %%WWWDIR%%/plugins/links/lang
+ at dir %%WWWDIR%%/plugins/links
+ at dir %%WWWDIR%%/plugins/categories/lang
+ at dir %%WWWDIR%%/plugins/categories
+ at dir %%WWWDIR%%/plugins/adsense/lang
+ at dir %%WWWDIR%%/plugins/adsense
+ at dir %%WWWDIR%%/plugins/about/lang
+ at dir %%WWWDIR%%/plugins/about
+ at dir %%WWWDIR%%/plugins
+ at dir %%WWWDIR%%/lang
+ at dir %%WWWDIR%%/content
+ at dir %%WWWDIR%%/ajax
+ at dir %%WWWDIR%%/admin/themes/default/ui-themes/smoothness/images
+ at dir %%WWWDIR%%/admin/themes/default/ui-themes/smoothness
+ at dir %%WWWDIR%%/admin/themes/default/ui-themes
+ at dir %%WWWDIR%%/admin/themes/default/img/icons
+ at dir %%WWWDIR%%/admin/themes/default/img/elrte
+ at dir %%WWWDIR%%/admin/themes/default/img/elfinder
+ at dir %%WWWDIR%%/admin/themes/default/img
+ at dir %%WWWDIR%%/admin/themes/default
+ at dir %%WWWDIR%%/admin/themes
+ at dir %%WWWDIR%%/admin/kernel
+ at dir %%WWWDIR%%/admin/js/jquery-ui
+ at dir %%WWWDIR%%/admin/js/jquery
+ at dir %%WWWDIR%%/admin/js/jcrop
+ at dir %%WWWDIR%%/admin/js/elrte
+ at dir %%WWWDIR%%/admin/js
+ at dir %%WWWDIR%%/admin/includes
+ at dir %%WWWDIR%%/admin/html
+ at dir %%WWWDIR%%/admin/ajax
+ at dir %%WWWDIR%%/admin
+ at dir %%WWWDIR%%
 @owner root
 @group wheel