From d1922e478d4b3761333f5c03452852f68a893e78 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 30 Mar 2006 03:31:13 +0000
Subject: * Install info files into ${EMACS_INFOPREFIX}, which is the correct  
 location for both emacs and xemacs.

* List the info files directly in the PLIST.

* Use EMACS_MODULES to deal with a possible xemacs-packages dependency.
---
 devel/flim/Makefile | 32 ++++++++++++++++++--------------
 devel/flim/PLIST    |  4 +++-
 2 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'devel/flim')

diff --git a/devel/flim/Makefile b/devel/flim/Makefile
index 091612d0321..666b10c67eb 100644
--- a/devel/flim/Makefile
+++ b/devel/flim/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/03/30 03:31:13 jlam Exp $
 
 DISTNAME=	flim-1.14.7
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/flim/flim-1.14/
 
@@ -11,35 +11,39 @@ HOMEPAGE=	http://www.m17n.org/FLIM/
 COMMENT=	Emacs lisp library for message representation/encoding
 
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
+EMACS_MODULES=	base
+
 .include "../../mk/emacs.mk"
 
-BUILD_DEPENDS+=	qkc-*:../../converters/qkc
+BUILD_DEPENDS+=	qkc-[0-9]*:../../converters/qkc
 
 .if ${EMACS_FLAVOR} == "emacs"
 DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=9.22:../../devel/apel
 BUILD_TARGET=	elc
 INSTALL_TARGET= install
 .else	# ${EMACS_FLAVOR} == "xemacs"
-DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
 BUILD_TARGET=	package
 INSTALL_TARGET= install-package
 MAKEFLAGS+=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 .endif
 
+EVAL_PREFIX+=	QKC_PREFIX=qkc
 USE_TOOLS+=	makeinfo
-INFO_FILES=	mime-en.info mime-ja.info
+INFO_FILES=	# PLIST
 TEXINFO_REQD=	4.5
 
-pre-build:
-	@cd ${WRKSRC}; \
-	for i in mime-en mime-ja; do \
-		${RM} -f $${i}.info; \
-		${CP} $${i}.texi $${i}.texi.orig; \
-		${LOCALBASE}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi; \
-		${MAKEINFO} --force --no-validate --no-split $${i}.texi; \
+post-build:
+	@cd ${WRKSRC}; for i in mime-en mime-ja; do			\
+		${RM} -f $${i}.info*;					\
+		${CP} $${i}.texi $${i}.texi.orig;			\
+		${QKC_PREFIX}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi;	\
+		makeinfo --force --no-validate $${i}.texi;		\
 	done
 
-pre-install:
-	${INSTALL_DATA} ${WRKSRC}/mime-*.info ${PREFIX}/info
+post-install:
+	cd ${WRKSRC}; for f in mime-*.info mime-*.info-[0-9]*; do	\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/flim/PLIST b/devel/flim/PLIST
index fae2cc8f90c..e2bc9f0cc2e 100644
--- a/devel/flim/PLIST
+++ b/devel/flim/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/12 19:03:15 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:31:13 jlam Exp $
+${EMACS_INFOPREFIX}/mime-en.info
+${EMACS_INFOPREFIX}/mime-ja.info
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/auto-autoloads.el
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/auto-autoloads.elc
 ${FOR_xemacs214}${EMACS_LISPPREFIX}/flim/custom-load.el
-- 
cgit v1.2.3