pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors Update editors/emacs and editors/emacs-nox11 t...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7851ebd341a2
branches: trunk
changeset: 396919:7851ebd341a2
user: minskim <minskim%pkgsrc.org@localhost>
date: Wed Aug 05 22:04:50 2009 +0000
description:
Update editors/emacs and editors/emacs-nox11 to 23.1.
Major changes:
- Improved Unicode support.
- Font rendering with Fontconfig and Xft.
- Support for using X displays and text terminals in one session, and
for running as a daemon.
- Support for multi-file commits in distributed version-control
systems (VC-dir).
- The default X toolkit is now Gtk+, rather than Lucid.
diffstat:
editors/emacs-nox11/Makefile | 16 +-
editors/emacs-nox11/version.mk | 10 +-
editors/emacs/DESCR | 29 +-
editors/emacs/Makefile | 67 +-
editors/emacs/Makefile.common | 59 +
editors/emacs/PLIST | 5845 +++++++++++++++++++++-----------------
editors/emacs/PLIST.carbon | 6 -
editors/emacs/PLIST.cocoa | 8 +
editors/emacs/PLIST.gnustep | 6 +
editors/emacs/buildlink3.mk | 3 +-
editors/emacs/distinfo | 28 +-
editors/emacs/files/dragonfly.h | 12 +-
editors/emacs/hacks.mk | 16 -
editors/emacs/options.mk | 146 +-
editors/emacs/patches/patch-aa | 34 -
editors/emacs/patches/patch-ad | 9 -
editors/emacs/patches/patch-aj | 12 -
editors/emacs/patches/patch-ak | 23 -
editors/emacs/patches/patch-am | 13 -
editors/emacs/patches/patch-an | 14 -
editors/emacs/patches/patch-ao | 15 -
editors/emacs/patches/patch-ap | 16 -
editors/emacs/patches/patch-aq | 17 -
editors/emacs/patches/patch-ar | 14 -
editors/emacs/patches/patch-as | 15 -
editors/emacs/patches/patch-at | 14 -
editors/emacs/patches/patch-au | 15 -
editors/emacs/patches/patch-av | 14 -
editors/emacs/patches/patch-aw | 13 -
editors/emacs/patches/patch-xx | 21 -
editors/emacs/version.mk | 10 +-
31 files changed, 3400 insertions(+), 3120 deletions(-)
diffs (truncated from 6770 to 300 lines):
diff -r 1963addafc8f -r 7851ebd341a2 editors/emacs-nox11/Makefile
--- a/editors/emacs-nox11/Makefile Wed Aug 05 20:58:56 2009 +0000
+++ b/editors/emacs-nox11/Makefile Wed Aug 05 22:04:50 2009 +0000
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.28 2008/04/25 16:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2009/08/05 22:04:51 minskim Exp $
PKGNAME= ${DISTNAME:S/-/-nox11-/}
+CONFLICTS+= emacs-[0-9]*
+
FILESDIR= ${.CURDIR}/../../editors/emacs/files
PATCHDIR= ${.CURDIR}/../../editors/emacs/patches
PKGDIR= ${.CURDIR}/../../editors/emacs
-# Mirror PKG_DESTDIR_SUPPORT setting from emacs/Makefile.
-PKG_DESTDIR_SUPPORT= user-destdir
+.include "../../editors/emacs/Makefile.common"
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --without-dbus --without-m17n-flt --without-otf \
+ --without-rsvg --without-x --without-xft \
+ --without-gif --without-jpeg --without-png \
+ --without-tiff --without-xpm
-PKG_OPTIONS.emacs+= -x11 -gtk -motif -xaw
-
-.include "../../editors/emacs/Makefile"
+.include "../../mk/bsd.pkg.mk"
diff -r 1963addafc8f -r 7851ebd341a2 editors/emacs-nox11/version.mk
--- a/editors/emacs-nox11/version.mk Wed Aug 05 20:58:56 2009 +0000
+++ b/editors/emacs-nox11/version.mk Wed Aug 05 22:04:50 2009 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: version.mk,v 1.2 2008/10/11 09:56:38 uebayasi Exp $
+# $NetBSD: version.mk,v 1.3 2009/08/05 22:04:51 minskim Exp $
_EMACS_FLAVOR= emacs
-_EMACS_REQD= emacs-nox11>=22<23
-_EMACS_PKGDEP.base=
-_EMACS_PKGDEP.leim=
+_EMACS_REQD= emacs-nox11>=23
-_EMACS_VERSION_MAJOR= 22
-_EMACS_VERSION_MINOR= 3
+_EMACS_VERSION_MAJOR= 23
+_EMACS_VERSION_MINOR= 1
diff -r 1963addafc8f -r 7851ebd341a2 editors/emacs/DESCR
--- a/editors/emacs/DESCR Wed Aug 05 20:58:56 2009 +0000
+++ b/editors/emacs/DESCR Wed Aug 05 22:04:50 2009 +0000
@@ -1,13 +1,18 @@
-GNU Emacs is a self-documenting, customizable, extensible real-time
-display editor.
+GNU Emacs is an extensible, customizable editor textand more. At its
+core is an interpreter for Emacs Lisp, a dialect of the Lisp
+programming language with extensions to support text editing. The
+features of GNU Emacs include:
-Users new to Emacs will be able to use basic features fairly rapidly
-by studying the tutorial and using the self-documentation features.
-Emacs also has an extensive interactive manual browser. It is easily
-extensible since its editing commands are written in Lisp.
-
-GNU Emacs's many special packages handle mail reading (RMail) and
-sending (Mail), outline editing (Outline), compiling (Compile),
-running subshells within Emacs windows (Shell), running a Lisp
-read-eval-print loop (Lisp-Interaction-Mode), automated psychotherapy
-(Doctor :-) and many more.
+- Content-sensitive editing modes, including syntax coloring, for a
+ wide variety of file types including plain text, source code, and
+ HTML.
+- Complete built-in documentation, including a tutorial for new users.
+- Support for many languages and their scripts, including all scripts,
+ Russian, Greek, Japanese, Chinese, Korean, Thai, Vietnamese, Lao,
+ Ethiopian, and some Indian scripts.
+- Highly customizable, using Emacs Lisp code or a graphical
+ customization interface.
+- A large number of extensions that add other functionality, including
+ a project planner, mail and news reader, debugger interface,
+ calendar, and more. Many of these extensions are distributed with
+ GNU Emacs; others are available separately.
diff -r 1963addafc8f -r 7851ebd341a2 editors/emacs/Makefile
--- a/editors/emacs/Makefile Wed Aug 05 20:58:56 2009 +0000
+++ b/editors/emacs/Makefile Wed Aug 05 22:04:50 2009 +0000
@@ -1,68 +1,11 @@
-# $NetBSD: Makefile,v 1.122 2009/08/02 10:44:48 jun Exp $
-
-PKGNAME?= ${DISTNAME}
-COMMENT?= GNU editing macros (editor)
-
-DISTNAME= emacs-22.3
-PKGREVISION= 3
-CATEGORIES= editors
-MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
+# $NetBSD: Makefile,v 1.123 2009/08/05 22:04:50 minskim Exp $
-MAINTAINER= markd%NetBSD.org@localhost
-HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
-LICENSE= gnu-gpl-v3
+CONFLICTS+= emacs-nox11-[0-9]*
-CONFLICTS+= elisp-manual-[0-9]*
-CONFLICTS+= emacs-[0-9]*
-CONFLICTS+= emacs-nox11-[0-9]*
-CONFLICTS+= mule-[0-9]*
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_TOOLS+= gmake gzip mktemp:run perl:run pkg-config
-GNU_CONFIGURE= yes
-INFO_FILES= # PLIST
+.include "../../editors/emacs/Makefile.common"
.include "options.mk"
-MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp
-
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
-CONFIGURE_ENV+= GAMEOWN=${GAMEOWN:Q}
-
-BUILD_DEFS+= VARBASE
-BUILD_DEFS+= GAMEDATAMODE
-
-# build PATH in the dumped emacs is not a problem
-CHECK_WRKREF_SKIP+= bin/emacs
-CHECK_WRKREF_SKIP+= bin/emacs-[0-9]*
-
-REPLACE_PERL= lib-src/grep-changelog
-
-SUBST_CLASSES+= test_equal
-SUBST_STAGE.test_equal= pre-configure
-SUBST_MESSAGE.test_equal= Fixing bashisms in test(1) usage.
-SUBST_FILES.test_equal= mac/make-package
-SUBST_SED.test_equal= -e 's/ == / = /g'
-
-MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs \
- ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
-CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \
- ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \
- ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEMODE:Q}
-
-.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
-CPPFLAGS+= -DDFLY_CRT_USRLIB
-.endif
-
-post-extract:
- cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
- cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
- ${CHMOD} -R go-w ${WRKSRC}
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
-
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1963addafc8f -r 7851ebd341a2 editors/emacs/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/emacs/Makefile.common Wed Aug 05 22:04:50 2009 +0000
@@ -0,0 +1,59 @@
+# $NetBSD: Makefile.common,v 1.22 2009/08/05 22:04:50 minskim Exp $
+
+DISTNAME= emacs-${EMACS_VERSION}
+CATEGORIES= editors
+MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
+
+MAINTAINER= markd%NetBSD.org@localhost
+HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
+COMMENT= GNU editing macros (editor)
+LICENSE= gnu-gpl-v3
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
+CONFLICTS+= emacs-nox11-[0-9]*
+
+GNU_CONFIGURE= yes
+INFO_FILES= yes
+USE_TOOLS+= gmake makeinfo gzip
+
+CONFIGURE_ARGS+= --srcdir=${WRKSRC}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+CONFIGURE_ENV+= GAMEOWN=${GAMEOWN}
+
+BUILD_DEFS+= VARBASE
+BUILD_DEFS+= GAMEDATAMODE
+PLIST_SRC+= ../../editors/emacs/PLIST
+
+.include "../../editors/emacs/version.mk"
+
+BUILD_TARGET= bootstrap
+EMACS_VERSION= ${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}
+PLIST_SUBST+= EMACS_VERSION=${EMACS_VERSION}
+
+REPLACE_PERL= lib-src/grep-changelog
+CHECK_INTERPRETER_SKIP= bin/grep-changelog
+
+MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs ${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores \
+ ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores \
+ ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
+
+# build PATH in the dumped emacs is not a problem
+CHECK_WRKREF_SKIP+= bin/emacs
+CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
+CPPFLAGS+= -DDFLY_CRT_USRLIB
+.endif
+
+.include "../../mk/termcap.buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+post-extract:
+ cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp
+ cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
+ ${CHMOD} -R go-w ${WRKSRC}
diff -r 1963addafc8f -r 7851ebd341a2 editors/emacs/PLIST
--- a/editors/emacs/PLIST Wed Aug 05 20:58:56 2009 +0000
+++ b/editors/emacs/PLIST Wed Aug 05 22:04:50 2009 +0000
@@ -1,75 +1,48 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:53:00 joerg Exp $
-bin/emacs-b2m
-bin/emacs-ctags
-bin/emacs-ebrowse
+@comment $NetBSD: PLIST,v 1.23 2009/08/05 22:04:50 minskim Exp $
+bin/b2m
+bin/ctags
+bin/ebrowse
bin/emacs
-bin/emacs-${PKGVERSION}
+bin/emacs-${EMACS_VERSION}
bin/emacsclient
-bin/emacs-etags
-bin/emacs-grep-changelog
-bin/emacs-rcs-checkin
+bin/etags
+bin/grep-changelog
+bin/rcs-checkin
info/ada-mode
+info/auth
info/autotype
info/calc
-info/calc-1
-info/calc-2
-info/calc-3
-info/calc-4
-info/calc-5
-info/calc-6
info/ccmode
info/cl
+info/dbus
info/dired-x
info/ebrowse
info/ediff
info/efaq
info/eintr
-info/eintr-1
-info/eintr-2
-info/eintr-3
info/elisp
-info/elisp-1
-info/elisp-10
-info/elisp-11
-info/elisp-2
-info/elisp-3
-info/elisp-4
-info/elisp-5
-info/elisp-6
-info/elisp-7
-info/elisp-8
-info/elisp-9
info/emacs
-info/emacs-1
-info/emacs-2
-info/emacs-3
-info/emacs-4
-info/emacs-5
-info/emacs-6
-info/emacs-7
info/emacs-mime
+info/epa
info/erc
info/eshell
info/eudc
info/flymake
info/forms
info/gnus
-info/gnus-1
-info/gnus-2
-info/gnus-3
-info/gnus-4
-info/gnus-5
info/idlwave
+info/mairix-el
info/message
info/mh-e
Home |
Main Index |
Thread Index |
Old Index