- Move options block to preoper place, use helpers

- Add NO_ARCH
- Convert deprecated @dirrm to @dir

Approved by:	portmgr blanket

2 files changed, 44 insertions, 49 deletions

diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index 8c255a1fb6f3..f4cdc567cc95 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -13,24 +13,19 @@ COMMENT=	Lightweight blog system for general use
 
 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}
diff --git a/www/nibbleblog/pkg-plist b/www/nibbleblog/pkg-plist
index 98ca96a6bcfd..a6fb0de51ea0 100644
--- a/www/nibbleblog/pkg-plist
+++ b/www/nibbleblog/pkg-plist
@@ -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