pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/vm Use a common PLIST by taking advantage of the ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ba48440fc0b
branches:  trunk
changeset: 510862:4ba48440fc0b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Apr 05 15:50:27 2006 +0000

description:
Use a common PLIST by taking advantage of the variables exported by
emacs.mk.

diffstat:

 mail/vm/Makefile     |   32 ++++----
 mail/vm/PLIST        |  175 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mail/vm/PLIST.emacs  |  174 -------------------------------------------------
 mail/vm/PLIST.xemacs |  178 ---------------------------------------------------
 4 files changed, 190 insertions(+), 369 deletions(-)

diffs (truncated from 597 to 300 lines):

diff -r cdf52ab030a6 -r 4ba48440fc0b mail/vm/Makefile
--- a/mail/vm/Makefile  Wed Apr 05 15:19:05 2006 +0000
+++ b/mail/vm/Makefile  Wed Apr 05 15:50:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/03/05 16:27:26 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/04/05 15:50:27 jlam Exp $
 
 DISTNAME=      vm-7.19
 PKGNAME=       ${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -24,34 +24,32 @@
 .include "../../mk/emacs.mk"
 
 USE_TOOLS+=    makeinfo
+INFO_FILES=    # PLIST
 
 .if ${EMACS_FLAVOR} == "xemacs"
-INFODIR=       ${PREFIX}/lib/xemacs/site-packages/info
-PIXMAPDIR=     ${PREFIX}/lib/xemacs/site-packages/etc/vm
-BINDIR=                ${PREFIX}/bin
-PLIST_SRC=     ${PKGDIR}/PLIST.xemacs
+PIXMAPDIR=     ${EMACS_LISPPREFIX:H}/etc/vm
 .elif ${EMACS_FLAVOR} == "emacs"
-INFODIR=       ${PREFIX}/info
-PIXMAPDIR=     ${PREFIX}/share/emacs/site-lisp/vm/pixmaps
-BINDIR=                ${PREFIX}/bin
-INFO_FILES=    vm.info
-PLIST_SRC=     ${PKGDIR}/PLIST.emacs
+PIXMAPDIR=     ${EMACS_LISPPREFIX}/vm/pixmaps
 .endif
+
 MAKEFLAGS+=    EMACS=${EMACS_BIN:Q}
-
 MAKE_ENV+=     LISPDIR=${EMACS_LISPPREFIX}/vm
 MAKE_ENV+=     INFODIR=${INFODIR:Q}
 MAKE_ENV+=     PIXMAPDIR=${PIXMAPDIR:Q}
-MAKE_ENV+=     BINDIR=${BINDIR:Q}
+MAKE_ENV+=     BINDIR=${PREFIX:Q}/bin
+PLIST_SUBST+=  PIXMAPDIR=${PIXMAPDIR:S/^${PREFIX}\///:Q}
+
+INSTALLATION_DIRS=     bin ${EMACS_INFOPREFIX} ${EMACS_LISPPREFIX}/vm  \
+                       ${PIXMAPDIR}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/vm
        cd ${WRKSRC} && ${INSTALL_DATA} *.el* ${EMACS_LISPPREFIX}/vm
-       ${INSTALL_DATA_DIR} ${INFODIR}
-       ${INSTALL_DATA} ${WRKSRC}/*.info* ${INFODIR}
-       ${INSTALL_DATA_DIR} ${PIXMAPDIR}
+       cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do                 \
+               ${TEST} ! -f "$$f" ||                                   \
+               ${INSTALL_DATA} "$$f" ${EMACS_INFOPREFIX};              \
+       done
        ${INSTALL_DATA} ${WRKSRC}/pixmaps/*.x[pb]m ${PIXMAPDIR}
        cd ${WRKSRC} && ${INSTALL_PROGRAM} qp-decode qp-encode          \
-               base64-decode base64-encode ${BINDIR}
+               base64-decode base64-encode ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff -r cdf52ab030a6 -r 4ba48440fc0b mail/vm/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/vm/PLIST     Wed Apr 05 15:50:27 2006 +0000
@@ -0,0 +1,175 @@
+@comment $NetBSD: PLIST,v 1.3 2006/04/05 15:50:27 jlam Exp $
+bin/base64-decode
+bin/base64-encode
+bin/qp-decode
+bin/qp-encode
+${PIXMAPDIR}/audio_stamp-colorful.xpm
+${PIXMAPDIR}/audio_stamp-simple.xpm
+${PIXMAPDIR}/autofile-dn.xbm
+${PIXMAPDIR}/autofile-dn.xpm
+${PIXMAPDIR}/autofile-up.xbm
+${PIXMAPDIR}/autofile-up.xpm
+${PIXMAPDIR}/autofile-xx.xbm
+${PIXMAPDIR}/compose-dn.xbm
+${PIXMAPDIR}/compose-dn.xpm
+${PIXMAPDIR}/compose-up.xbm
+${PIXMAPDIR}/compose-up.xpm
+${PIXMAPDIR}/compose-xx.xbm
+${PIXMAPDIR}/delete-dn.xbm
+${PIXMAPDIR}/delete-dn.xpm
+${PIXMAPDIR}/delete-up.xbm
+${PIXMAPDIR}/delete-up.xpm
+${PIXMAPDIR}/delete-xx.xbm
+${PIXMAPDIR}/document-colorful.xpm
+${PIXMAPDIR}/document-simple.xpm
+${PIXMAPDIR}/file-dn.xbm
+${PIXMAPDIR}/file-dn.xpm
+${PIXMAPDIR}/file-up.xbm
+${PIXMAPDIR}/file-up.xpm
+${PIXMAPDIR}/file-xx.xbm
+${PIXMAPDIR}/film-colorful.xpm
+${PIXMAPDIR}/film-simple.xpm
+${PIXMAPDIR}/gear-colorful.xpm
+${PIXMAPDIR}/gear-simple.xpm
+${PIXMAPDIR}/getmail-dn.xbm
+${PIXMAPDIR}/getmail-dn.xpm
+${PIXMAPDIR}/getmail-up.xbm
+${PIXMAPDIR}/getmail-up.xpm
+${PIXMAPDIR}/getmail-xx.xbm
+${PIXMAPDIR}/help-dn.xbm
+${PIXMAPDIR}/help-dn.xpm
+${PIXMAPDIR}/help-up.xbm
+${PIXMAPDIR}/help-up.xpm
+${PIXMAPDIR}/help-xx.xbm
+${PIXMAPDIR}/message-colorful.xpm
+${PIXMAPDIR}/message-simple.xpm
+${PIXMAPDIR}/mime-colorful-dn.xpm
+${PIXMAPDIR}/mime-colorful-up.xpm
+${PIXMAPDIR}/mime-colorful-xx.xpm
+${PIXMAPDIR}/mime-dn.xbm
+${PIXMAPDIR}/mime-simple-dn.xpm
+${PIXMAPDIR}/mime-simple-up.xpm
+${PIXMAPDIR}/mime-simple-xx.xpm
+${PIXMAPDIR}/mime-up.xbm
+${PIXMAPDIR}/mime-xx.xbm
+${PIXMAPDIR}/mona_stamp-colorful.xpm
+${PIXMAPDIR}/mona_stamp-simple.xpm
+${PIXMAPDIR}/next-dn.xbm
+${PIXMAPDIR}/next-dn.xpm
+${PIXMAPDIR}/next-up.xbm
+${PIXMAPDIR}/next-up.xpm
+${PIXMAPDIR}/next-xx.xbm
+${PIXMAPDIR}/previous-dn.xbm
+${PIXMAPDIR}/previous-dn.xpm
+${PIXMAPDIR}/previous-up.xbm
+${PIXMAPDIR}/previous-up.xpm
+${PIXMAPDIR}/previous-xx.xbm
+${PIXMAPDIR}/print-dn.xbm
+${PIXMAPDIR}/print-dn.xpm
+${PIXMAPDIR}/print-up.xbm
+${PIXMAPDIR}/print-up.xpm
+${PIXMAPDIR}/print-xx.xbm
+${PIXMAPDIR}/quit-dn.xbm
+${PIXMAPDIR}/quit-dn.xpm
+${PIXMAPDIR}/quit-up.xbm
+${PIXMAPDIR}/quit-up.xpm
+${PIXMAPDIR}/quit-xx.xbm
+${PIXMAPDIR}/recover-dn.xbm
+${PIXMAPDIR}/recover-dn.xpm
+${PIXMAPDIR}/recover-up.xbm
+${PIXMAPDIR}/recover-up.xpm
+${PIXMAPDIR}/recover-xx.xbm
+${PIXMAPDIR}/reply-dn.xbm
+${PIXMAPDIR}/reply-dn.xpm
+${PIXMAPDIR}/reply-up.xbm
+${PIXMAPDIR}/reply-up.xpm
+${PIXMAPDIR}/reply-xx.xbm
+${PIXMAPDIR}/stuffed_box-colorful.xpm
+${PIXMAPDIR}/stuffed_box-simple.xpm
+${PIXMAPDIR}/undelete-dn.xbm
+${PIXMAPDIR}/undelete-dn.xpm
+${PIXMAPDIR}/undelete-up.xbm
+${PIXMAPDIR}/undelete-up.xpm
+${PIXMAPDIR}/undelete-xx.xbm
+${PIXMAPDIR}/visit-dn.xbm
+${PIXMAPDIR}/visit-dn.xpm
+${PIXMAPDIR}/visit-up.xbm
+${PIXMAPDIR}/visit-up.xpm
+${PIXMAPDIR}/visit-xx.xbm
+${EMACS_INFOPREFIX}/vm.info
+${EMACS_LISPPREFIX}/vm/tapestry.el
+${EMACS_LISPPREFIX}/vm/tapestry.elc
+${EMACS_LISPPREFIX}/vm/vm-autoload.el
+${EMACS_LISPPREFIX}/vm/vm-autoload.elc
+${EMACS_LISPPREFIX}/vm/vm-byteopts.el
+${EMACS_LISPPREFIX}/vm/vm-crypto.el
+${EMACS_LISPPREFIX}/vm/vm-crypto.elc
+${EMACS_LISPPREFIX}/vm/vm-delete.el
+${EMACS_LISPPREFIX}/vm/vm-delete.elc
+${EMACS_LISPPREFIX}/vm/vm-digest.el
+${EMACS_LISPPREFIX}/vm/vm-digest.elc
+${EMACS_LISPPREFIX}/vm/vm-easymenu.el
+${EMACS_LISPPREFIX}/vm/vm-easymenu.elc
+${EMACS_LISPPREFIX}/vm/vm-edit.el
+${EMACS_LISPPREFIX}/vm/vm-edit.elc
+${EMACS_LISPPREFIX}/vm/vm-folder.el
+${EMACS_LISPPREFIX}/vm/vm-folder.elc
+${EMACS_LISPPREFIX}/vm/vm-imap.el
+${EMACS_LISPPREFIX}/vm/vm-imap.elc
+${EMACS_LISPPREFIX}/vm/vm-license.el
+${EMACS_LISPPREFIX}/vm/vm-license.elc
+${EMACS_LISPPREFIX}/vm/vm-macro.el
+${EMACS_LISPPREFIX}/vm/vm-macro.elc
+${EMACS_LISPPREFIX}/vm/vm-mark.el
+${EMACS_LISPPREFIX}/vm/vm-mark.elc
+${EMACS_LISPPREFIX}/vm/vm-menu.el
+${EMACS_LISPPREFIX}/vm/vm-menu.elc
+${EMACS_LISPPREFIX}/vm/vm-message.el
+${EMACS_LISPPREFIX}/vm/vm-message.elc
+${EMACS_LISPPREFIX}/vm/vm-mime.el
+${EMACS_LISPPREFIX}/vm/vm-mime.elc
+${EMACS_LISPPREFIX}/vm/vm-minibuf.el
+${EMACS_LISPPREFIX}/vm/vm-minibuf.elc
+${EMACS_LISPPREFIX}/vm/vm-misc.el
+${EMACS_LISPPREFIX}/vm/vm-misc.elc
+${EMACS_LISPPREFIX}/vm/vm-motion.el
+${EMACS_LISPPREFIX}/vm/vm-motion.elc
+${EMACS_LISPPREFIX}/vm/vm-mouse.el
+${EMACS_LISPPREFIX}/vm/vm-mouse.elc
+${EMACS_LISPPREFIX}/vm/vm-page.el
+${EMACS_LISPPREFIX}/vm/vm-page.elc
+${EMACS_LISPPREFIX}/vm/vm-pop.el
+${EMACS_LISPPREFIX}/vm/vm-pop.elc
+${EMACS_LISPPREFIX}/vm/vm-reply.el
+${EMACS_LISPPREFIX}/vm/vm-reply.elc
+${EMACS_LISPPREFIX}/vm/vm-save.el
+${EMACS_LISPPREFIX}/vm/vm-save.elc
+${EMACS_LISPPREFIX}/vm/vm-search.el
+${EMACS_LISPPREFIX}/vm/vm-search.elc
+${EMACS_LISPPREFIX}/vm/vm-sort.el
+${EMACS_LISPPREFIX}/vm/vm-sort.elc
+${EMACS_LISPPREFIX}/vm/vm-startup.el
+${EMACS_LISPPREFIX}/vm/vm-startup.elc
+${EMACS_LISPPREFIX}/vm/vm-summary.el
+${EMACS_LISPPREFIX}/vm/vm-summary.elc
+${EMACS_LISPPREFIX}/vm/vm-thread.el
+${EMACS_LISPPREFIX}/vm/vm-thread.elc
+${EMACS_LISPPREFIX}/vm/vm-toolbar.el
+${EMACS_LISPPREFIX}/vm/vm-toolbar.elc
+${EMACS_LISPPREFIX}/vm/vm-undo.el
+${EMACS_LISPPREFIX}/vm/vm-undo.elc
+${EMACS_LISPPREFIX}/vm/vm-user.el
+${EMACS_LISPPREFIX}/vm/vm-user.elc
+${EMACS_LISPPREFIX}/vm/vm-vars.el
+${EMACS_LISPPREFIX}/vm/vm-vars.elc
+${EMACS_LISPPREFIX}/vm/vm-version.el
+${EMACS_LISPPREFIX}/vm/vm-version.elc
+${EMACS_LISPPREFIX}/vm/vm-virtual.el
+${EMACS_LISPPREFIX}/vm/vm-virtual.elc
+${EMACS_LISPPREFIX}/vm/vm-window.el
+${EMACS_LISPPREFIX}/vm/vm-window.elc
+${EMACS_LISPPREFIX}/vm/vm.el
+${EMACS_LISPPREFIX}/vm/vm.elc
+@unexec ${RMDIR} -p %D/${PIXMAPDIR} 2>/dev/null || ${TRUE}
+@dirrm ${EMACS_LISPPREFIX}/vm
+@unexec ${RMDIR} -p %D/${EMACS_LISPPREFIX} 2>/dev/null || ${TRUE}
diff -r cdf52ab030a6 -r 4ba48440fc0b mail/vm/PLIST.emacs
--- a/mail/vm/PLIST.emacs       Wed Apr 05 15:19:05 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-@comment $NetBSD: PLIST.emacs,v 1.7 2004/03/07 21:46:31 seb Exp $
-bin/base64-decode
-bin/base64-encode
-bin/qp-decode
-bin/qp-encode
-share/emacs/site-lisp/vm/pixmaps/audio_stamp-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/audio_stamp-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/autofile-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/autofile-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/autofile-up.xbm
-share/emacs/site-lisp/vm/pixmaps/autofile-up.xpm
-share/emacs/site-lisp/vm/pixmaps/autofile-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/compose-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/compose-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/compose-up.xbm
-share/emacs/site-lisp/vm/pixmaps/compose-up.xpm
-share/emacs/site-lisp/vm/pixmaps/compose-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/delete-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/delete-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/delete-up.xbm
-share/emacs/site-lisp/vm/pixmaps/delete-up.xpm
-share/emacs/site-lisp/vm/pixmaps/delete-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/document-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/document-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/file-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/file-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/file-up.xbm
-share/emacs/site-lisp/vm/pixmaps/file-up.xpm
-share/emacs/site-lisp/vm/pixmaps/file-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/film-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/film-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/gear-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/gear-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/getmail-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/getmail-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/getmail-up.xbm
-share/emacs/site-lisp/vm/pixmaps/getmail-up.xpm
-share/emacs/site-lisp/vm/pixmaps/getmail-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/help-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/help-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/help-up.xbm
-share/emacs/site-lisp/vm/pixmaps/help-up.xpm
-share/emacs/site-lisp/vm/pixmaps/help-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/message-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/message-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-colorful-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-colorful-up.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-colorful-xx.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/mime-simple-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-simple-up.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-simple-xx.xpm
-share/emacs/site-lisp/vm/pixmaps/mime-up.xbm
-share/emacs/site-lisp/vm/pixmaps/mime-xx.xbm
-share/emacs/site-lisp/vm/pixmaps/mona_stamp-colorful.xpm
-share/emacs/site-lisp/vm/pixmaps/mona_stamp-simple.xpm
-share/emacs/site-lisp/vm/pixmaps/next-dn.xbm
-share/emacs/site-lisp/vm/pixmaps/next-dn.xpm
-share/emacs/site-lisp/vm/pixmaps/next-up.xbm



Home | Main Index | Thread Index | Old Index