From c0a6d41e3990b76cf921d641cede30f0b6b08366 Mon Sep 17 00:00:00 2001
From: seb <seb>
Date: Sat, 2 Aug 2003 22:09:36 +0000
Subject: Convert to USE_NEW_TEXINFO. Fix info files generation by ensuring
 buildlink2 framework is used: use BUILD_DIRS/INSTALL_DIRS.

---
 math/yorick/Makefile | 8 +++++---
 math/yorick/PLIST    | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'math/yorick')

diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 0b49c3089c4..2cd4d6114fd 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/08/02 21:45:39 seb Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/02 22:09:36 seb Exp $
 
 DISTNAME=	yorick-1.5.12
 WRKSRC=		${WRKDIR}/yorick-1.5
@@ -12,7 +12,11 @@ COMMENT=	Numerical algebra system (similar to Matlab)
 
 USE_BUILDLINK2=	yes
 USE_X11=        yes
+BUILD_DIRS=	${WRKSRC} ${WRKSRC}/doc
+INSTALL_DIRS=	${WRKSRC}
 
+USE_NEW_TEXINFO=	YES
+USE_MAKEINFO=	YES
 INFO_FILES=	yorick.info
 
 post-patch:
@@ -25,12 +29,10 @@ post-install:
 	for f in yorick gist; do \
 	cd ${PREFIX}/bin && ${LN} -sf ../lib/yorick/1.5/bin/$$f $$f; \
 	done
-	cd ${WRKSRC}/doc && ${MAKE} all
 	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${PREFIX}/info
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
 	cd ${PREFIX}/share/doc && ${LN} -sf ../yorick/1.5/doc yorick
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/emacs/*.el ${PREFIX}/share/emacs/site-lisp
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yorick/PLIST b/math/yorick/PLIST
index 4c1ebba44e7..ed36169027e 100644
--- a/math/yorick/PLIST
+++ b/math/yorick/PLIST
@@ -1,14 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/18 13:09:02 cjep Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/08/02 22:09:36 seb Exp $
 bin/gist
 bin/yorick
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/yorick.info
 info/yorick.info
 info/yorick.info-1
 info/yorick.info-2
 info/yorick.info-3
 info/yorick.info-4
 info/yorick.info-5
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/yorick.info
 man/man1/gist.1
 man/man1/yorick.1
 lib/yorick/1.5/Make.cfg
-- 
cgit v1.2.3