Prepare for switching to NO_MTREE=yes.

12 files changed, 33 insertions, 22 deletions

diff --git a/math/dcdflib.c/Makefile b/math/dcdflib.c/Makefile
index cc687bf3de1..ef2a7655b3c 100644
--- a/math/dcdflib.c/Makefile
+++ b/math/dcdflib.c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/09 09:58:57 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2007/03/24 19:21:27 joerg Exp $
 
 DISTNAME=	dcdflib.c-1.1
 PKGREVISION=	1
@@ -14,7 +14,7 @@ BUILD_DIRS=	src
 DIST_SUBDIR=	${PKGNAME_NOREV}
 MAKE_ENV+=	LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
 
-INSTALLATION_DIRS=	include share/doc/dcdflib.c
+INSTALLATION_DIRS=	include lib share/doc/dcdflib.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/dcdflib.h ${PREFIX}/include
diff --git a/math/dcdflib.f/Makefile b/math/dcdflib.f/Makefile
index cf3ae1287e4..fa94717ec21 100644
--- a/math/dcdflib.f/Makefile
+++ b/math/dcdflib.f/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/09 10:26:05 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/03/24 19:21:27 joerg Exp $
 
 DISTNAME=	dcdflib.f-1.1
 PKGREVISION=	2
@@ -13,8 +13,9 @@ WRKSRC=		${WRKDIR}/dcdflib.f
 BUILD_DIRS=	src
 USE_LANGUAGES=	c fortran
 
+INSTALLATION_DIRS=	lib share/doc/dcdflib.f
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dcdflib.f
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/dcdflib.f
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dcdflib.f
 
diff --git a/math/dfftpack/Makefile b/math/dfftpack/Makefile
index 9eecc2497cb..b1315b225f1 100644
--- a/math/dfftpack/Makefile
+++ b/math/dfftpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:03 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/24 19:21:27 joerg Exp $
 
 DISTNAME=		dfftpack-20001209
 PKGREVISION=		1
@@ -12,14 +12,14 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_LANGUAGES=		fortran
 WRKSRC=			${WRKDIR}/dfftpack
 
