[pkgsrc/trunk]: pkgsrc/x11/xlockmore Don't use the special permissions from c...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a226872e963e
branches:  trunk
changeset: 534647:a226872e963e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Oct 28 16:06:04 2007 +0000

description:
Don't use the special permissions from configure, but annotate them
directly. The OSF setgid is currently left out. Add DESTDIR support.

diffstat:

 x11/xlockmore/Makefile.common  |  18 +++++++++++++++---
 x11/xlockmore/distinfo         |   6 ++++--
 x11/xlockmore/patches/patch-ac |  20 +++++++++++++++-----
 x11/xlockmore/patches/patch-ad |  23 +++++++++++++++++++++++
 x11/xlockmore/patches/patch-ae |  33 +++++++++++++++++++++++++++++++++
 5 files changed, 90 insertions(+), 10 deletions(-)

diffs (158 lines):

diff -r ec0e39b20489 -r a226872e963e x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Sun Oct 28 16:04:41 2007 +0000
+++ b/x11/xlockmore/Makefile.common     Sun Oct 28 16:06:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2007/09/28 12:42:40 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.50 2007/10/28 16:06:04 joerg Exp $
 #
 # This Makefile.common is included by:
 #
@@ -24,6 +24,7 @@
 PATCHDIR?=             ${.CURDIR}/../xlockmore/patches
 PLIST_SRC?=            ${.CURDIR}/../xlockmore/PLIST
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
@@ -71,6 +72,17 @@
 CONFIGURE_ARGS+=       --disable-allow-root
 .endif
 
+#
+# Special permissions of bin/xlock if any.
+#
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || \
+    ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
+SPECIAL_PERMS+=        bin/xlock ${SETUID_ROOT_PERMS}
+.elif ${OPSYS} == "Linux"
+# setgid shadow should be enough for modern Linux
+SPECIAL_PERMS+=        bin/xlock ${REAL_ROOT_USER} shadow 2511
+.endif
+
 BUILDLINK_DEPMETHOD.libXt?=    build
 
 .include "../../x11/libICE/buildlink3.mk"
@@ -98,8 +110,8 @@
 .endif
 
 post-install:
-       ${INSTALL_DATA_DIR} ${XLOCK_SOUNDDIR}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${XLOCK_SOUNDDIR}
        cd ${WRKSRC}/sounds;                                            \
        for file in *.au; do                                            \
-               ${INSTALL_DATA} $$file ${XLOCK_SOUNDDIR};               \
+               ${INSTALL_DATA} $$file ${DESTDIR}${XLOCK_SOUNDDIR};     \
        done
diff -r ec0e39b20489 -r a226872e963e x11/xlockmore/distinfo
--- a/x11/xlockmore/distinfo    Sun Oct 28 16:04:41 2007 +0000
+++ b/x11/xlockmore/distinfo    Sun Oct 28 16:06:04 2007 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.38 2007/09/28 12:42:40 hubertf Exp $
+$NetBSD: distinfo,v 1.39 2007/10/28 16:06:04 joerg Exp $
 
 SHA1 (xlockmore-5.25.tar.bz2) = 60aa8bea7501aded6fb25f36a82b4f3f44baab47
 RMD160 (xlockmore-5.25.tar.bz2) = f73aa838ac0ec53a3ba0f2e4957b7955e4e964d3
 Size (xlockmore-5.25.tar.bz2) = 1792781 bytes
 SHA1 (patch-aa) = 98243d9a615d3f44b6e3aab71388acb72b96d383
 SHA1 (patch-ab) = 89f12f16e0756dd0eb1afc9df9bb175fd294e2f9
-SHA1 (patch-ac) = 1bcbf56cdb6709cf8f21855b141a4892a36751c1
+SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
+SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
+SHA1 (patch-ae) = bfd31fdd2d4a9ce3e9f4c23e6dff90631416c33d
diff -r ec0e39b20489 -r a226872e963e x11/xlockmore/patches/patch-ac
--- a/x11/xlockmore/patches/patch-ac    Sun Oct 28 16:04:41 2007 +0000
+++ b/x11/xlockmore/patches/patch-ac    Sun Oct 28 16:06:04 2007 +0000
@@ -1,13 +1,23 @@
-$NetBSD: patch-ac,v 1.11 2004/11/27 00:15:23 hubertf Exp $
+$NetBSD: patch-ac,v 1.12 2007/10/28 16:06:04 joerg Exp $
 
