net-mgmt/nagiosql: modernize

- add cpe,
- set NO_ARCH
- modernize plist

PR:                  200575
Submitted by:        amdmi3@FreeBSD.org
Approved by:         maintainer timeout (chris@smartt.com ; 26 days)

2 files changed, 11 insertions, 124 deletions

diff --git a/net-mgmt/nagiosql/Makefile b/net-mgmt/nagiosql/Makefile
index 8d54db9c0904..8a43ef1f533c 100644
--- a/net-mgmt/nagiosql/Makefile
+++ b/net-mgmt/nagiosql/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios \
 		${PEARDIR}/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT
 
 USE_MYSQL=	yes
-USES=		gettext tar:bzip2
+USES=		cpe gettext tar:bzip2
 USE_PHP=	mysql filter gettext session simplexml
 WANT_PHP_WEB=	yes
 
@@ -27,6 +27,7 @@ GROUPS?=	nagios
 NAGIOSUSER?=	nagios
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}32
 
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/nagiosql/pkg-plist b/net-mgmt/nagiosql/pkg-plist
index b06950e491ad..a8c84ae0fc3d 100644
--- a/net-mgmt/nagiosql/pkg-plist
+++ b/net-mgmt/nagiosql/pkg-plist
@@ -379,132 +379,18 @@
 %%WWWDIR%%/templates/files/timeperiods.tpl.dat
 %%WWWDIR%%/templates/index.tpl.htm
 %%WWWDIR%%/templates/main.tpl.htm
