[pkgsrc/trunk]: pkgsrc/x11/xworld DESTDIR support.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f21070343bc7
branches:  trunk
changeset: 555034:f21070343bc7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Feb 23 18:32:36 2009 +0000

description:
DESTDIR support.

diffstat:

 x11/xworld/Makefile         |  10 +++-------
 x11/xworld/distinfo         |   3 ++-
 x11/xworld/patches/patch-aj |  15 +++++++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diffs (63 lines):

diff -r bb2f3729d1b4 -r f21070343bc7 x11/xworld/Makefile
--- a/x11/xworld/Makefile       Mon Feb 23 18:25:04 2009 +0000
+++ b/x11/xworld/Makefile       Mon Feb 23 18:32:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/01/11 14:55:15 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/02/23 18:32:36 joerg Exp $
 #
 
 DISTNAME=              xworld-2.0
@@ -10,6 +10,8 @@
 MAINTAINER=            wennmach%NetBSD.org@localhost
 COMMENT=               Earth as seen from the direction of the sun
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 HAS_CONFIGURE=         yes
 USE_TOOLS+=            csh
 CONFIG_SHELL=          ${CSH}
@@ -24,11 +26,5 @@
 SUBST_FILES.x11=       defaults/NetBSD/set.csh
 SUBST_SED.x11=         -e 's,@X11BASE@,${X11BASE},g'
 
-SUBST_CLASSES+=                install
-SUBST_MESSAGE.install= Fixing install options.
-SUBST_STAGE.install=   post-patch
-SUBST_FILES.install=   Makefile.in
-SUBST_SED.install=     -e 's,-g bin -o bin,-g ${BINGRP} -o ${BINOWN},g'
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bb2f3729d1b4 -r f21070343bc7 x11/xworld/distinfo
--- a/x11/xworld/distinfo       Mon Feb 23 18:25:04 2009 +0000
+++ b/x11/xworld/distinfo       Mon Feb 23 18:32:36 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/02/19 01:40:26 schwarz Exp $
+$NetBSD: distinfo,v 1.9 2009/02/23 18:32:36 joerg Exp $
 
 SHA1 (xworld-2.0.tar.gz) = 99217a8f0b63ef8685c5508fbbff4f5d7bb9b9a8
 RMD160 (xworld-2.0.tar.gz) = b139357f529a8df535f82fecd74319b0f82605b3
@@ -12,3 +12,4 @@
 SHA1 (patch-ag) = b764304482e74438464cebdf8880381074887588
 SHA1 (patch-ah) = ee85c12a0b6d4355a235c6e26679448758067190
 SHA1 (patch-ai) = 2c22ad01c6adb966c7b445d86c1939fa4d8328c9
+SHA1 (patch-aj) = 0d8e63ab485b3cb43750cc34554025ba1316810f
diff -r bb2f3729d1b4 -r f21070343bc7 x11/xworld/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xworld/patches/patch-aj       Mon Feb 23 18:32:36 2009 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2009/02/23 18:32:36 joerg Exp $
+
+--- Makefile.in.orig   2009-02-23 19:29:15.000000000 +0100
++++ Makefile.in
+@@ -28,8 +28,8 @@ xworld: $(ASTROOBJS) $(SPHEREOBJS) getmy
+       $(RM) xworld.tmp
+ 
+ install: xworld
+-      -$(MKDIR) $(BINDIR)
+-      $(INSTALL) -m 755 -g bin -o bin xworld $(BINDIR)
++      -$(MKDIR) ${DESTDIR}$(BINDIR)
++      ${BSD_INSTALL_PROGRAM} xworld ${DESTDIR}$(BINDIR)
+ 
+ deinstall:
+       $(RM) $(BINDIR)/xworld