pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Use emacs.mk.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0e198cc5a383
branches:  trunk
changeset: 474987:0e198cc5a383
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Sat May 08 15:10:58 2004 +0000

description:
Use emacs.mk.

diffstat:

 devel/ruby-rd-mode/Makefile |  23 ++++++-----------------
 devel/ruby-rd-mode/PLIST    |   7 ++++---
 devel/sml-mode/Makefile     |   9 ++++-----
 devel/sml-mode/PLIST        |  38 +++++++++++++++++++-------------------
 mail/etach/Makefile         |  19 ++++---------------
 mail/etach/PLIST            |   4 ++--
 6 files changed, 39 insertions(+), 61 deletions(-)

diffs (177 lines):

diff -r 3815eba58984 -r 0e198cc5a383 devel/ruby-rd-mode/Makefile
--- a/devel/ruby-rd-mode/Makefile       Sat May 08 15:09:31 2004 +0000
+++ b/devel/ruby-rd-mode/Makefile       Sat May 08 15:10:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/16 02:01:10 taca Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/08 15:10:58 uebayasi Exp $
 #
 
 DISTNAME=      rdtool-${RUBY_RD_VERSION}
@@ -10,32 +10,21 @@
 HOMEPAGE=      http://www2.pos.to/~tosh/ruby/rdtool/
 COMMENT=       Editing mode for RD (Ruby Document Format)
 
-.if defined(USE_XEMACS)
-DEPENDS+=      xemacs-[0-9]*:../../editors/xemacs
-EMACS=         xemacs
-SITE_LISP=     lib/xemacs/xemacs-packages/lisp/prog-modes
-.else
-DEPENDS+=      emacs-[0-9]*:../../editors/emacs
-EMACS=         emacs
-SITE_LISP=     share/emacs/site-lisp
-.endif
-
 WRKSRC=                ${WRKDIR}/${DISTNAME}/utils
 EXTRACT_ELEMENTS= ${DISTNAME}/utils/rd-mode.el
 DIST_SUBDIR=   ruby
 NO_CONFIGURE=  # defined
 
-PLIST_SUBST+=  SITE_LISP=${SITE_LISP}
-
 do-build:
-       cd ${WRKSRC}; ${EMACS} --no-init-file --no-site-file -batch \
+       cd ${WRKSRC}; ${EMACS_BIN} --no-init-file --no-site-file -batch \
                -f batch-byte-compile rd-mode.el
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/${SITE_LISP}
-       ${INSTALL_DATA} ${WRKSRC}/rd-mode.el ${PREFIX}/${SITE_LISP}
-       ${INSTALL_DATA} ${WRKSRC}/rd-mode.elc ${PREFIX}/${SITE_LISP}
+       ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/rd-mode
+       ${INSTALL_DATA} ${WRKSRC}/rd-mode.el ${EMACS_LISPPREFIX}/rd-mode
+       ${INSTALL_DATA} ${WRKSRC}/rd-mode.elc ${EMACS_LISPPREFIX}/rd-mode
 
 .include "../../textproc/ruby-rdtool/Makefile.common"
 .include "../../lang/ruby-base/Makefile.common"
+.include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3815eba58984 -r 0e198cc5a383 devel/ruby-rd-mode/PLIST
--- a/devel/ruby-rd-mode/PLIST  Sat May 08 15:09:31 2004 +0000
+++ b/devel/ruby-rd-mode/PLIST  Sat May 08 15:10:58 2004 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:26:28 zuntum Exp $
-${SITE_LISP}/rd-mode.el
-${SITE_LISP}/rd-mode.elc
+@comment $NetBSD: PLIST,v 1.2 2004/05/08 15:10:58 uebayasi Exp $
+${EMACS_LISPPREFIX}/rd-mode/rd-mode.el
+${EMACS_LISPPREFIX}/rd-mode/rd-mode.elc
+@dirrm ${EMACS_LISPPREFIX}/rd-mode
diff -r 3815eba58984 -r 0e198cc5a383 devel/sml-mode/Makefile
--- a/devel/sml-mode/Makefile   Sat May 08 15:09:31 2004 +0000
+++ b/devel/sml-mode/Makefile   Sat May 08 15:10:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/08/09 10:44:50 seb Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/08 15:10:58 uebayasi Exp $
 
 DISTNAME=      sml-mode-3.9.5
 CATEGORIES=    devel editors
@@ -7,16 +7,15 @@
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 COMMENT=       Emacs mode for editing Standard ML source code
 
-DEPENDS+=      emacs-[0-9]*:../../editors/emacs
-
 ALL_TARGET=    default
 
 INFO_FILES=    sml-mode.info
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp/sml-mode
+       ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/sml-mode
        cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc README NEWS TODO \
-               ChangeLog ${PREFIX}/share/emacs/site-lisp/sml-mode
+               ChangeLog ${EMACS_LISPPREFIX}/sml-mode
        ${INSTALL_DATA} ${WRKSRC}/sml-mode.info ${PREFIX}/info
 