---- xglock/Makefile.in.orig    2003-01-09 04:27:51.000000000 +0100
+--- xglock/Makefile.in.orig    2006-10-25 03:01:51.000000000 +0200
 +++ xglock/Makefile.in
-@@ -122,7 +122,7 @@ install-man :
+@@ -116,14 +116,14 @@ install_xglock : install-program install
+       @ $(ECHO) ""
+ 
+ install-program : xglock
+-      $(top_srcdir)/mkinstalldirs $(bindir)
+-      $(INSTALL_PROGRAM) xglock$(E) $(bindir)
++      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++      $(INSTALL_PROGRAM) xglock$(E) ${DESTDIR}$(bindir)
+ 
+ install-man :
  
  install-ad :
-       $(top_srcdir)/mkinstalldirs $(datadir)/xlock
+-      $(top_srcdir)/mkinstalldirs $(datadir)/xlock
 -      $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc
-+      $(INSTALL_DATA) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc
++      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir)/xlock
++      $(INSTALL_DATA) $(top_srcdir)/xglock/xglockrc ${DESTDIR}$(datadir)/xlock/xglockrc
  
  uninstall : @UNINSTALL_XGLOCK@
  
diff -r ec0e39b20489 -r a226872e963e x11/xlockmore/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xlockmore/patches/patch-ad    Sun Oct 28 16:06:04 2007 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.8 2007/10/28 16:15:21 joerg Exp $
+
+--- xmlock/Makefile.in.orig    2007-09-16 20:16:51.000000000 +0200
++++ xmlock/Makefile.in
+@@ -118,14 +118,14 @@ install_xmlock : install-program install
+       @ $(ECHO) ""
+ 
+ install-program : xmlock
+-      $(top_srcdir)/mkinstalldirs $(bindir)
+-      $(INSTALL_PROGRAM) xmlock$(E) $(bindir)
++      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++      $(INSTALL_PROGRAM) xmlock$(E) ${DESTDIR}$(bindir)
+ 
+ install-man :
+ 
+ install-ad :
+-      $(top_srcdir)/mkinstalldirs $(xapploaddir)
+-      $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(xapploaddir)/XmLock
++      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(xapploaddir)
++      $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad ${DESTDIR}$(xapploaddir)/XmLock
+ 
+ uninstall : @UNINSTALL_XMLOCK@
+ 
diff -r ec0e39b20489 -r a226872e963e x11/xlockmore/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xlockmore/patches/patch-ae    Sun Oct 28 16:06:04 2007 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-ae,v 1.5 2007/10/28 16:15:22 joerg Exp $
+
+--- modes/Makefile.in.orig     2007-09-16 20:43:06.000000000 +0200
++++ modes/Makefile.in
+@@ -579,19 +579,19 @@ install : install-program install-man in
+       @ $(ECHO) ""
+ 
+ install-program : xlock
+-      $(top_srcdir)/mkinstalldirs $(bindir)
+-      $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir)
+-      @MODULES@mkdir -p $(DEF_MODULEPATH)
+-      @MODULES@cp *.xlk $(DEF_MODULEPATH)
+-      @MODULES@cp glx/*.xlk $(DEF_MODULEPATH)
++      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
++      $(INSTALL_PROGRAM) $(UTILOBJDIR)xlock$(E) ${DESTDIR}$(bindir)
++      @MODULES@mkdir -p ${DESTDIR}$(DEF_MODULEPATH)
++      @MODULES@cp *.xlk ${DESTDIR}$(DEF_MODULEPATH)
++      @MODULES@cp glx/*.xlk ${DESTDIR}$(DEF_MODULEPATH)
+ 
+ install-man :
+-      $(top_srcdir)/mkinstalldirs $(mandir)
+-      $(INSTALL_DATA) $(UTILDIR)xlock.man $(mandir)/xlock.1
++      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(mandir)
++      $(INSTALL_DATA) $(UTILDIR)xlock.man ${DESTDIR}$(mandir)/xlock.1
+ 
+ install-ad :
+-      $(top_srcdir)/mkinstalldirs $(xapploaddir)
+-      $(INSTALL_DATA) $(UTILDIR)XLock.ad $(xapploaddir)/XLock
++      $(top_srcdir)/mkinstalldirs ${DESTDIR}$(xapploaddir)
++      $(INSTALL_DATA) $(UTILDIR)XLock.ad ${DESTDIR}$(xapploaddir)/XLock
+ 
+ uninstall : uninstall-program uninstall-man uninstall-ad
+