summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-04-07 19:45:23 +0000
committerjlam <jlam@pkgsrc.org>2006-04-07 19:45:23 +0000
commit63fcd2a756d6079dcde1027466d02671df67f6da (patch)
tree78cc9f6495766aab9ff8a643f50ffde614c68d16
parent205200845bfb884c7568000564795da47b01dd69 (diff)
downloadpkgsrc-63fcd2a756d6079dcde1027466d02671df67f6da.tar.gz
* List info files directly in the PLIST, and install them into
${EMACS_INFOPREFIX}, which is correct for both emacs and xemacs. * Fix PLIST to be correct on xemacs. * Depend on xemacs-packages when building with xemacs. Bump the PKGREVISION.
-rw-r--r--textproc/psgml-mode/Makefile20
-rw-r--r--textproc/psgml-mode/PLIST8
2 files changed, 16 insertions, 12 deletions
diff --git a/textproc/psgml-mode/Makefile b/textproc/psgml-mode/Makefile
index 052600251b7..cc0618e9e2e 100644
--- a/textproc/psgml-mode/Makefile
+++ b/textproc/psgml-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:51 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/07 19:45:23 jlam Exp $
DISTNAME= psgml-1.3.2
PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME:S/-/-mode-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psgml/}
@@ -10,23 +10,25 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.lysator.liu.se/~lenst/about_psgml/
COMMENT= SGML/XML mode for Emacs
+EMACS_MODULES+= base
+
.include "../../mk/emacs.mk"
.if ${EMACS_FLAVOR} != "emacs"
BUILD_TARGET= xemacs
.endif
-INFO_FILES= psgml-api.info psgml.info
-
-INSTALLATION_DIRS+= info
+INFO_FILES= # PLIST
+INSTALLATION_DIRS+= ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/psgml-mode
do-install:
- ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX:Q}/psgml-mode
cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc \
${EMACS_LISPPREFIX:Q}/psgml-mode
- ${INSTALL_DATA} ${WRKSRC:Q}/iso88591.map \
+ ${INSTALL_DATA} ${WRKSRC:Q}/iso88591.map \
${EMACS_LISPPREFIX:Q}/psgml-mode
- ${INSTALL_DATA} ${WRKSRC:Q}/psgml-api.info ${PREFIX:Q}/info
- ${INSTALL_DATA} ${WRKSRC:Q}/psgml.info ${PREFIX:Q}/info
+ cd ${WRKSRC:Q}; for f in *.info *.info-[0-9]*; do \
+ ${TEST} ! -f "$$f" || \
+ ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX:Q}; \
+ done
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/psgml-mode/PLIST b/textproc/psgml-mode/PLIST
index d58805db749..00c6b468890 100644
--- a/textproc/psgml-mode/PLIST
+++ b/textproc/psgml-mode/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/05 05:59:56 hrs Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/04/07 19:45:23 jlam Exp $
+${EMACS_INFOPREFIX}/psgml-api.info
+${EMACS_INFOPREFIX}/psgml.info
${EMACS_LISPPREFIX}/psgml-mode/iso88591.map
${EMACS_LISPPREFIX}/psgml-mode/psgml-api.el
${EMACS_LISPPREFIX}/psgml-mode/psgml-api.elc
@@ -17,11 +19,11 @@ ${EMACS_LISPPREFIX}/psgml-mode/psgml-info.elc
${EMACS_LISPPREFIX}/psgml-mode/psgml-lucid.el
${EMACS_LISPPREFIX}/psgml-mode/psgml-maint.el
${EMACS_LISPPREFIX}/psgml-mode/psgml-other.el
-${EMACS_LISPPREFIX}/psgml-mode/psgml-other.elc
+${NOTFOR_xemacs}${EMACS_LISPPREFIX}/psgml-mode/psgml-other.elc
${EMACS_LISPPREFIX}/psgml-mode/psgml-parse.el
${EMACS_LISPPREFIX}/psgml-mode/psgml-parse.elc
${EMACS_LISPPREFIX}/psgml-mode/psgml-sysdep.el
${EMACS_LISPPREFIX}/psgml-mode/psgml-sysdep.elc
${EMACS_LISPPREFIX}/psgml-mode/psgml.el
${EMACS_LISPPREFIX}/psgml-mode/psgml.elc
-@dirrm ${EMACS_LISPPREFIX}/psgml-mode/
+@dirrm ${EMACS_LISPPREFIX}/psgml-mode