DESTDIR support

4 files changed, 16 insertions, 9 deletions

diff --git a/chat/xaric/Makefile b/chat/xaric/Makefile
index c374d5f8b59..57013f112fd 100644
--- a/chat/xaric/Makefile
+++ b/chat/xaric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/28 20:56:59 zafer Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/29 16:08:17 joerg Exp $
 #
 
 DISTNAME=	xaric-0.12.1
@@ -10,9 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rf.cx/software/xaric/
 COMMENT=	IRC client similar to BitchX and ircII
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
 CONFIGURE_ARGS+=	--enable-optimize
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index 9c4e9fd6743..68038625e6e 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:17 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/29 16:09:49 joerg Exp $
 
 DISTNAME=	xchat-systray-integration-2.4.5-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -10,6 +10,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.patriziobassi.it/blight/index.php?act=Systray
 COMMENT=	Systray icon plugin for XChat
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	xchat>=2.0:../../chat/xchat
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
diff --git a/chat/xchat-systray-integration/distinfo b/chat/xchat-systray-integration/distinfo
index da45b1a5ac0..403ba615018 100644
--- a/chat/xchat-systray-integration/distinfo
+++ b/chat/xchat-systray-integration/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/07/06 22:04:03 minskim Exp $
+$NetBSD: distinfo,v 1.7 2010/01/29 16:09:49 joerg Exp $
 
 SHA1 (xchat-systray-integration-2.4.5-src.tar.gz) = d7bad0f60c1944ce385e5799eb08a45a081365ab
 RMD160 (xchat-systray-integration-2.4.5-src.tar.gz) = 0d476ae52d491123b9da392eb3ee86322c2403ab
 Size (xchat-systray-integration-2.4.5-src.tar.gz) = 57953 bytes
-SHA1 (patch-aa) = 1afab689e88a6315201c3b1187dcdbbabc991ca8
+SHA1 (patch-aa) = f47cea4bd0fe7940813a5aa5c03e787320072161
 SHA1 (patch-ab) = c10c4125ea9d4f2555ec5b695746742577531487
 SHA1 (patch-ac) = f42ca3d00a9bcba15f2bd523cd54f3e606b4399f
 SHA1 (patch-ad) = 51f13e63894e2a5c391731262628dfa3ceed7a62
diff --git a/chat/xchat-systray-integration/patches/patch-aa b/chat/xchat-systray-integration/patches/patch-aa
index 8976ac7759a..47c8d06d75f 100644
--- a/chat/xchat-systray-integration/patches/patch-aa
+++ b/chat/xchat-systray-integration/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2006/07/06 22:04:03 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2010/01/29 16:09:49 joerg Exp $
 
 --- Makefile.orig	2004-04-30 05:38:10.000000000 -0700
 +++ Makefile
@@ -86,11 +86,11 @@ $NetBSD: patch-aa,v 1.3 2006/07/06 22:04:03 minskim Exp $
 -	$(install) src/images/Win32Tray $(plugindir)/ -r -f
 -	$(install) src/images/GTKTray $(plugindir)/ -r -f
 -	$(install) src/images/Menu $(plugindir)/ -r -f
-+	${BSD_INSTALL_LIB_DIR} $(plugindir)
-+	${SHLIBTOOL} --mode=install ${BSD_INSTALL_DATA} $(plugin) $(plugindir)
++	${BSD_INSTALL_LIB_DIR} ${DESTDIR}$(plugindir)
++	${SHLIBTOOL} --mode=install ${BSD_INSTALL_DATA} $(plugin) ${DESTDIR}$(plugindir)
 +	for d in Win32Tray GTKTray Menu; do \
-+		${BSD_INSTALL_DATA_DIR} ${plugindir}/$${d}; \
-+		${BSD_INSTALL_DATA} src/images/$${d}/* ${plugindir}/$${d}; done
++		${BSD_INSTALL_DATA_DIR} ${DESTDIR}${plugindir}/$${d}; \
++		${BSD_INSTALL_DATA} src/images/$${d}/* ${DESTDIR}${plugindir}/$${d}; done
  	
  win-install:
  	@echo 'Copy "Systray.dll" and "images" directory where you want. Set images directory in the settings tab'