Use SPECIAL_PERMS instead of relying on the package-specific Makefile from

doing the "right" thing (which it might not anyway because it does not check
error conditions).

Also set the package as 'user-destdir' because we don't need to do the install
as root any more.

Suggested by joerg@.

3 files changed, 22 insertions, 59 deletions

diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index 2545bb611fb..f64926bbb3c 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2011/01/18 13:46:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2011/01/19 16:43:38 jmmv Exp $
 
 DISTNAME=		libgtop-2.28.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.28/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,7 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Library to retrieve system information, used in GNOME2
 
-PKG_DESTDIR_SUPPORT=	destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 OSVERSION_SPECIFIC=	YES
 
@@ -48,11 +48,25 @@ PRINT_PLIST_AWK+=	/^include\/libgtop-2.0\/glibtop_suid.h$$/ \
 CONFIGURE_ENV+=	fu_cv_sys_mounted_getmntinfo=yes
 .endif
 
+INSTALL_MAKE_FLAGS+=	libgtop_postinstall=true
 PLIST_VARS+=	server suid.h
-.if ${OPSYS} == "Linux"
-#		nothing
+.if ${OPSYS} == "AIX"
+PLIST.server=	yes
+PLIST.suid.h=	yes
+SPECIAL_PERMS=	bin/libgtop_server2 ${REAL_ROOT_USER} system 2755
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || \
+      ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || \
+      ${OPSYS} == "OpenBSD"
+PLIST.server=	yes
+PLIST.suid.h=	yes
+SPECIAL_PERMS=	bin/libgtop_server2 ${REAL_ROOT_USER} kmem 2755
+.elif ${OPSYS} == "Linux"
+#PLIST.server=	no
+#PLIST.suid.h=	no
 .elif ${OPSYS} == "SunOS"
 PLIST.server=	yes
+PLIST.suid.h=	yes
+SPECIAL_PERMS=	bin/libgtop_server2 ${REAL_ROOT_USER} sys 2755
 .else
 PLIST.server=	yes
 PLIST.suid.h=	yes
diff --git a/sysutils/libgtop/distinfo b/sysutils/libgtop/distinfo
index 22164e35232..91c01221957 100644
--- a/sysutils/libgtop/distinfo
+++ b/sysutils/libgtop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2011/01/18 13:46:38 jmmv Exp $
+$NetBSD: distinfo,v 1.23 2011/01/19 16:43:38 jmmv Exp $
 
 SHA1 (libgtop-2.28.2.tar.bz2) = 5139d3d2a98c39c36b5b61352629bf16d54dc68a
 RMD160 (libgtop-2.28.2.tar.bz2) = 61b1ac4e9c7212a04ff4591edd1a1c154f689627
@@ -22,7 +22,7 @@ SHA1 (patch-ca) = 06bc86bce721155315a1905b750f795629460ff7
 SHA1 (patch-cb) = cabc971530d8113694ff6d04108490749d40bcec
 SHA1 (patch-cc) = 2cb1d2da57a8622c93ed255a416ed9c811e775a2
 SHA1 (patch-cd) = cf96896ddde9c830c1e808d8bf37b9fdb611ed24
-SHA1 (patch-da) = 1f8df28647142a77c125a202cb543a48ab6c07d1
+SHA1 (patch-da) = 01e7ac686f771b02b66ea70802e50545c22ab691
 SHA1 (patch-db) = e3efc8ac9cf2320fef788b6265b0012ea4d3d660
 SHA1 (patch-dc) = ada7813f4a4203cc8d1bfa46bce7b87ecee06bc0
 SHA1 (patch-dd) = fea61bea21b1d1ae52f614ce9804a1132f3f368f
diff --git a/sysutils/libgtop/patches/patch-da b/sysutils/libgtop/patches/patch-da
index f14f4fc098d..f46f498d085 100644
--- a/sysutils/libgtop/patches/patch-da
+++ b/sysutils/libgtop/patches/patch-da
@@ -1,49 +1,7 @@
-$NetBSD: patch-da,v 1.4 2011/01/18 13:46:38 jmmv Exp $
+$NetBSD: patch-da,v 1.5 2011/01/19 16:43:38 jmmv Exp $
 
 --- configure.orig	2010-09-28 09:37:06.000000000 +0000
 +++ configure
-@@ -12019,35 +12019,35 @@ $as_echo_n "checking for libgtop sysdeps
- 	  libgtop_sysdeps_dir=bsd
- 	  libgtop_use_machine_h=yes
- 	  libgtop_need_server=yes
--	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(bindir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(bindir)/libgtop_server2'
- 	  ;;
--	freebsd*|kfreebsd*)
-+	freebsd*|kfreebsd*|dragonfly*)
- 	  libgtop_sysdeps_dir=freebsd
- 	  libgtop_use_machine_h=yes
- 	  libgtop_need_server=yes
- 	  libgtop_sysdeps_private_mountlist=yes
- 	  libgtop_sysdeps_private_fsusage=yes
--	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(bindir)/libgtop_server2 && chmod 2755 $(DESTDIR)$(bindir)/libgtop_server2'
- 	  ;;
- 	solaris*)
- 	  libgtop_sysdeps_dir=solaris
- 	  libgtop_use_machine_h=yes
- 	  libgtop_need_server=yes
--	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-+	  libgtop_postinstall='chgrp sys $(DESTDIR)$(bindir)/libgtop_server && chmod 2755 $(DESTDIR)$(bindir)/libgtop_server'
- 	  ;;
- 	aix*)
- 	  libgtop_sysdeps_dir=aix
- 	  libgtop_use_machine_h=yes
- 	  libgtop_need_server=yes
- 	  libgtop_have_sysinfo=yes
--	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp system $(DESTDIR)$(bindir)/libgtop_server && chmod g+s $(DESTDIR)$(bindir)/libgtop_server2'
- 	  ;;
- 	darwin*)
- 	  libgtop_sysdeps_dir=darwin
- 	  libgtop_use_machine_h=yes
- 	  libgtop_need_server=yes
- 	  libgtop_have_sysinfo=yes
--	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
-+	  libgtop_postinstall='chgrp kmem $(DESTDIR)$(bindir)/libgtop_server2 && chmod g+s $(DESTDIR)$(bindir)/libgtop_server2'
- 	  ;;
- 	cygwin*)
- 	  libgtop_sysdeps_dir=cygwin
 @@ -12094,7 +12094,7 @@ $as_echo "$libgtop_sysdeps_dir" >&6; }
  
  
@@ -53,12 +11,3 @@ $NetBSD: patch-da,v 1.4 2011/01/18 13:46:38 jmmv Exp $
  		case "$host_os" in
  		*kfreebsd*)
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5
-@@ -18051,6 +18051,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;