From 27a3488310d9ab2b0554259396c75c20c8f33672 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 23 Feb 2009 18:32:36 +0000
Subject: DESTDIR support.

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

(limited to 'x11/xworld')

diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile
index 04c90760407..ad355dbff44 100644
--- a/x11/xworld/Makefile
+++ b/x11/xworld/Makefile
@@ -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 @@ MASTER_SITES=		ftp://gutemine.geo.uni-koeln.de/pub/xworld/ \
 MAINTAINER=		wennmach@NetBSD.org
 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_STAGE.x11=	post-patch
 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 --git a/x11/xworld/distinfo b/x11/xworld/distinfo
index cd6c7bb255a..e14846886f6 100644
--- a/x11/xworld/distinfo
+++ b/x11/xworld/distinfo
@@ -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-af) = cf41e600032bea1c3b2cbd5436160b412fad7010
 SHA1 (patch-ag) = b764304482e74438464cebdf8880381074887588
 SHA1 (patch-ah) = ee85c12a0b6d4355a235c6e26679448758067190
 SHA1 (patch-ai) = 2c22ad01c6adb966c7b445d86c1939fa4d8328c9
+SHA1 (patch-aj) = 0d8e63ab485b3cb43750cc34554025ba1316810f
diff --git a/x11/xworld/patches/patch-aj b/x11/xworld/patches/patch-aj
new file mode 100644
index 00000000000..76e34ce8d07
--- /dev/null
+++ b/x11/xworld/patches/patch-aj
@@ -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
-- 
cgit v1.2.3