summaryrefslogtreecommitdiff
path: root/lang/eieio
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-03-20 05:34:27 +0000
committerjlam <jlam@pkgsrc.org>2006-03-20 05:34:27 +0000
commit9322d7b1d1ba2bc22cd031854cc8ef6184439e07 (patch)
treefeea69fea6e36b738578cb33f01011667b48575d /lang/eieio
parentd4ef8ba919b55b3e7e0285a1ae0bbe46b63cafaf (diff)
downloadpkgsrc-9322d7b1d1ba2bc22cd031854cc8ef6184439e07.tar.gz
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.
Diffstat (limited to 'lang/eieio')
-rw-r--r--lang/eieio/Makefile22
-rw-r--r--lang/eieio/PLIST3
2 files changed, 12 insertions, 13 deletions
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