mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-22 00:35:15 +00:00
Code Issues Releases Activity

Update to 1.11.4

Browse Source
This commit is contained in:
Lars Engels 2014-05-30 13:10:58 +00:00
parent 6f01cbf941
commit 64de6ee633
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=355833
4 changed files with 21 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-mgmt/icinga/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= icinga
PORTVERSION= 1.11.2
PORTVERSION= 1.11.4
CATEGORIES= net-mgmt
MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/

4
net-mgmt/icinga/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (icinga-1.11.2.tar.gz) = 449145c53aa36380f70883c6d85baf0762f9c42dfdcffdbe567275e7c798079b
SIZE (icinga-1.11.2.tar.gz) = 18704180
SHA256 (icinga-1.11.4.tar.gz) = 34e923d8daac0235513ece5f54a2065b9166cce3ef3c9f8794e635c93ae0d541
SIZE (icinga-1.11.4.tar.gz) = 18657247

53
net-mgmt/icinga/files/patch-Makefile.in
View File

@ -1,6 +1,6 @@
--- Makefile.in.orig 2014-03-13 11:46:50.000000000 +0100
+++ Makefile.in 2014-03-13 21:46:18.322311413 +0100
@@ -140,16 +140,16 @@ none:
--- Makefile.in.orig 2014-05-28 23:00:23.000000000 +0200
+++ Makefile.in 2014-05-30 14:58:20.687021540 +0200
@@ -138,16 +138,16 @@ none:
###############################
all:
@ -22,7 +22,7 @@
fi
@echo ""
@@ -217,7 +217,7 @@ all:
@@ -215,7 +215,7 @@ all:
@echo ""
icinga:
@ -31,7 +31,7 @@
config:
@echo "Sample config files are automatically generated once you run the"
@@ -225,11 +225,11 @@ config:
@@ -223,11 +223,11 @@ config:
@echo "system by using the 'make install-config' command."
cgis:
@ -45,7 +45,7 @@
else \
echo "" ;\
echo "Sorry, IDOUtils not enabled!" ;\
@@ -238,13 +238,13 @@ idoutils:
@@ -236,13 +236,13 @@ idoutils:
fi
html:
@ -62,7 +62,7 @@
classicui-standalone: cgis
@@ -258,35 +258,35 @@ classicui-standalone: cgis
@@ -256,31 +256,31 @@ classicui-standalone: cgis
###############################
clean:
@ -75,9 +75,7 @@
- cd $(SRC_CONTRIB) && $(MAKE) $@
- cd $(SRC_MODULE) && $(MAKE) $@
- cd $(SRC_IDOUTILS) && $(MAKE) $@
- cd $(SRC_TTAP) && $(MAKE) $@
- cd $(SRC_T) && $(MAKE) $@
- cd $(SRC_TAP) && $(MAKE) $@; \
+ $(MAKE) -C $(SRC_BASE) $@
+ $(MAKE) -C $(SRC_CGI) $@
+ $(MAKE) -C $(SRC_COMMON) $@
@ -87,9 +85,7 @@
+ $(MAKE) -C $(SRC_CONTRIB) $@
+ $(MAKE) -C $(SRC_MODULE) $@
+ $(MAKE) -C $(SRC_IDOUTILS) $@
+ $(MAKE) -C $(SRC_TTAP) $@
+ $(MAKE) -C $(SRC_T) $@
+ $(MAKE) -C $(SRC_TAP) $@; \
rm -f *.cfg core
rm -f *~ *.*~ */*~ */*.*~ */*/*.*~
@ -104,9 +100,7 @@
- cd $(SRC_CONTRIB) && $(MAKE) $@
- cd $(SRC_MODULE) && $(MAKE) $@
- cd $(SRC_IDOUTILS) && $(MAKE) $@
- cd $(SRC_TTAP) && $(MAKE) $@
- cd $(SRC_T) && $(MAKE) $@
- cd $(SRC_TAP) && $(MAKE) $@; \
+ $(MAKE) -C $(SRC_BASE) $@
+ $(MAKE) -C $(SRC_CGI) $@
+ $(MAKE) -C $(SRC_COMMON) $@
@ -116,30 +110,11 @@
+ $(MAKE) -C $(SRC_CONTRIB) $@
+ $(MAKE) -C $(SRC_MODULE) $@
+ $(MAKE) -C $(SRC_IDOUTILS) $@
+ $(MAKE) -C $(SRC_TTAP) $@
+ $(MAKE) -C $(SRC_T) $@
+ $(MAKE) -C $(SRC_TAP) $@; \
rm -f sample-config/*.cfg sample-config/*.conf sample-config/template-object/*.cfg
rm -f daemon-init pkginfo rc.ido2db ido2db-systemd icinga-systemd sysconfig-env
@@ -307,13 +307,13 @@ test:
$(MAKE) test-tap
test-tap: tools/libtap/tap.o icinga cgis
- cd $(SRC_TTAP) && $(MAKE) test;
+ $(MAKE) -C $(SRC_TTAP) test;
tools/libtap/tap.o:
- cd tools/libtap && $(MAKE)
+ $(MAKE) -C tools/libtap
test-perl: icinga cgis
- cd t && $(MAKE) test
+ $(MAKE) -C t test
###############################
# Package
@@ -327,8 +327,8 @@ create-docs: copy-docs-style
@@ -314,8 +314,8 @@ create-docs: copy-docs-style
#${MAKE} submodule-init
#${MAKE} submodule-update
#${MAKE} submodule-update-latest
@ -150,7 +125,7 @@
cp ${SRC_DOCBOOK_IMAGES}/*.png ${SRC_DOCS_IMAGES}/
@echo "updated docs :)"
@@ -365,37 +365,33 @@ submodule-update-latest:
@@ -352,37 +352,33 @@ submodule-update-latest:
install-html:
@ -198,7 +173,7 @@
if [ $(INSTALLPERLSTUFF) = yes ]; then \
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(P1FILELOC); \
$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(P1FILELOC); \
@@ -438,8 +434,8 @@ install-basic:
@@ -425,8 +421,8 @@ install-basic:
install-cgiconf:
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
@ -209,7 +184,7 @@
install-config: install-cgiconf
@@ -447,17 +443,17 @@ install-config: install-cgiconf
@@ -434,17 +430,17 @@ install-config: install-cgiconf
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/conf.d
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
@ -238,7 +213,7 @@
@echo ""
@echo "*** Config files installed ***"
@@ -475,7 +471,7 @@ install-testconfig:
@@ -462,7 +458,7 @@ install-testconfig:
install-webconf:
$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
@ -247,7 +222,7 @@
@if [ x$(APACHE24_DEBIAN) = xyes ]; then \
echo " Debian Apache 2.4 detected. " ;\
echo " Run 'a2enconf icinga' and 'service apache2 reload'" ;\
@@ -488,7 +484,7 @@ install-webconf:
@@ -475,7 +471,7 @@ install-webconf:
install-webconf-auth:
$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
@ -256,7 +231,7 @@
@echo ""
@echo "*** Icinga http auth file installed ***"
@@ -497,7 +493,7 @@ install-webconf-auth:
@@ -484,7 +480,7 @@ install-webconf-auth:
install-idoutils:
@if [ x$(USE_IDOUTILS) = xyes ]; then \

4
net-mgmt/icinga/pkg-plist
View File

@ -61,6 +61,7 @@ libexec/icinga/eventhandlers/submit_check_result
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.7.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.8.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.3.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/create_icinga_objects_oracle.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/create_oracle_sys.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/icinga_defines.sql
@ -68,6 +69,7 @@ libexec/icinga/eventhandlers/submit_check_result
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/oracle-drop.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/oracle-truncate.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/oracle.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.3.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.1.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.2-fix-object-relations.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.0.3.sql
@ -89,6 +91,7 @@ libexec/icinga/eventhandlers/submit_check_result
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.10.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.3.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql
@ -2340,6 +2343,7 @@ libexec/icinga/eventhandlers/submit_check_result
%%ICINGAWWWDIR%%/js/jquery-1.8.0.js
%%ICINGAWWWDIR%%/js/jquery-1.8.0.min.js
%%ICINGAWWWDIR%%/js/jquery.dd.js
%%ICINGAWWWDIR%%/js/jquery.dd.min.js
%%ICINGAWWWDIR%%/js/menu.js
%%ICINGAWWWDIR%%/js/page_refresh.js
%%ICINGAWWWDIR%%/js/skinnytip.js