user-destdir support

3 files changed, 19 insertions, 13 deletions

diff --git a/textproc/detex/Makefile b/textproc/detex/Makefile
index ec1a17654c6..16ef85df7c6 100644
--- a/textproc/detex/Makefile
+++ b/textproc/detex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/11/20 02:19:26 chuck Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/07 22:20:41 joerg Exp $
 #
 
 DISTNAME=	detex-2.8
@@ -10,12 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cs.purdue.edu/homes/trinkle/detex/
 COMMENT=	Remove LaTeX commands
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	lex
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/detex ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/detex.1l ${PREFIX}/${PKGMANDIR}/man1/detex.1
+	${INSTALL_PROGRAM} ${WRKSRC}/detex ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/detex.1l ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/detex.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/dict-dictionaries/Makefile b/textproc/dict-dictionaries/Makefile
index 35b70578d6a..5d3385107ff 100644
--- a/textproc/dict-dictionaries/Makefile
+++ b/textproc/dict-dictionaries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/11/17 12:04:14 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/07 22:17:24 joerg Exp $
 
 DISTNAME=	#
 PKGNAME=	dict-data-1.8.0
@@ -16,6 +16,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary data for DICTD
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	dict-server>=1.8.0nb1:../../textproc/dict-server
 
 USE_TOOLS+=	gmake lex yacc
@@ -70,23 +72,24 @@ do-build:
 		fi; \
 	done
 
+INSTALLATION_DIRS=	share/dictd
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/dictd
 	for f in ${LEXICONS}; do \
 		${INSTALL_DATA} ${WRKDIR}/dict-misc-1.5/$$f \
-		    ${PREFIX}/share/dictd; \
+		    ${DESTDIR}${PREFIX}/share/dictd; \
 	done
 	for f in ${GAZETTEER}; do \
 		${INSTALL_DATA} ${WRKDIR}/dict-gazetteer-1.3/$$f \
-		    ${PREFIX}/share/dictd; \
+		    ${DESTDIR}${PREFIX}/share/dictd; \
 	done
 	for f in ${WEB1913}; do \
 		${INSTALL_DATA} ${WRKDIR}/dict-web1913-1.4/$$f \
-		    ${PREFIX}/share/dictd; \
+		    ${DESTDIR}${PREFIX}/share/dictd; \
 	done
 	for f in ${WN}; do \
 		${INSTALL_DATA} ${WRKDIR}/dict-wn-1.5/$$f \
-		    ${PREFIX}/share/dictd; \
+		    ${DESTDIR}${PREFIX}/share/dictd; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index d4d3555e108..8f90d438a8e 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/11/24 23:04:15 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2009/07/07 22:19:53 joerg Exp $
 
 DISTNAME=	dictd-1.9.15
 PKGNAME=	dict-server-1.9.15
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake lex yacc
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-cflags=${CFLAGS:M*:Q}
@@ -18,6 +20,7 @@ CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
 
 BUILD_TARGET=	dictd dictzip
 INSTALL_TARGET=	install.dictd install.dictzip install.dictfmt
+INSTALLATION_DIRS=	${EGDIR} share/dictd
 
 EGDIR=		${PREFIX}/share/examples/dict-server
 CONF_FILES=	${EGDIR}/dictd.conf \
@@ -33,10 +36,8 @@ post-patch:
 	done
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	${SED} "s#/usr/lib/dict#${PREFIX}/share/dictd#" \
-		${WRKSRC}/dictd.conf >${EGDIR}/dictd.conf
-	${INSTALL_DATA_DIR} ${PREFIX}/share/dictd
+		${WRKSRC}/dictd.conf >${DESTDIR}${EGDIR}/dictd.conf
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"