- Remove the unneeded .sample files in $DATADIR/itl. The .conf files there

  should never be touched by a user.
- Add a pkg-message with a notice on major upgrades
- Bump PORTREVISION

5 files changed, 19 insertions, 37 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index e3e121b41a35..e4afd7fc57a2 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
@@ -94,7 +94,6 @@ post-patch:
 
 pre-install:
 	${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \;
-	${FIND} ${WRKSRC}/itl -type f -name "*.conf" -exec ${MV} {} {}.sample \;
 	${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \
 		-exec ${MV} {} {}.sample \;
 
diff --git a/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt b/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt
deleted file mode 100644
index 6d5b29b362ba..000000000000
--- a/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- itl/CMakeLists.txt.orig	2015-07-13 22:14:51.872881000 +0200
-+++ itl/CMakeLists.txt	2015-07-13 22:15:19.702183000 +0200
-@@ -18,6 +18,6 @@
- add_subdirectory(plugins-contrib.d)
- 
- install(
--  FILES itl command.conf command-icinga.conf hangman timeperiod.conf plugins command-plugins.conf manubulon command-plugins-manubulon.conf windows-plugins command-plugins-windows.conf nscp command-nscp-local.conf plugins-contrib
-+  FILES itl command.conf.sample command-icinga.conf.sample hangman timeperiod.conf.sample plugins command-plugins.conf.sample manubulon command-plugins-manubulon.conf.sample windows-plugins command-plugins-windows.conf.sample nscp command-nscp-local.conf.sample plugins-contrib
-   DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include
- )
diff --git a/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt b/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt
deleted file mode 100644
index fe21d26c81e8..000000000000
--- a/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- itl/plugins-contrib.d/CMakeLists.txt.orig	2015-10-19 11:14:40.000000000 +0200
-+++ itl/plugins-contrib.d/CMakeLists.txt	2015-10-26 15:42:41.023004000 +0100
-@@ -16,6 +16,6 @@
- # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- 
- install(
--  FILES databases.conf ipmi.conf network-components.conf operating-system.conf virtualization.conf vmware.conf web.conf hardware.conf
-+  FILES databases.conf.sample ipmi.conf.sample network-components.conf.sample operating-system.conf.sample virtualization.conf.sample vmware.conf.sample web.conf.sample hardware.conf.sample
-   DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include/plugins-contrib.d
- )
diff --git a/net-mgmt/icinga2/files/pkg-message.in b/net-mgmt/icinga2/files/pkg-message.in
new file mode 100644
index 000000000000..765770a1f2cc
--- /dev/null
+++ b/net-mgmt/icinga2/files/pkg-message.in
@@ -0,0 +1,3 @@
+If you do a major upgrade of Icinga 2 and use a database, please see 
+http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/upgrading-icinga-2
+how to upgrade the database.
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 0d3f22da4539..7f2a776dad06 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -99,27 +99,27 @@ sbin/icinga2
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.4.0.sql
-@sample %%DATADIR%%/include/command-icinga.conf.sample
-@sample %%DATADIR%%/include/command-nscp-local.conf.sample
-@sample %%DATADIR%%/include/command-plugins-manubulon.conf.sample
-@sample %%DATADIR%%/include/command-plugins-windows.conf.sample
-@sample %%DATADIR%%/include/command-plugins.conf.sample
-@sample %%DATADIR%%/include/command.conf.sample
+%%DATADIR%%/include/command-icinga.conf
+%%DATADIR%%/include/command-nscp-local.conf
+%%DATADIR%%/include/command-plugins-manubulon.conf
+%%DATADIR%%/include/command-plugins-windows.conf
+%%DATADIR%%/include/command-plugins.conf
+%%DATADIR%%/include/command.conf
 %%DATADIR%%/include/hangman
 %%DATADIR%%/include/itl
 %%DATADIR%%/include/manubulon
 %%DATADIR%%/include/nscp
 %%DATADIR%%/include/plugins
 %%DATADIR%%/include/plugins-contrib
-@sample %%DATADIR%%/include/plugins-contrib.d/databases.conf.sample
-@sample %%DATADIR%%/include/plugins-contrib.d/ipmi.conf.sample
-@sample %%DATADIR%%/include/plugins-contrib.d/hardware.conf.sample
-@sample %%DATADIR%%/include/plugins-contrib.d/network-components.conf.sample
-@sample %%DATADIR%%/include/plugins-contrib.d/operating-system.conf.sample
-@sample %%DATADIR%%/include/plugins-contrib.d/virtualization.conf.sample
-@sample %%DATADIR%%/include/plugins-contrib.d/vmware.conf.sample
-@sample %%DATADIR%%/include/plugins-contrib.d/web.conf.sample
-@sample %%DATADIR%%/include/timeperiod.conf.sample
+%%DATADIR%%/include/plugins-contrib.d/databases.conf
+%%DATADIR%%/include/plugins-contrib.d/ipmi.conf
+%%DATADIR%%/include/plugins-contrib.d/hardware.conf
+%%DATADIR%%/include/plugins-contrib.d/network-components.conf
+%%DATADIR%%/include/plugins-contrib.d/operating-system.conf
+%%DATADIR%%/include/plugins-contrib.d/virtualization.conf
+%%DATADIR%%/include/plugins-contrib.d/vmware.conf
+%%DATADIR%%/include/plugins-contrib.d/web.conf
+%%DATADIR%%/include/timeperiod.conf
 %%DATADIR%%/include/windows-plugins
 @dir %%ETCDIR%%/pki
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2