[pkgsrc/trunk]: pkgsrc/games/xpat2 DESTDIR support

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0022cc7e72f1
branches:  trunk
changeset: 572052:0022cc7e72f1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Feb 19 19:30:10 2010 +0000

description:
DESTDIR support

diffstat:

 games/xpat2/Makefile         |  11 ++++++-----
 games/xpat2/distinfo         |   4 ++--
 games/xpat2/patches/patch-aa |  40 +++++++++++++++++++---------------------
 3 files changed, 27 insertions(+), 28 deletions(-)

diffs (103 lines):

diff -r e8dc1b786472 -r 0022cc7e72f1 games/xpat2/Makefile
--- a/games/xpat2/Makefile      Fri Feb 19 19:26:09 2010 +0000
+++ b/games/xpat2/Makefile      Fri Feb 19 19:30:10 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/04/17 08:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/02/19 19:30:10 joerg Exp $
 
 DISTNAME=      xpat2-1.07
 PKGREVISION=   3
@@ -11,17 +11,18 @@
 
 MAKE_JOBS_SAFE=                no
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-USE_TOOLS+=    imake
+USE_TOOLS+=    imake pax
 
 MAKE_ENV+=     XPMDIR=${BUILDLINK_PREFIX.libXpm:Q} XMKMF=${XMKMF_CMD:Q}
 
+SETGIDGAME=    yes
+
 CONF_FILES_PERMS=      /dev/null /var/games/xpat.log ${GAMEOWN} ${GAMEGRP} ${GAMEMODE}
 MAKE_DIRS=             /var/games
 
-post-install:
-       ${CHOWN} ${GAMEOWN}.${GAMEGRP} ${PREFIX}/bin/xpat2
-       ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xpat2
+SPECIAL_PERMS+=        bin/xpat2 ${SETGID_GAMES_PERMS}
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff -r e8dc1b786472 -r 0022cc7e72f1 games/xpat2/distinfo
--- a/games/xpat2/distinfo      Fri Feb 19 19:26:09 2010 +0000
+++ b/games/xpat2/distinfo      Fri Feb 19 19:30:10 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/03/07 01:54:04 rillig Exp $
+$NetBSD: distinfo,v 1.6 2010/02/19 19:30:10 joerg Exp $
 
 SHA1 (xpat2-1.07-src.tar.gz) = a200c526e842bc6dfe5da67d4e49714c21403e9c
 RMD160 (xpat2-1.07-src.tar.gz) = 79658d1c8372768200ae42f225da0c7fcdcf187c
 Size (xpat2-1.07-src.tar.gz) = 519326 bytes
-SHA1 (patch-aa) = 077dfbbf032e6bb9f05f7245946a1ca7896a359d
+SHA1 (patch-aa) = eac6d498efa924cb0aed966a2f3924e7ac432261
 SHA1 (patch-ab) = ab30f2db479dcfab41d4283af9fd07467a548f58
 SHA1 (patch-ac) = c7bebfc930d2357fdb7c48aca1d2e8b39e9f1e43
diff -r e8dc1b786472 -r 0022cc7e72f1 games/xpat2/patches/patch-aa
--- a/games/xpat2/patches/patch-aa      Fri Feb 19 19:26:09 2010 +0000
+++ b/games/xpat2/patches/patch-aa      Fri Feb 19 19:30:10 2010 +0000
@@ -1,34 +1,32 @@
-$NetBSD: patch-aa,v 1.2 2004/12/03 13:28:22 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2010/02/19 19:30:10 joerg Exp $
 
---- src/Imakefile.orig 2000-11-05 20:05:10.000000000 +0100
-+++ src/Imakefile      2004-12-02 23:49:15.000000000 +0100
-@@ -207,12 +207,12 @@
+--- src/Imakefile.orig 2000-11-05 19:05:10.000000000 +0000
++++ src/Imakefile
+@@ -205,23 +205,10 @@ XCOMM X-widget.c additionally requires T
+ all::         $(MYPROG)
+ 
  install::     $(MYPROGS)
-       mkdirhier $(XPATLIBDIR)
-       chmod 755 $(XPATLIBDIR)
+-      mkdirhier $(XPATLIBDIR)
+-      chmod 755 $(XPATLIBDIR)
 -      for f in $(LANGUAGES); do \
 -        mkdirhier $(APPDEFSDIR)/$$f/app-defaults; \
 -        cp ../lib/$$f/XPat $(APPDEFSDIR)/$$f/app-defaults; \
 -        chmod 755 $(APPDEFSDIR)/$$f/app-defaults; \
 -        chmod 644 $(APPDEFSDIR)/$$f/app-defaults/XPat; \
 -      done 
-+#     for f in $(LANGUAGES); do \
-+#       mkdirhier $(APPDEFSDIR)/$$f/app-defaults; \
-+#       cp ../lib/$$f/XPat $(APPDEFSDIR)/$$f/app-defaults; \
-+#       chmod 755 $(APPDEFSDIR)/$$f/app-defaults; \
-+#       chmod 644 $(APPDEFSDIR)/$$f/app-defaults/XPat; \
-+#     done 
-       (cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -))
-       chown -R root $(XPATLIBDIR)
-       chmod -R a+r $(XPATLIBDIR)
-@@ -220,8 +220,8 @@
-           chmod 755 $(XPATLIBDIR)/$$f; \
-       done
-       mkdirhier $(XPATMANDIR)
+-      (cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -))
+-      chown -R root $(XPATLIBDIR)
+-      chmod -R a+r $(XPATLIBDIR)
+-      for f in $(LANGUAGES); do \
+-          chmod 755 $(XPATLIBDIR)/$$f; \
+-      done
+-      mkdirhier $(XPATMANDIR)
 -      cp xpat2.man $(XPATMANDIR)/xpat2.6x
 -      chmod 644 $(XPATMANDIR)/xpat2.6x
-+      cp xpat2.man $(XPATMANDIR)/xpat2.6
-+      chmod 644 $(XPATMANDIR)/xpat2.6
++      mkdirhier ${DESTDIR}$(XPATLIBDIR)
++      (cd ../lib; pax -rw -pp * ${DESTDIR}$(XPATLIBDIR))
++      mkdirhier ${DESTDIR}$(XPATMANDIR)
++      ${BSD_INSTALL_MAN} xpat2.man ${DESTDIR}$(XPATMANDIR)/xpat2.6
  
  ComplexProgramTarget($(MYPROG))
  InstallAppDefaults(XPat)