Replace INFO_DIR with EMACS_INFOPREFIX, which is the correct location for

info files for both emacs and xemacs.  Install the info files correctly
by handling the case where there may be split info files.  List the info
files in the PLIST.  Use EMACS_MODULES where appropriate to replace the
conditional dependency on xemacs-packages.  Bump the PKGREVISION.

4 files changed, 22 insertions, 22 deletions

diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 1c50f614dbb..de36e3f247b 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:53 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/03/20 05:34:27 jlam Exp $
 #
 
 DISTNAME=	semantic-1.4.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
@@ -20,9 +20,7 @@ BUILD_ENV+=	EMACS=${EMACS_FLAVOR}
 
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-
-INFO_FILES=	semantic.info
-OTHER_INFO=	semantic.info-1 semantic.info-2
+INFO_FILES=	# PLIST
 
 MAKE_ENV+=	EMACS=${EMACS_FLAVOR:Q}
 
@@ -43,14 +41,16 @@ AUXFILES=	semantic-load.el
 # XXX cd ${WRKSRC}; ${MAKE} -V aux_AUX
 AUXFILES+=	c.bnf make.bnf java.bnf scheme.bnf
 
-INSTALLATION_DIRS=	${INFO_DIR}
+INSTALLATION_DIRS=	${EMACS_INFOPREFIX}
 
 do-install:
 	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/semantic
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
 			${EMACS_LISPPREFIX}/semantic
 	cd ${WRKSRC} && ${INSTALL_DATA} ${AUXFILES} ${EMACS_LISPPREFIX}/semantic
-	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${OTHER_INFO}	\
-			${PREFIX}/${INFO_DIR}
+	cd ${WRKSRC}; for f in semantic.info semantic.info-[0-9]*; do	\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};		\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/semantic/PLIST b/devel/semantic/PLIST
index fa02f16aecf..42a5a50e747 100644
--- a/devel/semantic/PLIST
+++ b/devel/semantic/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/16 17:55:39 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/20 05:34:27 jlam Exp $
+${EMACS_INFOPREFIX}/semantic.info
 ${EMACS_LISPPREFIX}/semantic/document-vars.el
 ${EMACS_LISPPREFIX}/semantic/document-vars.elc
 ${EMACS_LISPPREFIX}/semantic/document.el
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index 82365d374e3..d12f75851f4 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:09:44 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/20 05:34:27 jlam Exp $
 #
 
 DISTNAME=	eieio-0.17
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
@@ -11,18 +11,12 @@ MAINTAINER=	cjones@NetBSD.org
 HOMEPAGE=	http://cedet.sourceforge.net/eieio.shtml
 COMMENT=	Enhanced Integration of Emacs Interpreted Objects
 
-.include "../../mk/emacs.mk"
-
-.if ${EMACS_FLAVOR} == "xemacs"
-DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
-.endif
-
+EMACS_MODULES+=	base
 MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-
-INFO_FILES=	eieio.info
+INFO_FILES=	# PLIST
 
 # XXX $cd ${WRKSRC}; ${MAKE} -V eieio_LISP
 SRCS=	eieio.el eieio-comp.el eieio-opt.el eieio-custom.el eieio-doc.el \
@@ -30,12 +24,16 @@ SRCS=	eieio.el eieio-comp.el eieio-opt.el eieio-custom.el eieio-doc.el \
 # XXX $cd ${WRKSRC}; ${MAKE} -V examples_LISP
 SRCS+=	tree.el call-tree.el chart.el eieio-speedbar.el linemark.el
 
-INSTALLATION_DIRS=	${INFO_DIR}
+INSTALLATION_DIRS=	${EMACS_INFOPREFIX}
 
 do-install:
 	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/eieio
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
 			${EMACS_LISPPREFIX}/eieio
-	cd ${WRKSRC} && ${INSTALL_DATA} ${INFO_FILES} ${PREFIX}/${INFO_DIR}
+	cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do			\
+		${TEST} ! -f "$$f" ||					\
+		${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};		\
+	done
 
+.include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/eieio/PLIST b/lang/eieio/PLIST
index ae4d2e22b30..04caf6bd6e0 100644
--- a/lang/eieio/PLIST
+++ b/lang/eieio/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2004/02/22 14:34:48 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/03/20 05:34:27 jlam Exp $
+${EMACS_INFOPREFIX}/eieio.info
 ${EMACS_LISPPREFIX}/eieio/call-tree.el
 ${EMACS_LISPPREFIX}/eieio/call-tree.elc
 ${EMACS_LISPPREFIX}/eieio/chart.el