-@dirrm %%WWWDIR%%/templates/files
-@dirrm %%WWWDIR%%/templates/admin
-@dirrm %%WWWDIR%%/templates
-@dirrm %%WWWDIR%%/scripts
-@dirrm %%WWWDIR%%/libraries/pear/JSON
-@dirrm %%WWWDIR%%/libraries/pear/HTML/Template
-@dirrm %%WWWDIR%%/libraries/pear/HTML
-@dirrm %%WWWDIR%%/libraries/pear
-@dirrm %%WWWDIR%%/libraries
-@dirrm %%WWWDIR%%/install/templates
-@dirrm %%WWWDIR%%/install/sql
-@dirrm %%WWWDIR%%/install/images
-@dirrm %%WWWDIR%%/install/functions
-@dirrm %%WWWDIR%%/install/css
-@dirrm %%WWWDIR%%/install
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/functions/yui/build/yahoo-dom-event
-@dirrm %%WWWDIR%%/functions/yui/build/utilities
-@dirrm %%WWWDIR%%/functions/yui/build/tabview/assets/skins/sam
-@dirrm %%WWWDIR%%/functions/yui/build/tabview/assets/skins
-@dirrm %%WWWDIR%%/functions/yui/build/tabview/assets
-@dirrm %%WWWDIR%%/functions/yui/build/tabview
-@dirrm %%WWWDIR%%/functions/yui/build/paginator/assets/skins/sam
-@dirrm %%WWWDIR%%/functions/yui/build/paginator/assets/skins
-@dirrm %%WWWDIR%%/functions/yui/build/paginator/assets
-@dirrm %%WWWDIR%%/functions/yui/build/paginator
-@dirrm %%WWWDIR%%/functions/yui/build/json
-@dirrm %%WWWDIR%%/functions/yui/build/fonts
-@dirrm %%WWWDIR%%/functions/yui/build/event-delegate
-@dirrm %%WWWDIR%%/functions/yui/build/element
-@dirrm %%WWWDIR%%/functions/yui/build/datatable/assets/skins/sam
-@dirrm %%WWWDIR%%/functions/yui/build/datatable/assets/skins
-@dirrm %%WWWDIR%%/functions/yui/build/datatable/assets
-@dirrm %%WWWDIR%%/functions/yui/build/datatable
-@dirrm %%WWWDIR%%/functions/yui/build/datasource
-@dirrm %%WWWDIR%%/functions/yui/build/container/assets/skins/sam
-@dirrm %%WWWDIR%%/functions/yui/build/container/assets/skins
-@dirrm %%WWWDIR%%/functions/yui/build/container/assets
-@dirrm %%WWWDIR%%/functions/yui/build/container
-@dirrm %%WWWDIR%%/functions/yui/build/connection
-@dirrm %%WWWDIR%%/functions/yui/build/calendar/assets/skins/sam
-@dirrm %%WWWDIR%%/functions/yui/build/calendar/assets/skins
-@dirrm %%WWWDIR%%/functions/yui/build/calendar/assets
-@dirrm %%WWWDIR%%/functions/yui/build/calendar
-@dirrm %%WWWDIR%%/functions/yui/build/button/assets/skins/sam
-@dirrm %%WWWDIR%%/functions/yui/build/button/assets/skins
-@dirrm %%WWWDIR%%/functions/yui/build/button/assets
-@dirrm %%WWWDIR%%/functions/yui/build/button
-@dirrm %%WWWDIR%%/functions/yui/build/assets/skins/sam
-@dirrm %%WWWDIR%%/functions/yui/build/assets/skins
-@dirrm %%WWWDIR%%/functions/yui/build/assets
-@dirrm %%WWWDIR%%/functions/yui/build
-@dirrm %%WWWDIR%%/functions/yui
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/utils
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/skins/o2k7/img
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/skins/o2k7
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/skins/highcontrast
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/skins/default/img
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/skins/default
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/skins
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/langs
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/js
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced/img
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes/advanced
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/themes
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/table/langs
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/table/js
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/table/css
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/table
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/searchreplace/langs
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/searchreplace/js
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/searchreplace/css
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/searchreplace
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins/contextmenu
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/plugins
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/langs
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce
-@dirrm %%WWWDIR%%/functions/tinyMCE/jscripts
-@dirrm %%WWWDIR%%/functions/tinyMCE
-@dirrm %%WWWDIR%%/functions
-@dirrm %%WWWDIR%%/doc
-@dirrm %%WWWDIR%%/config/locale/zh_CN/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/zh_CN
-@dirrm %%WWWDIR%%/config/locale/ru_RU/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/ru_RU
-@dirrm %%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/pt_BR
-@dirrm %%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/pl_PL
-@dirrm %%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/nl_NL
-@dirrm %%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/ja_JP
-@dirrm %%WWWDIR%%/config/locale/it_IT/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/it_IT
-@dirrm %%WWWDIR%%/config/locale/fr_FR/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/fr_FR
-@dirrm %%WWWDIR%%/config/locale/es_ES/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/es_ES
-@dirrm %%WWWDIR%%/config/locale/es_AR/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/es_AR
-@dirrm %%WWWDIR%%/config/locale/en_GB/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/en_GB
-@dirrm %%WWWDIR%%/config/locale/de_DE/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/de_DE
-@dirrm %%WWWDIR%%/config/locale/da_DK/LC_MESSAGES
-@dirrm %%WWWDIR%%/config/locale/da_DK
-@dirrm %%WWWDIR%%/config/locale
-@owner %%WWWOWN%%
-@group %%WWWGRP%%
-@dirrmtry %%WWWDIR%%/config
-@group
-@owner
-@dirrm %%WWWDIR%%/admin
-@dirrmtry %%WWWDIR%%
+@dir(%%WWWOWN%%,%%WWWGRP%%) %%WWWDIR%%/config
 @mode 750
 @owner %%WWWOWN%%
 @group %%NAGIOSUSER%%
-@dirrmtry %%ETCDIR%%/ssh
-@dirrmtry %%ETCDIR%%/services
-@dirrmtry %%ETCDIR%%/hosts
-@dirrmtry %%ETCDIR%%/backup/ssh
-@dirrmtry %%ETCDIR%%/backup/services
-@dirrmtry %%ETCDIR%%/backup/hosts
-@dirrmtry %%ETCDIR%%/backup
-@dirrmtry %%ETCDIR%%
+@dir %%ETCDIR%%/ssh
+@dir %%ETCDIR%%/services
+@dir %%ETCDIR%%/hosts
+@dir %%ETCDIR%%/backup/ssh
+@dir %%ETCDIR%%/backup/services
+@dir %%ETCDIR%%/backup/hosts
+@dir %%ETCDIR%%/backup
+@dir %%ETCDIR%%
 @mode
 @owner
 @group