diff options
| author | jlam <jlam@pkgsrc.org> | 2006-03-31 04:29:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-03-31 04:29:51 +0000 |
| commit | bd7bbec1ba6bc661e6850747f7310121de8d118c (patch) | |
| tree | 9043d025a6e7623bfa95f1fcee45fd3ed12f864b /math | |
| parent | bf557ad0a626e87f12360ce2bbe213d44bea3aaf (diff) | |
| download | pkgsrc-bd7bbec1ba6bc661e6850747f7310121de8d118c.tar.gz | |
Make this package install correctly regardless of whether we are using
emacs or xemacs. Move the info files into the PLIST. Bump the
PKGREVISION to 2.
Diffstat (limited to 'math')
| -rw-r--r-- | math/ess/Makefile | 27 | ||||
| -rw-r--r-- | math/ess/PLIST | 8 |
2 files changed, 12 insertions, 23 deletions
diff --git a/math/ess/Makefile b/math/ess/Makefile index cdba644c22c..45fa5e65073 100644 --- a/math/ess/Makefile +++ b/math/ess/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2006/03/05 16:27:27 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/03/31 04:29:51 jlam Exp $ DISTNAME= ess-5.1.24 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= math MASTER_SITES= http://software.biostat.washington.edu/ess/ @@ -10,27 +10,20 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://software.biostat.washington.edu/statsoft/ess/ COMMENT= Emacs Speaks Statistics -MAKEFLAGS+= EMACS=${EMACS_BIN:Q} - USE_TOOLS+= makeinfo perl - -.if defined(USE_XEMACS) -LISPDIR= ${EMACS_LISPPREFIX} -INFODIR= ${EMACS_LISPPREFIX}/../info -.else -LISPDIR= ${EMACS_LISPPREFIX} -INFODIR= info -INFO_FILES= ess.info -.endif -INSTALLATION_DIRS= ${INFODIR} +EMACS_MODULES= base MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/ess -PLIST_SUBST+= INFODIR=${INFODIR:Q} +MAKEFLAGS+= EMACS=${EMACS_BIN:Q} + +INSTALLATION_DIRS= ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/ess do-install: - ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ess cd ${WRKSRC}/lisp && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/ess - ${INSTALL_DATA} ${WRKSRC}/doc/ess.info* ${PREFIX}/${INFODIR} + cd ${WRKSRC}/doc; for f in ess.info ess.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/math/ess/PLIST b/math/ess/PLIST index ff134108c3d..cf0e390f65a 100644 --- a/math/ess/PLIST +++ b/math/ess/PLIST @@ -1,9 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2003/07/31 23:41:11 seb Exp $ -${INFODIR}/ess.info -${INFODIR}/ess.info-1 -${INFODIR}/ess.info-2 -${INFODIR}/ess.info-3 -${INFODIR}/ess.info-4 +@comment $NetBSD: PLIST,v 1.3 2006/03/31 04:29:51 jlam Exp $ +${EMACS_INFOPREFIX}/ess.info ${EMACS_LISPPREFIX}/ess/ess-batch.el ${EMACS_LISPPREFIX}/ess/ess-comp.el ${EMACS_LISPPREFIX}/ess/ess-comp.elc |