[pkgsrc/trunk]: pkgsrc/textproc/psgml-mode * List info files directly in the ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/278f0d0f6653
branches:  trunk
changeset: 511002:278f0d0f6653
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Apr 07 19:45:23 2006 +0000

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

diffstat:

 textproc/psgml-mode/Makefile |  20 +++++++++++---------
 textproc/psgml-mode/PLIST    |   8 +++++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diffs (72 lines):

diff -r 52db50a08f63 -r 278f0d0f6653 textproc/psgml-mode/Makefile
--- a/textproc/psgml-mode/Makefile      Fri Apr 07 19:27:19 2006 +0000
+++ b/textproc/psgml-mode/Makefile      Fri Apr 07 19:45:23 2006 +0000
@@ -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 @@
 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 -r 52db50a08f63 -r 278f0d0f6653 textproc/psgml-mode/PLIST
--- a/textproc/psgml-mode/PLIST Fri Apr 07 19:27:19 2006 +0000
+++ b/textproc/psgml-mode/PLIST Fri Apr 07 19:45:23 2006 +0000
@@ -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-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