Prepare for switching to NO_MTREE=yes.

5 files changed, 13 insertions, 7 deletions

diff --git a/audio/csound4-manual/Makefile b/audio/csound4-manual/Makefile
index 7c461b09d9d..432ab0f40b1 100644
--- a/audio/csound4-manual/Makefile
+++ b/audio/csound4-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/12/15 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/03/24 19:21:18 joerg Exp $
 #
 
 DISTNAME=		manual-html-4.23
@@ -15,8 +15,9 @@ NO_BUILD=		yes
 WRKSRC=			${WRKDIR}
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
+INSTALLATION_DIRS=	share/doc/csound4  share/examples
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/csound4
 	cd ${WRKSRC}/csound-4.23/manual \
 	&& ${PAX} -rw -s '|.*/CVS/.*||' -s ',.*/CVS$$,,' * ${PREFIX}/share/doc/csound4
 	cd ${FILESDIR} && ${INSTALL_DATA} rt-midi-input.* \
diff --git a/audio/emixer/Makefile b/audio/emixer/Makefile
index 6be3bba283c..2fed567c5ad 100644
--- a/audio/emixer/Makefile
+++ b/audio/emixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/09 21:04:40 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/03/24 19:21:18 joerg Exp $
 #
 
 DISTNAME=	emixer-0.05.5
@@ -15,6 +15,8 @@ DEPENDS+=	mpg123{,-esound,-nas}-0.59*:../../audio/mpg123
 
 NO_CONFIGURE=	YES
 
+INSTALLATION_DIRS=	bin share/doc
+
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 570cd12e731..719f2eb8029 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/02/22 19:26:05 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/03/24 19:21:19 joerg Exp $
 #
 
 DISTNAME=	gsm-1.0.10
@@ -15,6 +15,7 @@ USE_LIBTOOL=	yes
 
 NO_CONFIGURE=	yes
 MAKE_ENV+=	INSTALL_ROOT=${PREFIX:Q} ROOT=${WRKSRC:Q}
+INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/gsm
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index c098a1ed2fe..094b3e49b4c 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:08 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/03/24 19:21:19 joerg Exp $
 
 DISTNAME=	wmmp3-0.12
 PKGREVISION=	2
@@ -13,13 +13,14 @@ DEPENDS+=	mpg123>=0.59.18:../../audio/mpg123
 
 GNU_CONFIGURE=	yes
 
+INSTALLATION_DIRS=	share/examples
+
 post-patch:
 	${MV} ${WRKSRC}/sample.wmmp3 ${WRKSRC}/sample.wmmp3.orig
 	${SED} -e 's:/usr/local:'${LOCALBASE}':g' \
 		${WRKSRC}/sample.wmmp3.orig > ${WRKSRC}/sample.wmmp3
 
 post-install:
-	@${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples"
 	${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples
 
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 7c884d24f3d..ba52bf91666 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:35 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/03/24 19:21:19 joerg Exp $
 
 DISTNAME=		xmix-2.1
 PKGREVISION=		2
@@ -15,6 +15,7 @@ NOT_FOR_PLATFORM=	Interix-*-*
 
 WRKSRC=			${WRKDIR}/xmix
 USE_IMAKE=		yes
+INSTALLATION_DIRS=	lib/X11/app-defaults
 
 pre-configure:
 	${CP} ${WRKSRC}/xmix.1 ${WRKSRC}/xmix.man