+INSTALLATION_DIRS=	lib share/doc/dfftpack share/examples/dfftpack
+
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dfftpack
 	@for f in README doc doc.double ; do \
 	${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/dfftpack ; done
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dfftpack
 	${INSTALL_DATA} ${WRKSRC}/test.f ${PREFIX}/share/examples/dfftpack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/djbfft/Makefile b/math/djbfft/Makefile
index bdda4d0c220..dafb35a91f7 100644
--- a/math/djbfft/Makefile
+++ b/math/djbfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/22 19:26:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/24 19:21:27 joerg Exp $
 
 DISTNAME=	djbfft-0.76
 CATEGORIES=	math
@@ -11,5 +11,7 @@ COMMENT=	Extremely fast library for floating-point convolution
 DJB_RESTRICTED=		YES
 NOT_FOR_PLATFORM=	IRIX-*-*
 
+INSTALLATION_DIRS=	lib
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index e68870f14ff..18d5acc5632 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:03 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/24 19:21:27 joerg Exp $
 
 DISTNAME=		eispack-20001130
 PKGREVISION=		1
@@ -12,6 +12,8 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_LANGUAGES=		fortran
 WRKSRC=			${WRKDIR}/eispack
 
+INSTALLATION_DIRS=	lib
+
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index 8fc92e02ea9..1e43c74d2ab 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:03 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/03/24 19:21:27 joerg Exp $
 
 DISTNAME=		fftpack-20001130
 PKGREVISION=		1
@@ -11,12 +11,12 @@ COMMENT=		Single precision Fortran FFT subroutines
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_LANGUAGES=		fortran
 WRKSRC=			${WRKDIR}/fftpack
+INSTALLATION_DIRS=	lib share/doc/fftpack
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fftpack
 	${INSTALL_DATA} ${WRKSRC}/doc ${PREFIX}/share/doc/fftpack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fgmp/Makefile b/math/fgmp/Makefile
index 067f7bdc576..79ae4f292df 100644
--- a/math/fgmp/Makefile
+++ b/math/fgmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/01/03 07:53:37 agc Exp $
+# $NetBSD: Makefile,v 1.2 2007/03/24 19:21:28 joerg Exp $
 
 DISTNAME=	fgmp-1.0b5-src-10.10
 PKGNAME=	fgmp-1.0b5
@@ -11,8 +11,9 @@ COMMENT=	Minimalist free re-implementation of GNU multi-precision routines
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LIBTOOL=	yes
+NO_CONFIGURE=	yes
 
-do-configure:;
+INSTALLATION_DIRS=	include lib
 
 do-build:
 	cd ${WRKSRC} && (						\
diff --git a/math/minpack/Makefile b/math/minpack/Makefile
index 5c15ea4fd09..e4e38c7e97b 100644
--- a/math/minpack/Makefile
+++ b/math/minpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:04 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:28 joerg Exp $
 
 DISTNAME=		minpack-20001130
 PKGREVISION=		1
@@ -12,6 +12,8 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_LANGUAGES=		fortran
 WRKSRC=			${WRKDIR}/minpack
 
+INSTALLATION_DIRS=	lib
+
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
diff --git a/math/quadpack/Makefile b/math/quadpack/Makefile
index d272404e4ac..f9272ade677 100644
--- a/math/quadpack/Makefile
+++ b/math/quadpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:08 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/03/24 19:21:28 joerg Exp $
 
 DISTNAME=		quadpack-20001130
 PKGREVISION=		1
@@ -12,11 +12,12 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_LANGUAGES=		fortran
 WRKSRC=			${WRKDIR}/quadpack
 
+INSTALLATION_DIRS=	lib share/doc/quadpack
+
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quadpack
 	cd ${WRKSRC} && ${INSTALL_DATA} doc readme ${PREFIX}/share/doc/quadpack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index 1213ca658e9..9a5a527ef69 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:08 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/24 19:21:28 joerg Exp $
 
 DISTNAME=	randlib.c-1.3
 PKGNAME=	randlib-1.3
@@ -14,11 +14,11 @@ WRKSRC=		${WRKDIR}/randlib.c/src
 
 MAKE_ENV+=	LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
 
+INSTALLATION_DIRS=	include lib share/doc/randlib share/examples/randlib
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/randlib
 	${INSTALL_DATA} ${WRKSRC}/../README ${WRKSRC}/../doc/* \
 	${PREFIX}/share/doc/randlib
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/randlib
 	${INSTALL_DATA} ${WRKSRC}/../test/* ${PREFIX}/share/examples/randlib
 	${INSTALL_DATA} ${WRKSRC}/randlib.h ${PREFIX}/include
 
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index a3de1c3bfc9..a00e5ad5daa 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/27 18:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2007/03/24 19:21:28 joerg Exp $
 #
 
 DISTNAME=	slatec_src
@@ -20,6 +20,8 @@ WRKSRC=			${WRKDIR}/src
 USE_LANGUAGES=		fortran
 USE_LIBTOOL=		YES
 
+INSTALLATION_DIRS=	lib
+
 post-extract:
 	cd ${FILESDIR} && cp d1mach.f i1mach.f r1mach.f ${WRKSRC}
 
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 70ea321c43c..3f625cb3860 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:48 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/03/24 19:21:28 joerg Exp $
 
 DISTNAME=	yorick-1.6.02
 PKGREVISION=	2
@@ -13,6 +13,7 @@ COMMENT=	Numerical algebra system (similar to Matlab)
 WRKSRC=		${WRKDIR}/yorick-1.6
 BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc
 INSTALL_DIRS=	${WRKSRC}
+INSTALLATION_DIRS=	${PKGINFODIR} ${PKGMANDIR}/man1 share/doc share/emacs/site-lisp
 
 USE_TOOLS+=	gmake makeinfo
 INFO_FILES=	# PLIST
@@ -33,7 +34,6 @@ post-install:
 	done
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/${PKGMANDIR}/man1
 	cd ${PREFIX}/share/doc && ${LN} -sf ../yorick/1.6/doc yorick
-	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/emacs/*.el ${PREFIX}/share/emacs/site-lisp
 
 .include "../../x11/libX11/buildlink3.mk"