summaryrefslogtreecommitdiff
path: root/editors/emacs-nox11
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2009-08-05 22:04:50 +0000
committerminskim <minskim@pkgsrc.org>2009-08-05 22:04:50 +0000
commit87861c8a8969013da387a6efce396b780791e479 (patch)
treea9fb5d7d981743a3a24473b9c3783ebbb53d429e /editors/emacs-nox11
parent1cddb051ccef3e55672391b20405baf5c7fdaf70 (diff)
downloadpkgsrc-87861c8a8969013da387a6efce396b780791e479.tar.gz
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 (limited to 'editors/emacs-nox11')
-rw-r--r--editors/emacs-nox11/Makefile16
-rw-r--r--editors/emacs-nox11/version.mk10
2 files changed, 13 insertions, 13 deletions
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 1bc5d346f8f..88fe8afa697 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -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 "../../mk/bsd.prefs.mk"
+.include "../../editors/emacs/Makefile.common"
-PKG_OPTIONS.emacs+= -x11 -gtk -motif -xaw
+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
-.include "../../editors/emacs/Makefile"
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs-nox11/version.mk b/editors/emacs-nox11/version.mk
index 593df6f4fd8..872d0e9b866 100644
--- a/editors/emacs-nox11/version.mk
+++ b/editors/emacs-nox11/version.mk
@@ -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