cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if we change all $(INSTALL) anyhow, we can as well use $(BSD_INSTALL_*)

Browse Source 
fixes stripping as well

noticed by mitja at muzenic.net
This commit is contained in:
sturm 2005-07-25 19:23:47 +00:00
parent 48498b5692
commit 038999b779
4 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/nagios/nagios/Makefile
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
# $OpenBSD: Makefile,v 1.2 2005/07/25 19:23:47 sturm Exp $
COMMENT= "host and service monitor"
COMMENT-web= "cgis and webpages for nagios"
V= 2.0b3
DISTNAME= nagios-${V}
PKGNAME-web= nagios-web-${V}
PKGNAME= ${DISTNAME}p0
PKGNAME-web= nagios-web-${V}p0
CATEGORIES= net
HOMEPAGE= http://www.nagios.org/

16
net/nagios/nagios/patches/patch-base_Makefile_in
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-base_Makefile_in,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
$OpenBSD: patch-base_Makefile_in,v 1.2 2005/07/25 19:23:47 sturm Exp $
--- base/Makefile.in.orig Thu Dec 9 07:48:33 2004
+++ base/Makefile.in Mon Feb 7 22:23:41 2005
@@ -181,10 +181,10 @@ distclean: clean
+++ base/Makefile.in Mon Jul 25 21:05:59 2005
@@ -181,10 +181,8 @@ distclean: clean
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 555 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(prefix)/sbin
$(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
- $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 555 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
$(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
- $(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR)
+ $(BSD_INSTALL_PROGRAM) @nagios_name@ $(DESTDIR)$(prefix)/sbin
+ $(BSD_INSTALL_PROGRAM) @nagiostats_name@ $(DESTDIR)$(BINDIR)

15
net/nagios/nagios/patches/patch-cgi_Makefile_in
View File

@ -1,15 +1,16 @@
$OpenBSD: patch-cgi_Makefile_in,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
--- cgi/Makefile.in.orig Mon Jan 10 18:15:20 2005
+++ cgi/Makefile.in Mon Jan 10 18:17:01 2005
@@ -191,9 +191,9 @@ distclean: clean
$OpenBSD: patch-cgi_Makefile_in,v 1.2 2005/07/25 19:23:47 sturm Exp $
--- cgi/Makefile.in.orig Mon Oct 25 07:05:54 2004
+++ cgi/Makefile.in Mon Jul 25 21:06:41 2005
@@ -191,10 +191,9 @@ distclean: clean
devclean: distclean
install:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR)
+ $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(CGIDIR)
for file in *.cgi; do \
- $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
+ $(INSTALL) -m 555 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \
$(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
- $(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \
+ $(BSD_INSTALL_PROGRAM) $$file $(DESTDIR)$(CGIDIR); \
done

48
net/nagios/nagios/patches/patch-html_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-html_Makefile_in,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
--- html/Makefile.in.orig Mon Jan 10 18:15:54 2005
+++ html/Makefile.in Mon Jan 10 18:16:29 2005
$OpenBSD: patch-html_Makefile_in,v 1.2 2005/07/25 19:23:47 sturm Exp $
--- html/Makefile.in.orig Thu Apr 10 05:46:02 2003
+++ html/Makefile.in Mon Jul 25 21:09:55 2005
@@ -33,37 +33,37 @@ distclean: clean
devclean: distclean
@ -16,47 +16,47 @@ $OpenBSD: patch-html_Makefile_in,v 1.1.1.1 2005/07/25 16:32:05 sturm Exp $
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi
+ $(INSTALL) -m 444 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+ $(INSTALL) -m 444 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
+ $(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
+ $(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
for file in *.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done
for file in media/*.wav; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done
for file in stylesheets/*.css; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
for file in contexthelp/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
for file in docs/*.html; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done
for file in docs/images/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
for file in images/*.gif; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.jpg; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/*.png; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
for file in images/logos/*.*; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ do $(INSTALL) -m 444 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done