From 7454dac33cb9736bd4cbbe0a7e1d94f2efbe649c Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 3 Feb 2010 21:55:04 +0000
Subject: DESTDIR support

---
 graphics/tuxpaint/Makefile         | 10 +++++++---
 graphics/tuxpaint/distinfo         |  4 ++--
 graphics/tuxpaint/patches/patch-aa |  9 ++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'graphics/tuxpaint')

diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index c61531fae81..8822fa78b9b 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2010/02/03 22:13:09 joerg Exp $
 #
 
 DISTNAME=	tuxpaint-0.9.17
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tuxpaint.org/
 COMMENT=	Drawing program for small children
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 MANCOMPRESSED=		YES
@@ -27,6 +29,8 @@ MAKE_ENV+=		CONFDIR=${PKG_SYSCONFDIR:Q} CP=${CP:Q} CHMOD=${CHMOD:Q}
 EGDIR=			${PREFIX}/share/examples/tuxpaint
 CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
 
+INSTALL_MAKE_FLAGS+=	PKG_ROOT=${DESTDIR}
+
 # this uses iconv and png functions directly, so link against them
 # explicitly.
 MAKE_ENV+=		LIBS=${LIBS:M*:Q}
@@ -34,8 +38,8 @@ LIBS+=			-liconv
 LIBS+=			-lpng
 
 post-install:
-	-${FIND} ${PREFIX}/share/doc/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
-	-${FIND} ${PREFIX}/share/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
+	-${FIND} ${DESTDIR}${PREFIX}/share/doc/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
+	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index c89aedd2ed7..54262867744 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2007/09/04 21:11:58 drochner Exp $
+$NetBSD: distinfo,v 1.20 2010/02/03 22:13:09 joerg Exp $
 
 SHA1 (tuxpaint-0.9.17.tar.gz) = 88e42d19339bb1faa03bce45a28d3fe11fbe05b4
 RMD160 (tuxpaint-0.9.17.tar.gz) = c7cf3636875cad87646cda4df978f9adbbf18630
 Size (tuxpaint-0.9.17.tar.gz) = 7570223 bytes
-SHA1 (patch-aa) = f08aa3c9096e17a5fed7b893ec04a9c86f6a4bc9
+SHA1 (patch-aa) = 85365ebbe02084a3f11dcd365e5e5ecdee8c86c9
 SHA1 (patch-ab) = 78cba52d776088c5ad8ba3ea77a8584d0f708159
 SHA1 (patch-ad) = ac33e71f3cd7e581d67206a86875492af2836f47
diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa
index 020ff3845c0..81f176f2ec3 100644
--- a/graphics/tuxpaint/patches/patch-aa
+++ b/graphics/tuxpaint/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2007/09/04 21:11:58 drochner Exp $
+$NetBSD: patch-aa,v 1.13 2010/02/03 22:13:09 joerg Exp $
 
 --- Makefile.orig	2007-07-01 17:05:57.000000000 +0200
 +++ Makefile
@@ -68,16 +68,15 @@ $NetBSD: patch-aa,v 1.12 2007/09/04 21:11:58 drochner Exp $
  	@echo
  	@echo "--------------------------------------------------------------"
  	@echo
-@@ -478,9 +466,9 @@ uninstall:	uninstall-i18n
+@@ -478,9 +466,8 @@ uninstall:	uninstall-i18n
  install-default-config:
  	@echo
  	@echo "...Installing default config file..."
 -	@install -d $(CONFDIR)
 -	@cp src/tuxpaint.conf $(CONFDIR)
 -	@chmod 644 $(CONFDIR)/tuxpaint.conf
-+	@$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/examples/tuxpaint
-+	@$(CP) src/tuxpaint.conf $(PREFIX)/share/examples/tuxpaint
-+	@$(CHMOD) 644 $(PREFIX)/share/examples/tuxpaint/tuxpaint.conf
++	@$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/share/examples/tuxpaint
++	@$(BSD_INSTALL_DATA) src/tuxpaint.conf ${DESTDIR}$(PREFIX)/share/examples/tuxpaint
  
  
  # Install example stamps
-- 
cgit v1.2.3