[pkgsrc/trunk]: pkgsrc/misc/bbdb Replace INFO_DIR with EMACS_INFOPREFIX, whic...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/81913486ef36
branches:  trunk
changeset: 509954:81913486ef36
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 20 05:35:58 2006 +0000

description:
Replace INFO_DIR with EMACS_INFOPREFIX, which is the correct location for
info files for both emacs and xemacs.  Handle the split info file case
correctly when installing the info files.

diffstat:

 misc/bbdb/Makefile |  21 ++++++++-------------
 misc/bbdb/PLIST    |   8 ++------
 2 files changed, 10 insertions(+), 19 deletions(-)

diffs (66 lines):

diff -r db68fae613d4 -r 81913486ef36 misc/bbdb/Makefile
--- a/misc/bbdb/Makefile        Mon Mar 20 05:34:27 2006 +0000
+++ b/misc/bbdb/Makefile        Mon Mar 20 05:35:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/05 16:27:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/03/20 05:35:58 jlam Exp $
 #
 
 DISTNAME=              bbdb-2.34
@@ -19,9 +19,9 @@
 GNU_CONFIGURE=         yes
 BUILD_TARGET=          all mhe
 USE_TOOLS+=            makeinfo
-INFO_FILES=            bbdb.info
-INFO_DIR=              ${INFODIR}
-PLIST_SUBST+=          INFODIR=${INFODIR:Q}
+INFO_FILES=            # PLIST
+LISPDIR=               ${EMACS_LISPPREFIX}/bbdb
+INSTALLATION_DIRS=     ${EMACS_INFOPREFIX}
 
 .include "../../mk/emacs.mk"
 
@@ -29,20 +29,15 @@
 CONFIGURE_ARGS+=       --with-emacs=xemacs
 CONFIGURE_ARGS+=       --with-package-dir=${PREFIX}/lib/xemacs/site-packages
 INSTALL_TARGET=                install-pkg
-INFODIR=               lib/xemacs/site-packages/info
-pre-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/${INFODIR}
 .else
-LISPDIR=       ${EMACS_LISPPREFIX}/bbdb
-INFODIR=       info
-
-INSTALLATION_DIRS=     ${INFO_DIR}
-
 do-install:
        ${MKDIR} ${LISPDIR}
        ${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${LISPDIR}
        ${INSTALL_DATA} ${WRKSRC}/lisp/*.elc ${LISPDIR}
-       ${INSTALL_DATA} ${WRKSRC}/texinfo/bbdb.info* ${PREFIX}/${INFO_DIR}
+       cd ${WRKSRC}; for f in bbdb.info bbdb.info-[0-9]*; do           \
+               ${TEST} ! -f "$$f" ||                                   \
+               ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};          \
+       done
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r db68fae613d4 -r 81913486ef36 misc/bbdb/PLIST
--- a/misc/bbdb/PLIST   Mon Mar 20 05:34:27 2006 +0000
+++ b/misc/bbdb/PLIST   Mon Mar 20 05:35:58 2006 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/04 13:45:53 minoura Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/03/20 05:35:58 jlam Exp $
+${EMACS_INFOPREFIX}/bbdb.info
 ${FOR_emacs20}${EMACS_LISPPREFIX}/bbdb/bbdb-autoloads.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/bbdb/bbdb-autoloads.el
 ${EMACS_LISPPREFIX}/bbdb/bbdb-com.el
@@ -42,8 +43,3 @@
 ${EMACS_LISPPREFIX}/bbdb/bbdb.el
 ${EMACS_LISPPREFIX}/bbdb/bbdb.elc
 @dirrm ${EMACS_LISPPREFIX}/bbdb
-${INFODIR}/bbdb.info
-${INFODIR}/bbdb.info-1
-${INFODIR}/bbdb.info-2
-${INFODIR}/bbdb.info-3
-${INFODIR}/bbdb.info-4