diff options
| author | bouyer <bouyer@pkgsrc.org> | 2016-02-09 10:13:17 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2016-02-09 10:13:17 +0000 |
| commit | a84a79fc76e69be25e24627952bc6b0828364ef5 (patch) | |
| tree | a7b1a274214824f1a4cb7667a003937de8e435ec /net | |
| parent | c4415432bb282790cc8664dae71e9c01c78f667f (diff) | |
| download | pkgsrc-a84a79fc76e69be25e24627952bc6b0828364ef5.tar.gz | |
Add user-destdir support
Diffstat (limited to 'net')
| -rw-r--r-- | net/nagios-plugins/Makefile | 4 | ||||
| -rw-r--r-- | net/nagios-plugins/distinfo | 3 | ||||
| -rw-r--r-- | net/nagios-plugins/patches/patch-plugins-root_Makefile.in | 30 |
3 files changed, 34 insertions, 3 deletions
diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile index 8c6c90b2b69..30c2e51e569 100644 --- a/net/nagios-plugins/Makefile +++ b/net/nagios-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2015/06/12 10:50:43 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2016/02/09 10:13:17 bouyer Exp $ # PKGREVISION= 1 @@ -9,7 +9,7 @@ HOMEPAGE= http://sourceforge.net/projects/nagiosplug/ COMMENT= Nagios plugins LICENSE= gnu-gpl-v2 -PKG_DESTDIR_SUPPORT= destdir +PKG_DESTDIR_SUPPORT= user-destdir .include "../../net/nagios-plugins/Makefile.common" diff --git a/net/nagios-plugins/distinfo b/net/nagios-plugins/distinfo index b727ac263fa..22c4a2eeaa4 100644 --- a/net/nagios-plugins/distinfo +++ b/net/nagios-plugins/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2015/11/04 00:35:14 agc Exp $ +$NetBSD: distinfo,v 1.19 2016/02/09 10:13:17 bouyer Exp $ SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6 RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4 @@ -11,4 +11,5 @@ SHA1 (patch-ai) = 645ebd4ac16a71bd5944fe3850c809cb45bf6a4c SHA1 (patch-ak) = 093638669dd5b524d8a9b31d452f1ba737e684b3 SHA1 (patch-an) = 6ba8dec0eb62cd0097809daf8075248afd448695 SHA1 (patch-configure) = 8a06bbd0fa0649625ffb1c8e2f4b667714a40fe4 +SHA1 (patch-plugins-root_Makefile.in) = e4352f38bd0085f5c0acd9d058f1aa5d76676fff SHA1 (patch-plugins__check_swap.c) = 4a32398b3e8e596b9f67b3ea95a3acce37287b0b diff --git a/net/nagios-plugins/patches/patch-plugins-root_Makefile.in b/net/nagios-plugins/patches/patch-plugins-root_Makefile.in new file mode 100644 index 00000000000..d6ae4c34a21 --- /dev/null +++ b/net/nagios-plugins/patches/patch-plugins-root_Makefile.in @@ -0,0 +1,30 @@ +$NetBSD: patch-plugins-root_Makefile.in,v 1.1 2016/02/09 10:13:17 bouyer Exp $ +user-destdir install fixes. + +--- plugins-root/Makefile.in.orig 2016-02-08 13:26:51.000000000 +0100 ++++ plugins-root/Makefile.in 2016-02-08 13:27:43.000000000 +0100 +@@ -1312,10 +1312,6 @@ + p=$$f; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ +- echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \ +- chown root $(DESTDIR)$(libexecdir)/$$p; \ +- echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \ +- chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ + done + + +@@ -1748,12 +1744,7 @@ + && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ + && can_create_suid_root_executable=yes; \ + rm -f $$TMPFILE; \ +- if test $$can_create_suid_root_executable = yes; then \ +- $(INSTALL_SUID); \ +- else \ +- echo "WARNING: insufficient access; not installing setuid plugins"; \ +- echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ +- fi ++ $(INSTALL_SUID); \ + + clean-local: + rm -f NP-VERSION-FILE |