update to nagiosql 3.2.0_SP2

- use OPTIONS-NG
- make php5-ftp to optional (I suspect local file or SSH is the preferred config distribuiton methode)
- remove all patch files, they are already included in the re-rolled sourcefile
- use DISTSUBDIR (unluckily distversion does not increment with applied patches)
- WWWGROUP is not defined it is WWWGRP (Makefile)
- define WRKSRC
- use COPYTREE_SHARE instead cp
- use post-install script to create $ETCDIR structure

additional for fresh install (adjust paths in sql script)
- change default nagiosql paths from /etc/nagiosql -> ${ETCDIR}
- change default nagios paths from /etc/nagios -> ${LOCALBASE}/etc/nagios

PR:		175457
Submitted by:	ohauer
Approved by:	maintainer timeout

14 files changed, 96 insertions, 285 deletions

diff --git a/net-mgmt/nagiosql/Makefile b/net-mgmt/nagiosql/Makefile
index 2363f17c73af..9079bc6216cc 100644
--- a/net-mgmt/nagiosql/Makefile
+++ b/net-mgmt/nagiosql/Makefile
@@ -1,15 +1,13 @@
-# New ports collection makefile for:	nagiosql
-# Date created:			7 Dec 2010
-# Whom:				Chris St Denis <chris@smartt.com>
-#
+# Created by: Chris St Denis <chris@smartt.com>
 # $FreeBSD$
-#
 
 PORTNAME=	nagiosql
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/NagiosQL%20${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//g}
+DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}_SP2
 
 MAINTAINER=	chris@smartt.com
 COMMENT=	A web based administration tool for Nagios
@@ -22,36 +20,62 @@ RUN_DEPENDS=	nagios:${PORTSDIR}/net-mgmt/nagios \
 USE_BZIP2=	yes
 USE_MYSQL=	yes
 USE_GETTEXT=	yes
-USE_PHP=	mysql gettext ftp session simplexml
-IGNORE_WITH_PHP=4
+USE_PHP=	mysql gettext session simplexml
 WANT_PHP_WEB=	yes
 
+USERS?=		nagios
+GROUPS?=	nagios
+NAGIOSUSER?=	nagios
+
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message
+WRKSRC=		${WRKDIR}/${PORTNAME}32
+
+SUB_FILES=	pkg-message pkg-install
+SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} NAGIOSUSER=${NAGIOSUSER}
 
 PEARDIR?=	${LOCALBASE}/share/pear
 
-OPTIONS=	CURL "Configure with cURL support" off \
-		SSH2 "Configure with SSH2 support" off
+OPTIONS_DEFINE=	CURL FTP SSH2
+CURL_DESC=	Configure with cURL support
+FTP_DESC=	Configure with FTP support
+SSH2_DESC=	Configure with SSH2 support
 
-#.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
 USE_PHP+=	curl
 .endif
 
-.if defined(WITH_SSH2)
+.if ${PORT_OPTIONS:MFTP}
+USE_PHP+=	ftp
+.endif
+
+.if ${PORT_OPTIONS:MSSH2}
 USE_PHP+=	ssh2
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e "s|\'/etc/nagiosql/|\'${ETCDIR}/|g" \
+		-e "s|/opt/nagios/etc/objects/|${LOCALBASE}/etc/nagios/objects/|" \
+		-e "s|/opt/nagios/bin/nagios|${LOCALBASE}/bin/nagios|" \
+		-e "s|/var/nagios/nagios.lock|/var/spool/nagios/nagios.lock|" \
+		-e "s|/var/nagios/rw/nagios.cmd|/var/spool/nagios/rw/nagios.cmd|" \
+		-e "s|nagios/etc/|etc/nagios/|" \
+		-e "s|nagiosql/etc/|${ETCDIR}/|" \
+		-e "s|\>/etc/nagiosql|\>${ETCDIR}|g" \
+		-e "s|\>/etc/nagios/|\>${LOCALBASE}/etc/nagios/|g" \
+		${WRKSRC}/install/sql/nagiosQL_v32_db_mysql.sql
+
+	${REINPLACE_CMD} -e "s|\"/etc/|\"${LOCALBASE}/etc/|" \
+		${WRKSRC}/install/install.php
+
 do-install:
-	${MKDIR} ${WWWDIR}
-	${CP} -R ${WRKSRC}/${PORTNAME}32/ ${WWWDIR}
-	${CHOWN} ${WWWOWN}:${WWWGROUP} ${WWWDIR}/config
+	@${MKDIR} ${WWWDIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR} "! ( -name *\.orig -o -name *\.bak )")
+	@${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/config
 
 post-install:
+	@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagiosql/distinfo b/net-mgmt/nagiosql/distinfo
index 66dc86eb018a..926d7287f221 100644
--- a/net-mgmt/nagiosql/distinfo
+++ b/net-mgmt/nagiosql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagiosql_320.tar.bz2) = a5259d2342752949f005533eec5a68c10e7476b83f192e972d9edcd3ec92d5d1
-SIZE (nagiosql_320.tar.bz2) = 921396
+SHA256 (nagiosql/3.2.0_SP2/nagiosql_320.tar.bz2) = 32a019ec6b13342257787d83839c5913f87534d840e96ebde8d663e656833d4d
+SIZE (nagiosql/3.2.0_SP2/nagiosql_320.tar.bz2) = 996713
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-contacts.php b/net-mgmt/nagiosql/files/patch-nagiosql32-admin-contacts.php
deleted file mode 100644
index 6f86fe57893b..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-contacts.php
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../nagiosql/work/./nagiosql32/admin/contacts.php	2012-03-27 12:47:56.000000000 +0200
-+++ ./nagiosql32/admin/contacts.php	2012-04-20 12:39:56.000000000 +0200
-@@ -10,10 +10,10 @@
- // Project   : NagiosQL
- // Component : Contact definitions
- // Website   : http://www.nagiosql.org
--// Date      : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $
-+// Date      : $LastChangedDate: 2012-04-20 12:39:53 +0200 (Fr, 20. Apr 2012) $
- // Author    : $LastChangedBy: martin $
- // Version   : 3.2.0
--// Revision  : $LastChangedRevision: 1308 $
-+// Revision  : $LastChangedRevision: 1323 $
- //
- ///////////////////////////////////////////////////////////////////////////////
- //
-@@ -259,7 +259,7 @@
-   	} else {
-     	$conttp->setVariable("HOST_OPTION_FIELDS","chbGr1a,chbGr1b,chbGr1c,chbGr1d,chbGr1f");
-     	$conttp->setVariable("SERVICE_OPTION_FIELDS","chbGr2a,chbGr2b,chbGr2c,chbGr2d,chbGr2e,chbGr2g");
--		$conttp->setVariable("VERSION_20_VALUE_MUST",",tfFriendly");
-+		$conttp->setVariable("VERSION_20_VALUE_MUST",",tfValue2");
-   	}
- 	// Insert data from database in "modify" mode
- 	if (isset($arrModifyData) && ($chkSelModify == "modify")) {
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-hosts.php b/net-mgmt/nagiosql/files/patch-nagiosql32-admin-hosts.php
deleted file mode 100644
index f95da42c5c9c..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-hosts.php
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../nagiosql/work/./nagiosql32/admin/hosts.php	2012-03-09 07:43:00.000000000 +0100
-+++ ./nagiosql32/admin/hosts.php	2012-04-17 11:54:12.000000000 +0200
-@@ -10,10 +10,10 @@
- // Project   : NagiosQL
- // Component : Host definition
- // Website   : http://www.nagiosql.org
--// Date      : $LastChangedDate: 2012-03-09 07:43:00 +0100 (Fri, 09 Mar 2012) $
-+// Date      : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
- // Author    : $LastChangedBy: martin $
- // Version   : 3.2.0
--// Revision  : $LastChangedRevision: 1282 $
-+// Revision  : $LastChangedRevision: 1315 $
- //
- ///////////////////////////////////////////////////////////////////////////////
- //
-@@ -41,7 +41,6 @@
- if ($chkSelValue1 != "") {
-   	for ($i=1;$i<=8;$i++) {
- 		${"chkTfArg$i"} = str_replace("!","::bang::",${"chkTfArg$i"});
--		${"chkTfArg$i"} = str_replace("\\","::back::",${"chkTfArg$i"});
-     	if (${"chkTfArg$i"} != "") $chkSelValue1 .= "!".${"chkTfArg$i"};
-   	}
- }
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-services.php b/net-mgmt/nagiosql/files/patch-nagiosql32-admin-services.php
deleted file mode 100644
index d2c348ecbedf..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-services.php
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../nagiosql/work/./nagiosql32/admin/services.php	2012-03-09 07:43:00.000000000 +0100
-+++ ./nagiosql32/admin/services.php	2012-04-17 11:53:36.000000000 +0200
-@@ -10,10 +10,10 @@
- // Project   : NagiosQL
- // Component : Service definition
- // Website   : http://www.nagiosql.org
--// Date      : $LastChangedDate: 2012-03-09 07:43:00 +0100 (Fri, 09 Mar 2012) $
-+// Date      : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
- // Author    : $LastChangedBy: martin $
- // Version   : 3.2.0
--// Revision  : $LastChangedRevision: 1282 $
-+// Revision  : $LastChangedRevision: 1315 $
- //
- ///////////////////////////////////////////////////////////////////////////////
- //
-@@ -41,7 +41,6 @@
- if ($chkSelValue1 != "") {
-   	for ($i=1;$i<=8;$i++) {
- 		${"chkTfArg$i"} = str_replace("!","::bang::",${"chkTfArg$i"});
--		${"chkTfArg$i"} = str_replace("\\","::back::",${"chkTfArg$i"});
- 		if (${"chkTfArg$i"} != "") $chkSelValue1 .= "!".${"chkTfArg$i"};
-   	}
- }
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-templatedefinitions.php b/net-mgmt/nagiosql/files/patch-nagiosql32-admin-templatedefinitions.php
deleted file mode 100644
index 1cdfb1e56f49..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-admin-templatedefinitions.php
+++ /dev/null
@@ -1,44 +0,0 @@
---- ../nagiosql/work/./nagiosql32/admin/templatedefinitions.php	2012-02-27 13:01:17.000000000 +0100
-+++ ./nagiosql32/admin/templatedefinitions.php	2012-04-05 08:12:08.000000000 +0200
-@@ -10,10 +10,10 @@
- // Project   : NagiosQL
- // Component : Template definition list
- // Website   : http://www.nagiosql.org
--// Date      : $LastChangedDate: 2012-02-27 13:01:17 +0100 (Mon, 27 Feb 2012) $
-+// Date      : $LastChangedDate: 2012-04-05 08:11:59 +0200 (Do, 05. Apr 2012) $
- // Author    : $LastChangedBy: martin $
- // Version   : 3.2.0
--// Revision  : $LastChangedRevision: 1257 $
-+// Revision  : $LastChangedRevision: 1315 $
- //
- ///////////////////////////////////////////////////////////////////////////////
- //
-@@ -102,8 +102,10 @@
- if ($chkMode == "add") {
-   	if ($arrDefinition[1] == 1) {
-     	$strSQL2 = "SELECT `template_name` FROM `tbl_".$chkPreTab."template` WHERE `id` = ".$arrDefinition[0];
-+		$strSQL3 = "SELECT `active` FROM `tbl_".$chkPreTab."template` WHERE `id` = ".$arrDefinition[0];
-   	} else {
-     	$strSQL2 = "SELECT `name` FROM `tbl_".$chkPreTab."` WHERE `id` = ".$arrDefinition[0];
-+		$strSQL3 = "SELECT `active` FROM `tbl_".$chkPreTab."` WHERE `id` = ".$arrDefinition[0];
-   	}
-   	if (isset($_SESSION['templatedefinition']) && is_array($_SESSION['templatedefinition'])) {
-     	$intCheck = 0;
-@@ -118,7 +120,7 @@
- 			$arrTemp['idTable'] = $arrDefinition[1];
- 			$arrTemp['idSort']  = 0;
- 			$arrTemp['status'] = 0;
--			$arrTemp['active'] = 0;
-+			$arrTemp['active'] = $myDBClass->getFieldData($strSQL3)+0;
- 			$_SESSION['templatedefinition'][] = $arrTemp;
-     	}
-   	} else {
-@@ -127,7 +129,7 @@
- 		$arrTemp['idTable'] = $arrDefinition[1];
- 		$arrTemp['idSort']  = 0;
- 		$arrTemp['status'] = 0;
--		$arrTemp['active'] = 0;
-+		$arrTemp['active'] = $myDBClass->getFieldData($strSQL3)+0;
- 		$_SESSION['templatedefinition'][] = $arrTemp;
-   	}
- }
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-config__class.php b/net-mgmt/nagiosql/files/patch-nagiosql32-functions-config__class.php
deleted file mode 100644
index 7282c7213220..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-config__class.php
+++ /dev/null
@@ -1,61 +0,0 @@
---- ../nagiosql/work/./nagiosql32/functions/config_class.php	2012-03-07 10:38:34.000000000 +0100
-+++ ./nagiosql32/functions/config_class.php	2012-04-17 11:59:16.000000000 +0200
-@@ -10,10 +10,10 @@
- // Project   : NagiosQL
- // Component : Configuration Class
- // Website   : http://www.nagiosql.org
--// Date      : $LastChangedDate: 2012-03-07 10:38:34 +0100 (Wed, 07 Mar 2012) $
-+// Date      : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
- // Author    : $LastChangedBy: martin $
- // Version   : 3.2.0
--// Revision  : $LastChangedRevision: 1275 $
-+// Revision  : $LastChangedRevision: 1319 $
- //
- ///////////////////////////////////////////////////////////////////////////////////////////////
- //
-@@ -749,13 +749,6 @@
-   	//
-   	///////////////////////////////////////////////////////////////////////////////////////////
- 	function createConfigSingle($strTableName,$intDbId = 0,$intMode = 0) {
--		// Get write access groups
--		if (isset($_SESSION['userid'])) {
--			$strAccess   = $this->myVisClass->getAccGroups('write');
--			$strAccWhere = " AND `access_group` IN ($strAccess) ";
--		} else {
--			$strAccWhere = "";
--		}
- 		// Do not create configs in common domain
- 		if ($this->intDomainId == 0) {
- 			$this->processClassMessage(translate('It is not possible to write config files directly from the common domain!')."::",$this->strErrorMessage);
-@@ -769,9 +762,9 @@
- 			$strDomainWhere = " (`config_id`=".$this->intDomainId.") ";
- 		}
- 		if ($intDbId == 0) {
--    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' $strAccWhere ORDER BY `id`";
-+    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' ORDER BY `id`";
- 		} else {
--    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' $strAccWhere AND `id`=$intDbId";
-+    		$strSQL = "SELECT * FROM `".$strTableName."` WHERE $strDomainWhere AND `active`='1' AND `id`=$intDbId";
- 		}
-     	$booReturn = $this->myDBClass->getDataArray($strSQL,$arrData,$intDataCount);
-     	if (($booReturn != false) && ($intDataCount != 0)) {
-@@ -1381,8 +1374,8 @@
- 		  	if ($key == "contacts")     	$value = $this->checkTpl($value,"contacts_tploptions","tbl_host",$intDataId,$intSkip);
- 		  	if ($key == "contact_groups") 	$value = $this->checkTpl($value,"contact_groups_tploptions","tbl_host",$intDataId,$intSkip);
- 		  	if ($key == "use")        		$value = $this->checkTpl($value,"use_template_tploptions","tbl_host",$intDataId,$intSkip);
-+			if ($key == "check_command") 	$value = str_replace("\::bang::","\!",$value);
- 			if ($key == "check_command") 	$value = str_replace("::bang::","\!",$value);
--			if ($key == "check_command") 	$value = str_replace("::back::","\\\\",$value);
- 		}
- 		if ($strTableName == "tbl_service") {
- 		  	if ($key == "use_template")   	$key = "use";
-@@ -1403,8 +1396,8 @@
- 		  	if ($key == "contacts")     	$value = $this->checkTpl($value,"contacts_tploptions","tbl_service",$intDataId,$intSkip);
- 		  	if ($key == "contact_groups") 	$value = $this->checkTpl($value,"contact_groups_tploptions","tbl_service",$intDataId,$intSkip);
- 		  	if ($key == "use")        		$value = $this->checkTpl($value,"use_template_tploptions","tbl_service",$intDataId,$intSkip);
-+			if ($key == "check_command") 	$value = str_replace("\::bang::","\!",$value);
- 			if ($key == "check_command") 	$value = str_replace("::bang::","\!",$value);
--			if ($key == "check_command") 	$value = str_replace("::back::","\\\\",$value);
- 		}
- 		if ($strTableName == "tbl_hosttemplate") {
- 			if ($key == "template_name")  	$key = "name";
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-import__class.php b/net-mgmt/nagiosql/files/patch-nagiosql32-functions-import__class.php
deleted file mode 100644
index 74da2c80d9ac..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-import__class.php
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../nagiosql/work/./nagiosql32/functions/import_class.php	2012-03-07 10:38:34.000000000 +0100
-+++ ./nagiosql32/functions/import_class.php	2012-04-17 11:47:08.000000000 +0200
-@@ -10,10 +10,10 @@
- // Project   : NagiosQL
- // Component : Import Class
- // Website   : http://www.nagiosql.org
--// Date      : $LastChangedDate: 2012-03-07 10:38:34 +0100 (Wed, 07 Mar 2012) $
-+// Date      : $LastChangedDate: 2012-04-17 11:47:05 +0200 (Di, 17. Apr 2012) $
- // Author    : $LastChangedBy: martin $
- // Version   : 3.2.0
--// Revision  : $LastChangedRevision: 1275 $
-+// Revision  : $LastChangedRevision: 1319 $
- //
- ///////////////////////////////////////////////////////////////////////////////////////////////
- //
-@@ -75,7 +75,7 @@
-     	$intRemoveTmp   = 0;
-     	$strFileName    = trim($strFileName);
-     	$intReturn = $this->myConfigClass->getConfigData($intConfigId,"method",$intMethod);
--		if ($intReturn != 0) { $this->strErrorMessage .= translate('Unable to get configuration data:')."method::"; return(1); }
-+		if ($intReturn != 0) { $this->strErrorMessage .= translate('Unable to get configuration data:')." method::"; return(1); }
-     	// Read import file
- 		// Local file system
- 		if ($intMethod == 1) {
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-prepend__adm.php b/net-mgmt/nagiosql/files/patch-nagiosql32-functions-prepend__adm.php
deleted file mode 100644
index 7109fa87ab71..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-prepend__adm.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../nagiosql/work/./nagiosql32/functions/prepend_adm.php	2012-03-27 12:47:56.000000000 +0200
-+++ ./nagiosql32/functions/prepend_adm.php	2012-03-27 12:47:58.000000000 +0200
-@@ -9,7 +9,7 @@
- // Project   : NagiosQL
- // Component : Preprocessing script
- // Website   : http://www.nagiosql.org
--// Date      : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $
-+// Date      : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Di, 27. Mär 2012) $
- // Author    : $LastChangedBy: martin $
- // Version   : 3.2.0
- // Revision  : $LastChangedRevision: 1308 $
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-prepend__content.php b/net-mgmt/nagiosql/files/patch-nagiosql32-functions-prepend__content.php
deleted file mode 100644
index 9a1bff1f9ef8..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-functions-prepend__content.php
+++ /dev/null
@@ -1,32 +0,0 @@
---- ../nagiosql/work/./nagiosql32/functions/prepend_content.php	2012-02-29 11:01:14.000000000 +0100
-+++ ./nagiosql32/functions/prepend_content.php	2012-04-04 07:30:16.000000000 +0200
-@@ -178,6 +178,14 @@
- 	$chkTfValue19   = addslashes($chkTfValue19);
- 	$chkTfValue20   = addslashes($chkTfValue20);
- 	$chkTaValue1    = addslashes($chkTaValue1);
-+	$chkTfArg1		= addslashes($chkTfArg1);	
-+	$chkTfArg2		= addslashes($chkTfArg2);
-+	$chkTfArg3		= addslashes($chkTfArg3);
-+	$chkTfArg4		= addslashes($chkTfArg4);
-+	$chkTfArg5		= addslashes($chkTfArg5);
-+	$chkTfArg6		= addslashes($chkTfArg6);
-+	$chkTfArg7		= addslashes($chkTfArg7);
-+	$chkTfArg8		= addslashes($chkTfArg8);
- 	$chkTaFileText  = addslashes($chkTaFileText);
- }
- //
-@@ -204,6 +212,14 @@
- $chkTfValue18   = $myVisClass->tfSecure($chkTfValue18);
- $chkTfValue19   = $myVisClass->tfSecure($chkTfValue19);
- $chkTfValue20   = $myVisClass->tfSecure($chkTfValue20);
-+$chkTfArg1		= $myVisClass->tfSecure($chkTfArg1);	
-+$chkTfArg2		= $myVisClass->tfSecure($chkTfArg2);
-+$chkTfArg3		= $myVisClass->tfSecure($chkTfArg3);
-+$chkTfArg4		= $myVisClass->tfSecure($chkTfArg4);
-+$chkTfArg5		= $myVisClass->tfSecure($chkTfArg5);
-+$chkTfArg6		= $myVisClass->tfSecure($chkTfArg6);
-+$chkTfArg7		= $myVisClass->tfSecure($chkTfArg7);
-+$chkTfArg8		= $myVisClass->tfSecure($chkTfArg8);
- $chkTaValue1    = $myVisClass->tfSecure($chkTaValue1);
- $chkTaFileText  = stripslashes($chkTaFileText);
- //
diff --git a/net-mgmt/nagiosql/files/patch-nagiosql32-templates-admin-user.tpl.htm b/net-mgmt/nagiosql/files/patch-nagiosql32-templates-admin-user.tpl.htm
deleted file mode 100644
index 86ab3decb81e..000000000000
--- a/net-mgmt/nagiosql/files/patch-nagiosql32-templates-admin-user.tpl.htm
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../nagiosql/work/./nagiosql32/templates/admin/user.tpl.htm	2012-03-27 12:47:56.000000000 +0200
-+++ ./nagiosql32/templates/admin/user.tpl.htm	2012-03-27 12:47:58.000000000 +0200
-@@ -3,7 +3,7 @@
- <!-- Project    : NagiosQL -->
- <!-- Component  : User template -->
- <!-- Website    : http://www.nagiosql.org -->
--<!-- Date       : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Tue, 27 Mar 2012) $ -->
-+<!-- Date       : $LastChangedDate: 2012-03-27 12:47:56 +0200 (Di, 27. Mär 2012) $ -->
- <!-- Author     : $LastChangedBy: martin $ -->
- <!-- Version    : 3.2.0 -->
- <!-- Revision   : $LastChangedRevision: 1308 $ -->
diff --git a/net-mgmt/nagiosql/files/pkg-install.in b/net-mgmt/nagiosql/files/pkg-install.in
new file mode 100644
index 000000000000..d27a1fe45264
--- /dev/null
+++ b/net-mgmt/nagiosql/files/pkg-install.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+WWWOWN=%%WWWOWN%%
+WWWGRP=%%WWWGRP%%
+NAGIOSUSER=%%NAGIOSUSER%%
+
+ETCDIR=%%ETCDIR%%
+WWWDIR=%%WWWDIR%%
+
+if [ "$2" = "POST-INSTALL" ]; then
+    echo "=========== p o s t - i n s t a l l ================="
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/ssh
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/hosts
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/services
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup/hosts
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup/services
+	install -m 750 -o ${WWWOWN} -g ${NAGIOSUSER} -d ${ETCDIR}/backup/ssh
+	chown ${WWWOWN}:${WWWGRP} ${WWWDIR}/config
+fi
diff --git a/net-mgmt/nagiosql/files/pkg-message.in b/net-mgmt/nagiosql/files/pkg-message.in
index e66544f63b3b..e783601d0ef9 100644
--- a/net-mgmt/nagiosql/files/pkg-message.in
+++ b/net-mgmt/nagiosql/files/pkg-message.in
@@ -1,5 +1,5 @@
 =======================================================================
-Nagiosql is now installed. If you intall it for the first time,
+Nagiosql is now installed. If you install it for the first time,
 you may have to add an alias in apache config for it.
 
 Alias /nagiosql/ "%%WWWDIR%%/"
diff --git a/net-mgmt/nagiosql/pkg-plist b/net-mgmt/nagiosql/pkg-plist
index 432eeb3efa03..b5936d13a3ab 100644
--- a/net-mgmt/nagiosql/pkg-plist
+++ b/net-mgmt/nagiosql/pkg-plist
@@ -8,7 +8,6 @@
 %%WWWDIR%%/admin/configtargets.php
 %%WWWDIR%%/admin/contactgroups.php
 %%WWWDIR%%/admin/contacts.php
-%%WWWDIR%%/admin/contacts.php.orig
 %%WWWDIR%%/admin/contacttemplates.php
 %%WWWDIR%%/admin/datadomain.php
 %%WWWDIR%%/admin/delbackup.php
@@ -22,7 +21,6 @@
 %%WWWDIR%%/admin/hostextinfo.php
 %%WWWDIR%%/admin/hostgroups.php
 %%WWWDIR%%/admin/hosts.php
-%%WWWDIR%%/admin/hosts.php.orig
 %%WWWDIR%%/admin/hosttemplates.php
 %%WWWDIR%%/admin/import.php
 %%WWWDIR%%/admin/index.html
@@ -38,13 +36,11 @@
 %%WWWDIR%%/admin/serviceextinfo.php
 %%WWWDIR%%/admin/servicegroups.php
 %%WWWDIR%%/admin/services.php
-%%WWWDIR%%/admin/services.php.orig
 %%WWWDIR%%/admin/servicetemplates.php
 %%WWWDIR%%/admin/settings.php
 %%WWWDIR%%/admin/specials.php
 %%WWWDIR%%/admin/support.php
 %%WWWDIR%%/admin/templatedefinitions.php
-%%WWWDIR%%/admin/templatedefinitions.php.orig
 %%WWWDIR%%/admin/timedefinitions.php
 %%WWWDIR%%/admin/timeperiods.php
 %%WWWDIR%%/admin/tools.php
@@ -66,6 +62,10 @@
 %%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/en_GB.po
 %%WWWDIR%%/config/locale/en_GB/LC_MESSAGES/index.html
 %%WWWDIR%%/config/locale/en_GB/index.html
+%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/es_AR.mo
+%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/es_AR.po
+%%WWWDIR%%/config/locale/es_AR/LC_MESSAGES/index.html
+%%WWWDIR%%/config/locale/es_AR/index.html
 %%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.mo
 %%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/es_ES.po
 %%WWWDIR%%/config/locale/es_ES/LC_MESSAGES/index.html
@@ -78,10 +78,18 @@
 %%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.mo
 %%WWWDIR%%/config/locale/it_IT/LC_MESSAGES/it_IT.po
 %%WWWDIR%%/config/locale/it_IT/index.html
+%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/index.html
+%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/ja_JP.mo
+%%WWWDIR%%/config/locale/ja_JP/LC_MESSAGES/ja_JP.po
+%%WWWDIR%%/config/locale/ja_JP/index.html
 %%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/index.html
 %%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.mo
 %%WWWDIR%%/config/locale/nl_NL/LC_MESSAGES/nl_NL.po
 %%WWWDIR%%/config/locale/nl_NL/index.html
+%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/index.html
+%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/pl_PL.mo
+%%WWWDIR%%/config/locale/pl_PL/LC_MESSAGES/pl_PL.po
+%%WWWDIR%%/config/locale/pl_PL/index.html
 %%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/index.html
 %%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.mo
 %%WWWDIR%%/config/locale/pt_BR/LC_MESSAGES/pt_BR.po
@@ -104,17 +112,13 @@
 %%WWWDIR%%/favicon.ico
 %%WWWDIR%%/functions/common.js
 %%WWWDIR%%/functions/config_class.php
-%%WWWDIR%%/functions/config_class.php.orig
 %%WWWDIR%%/functions/content_class.php
 %%WWWDIR%%/functions/data_class.php
 %%WWWDIR%%/functions/import_class.php
-%%WWWDIR%%/functions/import_class.php.orig
 %%WWWDIR%%/functions/mysql_class.php
 %%WWWDIR%%/functions/nag_class.php
 %%WWWDIR%%/functions/prepend_adm.php
-%%WWWDIR%%/functions/prepend_adm.php.orig
 %%WWWDIR%%/functions/prepend_content.php
-%%WWWDIR%%/functions/prepend_content.php.orig
 %%WWWDIR%%/functions/prepend_scripting.php
 %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/langs/en.js
 %%WWWDIR%%/functions/tinyMCE/jscripts/tiny_mce/license.txt
@@ -355,7 +359,6 @@
 %%WWWDIR%%/templates/admin/support.tpl.htm
 %%WWWDIR%%/templates/admin/timeperiods.tpl.htm
 %%WWWDIR%%/templates/admin/user.tpl.htm
-%%WWWDIR%%/templates/admin/user.tpl.htm.orig
 %%WWWDIR%%/templates/admin/verify.tpl.htm
 %%WWWDIR%%/templates/files/commands.tpl.dat
 %%WWWDIR%%/templates/files/contactgroups.tpl.dat
@@ -463,14 +466,20 @@
 @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
@@ -478,6 +487,14 @@
 @dirrm %%WWWDIR%%/config/locale/da_DK/LC_MESSAGES
 @dirrm %%WWWDIR%%/config/locale/da_DK
 @dirrm %%WWWDIR%%/config/locale
-@dirrm %%WWWDIR%%/config
+@dirrmtry %%WWWDIR%%/config
 @dirrm %%WWWDIR%%/admin
-@dirrm %%WWWDIR%%
+@dirrmtry %%WWWDIR%%
+@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%%