[pkgsrc/trunk]: pkgsrc Fix DESTDIR.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19f33ebf75de
branches:  trunk
changeset: 540813:19f33ebf75de
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 07 18:08:18 2008 +0000

description:
Fix DESTDIR.

diffstat:

 fonts/thaixfonts/Makefile |  4 ++--
 games/tetrinetx/Makefile  |  7 ++++---
 mail/t-prot/Makefile      |  5 +++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r f55481441425 -r 19f33ebf75de fonts/thaixfonts/Makefile
--- a/fonts/thaixfonts/Makefile Mon Apr 07 18:07:15 2008 +0000
+++ b/fonts/thaixfonts/Makefile Mon Apr 07 18:08:18 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/03 20:17:12 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/07 18:14:16 joerg Exp $
 #
 
 DISTNAME=      thaixfonts-1.1-3.noarch
@@ -20,6 +20,7 @@
 MAKE_ENV+=     FONTDIR=${FONTDIR}
 
 FONTDIR=       ${PREFIX}/lib/X11/fonts/thaixfonts/
+INSTALLATION_DIRS=     ${FONTDIR}
 
 WRKSRC=                ${WRKDIR}/usr/share/fonts/TIS-620/misc/
 
@@ -31,7 +32,6 @@
                cpio -i --make-directories \*
 
 do-install:
-       ${INSTALL_DATA_DIR} ${FONTDIR}
        cd ${WRKSRC} && ${INSTALL_DATA} *.gz fonts.* ${DESTDIR}${FONTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r f55481441425 -r 19f33ebf75de games/tetrinetx/Makefile
--- a/games/tetrinetx/Makefile  Mon Apr 07 18:07:15 2008 +0000
+++ b/games/tetrinetx/Makefile  Mon Apr 07 18:08:18 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/03/04 06:59:06 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/04/07 18:13:27 joerg Exp $
 
 DISTNAME=      tetrinetx-1.13.16+qirc-1.40c
 PKGNAME=       tetrinetx-1.13.16
@@ -19,6 +19,8 @@
 
 LIBS.SunOS+=   -lsocket -lnsl -lresolv
 
+INSTALLATION_DIRS=     bin ${SHAREDIR}
+
 do-build:
        cd ${WRKSRC:Q}/src && \
        ${CC} \
@@ -30,9 +32,8 @@
                main.c
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
        ${INSTALL_PROGRAM} ${WRKSRC:Q}/bin/${BINARY:Q} \
-               ${DESTDIR}${PREFIX:Q}/bin/tetrix
+               ${DESTDIR}${PREFIX}/bin/tetrix
        ${INSTALL_DATA} ${WRKSRC:Q}/bin/game.conf ${DESTDIR}${SHAREDIR:Q}
        ${INSTALL_DATA} ${WRKSRC:Q}/bin/game.secure ${DESTDIR}${SHAREDIR:Q}
        ${INSTALL_DATA} ${WRKSRC:Q}/bin/game.motd ${DESTDIR}${SHAREDIR:Q}
diff -r f55481441425 -r 19f33ebf75de mail/t-prot/Makefile
--- a/mail/t-prot/Makefile      Mon Apr 07 18:07:15 2008 +0000
+++ b/mail/t-prot/Makefile      Mon Apr 07 18:08:18 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/03/04 17:57:20 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/07 18:08:18 joerg Exp $
 #
 
 DISTNAME=      t-prot-2.5
@@ -15,13 +15,14 @@
 
 REPLACE_PERL+= t-prot
 
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/doc/t-prot
+
 do-configure do-build:
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/t-prot ${DESTDIR}${PREFIX}/bin/t-prot
        ${INSTALL_MAN} ${WRKSRC}/t-prot.1 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/t-prot.1
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/t-prot
        ${INSTALL_DATA} ${WRKSRC}/contrib/muttrc.t-prot \
                ${DESTDIR}${PREFIX}/share/doc/t-prot/