[pkgsrc/trunk]: pkgsrc/math/ess Make this package install correctly regardles...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/08053db816e5
branches:  trunk
changeset: 510552:08053db816e5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Mar 31 04:29:51 2006 +0000

description:
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:

 math/ess/Makefile |  29 +++++++++++------------------
 math/ess/PLIST    |   8 ++------
 2 files changed, 13 insertions(+), 24 deletions(-)

diffs (66 lines):

diff -r 9bcb49856fe8 -r 08053db816e5 math/ess/Makefile
--- a/math/ess/Makefile Fri Mar 31 03:56:30 2006 +0000
+++ b/math/ess/Makefile Fri Mar 31 04:29:51 2006 +0000
@@ -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 @@
 HOMEPAGE=      http://software.biostat.washington.edu/statsoft/ess/
 COMMENT=       Emacs Speaks Statistics
 
+USE_TOOLS+=    makeinfo perl
+EMACS_MODULES= base
+
+MAKE_ENV+=     LISPDIR=${EMACS_LISPPREFIX}/ess
 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}
-
-MAKE_ENV+=     LISPDIR=${EMACS_LISPPREFIX}/ess
-PLIST_SUBST+=  INFODIR=${INFODIR: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 -r 9bcb49856fe8 -r 08053db816e5 math/ess/PLIST
--- a/math/ess/PLIST    Fri Mar 31 03:56:30 2006 +0000
+++ b/math/ess/PLIST    Fri Mar 31 04:29:51 2006 +0000
@@ -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