diff options
Diffstat (limited to 'net/nagios-base/patches/patch-Makefile.in')
| -rw-r--r-- | net/nagios-base/patches/patch-Makefile.in | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/net/nagios-base/patches/patch-Makefile.in b/net/nagios-base/patches/patch-Makefile.in index 8a5eca0a40d..c61aa7f4da5 100644 --- a/net/nagios-base/patches/patch-Makefile.in +++ b/net/nagios-base/patches/patch-Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- Makefile.in.orig 2012-04-25 12:30:47.000000000 +0000 +--- Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ Makefile.in -@@ -24,17 +24,16 @@ prefix=@prefix@ +@@ -25,9 +25,9 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ CHECKRESULTDIR=@CHECKRESULTDIR@ @@ -14,7 +14,9 @@ Adjustments to build procedure. -CGIDIR=@sbindir@ +CGIDIR=@libexecdir@ LIBEXECDIR=@libexecdir@ - HTMLDIR=@datadir@ + LIBDIR=@libdir@ + INCLUDEDIR=@includedir@/nagios +@@ -36,9 +36,8 @@ datarootdir=@datarootdir@ INSTALL=@INSTALL@ INSTALL_OPTS=@INSTALL_OPTS@ COMMAND_OPTS=@COMMAND_OPTS@ @@ -23,15 +25,16 @@ Adjustments to build procedure. -INIT_OPTS=-o root -g root +INIT_OPTS=-o root -g wheel CGICFGDIR=$(CGIDIR) - PERLDIR=@PERLDIR@ -@@ -72,74 +71,6 @@ all: + USE_EVENTBROKER=@USE_EVENTBROKER@ +@@ -71,75 +70,6 @@ all: cd $(SRC_BASE) && $(MAKE) cd $(SRC_CGI) && $(MAKE) cd $(SRC_HTM) && $(MAKE) - if [ x$(USE_EVENTBROKER) = xyes ]; then \ - cd $(SRC_MODULE) && $(MAKE); \ - fi +- cd $(SRC_WORKERS) && $(MAKE) $@ - - @echo "" - @echo "*** Compile finished ***" @@ -98,26 +101,21 @@ Adjustments to build procedure. - @echo "Enjoy." - @echo "" - nagios: - cd $(SRC_BASE) && $(MAKE) -@@ -234,14 +165,10 @@ install-unstripped: + $(SRC_LIB)/libnagios.a: + cd $(SRC_LIB) && $(MAKE) +@@ -245,11 +175,6 @@ install-unstripped: $(MAKE) install-basic install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) - if [ $(INSTALLPERLSTUFF) = yes ]; then \ -- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ -+ $(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \ - fi; -- -+ +- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) +- chmod g+s $(DESTDIR)$(CHECKRESULTDIR) + @echo "" @echo "*** Main program, CGIs and HTML files installed ***" - @echo "" -@@ -261,20 +188,20 @@ install-basic: +@@ -270,20 +195,20 @@ install-basic: install-config: @@ -152,7 +150,7 @@ Adjustments to build procedure. @echo "" @echo "*** Config files installed ***" @echo "" -@@ -291,8 +218,15 @@ install-webconf: +@@ -300,8 +225,15 @@ install-webconf: @echo "" install-exfoliation: @@ -170,7 +168,7 @@ Adjustments to build procedure. @echo "" @echo "*** Exfoliation theme installed ***" -@@ -320,7 +254,10 @@ install-daemoninit: +@@ -329,7 +261,10 @@ install-daemoninit: install-commandmode: |