Tue Feb 9 10:13:17 2016 UTC ()
Add user-destdir support


(bouyer)
diff -r1.40 -r1.41 pkgsrc/net/nagios-plugins/Makefile
diff -r1.18 -r1.19 pkgsrc/net/nagios-plugins/distinfo
diff -r0 -r1.1 pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in
cvs diff -r1.40 -r1.41 pkgsrc/net/nagios-plugins/Makefile (expand / switch to unified diff)

--- pkgsrc/net/nagios-plugins/Makefile 2015/06/12 10:50:43 1.40
+++ pkgsrc/net/nagios-plugins/Makefile 2016/02/09 10:13:17 1.41
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: Makefile,v 1.40 2015/06/12 10:50:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.41 2016/02/09 10:13:17 bouyer Exp $
2# 2#
3 3
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= net sysutils 5CATEGORIES= net sysutils
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://sourceforge.net/projects/nagiosplug/ 8HOMEPAGE= http://sourceforge.net/projects/nagiosplug/
9COMMENT= Nagios plugins 9COMMENT= Nagios plugins
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12PKG_DESTDIR_SUPPORT= destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14.include "../../net/nagios-plugins/Makefile.common" 14.include "../../net/nagios-plugins/Makefile.common"
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
18USE_TOOLS+= msgfmt msgmerge intltool perl:run xgettext 18USE_TOOLS+= msgfmt msgmerge intltool perl:run xgettext
19 19
20PKG_GROUPS+= ${NAGIOS_GROUP} 20PKG_GROUPS+= ${NAGIOS_GROUP}
21BUILD_DEFS+= ${NAGIOS_GROUP} 21BUILD_DEFS+= ${NAGIOS_GROUP}
22 22
23CONFIGURE_ARGS+= --without-pgsql --without-mysql \ 23CONFIGURE_ARGS+= --without-pgsql --without-mysql \
24 --without-smbclient-command --without-snmpget-command \ 24 --without-smbclient-command --without-snmpget-command \
25 --without-snmpgetnext-command --without-fping-command \ 25 --without-snmpgetnext-command --without-fping-command \
cvs diff -r1.18 -r1.19 pkgsrc/net/nagios-plugins/distinfo (expand / switch to unified diff)

--- pkgsrc/net/nagios-plugins/distinfo 2015/11/04 00:35:14 1.18
+++ pkgsrc/net/nagios-plugins/distinfo 2016/02/09 10:13:17 1.19
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.18 2015/11/04 00:35:14 agc Exp $ 1$NetBSD: distinfo,v 1.19 2016/02/09 10:13:17 bouyer Exp $
2 2
3SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6 3SHA1 (nagios-plugins-2.0.3.tar.gz) = 29b6183ab9d796299dc17c395eef493415d1e9d6
4RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4 4RMD160 (nagios-plugins-2.0.3.tar.gz) = b682b126c78df51f64d9cb8599d2f9dfd411d5f4
5SHA512 (nagios-plugins-2.0.3.tar.gz) = 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36 5SHA512 (nagios-plugins-2.0.3.tar.gz) = 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36
6Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes 6Size (nagios-plugins-2.0.3.tar.gz) = 2659772 bytes
7SHA1 (patch-ad) = 7dc748ce7815f3f90212815a9fe9a9a7db961617 7SHA1 (patch-ad) = 7dc748ce7815f3f90212815a9fe9a9a7db961617
8SHA1 (patch-af) = 8fd2e50ca63f014f88195552884913c7383cb6a1 8SHA1 (patch-af) = 8fd2e50ca63f014f88195552884913c7383cb6a1
9SHA1 (patch-ah) = f884e80c1e09fefd5e37f087d95d3b76b9d44ab6 9SHA1 (patch-ah) = f884e80c1e09fefd5e37f087d95d3b76b9d44ab6
10SHA1 (patch-ai) = 645ebd4ac16a71bd5944fe3850c809cb45bf6a4c 10SHA1 (patch-ai) = 645ebd4ac16a71bd5944fe3850c809cb45bf6a4c
11SHA1 (patch-ak) = 093638669dd5b524d8a9b31d452f1ba737e684b3 11SHA1 (patch-ak) = 093638669dd5b524d8a9b31d452f1ba737e684b3
12SHA1 (patch-an) = 6ba8dec0eb62cd0097809daf8075248afd448695 12SHA1 (patch-an) = 6ba8dec0eb62cd0097809daf8075248afd448695
13SHA1 (patch-configure) = 8a06bbd0fa0649625ffb1c8e2f4b667714a40fe4 13SHA1 (patch-configure) = 8a06bbd0fa0649625ffb1c8e2f4b667714a40fe4
 14SHA1 (patch-plugins-root_Makefile.in) = e4352f38bd0085f5c0acd9d058f1aa5d76676fff
14SHA1 (patch-plugins__check_swap.c) = 4a32398b3e8e596b9f67b3ea95a3acce37287b0b 15SHA1 (patch-plugins__check_swap.c) = 4a32398b3e8e596b9f67b3ea95a3acce37287b0b
File Added: pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in
$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