+.include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3815eba58984 -r 0e198cc5a383 devel/sml-mode/PLIST
--- a/devel/sml-mode/PLIST      Sat May 08 15:09:31 2004 +0000
+++ b/devel/sml-mode/PLIST      Sat May 08 15:10:58 2004 +0000
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/16 18:20:56 seb Exp $
-share/emacs/site-lisp/sml-mode/sml-compat.el
-share/emacs/site-lisp/sml-mode/sml-defs.el
-share/emacs/site-lisp/sml-mode/sml-mode-startup.el
-share/emacs/site-lisp/sml-mode/sml-mode.el
-share/emacs/site-lisp/sml-mode/sml-move.el
-share/emacs/site-lisp/sml-mode/sml-proc.el
-share/emacs/site-lisp/sml-mode/sml-util.el
-share/emacs/site-lisp/sml-mode/sml-compat.elc
-share/emacs/site-lisp/sml-mode/sml-defs.elc
-share/emacs/site-lisp/sml-mode/sml-mode.elc
-share/emacs/site-lisp/sml-mode/sml-move.elc
-share/emacs/site-lisp/sml-mode/sml-proc.elc
-share/emacs/site-lisp/sml-mode/sml-util.elc
-share/emacs/site-lisp/sml-mode/README
-share/emacs/site-lisp/sml-mode/NEWS
-share/emacs/site-lisp/sml-mode/TODO
-share/emacs/site-lisp/sml-mode/ChangeLog
-@dirrm share/emacs/site-lisp/sml-mode
+@comment $NetBSD: PLIST,v 1.5 2004/05/08 15:10:58 uebayasi Exp $
+${EMACS_LISPPREFIX}/sml-mode/sml-compat.el
+${EMACS_LISPPREFIX}/sml-mode/sml-defs.el
+${EMACS_LISPPREFIX}/sml-mode/sml-mode-startup.el
+${EMACS_LISPPREFIX}/sml-mode/sml-mode.el
+${EMACS_LISPPREFIX}/sml-mode/sml-move.el
+${EMACS_LISPPREFIX}/sml-mode/sml-proc.el
+${EMACS_LISPPREFIX}/sml-mode/sml-util.el
+${EMACS_LISPPREFIX}/sml-mode/sml-compat.elc
+${EMACS_LISPPREFIX}/sml-mode/sml-defs.elc
+${EMACS_LISPPREFIX}/sml-mode/sml-mode.elc
+${EMACS_LISPPREFIX}/sml-mode/sml-move.elc
+${EMACS_LISPPREFIX}/sml-mode/sml-proc.elc
+${EMACS_LISPPREFIX}/sml-mode/sml-util.elc
+${EMACS_LISPPREFIX}/sml-mode/README
+${EMACS_LISPPREFIX}/sml-mode/NEWS
+${EMACS_LISPPREFIX}/sml-mode/TODO
+${EMACS_LISPPREFIX}/sml-mode/ChangeLog
+@dirrm ${EMACS_LISPPREFIX}/sml-mode
diff -r 3815eba58984 -r 0e198cc5a383 mail/etach/Makefile
--- a/mail/etach/Makefile       Sat May 08 15:09:31 2004 +0000
+++ b/mail/etach/Makefile       Sat May 08 15:10:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:45:56 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/08 15:11:28 uebayasi Exp $
 
 DISTNAME=              etach-1.2.9
 CATEGORIES=            mail
@@ -11,23 +11,12 @@
 NO_CONFIGURE=          # defined
 NO_BUILD=              # defined
 
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_XEMACS)
-DEPENDS+=              xemacs-[0-9]*:../../editors/xemacs
-LISPDIR=               lib/xemacs/xemacs-packages/lisp/mail-lib
-.else
-DEPENDS+=              emacs-[0-9]*:../../editors/emacs
-LISPDIR=               share/emacs/site-lisp
-.endif
-
-PLIST_SUBST+=          LISPDIR=${LISPDIR}
-
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/${LISPDIR}
-       ${INSTALL_DATA} ${WRKSRC}/etach.el ${PREFIX}/${LISPDIR}
+       ${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/etach
+       ${INSTALL_DATA} ${WRKSRC}/etach.el ${EMACS_LISPPREFIX}/etach
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/etach
        cd ${WRKSRC} && ${INSTALL_DATA} README.txt FAQ.txt LICENSE.txt  \
                ${PREFIX}/share/doc/etach/
 
+.include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3815eba58984 -r 0e198cc5a383 mail/etach/PLIST
--- a/mail/etach/PLIST  Sat May 08 15:09:31 2004 +0000
+++ b/mail/etach/PLIST  Sat May 08 15:10:58 2004 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/08 15:11:28 uebayasi Exp $
 
-${LISPDIR}/etach.el
+${EMACS_LISPPREFIX}/etach/etach.el
 share/doc/etach/FAQ.txt
 share/doc/etach/LICENSE.txt
 share/doc/etach/README.txt



Home | Main Index | Thread Index | Old Index