DESTDIR support

6 files changed, 28 insertions, 18 deletions

diff --git a/cad/nelma/Makefile b/cad/nelma/Makefile
index c2bb2c4adc4..c6de54082ff 100644
--- a/cad/nelma/Makefile
+++ b/cad/nelma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/12/29 19:57:43 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/28 19:27:03 joerg Exp $
 #
 
 DISTNAME=	nelma-3.0
@@ -11,9 +11,12 @@ HOMEPAGE=	http://www.tablix.org/~avian/nelma/
 COMMENT=	Circuit board capacitance extraction tool
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	pkg-config
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 
 .include "../../devel/confuse/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/cad/nelma/distinfo b/cad/nelma/distinfo
index c7d4c1d6239..aec3db94133 100644
--- a/cad/nelma/distinfo
+++ b/cad/nelma/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/03/02 23:08:12 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2010/01/28 19:27:03 joerg Exp $
 
 SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c
 RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad
 Size (nelma-3.0.tar.gz) = 64078 bytes
-SHA1 (patch-aa) = 0fdc453940b3cdba4383fcc769e81440826be265
-SHA1 (patch-ab) = e82626a1d5658a5f154166d5efe54f0a16b84986
+SHA1 (patch-aa) = 1ed06b063a0e0766e3a9d597629180aa27de9714
+SHA1 (patch-ab) = a1ced09d3ce03ea92d82e8ad4edc51ed1050cfb0
diff --git a/cad/nelma/patches/patch-aa b/cad/nelma/patches/patch-aa
index 50d40cc38f5..407009d6ee3 100644
--- a/cad/nelma/patches/patch-aa
+++ b/cad/nelma/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/02 01:59:47 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/28 19:27:03 joerg Exp $
 
 --- Makefile.orig	2006-12-10 18:14:29.000000000 +0000
 +++ Makefile
@@ -24,8 +24,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/03/02 01:59:47 dmcmahill Exp $
  man-install:
 -	install	doc/nelma-cap.1 $(PREFIX)/man/man1
 -	install	doc/nelma-drc.1 $(PREFIX)/man/man1
-+	$(INSTALL_MAN) doc/nelma-cap.1 $(PREFIX)/man/man1
-+	$(INSTALL_MAN) doc/nelma-drc.1 $(PREFIX)/man/man1
++	$(BSD_INSTALL_MAN) doc/nelma-cap.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
++	$(BSD_INSTALL_MAN) doc/nelma-drc.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1
  
  doxygen:
  	doxygen
diff --git a/cad/nelma/patches/patch-ab b/cad/nelma/patches/patch-ab
index bbf4e3fe53e..0279d0eca84 100644
--- a/cad/nelma/patches/patch-ab
+++ b/cad/nelma/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2007/03/02 23:08:12 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2010/01/28 19:27:03 joerg Exp $
 
 --- src/Makefile.orig	2006-12-10 13:10:30.000000000 -0500
 +++ src/Makefile
@@ -51,7 +51,7 @@ $NetBSD: patch-ab,v 1.3 2007/03/02 23:08:12 dmcmahill Exp $
  install: all
 -	install nelma-cap $(PREFIX)/bin
 -	install nelma-drc $(PREFIX)/bin
-+	$(INSTALL_PROGRAM) nelma-cap $(PREFIX)/bin
-+	$(INSTALL_PROGRAM) nelma-drc $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nelma-cap ${DESTDIR}$(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nelma-drc ${DESTDIR}$(PREFIX)/bin
  
  .PHONY:	all clean install
diff --git a/chat/atheme/Makefile b/chat/atheme/Makefile
index 7cbc78a6999..239083f6c61 100644
--- a/chat/atheme/Makefile
+++ b/chat/atheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/07/17 18:00:13 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/28 19:32:48 joerg Exp $
 #
 
 DISTNAME=	atheme-services-3.0.4
@@ -12,6 +12,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.atheme.org/
 COMMENT=	Flexible IRC services system with proven scalability
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=		yes
@@ -64,18 +66,19 @@ MAKE_DIRS_PERMS+=	${VARBASE}/log/atheme \
 MAKE_DIRS_PERMS+=	${VARBASE}/run/atheme \
 			${ATHEME_USER} ${ATHEME_GROUP} 0770
 
+INSTALLATION_DIRS+=	${EGDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/atheme.conf.example \
-		${EGDIR}/atheme.conf.example
+	    ${DESTDIR}${EGDIR}/atheme.conf.example
 	${INSTALL_DATA} ${WRKSRC}/dist/atheme.conf.userserv-example \
-		${EGDIR}/atheme.conf.userserv-example
+	    ${DESTDIR}${EGDIR}/atheme.conf.userserv-example
 	${INSTALL_DATA} ${WRKSRC}/dist/atheme.cron.example \
-		${EGDIR}/atheme.cron.example
+	    ${DESTDIR}${EGDIR}/atheme.cron.example
 	${INSTALL_DATA} ${WRKSRC}/dist/atheme.motd.example \
-		${EGDIR}/atheme.motd.example
+	    ${DESTDIR}${EGDIR}/atheme.motd.example
 .	for i in ${DOC_FILES}
-		${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/atheme/
+		${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/atheme/
 .	endfor
 
 .include "../../devel/libmowgli/buildlink3.mk"
diff --git a/chat/blackened/Makefile b/chat/blackened/Makefile
index 7d6c9f9f20a..0a9042ef33c 100644
--- a/chat/blackened/Makefile
+++ b/chat/blackened/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/04 20:50:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/28 19:32:09 joerg Exp $
 #
 
 DISTNAME=	blackened-1.7.1
@@ -10,8 +10,12 @@ MAINTAINER=	carneous@carneous.net
 HOMEPAGE=	http://www.blackened.com/blackened/
 COMMENT=	The Blackened IRC client
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	ircII-[0-9]*
 
 GNU_CONFIGURE=	YES
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+
 .include "../../mk/bsd.pkg.mk"