pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors Share a Makefile.common between emacs and emac...
details: https://anonhg.NetBSD.org/pkgsrc/rev/556617fcab3d
branches: trunk
changeset: 495396:556617fcab3d
user: markd <markd%pkgsrc.org@localhost>
date: Wed Jun 08 14:39:40 2005 +0000
description:
Share a Makefile.common between emacs and emacs-nox11.
Should fix PR pkg/30462.
Also convert emacs to options framework.
diffstat:
editors/emacs-nox11/Makefile | 40 +-
editors/emacs-nox11/PLIST | 1770 -----------------------------------------
editors/emacs/Makefile | 72 +-
editors/emacs/Makefile.common | 69 +
4 files changed, 84 insertions(+), 1867 deletions(-)
diffs (truncated from 1994 to 300 lines):
diff -r 13bf47a6f094 -r 556617fcab3d editors/emacs-nox11/Makefile
--- a/editors/emacs-nox11/Makefile Wed Jun 08 14:02:18 2005 +0000
+++ b/editors/emacs-nox11/Makefile Wed Jun 08 14:39:40 2005 +0000
@@ -1,43 +1,15 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:56 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/08 14:39:40 markd Exp $
-DISTNAME= emacs-21.4a
-PKGNAME= emacs-nox11-21.4a
+DISTNAME= emacs-${EMACSVERSION}a
+PKGNAME= emacs-nox11-${EMACSVERSION}a
PKGREVISION= 1
CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
-
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
-COMMENT= GNU editing macros (editor)
-
-CONFLICTS= mule-[0-9]*
-CONFLICTS+= emacs-[0-9]*
+COMMENT= GNU editing macros (editor) - non X11 version
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+.include "../../editors/emacs/Makefile.common"
-PATCHDIR= ${.CURDIR}/../emacs/patches
-FILESDIR= ${.CURDIR}/../emacs/files
-DISTINFO_FILE= ${.CURDIR}/../emacs/distinfo
-
-# needed for 21.4a, can probably go away on next update
-WRKSRC= ${WRKDIR}/emacs-21.4
-PLIST_SUBST+= EMACSVERSION=21.4
+CONFLICTS+= emacs-[0-9]*
CONFIGURE_ARGS+=--without-x
-INFO_FILES= ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs
-INFO_FILES+= emacs-mime eshell eudc forms gnus idlwave message mh-e pcl-cvs
-INFO_FILES+= reftex sc speedbar vip viper widget woman
-
-post-extract:
- ${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
- ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
-
-pre-install:
- @${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
-
-post-install:
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs
-
.include "../../mk/bsd.pkg.mk"
diff -r 13bf47a6f094 -r 556617fcab3d editors/emacs-nox11/PLIST
--- a/editors/emacs-nox11/PLIST Wed Jun 08 14:02:18 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1770 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/03/22 15:39:55 wiz Exp $
-bin/emacs
-bin/emacs-${EMACSVERSION}
-bin/emacs-b2m
-bin/emacs-ctags
-bin/emacs-ebrowse
-bin/emacs-etags
-bin/emacs-grep-changelog
-bin/emacs-rcs-checkin
-bin/emacsclient
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fakemail
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/hexl
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/movemail
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/profile
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/rcs2log
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/sorted-doc
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/vcdiff
-libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/yow
-man/man1/emacs-ctags.1
-man/man1/emacs-etags.1
-man/man1/emacs-gfdl.1
-man/man1/emacs.1
-share/emacs/${EMACSVERSION}/etc/BABYL
-share/emacs/${EMACSVERSION}/etc/CENSORSHIP
-share/emacs/${EMACSVERSION}/etc/COOKIES
-share/emacs/${EMACSVERSION}/etc/COPYING
-share/emacs/${EMACSVERSION}/etc/DEBUG
-share/emacs/${EMACSVERSION}/etc/DISTRIB
-share/emacs/${EMACSVERSION}/etc/DOC-${EMACSVERSION}.1
-share/emacs/${EMACSVERSION}/etc/FTP
-share/emacs/${EMACSVERSION}/etc/GNU
-share/emacs/${EMACSVERSION}/etc/HELLO
-share/emacs/${EMACSVERSION}/etc/INTERVIEW
-share/emacs/${EMACSVERSION}/etc/JOKES
-share/emacs/${EMACSVERSION}/etc/LEDIT
-share/emacs/${EMACSVERSION}/etc/LINUX-GNU
-share/emacs/${EMACSVERSION}/etc/LPF
-share/emacs/${EMACSVERSION}/etc/MACHINES
-share/emacs/${EMACSVERSION}/etc/MAILINGLISTS
-share/emacs/${EMACSVERSION}/etc/MH-E-NEWS
-share/emacs/${EMACSVERSION}/etc/MH-E-ONEWS
-share/emacs/${EMACSVERSION}/etc/MORE.STUFF
-share/emacs/${EMACSVERSION}/etc/MOTIVATION
-share/emacs/${EMACSVERSION}/etc/NEWS
-share/emacs/${EMACSVERSION}/etc/ONEWS
-share/emacs/${EMACSVERSION}/etc/ONEWS.1
-share/emacs/${EMACSVERSION}/etc/ONEWS.2
-share/emacs/${EMACSVERSION}/etc/ONEWS.3
-share/emacs/${EMACSVERSION}/etc/ONEWS.4
-share/emacs/${EMACSVERSION}/etc/ORDERS
-share/emacs/${EMACSVERSION}/etc/ORDERS.EUROPE
-share/emacs/${EMACSVERSION}/etc/ORDERS.JAPAN
-share/emacs/${EMACSVERSION}/etc/OTHER.EMACSES
-share/emacs/${EMACSVERSION}/etc/PROBLEMS
-share/emacs/${EMACSVERSION}/etc/README
-share/emacs/${EMACSVERSION}/etc/SERVICE
-share/emacs/${EMACSVERSION}/etc/TERMS
-share/emacs/${EMACSVERSION}/etc/THE-GNU-PROJECT
-share/emacs/${EMACSVERSION}/etc/TODO
-share/emacs/${EMACSVERSION}/etc/TUTORIAL
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.cs
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.de
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.es
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.fr
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.it
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.ja
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.ko
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.nl
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.pl
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.ro
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.sk
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.sl
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.sv
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.th
-share/emacs/${EMACSVERSION}/etc/TUTORIAL.translators
-share/emacs/${EMACSVERSION}/etc/WHY-FREE
-share/emacs/${EMACSVERSION}/etc/Xkeymap.txt
-share/emacs/${EMACSVERSION}/etc/celibacy.1
-share/emacs/${EMACSVERSION}/etc/condom.1
-share/emacs/${EMACSVERSION}/etc/copying.paper
-share/emacs/${EMACSVERSION}/etc/cs-dired-ref.ps
-share/emacs/${EMACSVERSION}/etc/cs-dired-ref.tex
-share/emacs/${EMACSVERSION}/etc/cs-refcard.ps
-share/emacs/${EMACSVERSION}/etc/cs-refcard.tex
-share/emacs/${EMACSVERSION}/etc/cs-survival.tex
-share/emacs/${EMACSVERSION}/etc/ctags.1
-share/emacs/${EMACSVERSION}/etc/de-refcard.ps
-share/emacs/${EMACSVERSION}/etc/de-refcard.tex
-share/emacs/${EMACSVERSION}/etc/dired-ref.ps
-share/emacs/${EMACSVERSION}/etc/dired-ref.tex
-share/emacs/${EMACSVERSION}/etc/e/eterm
-share/emacs/${EMACSVERSION}/etc/e/eterm.ti
-share/emacs/${EMACSVERSION}/etc/echo.msg
-share/emacs/${EMACSVERSION}/etc/edt-user.doc
-share/emacs/${EMACSVERSION}/etc/emacs.1
-share/emacs/${EMACSVERSION}/etc/emacs.bash
-share/emacs/${EMACSVERSION}/etc/emacs.csh
-share/emacs/${EMACSVERSION}/etc/emacs.icon
-share/emacs/${EMACSVERSION}/etc/emacs.xbm
-share/emacs/${EMACSVERSION}/etc/emacsclient.1
-share/emacs/${EMACSVERSION}/etc/emacstool.1
-share/emacs/${EMACSVERSION}/etc/enriched.doc
-share/emacs/${EMACSVERSION}/etc/etags.1
-share/emacs/${EMACSVERSION}/etc/fr-drdref.ps
-share/emacs/${EMACSVERSION}/etc/fr-drdref.tex
-share/emacs/${EMACSVERSION}/etc/fr-refcard.ps
-share/emacs/${EMACSVERSION}/etc/fr-refcard.tex
-share/emacs/${EMACSVERSION}/etc/future-bug
-share/emacs/${EMACSVERSION}/etc/gfdl.1
-share/emacs/${EMACSVERSION}/etc/gnu.xpm
-share/emacs/${EMACSVERSION}/etc/gnus-pointer.xbm
-share/emacs/${EMACSVERSION}/etc/gnus-pointer.xpm
-share/emacs/${EMACSVERSION}/etc/gnus-tut.txt
-share/emacs/${EMACSVERSION}/etc/gnus.pbm
-share/emacs/${EMACSVERSION}/etc/gnus.xpm
-share/emacs/${EMACSVERSION}/etc/ledit.l
-share/emacs/${EMACSVERSION}/etc/letter.xbm
-share/emacs/${EMACSVERSION}/etc/ms-7bkermit
-share/emacs/${EMACSVERSION}/etc/ms-kermit
-share/emacs/${EMACSVERSION}/etc/pl-refcard.ps
-share/emacs/${EMACSVERSION}/etc/pl-refcard.tex
-share/emacs/${EMACSVERSION}/etc/ps-prin0.ps
-share/emacs/${EMACSVERSION}/etc/ps-prin1.ps
-share/emacs/${EMACSVERSION}/etc/refcard.ps
-share/emacs/${EMACSVERSION}/etc/refcard.tex
-share/emacs/${EMACSVERSION}/etc/rgb.txt
-share/emacs/${EMACSVERSION}/etc/sex.6
-share/emacs/${EMACSVERSION}/etc/sk-dired-ref.ps
-share/emacs/${EMACSVERSION}/etc/sk-dired-ref.tex
-share/emacs/${EMACSVERSION}/etc/sk-refcard.ps
-share/emacs/${EMACSVERSION}/etc/sk-refcard.tex
-share/emacs/${EMACSVERSION}/etc/sk-survival.tex
-share/emacs/${EMACSVERSION}/etc/splash.pbm
-share/emacs/${EMACSVERSION}/etc/splash.xpm
-share/emacs/${EMACSVERSION}/etc/splash8.xpm
-share/emacs/${EMACSVERSION}/etc/spook.lines
-share/emacs/${EMACSVERSION}/etc/survival.tex
-share/emacs/${EMACSVERSION}/etc/tasks.texi
-share/emacs/${EMACSVERSION}/etc/termcap.src
-share/emacs/${EMACSVERSION}/etc/ulimit.hack
-share/emacs/${EMACSVERSION}/etc/vipcard.tex
-share/emacs/${EMACSVERSION}/etc/viperCard.tex
-share/emacs/${EMACSVERSION}/etc/yow.lines
-share/emacs/${EMACSVERSION}/lisp/COPYING
-share/emacs/${EMACSVERSION}/lisp/README
-share/emacs/${EMACSVERSION}/lisp/abbrev.el
-share/emacs/${EMACSVERSION}/lisp/abbrev.elc
-share/emacs/${EMACSVERSION}/lisp/abbrevlist.el
-share/emacs/${EMACSVERSION}/lisp/abbrevlist.elc
-share/emacs/${EMACSVERSION}/lisp/add-log.el
-share/emacs/${EMACSVERSION}/lisp/add-log.elc
-share/emacs/${EMACSVERSION}/lisp/align.el
-share/emacs/${EMACSVERSION}/lisp/align.elc
-share/emacs/${EMACSVERSION}/lisp/allout.el
-share/emacs/${EMACSVERSION}/lisp/allout.elc
-share/emacs/${EMACSVERSION}/lisp/ansi-color.el
-share/emacs/${EMACSVERSION}/lisp/ansi-color.elc
-share/emacs/${EMACSVERSION}/lisp/apropos.el
-share/emacs/${EMACSVERSION}/lisp/apropos.elc
-share/emacs/${EMACSVERSION}/lisp/arc-mode.el
-share/emacs/${EMACSVERSION}/lisp/arc-mode.elc
-share/emacs/${EMACSVERSION}/lisp/array.el
-share/emacs/${EMACSVERSION}/lisp/array.elc
-share/emacs/${EMACSVERSION}/lisp/autoarg.el
-share/emacs/${EMACSVERSION}/lisp/autoarg.elc
-share/emacs/${EMACSVERSION}/lisp/autoinsert.el
-share/emacs/${EMACSVERSION}/lisp/autoinsert.elc
-share/emacs/${EMACSVERSION}/lisp/autorevert.el
-share/emacs/${EMACSVERSION}/lisp/autorevert.elc
-share/emacs/${EMACSVERSION}/lisp/avoid.el
-share/emacs/${EMACSVERSION}/lisp/avoid.elc
-share/emacs/${EMACSVERSION}/lisp/battery.el
-share/emacs/${EMACSVERSION}/lisp/battery.elc
-share/emacs/${EMACSVERSION}/lisp/bindings.el
-share/emacs/${EMACSVERSION}/lisp/bindings.elc
-share/emacs/${EMACSVERSION}/lisp/bookmark.el
-share/emacs/${EMACSVERSION}/lisp/bookmark.elc
-share/emacs/${EMACSVERSION}/lisp/bs.el
-share/emacs/${EMACSVERSION}/lisp/bs.elc
-share/emacs/${EMACSVERSION}/lisp/buff-menu.el
-share/emacs/${EMACSVERSION}/lisp/buff-menu.elc
-share/emacs/${EMACSVERSION}/lisp/byte-run.el
-share/emacs/${EMACSVERSION}/lisp/byte-run.elc
-share/emacs/${EMACSVERSION}/lisp/calculator.el
-share/emacs/${EMACSVERSION}/lisp/calculator.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/appt.el
-share/emacs/${EMACSVERSION}/lisp/calendar/appt.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-china.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-china.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-coptic.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-coptic.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-dst.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-dst.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-french.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-french.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-hebrew.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-hebrew.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-islam.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-islam.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-iso.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-iso.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-julian.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-julian.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-mayan.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-mayan.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-menu.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-menu.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-move.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-move.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-persia.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-persia.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-tex.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-tex.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-x.el
-share/emacs/${EMACSVERSION}/lisp/calendar/cal-x.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/calendar.el
-share/emacs/${EMACSVERSION}/lisp/calendar/calendar.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/diary-lib.el
-share/emacs/${EMACSVERSION}/lisp/calendar/diary-lib.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/holidays.el
-share/emacs/${EMACSVERSION}/lisp/calendar/holidays.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/lunar.el
-share/emacs/${EMACSVERSION}/lisp/calendar/lunar.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/solar.el
-share/emacs/${EMACSVERSION}/lisp/calendar/solar.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/timeclock.el
-share/emacs/${EMACSVERSION}/lisp/calendar/timeclock.elc
-share/emacs/${EMACSVERSION}/lisp/calendar/todo-mode.el
-share/emacs/${EMACSVERSION}/lisp/calendar/todo-mode.elc
-share/emacs/${EMACSVERSION}/lisp/case-table.el
-share/emacs/${EMACSVERSION}/lisp/case-table.elc
-share/emacs/${EMACSVERSION}/lisp/cdl.el
-share/emacs/${EMACSVERSION}/lisp/cdl.elc
-share/emacs/${EMACSVERSION}/lisp/chistory.el
-share/emacs/${EMACSVERSION}/lisp/chistory.elc
-share/emacs/${EMACSVERSION}/lisp/cmuscheme.el
-share/emacs/${EMACSVERSION}/lisp/cmuscheme.elc
-share/emacs/${EMACSVERSION}/lisp/comint.el
-share/emacs/${EMACSVERSION}/lisp/comint.elc
Home |
Main Index |
Thread Index |
Old Index