DESTDIR support. Fix maintainer

3 files changed, 18 insertions, 13 deletions

diff --git a/sysutils/logfinder/Makefile b/sysutils/logfinder/Makefile
index 9fe66bcd878..2fafde3c253 100644
--- a/sysutils/logfinder/Makefile
+++ b/sysutils/logfinder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2009/02/16 13:36:46 joerg Exp $
 #
 
 DISTNAME=		logfinder-0.1
@@ -6,10 +6,12 @@ PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.eff.org/osp/
 
-MAINTAINER=		pkgsrc-users@@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.eff.org/osp/
 COMMENT=		Eliminate Unwanted Logging of Personal Data
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		lsof>=4.72:../../sysutils/lsof
 
 NO_BUILD=		YES
@@ -18,7 +20,7 @@ PYTHON_PATCH_SCRIPTS+=	${WRKSRC}/logfinder.py
 INSTALLATION_DIRS=	sbin
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/logfinder.py ${PREFIX}/sbin/
+	${INSTALL_SCRIPT} ${WRKSRC}/logfinder.py ${DESTDIR}${PREFIX}/sbin/
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/news/Makefile b/sysutils/news/Makefile
index 81ee4f914c6..e6953eeb2d7 100644
--- a/sysutils/news/Makefile
+++ b/sysutils/news/Makefile
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.9 2009/01/23 21:14:17 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/16 13:39:13 joerg Exp $
 #
 
 DISTNAME=		news-0.2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.netmeister.org/apps/
 
-MAINTAINER=		pkgsrc-users@@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.netmeister.org/
 COMMENT=		System V news(1)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_FEATURES=		utimes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/news ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/news.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/news ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/news.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xraidadmin/Makefile b/sysutils/xraidadmin/Makefile
index a7e6f290330..cecb4f118e7 100644
--- a/sysutils/xraidadmin/Makefile
+++ b/sysutils/xraidadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/01/23 21:14:17 jschauma Exp $
+# $NetBSD: Makefile,v 1.13 2009/02/16 13:40:11 joerg Exp $
 #
 
 DISTNAME=		RAIDAdmin1.3.1archive
@@ -7,10 +7,12 @@ PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://download.info.apple.com/Mac_OS_X/061-1325.20040706.bNhy4/
 
-MAINTAINER=		pkgsrc-users@@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.apple.com/downloads/macosx/apple/xserveraidadmintools.html
 COMMENT=		Tool to administer Apple's Xserve RAID
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 LICENSE=		apple-admin-license
 
 RESTRICTED=		Redistribution not permitted
@@ -24,7 +26,7 @@ WRKSRC=			${WRKDIR}/RAID\ Admin\ 1.3.1
 NO_BUILD=		yes
 USE_JAVA=		run
 PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin libexec/xraidadmin
 
 do-configure:
 	${SED} -e 's|@SH@|${SH}|' -e 's|@PKG_JAVA_HOME@|${PKG_JAVA_HOME}|' \
@@ -32,9 +34,8 @@ do-configure:
 		${WRKSRC}/xraidadmin
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/xraidadmin
-	${INSTALL_DATA} ${WRKSRC}/RAID_Admin.jar ${PREFIX}/libexec/xraidadmin/RAID_Admin.jar
-	${INSTALL_SCRIPT} ${WRKSRC}/xraidadmin ${PREFIX}/bin/xraidadmin
+	${INSTALL_DATA} ${WRKSRC}/RAID_Admin.jar ${DESTDIR}${PREFIX}/libexec/xraidadmin/RAID_Admin.jar
+	${INSTALL_SCRIPT} ${WRKSRC}/xraidadmin ${DESTDIR}${PREFIX}/bin/xraidadmin
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"