* 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.

4 files changed, 29 insertions, 21 deletions

diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 2ad4d1075a6..847fda44e48 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2006/03/05 16:27:24 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/30 03:31:13 jlam Exp $
 #
 
 DISTNAME=	elib-1.0
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://jde.sunsite.dk/
 
@@ -15,13 +15,14 @@ CONFLICTS+=	emacs20-elib-[0-9]*
 .include "../../mk/emacs.mk"
 
 BUILD_ENV+=	EMACS=${EMACS_FLAVOR}
-
 MAKEFLAGS+=	EMACS=${EMACS_FLAVOR:Q}
 
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake makeinfo
 
-INFO_FILES=	elib.info
+INFO_FILES=	# PLIST
+
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX}/elib ${EMACS_INFOPREFIX}
 
 SRCS=	stack-f.el stack-m.el queue-f.el queue-m.el elib-node.el	\
 	bintree.el avltree.el string.el read.el cookie.el dll.el	\
@@ -31,6 +32,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/elib
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
 			${EMACS_LISPPREFIX}/elib
-	cd ${WRKSRC} && ${INSTALL_DATA} elib.info* ${PREFIX}/info
+	cd ${WRKSRC} && ${INSTALL_DATA} elib.info* ${EMACS_INFOPREFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/elib/PLIST b/devel/elib/PLIST
index aaf0edd47f5..ec053422779 100644
--- a/devel/elib/PLIST
+++ b/devel/elib/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/13 08:26:04 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:31:13 jlam Exp $
+${EMACS_INFOPREFIX}/elib.info
 ${EMACS_LISPPREFIX}/elib/stack-f.el
 ${EMACS_LISPPREFIX}/elib/stack-f.elc
 ${EMACS_LISPPREFIX}/elib/stack-m.el
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