List the info files directly in the PLIST and honor PKG{INFO,MAN}DIR.

4 files changed, 16 insertions, 45 deletions

diff --git a/math/algae/Makefile b/math/algae/Makefile
index 2c3993fb664..61cdad42398 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:02 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/05 23:01:15 jlam Exp $
 
 DISTNAME=		algae-4.1.3
 PKGREVISION=		4
@@ -15,8 +15,13 @@ GNU_CONFIGURE=		yes
 USE_LANGUAGES=		fortran
 USE_TOOLS+=		ls tr
 USE_GNU_READLINE=	# uses history_truncate_file
-
-INFO_FILES=		algae.info
+INFO_FILES=		# PLIST
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
+			mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1		\
+			infodir=${PREFIX:Q}/${PKGINFODIR:Q}		\
+			htmldir=${PREFIX:Q}/share/doc/html/algae	\
+			sourcedir=${PREFIX:Q}/include			\
+			hdir=${PREFIX:Q}/include/algae
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/algae/PLIST b/math/algae/PLIST
index a19c16f2df3..11079578abf 100644
--- a/math/algae/PLIST
+++ b/math/algae/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/06/17 12:47:55 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/05 23:01:15 jlam Exp $
 bin/${PKGNAME}
 bin/algae
 include/algae/abs.h
@@ -119,6 +119,7 @@ include/algae/vector.h
 include/algae/vector_st.h
 include/algae/version.h
 include/algae/zero.h
+info/algae.info
 lib/algae/${PKGVERSION}/algae.A
 man/man1/algae.1
 share/algae/${PKGVERSION}/tools/all.A
diff --git a/math/algae/distinfo b/math/algae/distinfo
index fdb98200360..316a01aae71 100644
--- a/math/algae/distinfo
+++ b/math/algae/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/12/21 17:56:10 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/04/05 23:01:15 jlam Exp $
 
 SHA1 (algae-4.1.3.tar.gz) = 73da6e67e9b73389af97239deda4479096cb7eb0
 RMD160 (algae-4.1.3.tar.gz) = 79b127f3f8983c19f5a9984d14ce9cc2cc913031
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = c9808abd82f27eb9b41358d8b962553446b473b8
 SHA1 (patch-ab) = 79866650010effa2a7179dc246c835a98b152c1c
 SHA1 (patch-ac) = 5f638e253bef7cb53b56d645d8ab9a2fe873e96f
 SHA1 (patch-ad) = f169de7ed2a8b0302f8bcd7110ca216526eaf1cb
-SHA1 (patch-ae) = 6c7e7d8f1aa9aa1ed3aac19742351c5f884fa227
+SHA1 (patch-ae) = 926e28580031c61fba5d8e47a690741766e94555
 SHA1 (patch-af) = c70e919a048992058fa1305d7a2ab3435f38a026
diff --git a/math/algae/patches/patch-ae b/math/algae/patches/patch-ae
index b507b980d2c..0b2170f063d 100644
--- a/math/algae/patches/patch-ae
+++ b/math/algae/patches/patch-ae
@@ -1,43 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2003/07/24 16:28:56 jtb Exp $
+$NetBSD: patch-ae,v 1.4 2006/04/05 23:01:15 jlam Exp $
 
---- Makefile.in.orig	2003-02-28 23:07:03.000000000 +0000
-+++ Makefile.in	2003-07-24 17:14:18.000000000 +0100
-@@ -78,18 +78,18 @@
- libdir = $(prefix)/lib
- 
- # Directory in which to install the man page.
--mandir = $(datadir)/man/man$(manext)
-+mandir = $(prefix)/man/man$(manext)
- # The manpage extension
- manext = 1
- 
- # Directory in which to install the Info files.
--infodir = $(datadir)/info
-+infodir = $(prefix)/info
- 
- # Directory in which to install the algae tools.
- tooldir = $(datadir)/algae/$(VERSION_NUMBER)/tools
- 
- # Directory in which to install the algae html files.
--htmldir = $(datadir)/algae/$(VERSION_NUMBER)/html
-+htmldir = $(prefix)/share/doc/html/algae
- 
- # Directory and name of the startup file.  This is compiled into the
- # executable, so don't change either assignment if you have a binary
-@@ -99,10 +99,10 @@
- RC0 = $(rcdir)/algae.A
- 
- # Directory in which to install source code.
--sourcedir = $(prefix)/src
-+sourcedir = $(prefix)/include
- 
- # Directory in which to install the header files.
--hdir = $(sourcedir)/algae/$(VERSION_NUMBER)/include
-+hdir = $(sourcedir)/algae
- 
- # Directory containing site files: that is, files installed locally
- # which are not part of the standard Algae distribution.
-@@ -308,7 +308,7 @@
+--- Makefile.in.orig	2003-02-28 18:07:03.000000000 -0500
++++ Makefile.in
+@@ -308,7 +308,7 @@ install: algae.A installdirs
  	cd tools; \
  	  $(MAKE) tooldir=$(tooldir) install
  	cd doc; \