details: https://anonhg.NetBSD.org/pkgsrc/rev/439c89c804ac
branches: trunk
changeset: 530259:439c89c804ac
user: markd <markd%pkgsrc.org@localhost>
date: Wed Jun 20 11:49:39 2007 +0000
description:
Fix installation of package etc directory. Bump PKGREVISION.
diffstat:
math/ess/Makefile | 13 +++++++++++--
math/ess/PLIST | 17 ++++++++++++++++-
2 files changed, 27 insertions(+), 3 deletions(-)
diffs (69 lines):
diff -r 6c3801a5d093 -r 439c89c804ac math/ess/Makefile
--- a/math/ess/Makefile Wed Jun 20 11:42:23 2007 +0000
+++ b/math/ess/Makefile Wed Jun 20 11:49:39 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/06/11 14:16:25 markd Exp $
+# $NetBSD: Makefile,v 1.15 2007/06/20 11:49:39 markd Exp $
DISTNAME= ess-5.3.4
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= http://ess.r-project.org/downloads/ess/
EXTRACT_SUFX= .tgz
@@ -14,11 +15,16 @@
EMACS_MODULES= base
INFO_FILES= # PLIST
-
MAKE_ENV+= LISPDIR=${EMACS_LISPPREFIX}/ess
MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
+SUBST_CLASSES+= etcdir
+SUBST_STAGE.etcdir= pre-patch
+SUBST_FILES.etcdir= lisp/ess-site.el
+SUBST_SED.etcdir= -e 's,"./etc/"),"./etc/" "../../../ess/"),'
+
INSTALLATION_DIRS= ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/ess
+INSTALLATION_DIRS+= ${EMACS_ETCPREFIX}/ess ${EMACS_ETCPREFIX}/ess/icons
do-install:
cd ${WRKSRC}/lisp && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/ess
@@ -26,6 +32,9 @@
${TEST} ! -f "$$f" || \
${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX}; \
done
+ cd ${WRKSRC}/etc && ${INSTALL_DATA} icons/*.xpm ${EMACS_ETCPREFIX}/ess/icons
+ cd ${WRKSRC}/etc && ${INSTALL_DATA} *.S ${EMACS_ETCPREFIX}/ess
+ cd ${WRKSRC}/etc && ${INSTALL_SCRIPT} ess-sas-sh-command ${EMACS_ETCPREFIX}/ess
.include "../../mk/emacs.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6c3801a5d093 -r 439c89c804ac math/ess/PLIST
--- a/math/ess/PLIST Wed Jun 20 11:42:23 2007 +0000
+++ b/math/ess/PLIST Wed Jun 20 11:49:39 2007 +0000
@@ -1,4 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2007/06/11 14:16:26 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/06/20 11:49:39 markd Exp $
+${EMACS_ETCPREFIX}/ess/ess-s4.S
+${EMACS_ETCPREFIX}/ess/ess-sas-sh-command
+${EMACS_ETCPREFIX}/ess/ess-sp3.S
+${EMACS_ETCPREFIX}/ess/function-outline.S
+${EMACS_ETCPREFIX}/ess/icons/rbuffer.xpm
+${EMACS_ETCPREFIX}/ess/icons/rfunction.xpm
+${EMACS_ETCPREFIX}/ess/icons/rline.xpm
+${EMACS_ETCPREFIX}/ess/icons/rregion.xpm
+${EMACS_ETCPREFIX}/ess/icons/spluslogo.xpm
+${EMACS_ETCPREFIX}/ess/icons/startr.xpm
+${EMACS_ETCPREFIX}/ess/icons/switch_ess.xpm
+${EMACS_ETCPREFIX}/ess/icons/switchr.xpm
+${EMACS_ETCPREFIX}/ess/icons/switchs.xpm
${EMACS_INFOPREFIX}/ess.info
${EMACS_LISPPREFIX}/ess/ess-comp.el
${EMACS_LISPPREFIX}/ess/ess-comp.elc
@@ -103,3 +116,5 @@
${EMACS_LISPPREFIX}/ess/noweb-mode.el
${EMACS_LISPPREFIX}/ess/noweb-mode.elc
@dirrm ${EMACS_LISPPREFIX}/ess
+@dirrm ${EMACS_ETCPREFIX}/ess/icons
+@dirrm ${EMACS_ETCPREFIX}/ess