summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorminskim <minskim>2011-04-17 03:52:18 +0000
committerminskim <minskim>2011-04-17 03:52:18 +0000
commit7c394faca130c5f2631c9138f186ea2011c610e3 (patch)
tree0d05441ecff71eee6b125efdd1711097f473e501 /editors
parent968633f71ef571c19370083471640b4d8fd98ddf (diff)
downloadpkgsrc-7c394faca130c5f2631c9138f186ea2011c610e3.tar.gz
Update emacs-snapshot to 24.0.50.20110408.
Patches provided by Makoto Fujiwara in PR 44871. Changes: - Fix problems found by GCC 4.6.0's static checks. - man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported. - custom.el (load-theme): Minor optimization in assigning faces. - emacs-lisp/package.el (package--with-work-buffer): Recognize https URLs.
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs-snapshot/Makefile.common11
-rw-r--r--editors/emacs-snapshot/PLIST21
-rw-r--r--editors/emacs-snapshot/distinfo9
-rw-r--r--editors/emacs-snapshot/patches/patch-ab30
4 files changed, 25 insertions, 46 deletions
diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common
index 7ee4de5b06d..573ad83e896 100644
--- a/editors/emacs-snapshot/Makefile.common
+++ b/editors/emacs-snapshot/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.25 2011/03/21 00:07:45 minskim Exp $
+# $NetBSD: Makefile.common,v 1.26 2011/04/17 03:52:18 minskim Exp $
-DISTNAME= emacs-snapshot_20110316.orig
+DISTNAME= emacs-snapshot_20110408.orig
PKGNAME= ${DISTNAME:S/snapshot_/${EMACS_VERSION}./:S/.orig//}
CATEGORIES= editors
MASTER_SITES= http://emacs.naquadah.org/unstable/
@@ -19,7 +19,7 @@ CONFLICTS+= emacs-nox11-[0-9]*
GNU_CONFIGURE= yes
INFO_FILES= yes
-USE_TOOLS+= gmake makeinfo gzip
+USE_TOOLS+= automake autoconf gmake makeinfo gzip
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
CONFIGURE_ARGS+= --srcdir=${WRKSRC}
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --with-gameuser=${GAMEOWN}
BUILD_DEFS+= VARBASE
-BUILD_DEFS+= GAMEDATAMODE
+BUILD_DEFS+= GAMES_USER GAMES_GROUP GAMEDATAMODE
PLIST_SRC+= ../../editors/emacs-snapshot/PLIST
.include "../../editors/emacs-snapshot/version.mk"
@@ -72,3 +72,6 @@ post-extract:
cp ${.CURDIR}/../../editors/emacs/files/site-init.el ${WRKSRC}/lisp
cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
${CHMOD} -R go-w ${WRKSRC}
+
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
diff --git a/editors/emacs-snapshot/PLIST b/editors/emacs-snapshot/PLIST
index d46c44ff8af..5260cf2bf6c 100644
--- a/editors/emacs-snapshot/PLIST
+++ b/editors/emacs-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2011/03/10 01:28:48 minskim Exp $
+@comment $NetBSD: PLIST,v 1.20 2011/04/17 03:52:18 minskim Exp $
bin/ctags
bin/ebrowse
bin/emacs
@@ -926,6 +926,7 @@ share/emacs/${EMACS_VERSION}/etc/srecode/test.srt
share/emacs/${EMACS_VERSION}/etc/srecode/texi.srt
share/emacs/${EMACS_VERSION}/etc/srecode/wisent.srt
share/emacs/${EMACS_VERSION}/etc/themes/light-blue-theme.el
+share/emacs/${EMACS_VERSION}/etc/themes/misterioso-theme.el
share/emacs/${EMACS_VERSION}/etc/themes/tango-dark-theme.el
share/emacs/${EMACS_VERSION}/etc/themes/tango-theme.el
share/emacs/${EMACS_VERSION}/etc/themes/tsdh-dark-theme.el
@@ -1067,8 +1068,6 @@ share/emacs/${EMACS_VERSION}/lisp/COPYING
share/emacs/${EMACS_VERSION}/lisp/README
share/emacs/${EMACS_VERSION}/lisp/abbrev.el.gz
share/emacs/${EMACS_VERSION}/lisp/abbrev.elc
-share/emacs/${EMACS_VERSION}/lisp/abbrevlist.el.gz
-share/emacs/${EMACS_VERSION}/lisp/abbrevlist.elc
share/emacs/${EMACS_VERSION}/lisp/align.el.gz
share/emacs/${EMACS_VERSION}/lisp/align.elc
share/emacs/${EMACS_VERSION}/lisp/allout-widgets.el.gz
@@ -1649,6 +1648,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/byte-run.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/byte-run.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/bytecomp.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/bytecomp.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cconv.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/cconv.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/chart.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/chart.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/check-declare.el.gz
@@ -1687,8 +1688,6 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/edebug.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-base.elc
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-comp.el.gz
-share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-comp.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-custom.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/eieio-datadebug.el.gz
@@ -1757,6 +1756,8 @@ share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/smie.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/syntax.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/syntax.elc
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tabulated-list.el.gz
+share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tabulated-list.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tcover-ses.el.gz
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tcover-ses.elc
share/emacs/${EMACS_VERSION}/lisp/emacs-lisp/tcover-unsafep.el.gz
@@ -2128,6 +2129,8 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/gnus.el.gz
share/emacs/${EMACS_VERSION}/lisp/gnus/gnus.elc
share/emacs/${EMACS_VERSION}/lisp/gnus/gravatar.el.gz
share/emacs/${EMACS_VERSION}/lisp/gnus/gravatar.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/gssapi.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/gssapi.elc
share/emacs/${EMACS_VERSION}/lisp/gnus/html2text.el.gz
share/emacs/${EMACS_VERSION}/lisp/gnus/html2text.elc
share/emacs/${EMACS_VERSION}/lisp/gnus/ietf-drums.el.gz
@@ -2228,10 +2231,10 @@ share/emacs/${EMACS_VERSION}/lisp/gnus/nnweb.el.gz
share/emacs/${EMACS_VERSION}/lisp/gnus/nnweb.elc
share/emacs/${EMACS_VERSION}/lisp/gnus/pop3.el.gz
share/emacs/${EMACS_VERSION}/lisp/gnus/pop3.elc
-share/emacs/${EMACS_VERSION}/lisp/gnus/proto-stream.el.gz
-share/emacs/${EMACS_VERSION}/lisp/gnus/proto-stream.elc
share/emacs/${EMACS_VERSION}/lisp/gnus/qp.el.gz
share/emacs/${EMACS_VERSION}/lisp/gnus/qp.elc
+share/emacs/${EMACS_VERSION}/lisp/gnus/registry.el.gz
+share/emacs/${EMACS_VERSION}/lisp/gnus/registry.elc
share/emacs/${EMACS_VERSION}/lisp/gnus/rfc1843.el.gz
share/emacs/${EMACS_VERSION}/lisp/gnus/rfc1843.elc
share/emacs/${EMACS_VERSION}/lisp/gnus/rfc2045.el.gz
@@ -2697,6 +2700,8 @@ share/emacs/${EMACS_VERSION}/lisp/net/net-utils.el.gz
share/emacs/${EMACS_VERSION}/lisp/net/net-utils.elc
share/emacs/${EMACS_VERSION}/lisp/net/netrc.el.gz
share/emacs/${EMACS_VERSION}/lisp/net/netrc.elc
+share/emacs/${EMACS_VERSION}/lisp/net/network-stream.el.gz
+share/emacs/${EMACS_VERSION}/lisp/net/network-stream.elc
share/emacs/${EMACS_VERSION}/lisp/net/newst-backend.el.gz
share/emacs/${EMACS_VERSION}/lisp/net/newst-backend.elc
share/emacs/${EMACS_VERSION}/lisp/net/newst-plainview.el.gz
@@ -2824,6 +2829,8 @@ share/emacs/${EMACS_VERSION}/lisp/nxml/xmltok.el.gz
share/emacs/${EMACS_VERSION}/lisp/nxml/xmltok.elc
share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.el.gz
share/emacs/${EMACS_VERSION}/lisp/nxml/xsd-regexp.elc
+share/emacs/${EMACS_VERSION}/lisp/obsolete/abbrevlist.el.gz
+share/emacs/${EMACS_VERSION}/lisp/obsolete/abbrevlist.elc
share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.el.gz
share/emacs/${EMACS_VERSION}/lisp/obsolete/awk-mode.elc
share/emacs/${EMACS_VERSION}/lisp/obsolete/cl-compat.el.gz
diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo
index 76256da8c1a..3fabbb3b721 100644
--- a/editors/emacs-snapshot/distinfo
+++ b/editors/emacs-snapshot/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.30 2011/03/21 00:07:45 minskim Exp $
+$NetBSD: distinfo,v 1.31 2011/04/17 03:52:18 minskim Exp $
-SHA1 (emacs-snapshot_20110316.orig.tar.xz) = adfed1a39c8211c982c77212e52512122f465b51
-RMD160 (emacs-snapshot_20110316.orig.tar.xz) = f7057bcd7ceca704aa8b93763dd523e95b575f94
-Size (emacs-snapshot_20110316.orig.tar.xz) = 23060948 bytes
+SHA1 (emacs-snapshot_20110408.orig.tar.xz) = 2cfc069868ca62f672c8deb970c5d1aaf888fb2a
+RMD160 (emacs-snapshot_20110408.orig.tar.xz) = fcff524894c3da6896be00a85c4b8be0de9e8f0c
+Size (emacs-snapshot_20110408.orig.tar.xz) = 23120960 bytes
SHA1 (patch-aa) = 052ea84f7e3b35d1aba08bd641d7250ec07d09aa
-SHA1 (patch-ab) = 51614c9337f77e39dab410faf78b95d8b9b6e381
SHA1 (patch-ac) = cbc72f45d6648b3ab7f76af8d5a2156fd154b16a
SHA1 (patch-ad) = b8faf958f7ab3effd6c8dbcbf51fe70ddb2ecdae
SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095
diff --git a/editors/emacs-snapshot/patches/patch-ab b/editors/emacs-snapshot/patches/patch-ab
deleted file mode 100644
index 0c4cb8407f8..00000000000
--- a/editors/emacs-snapshot/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2011/03/01 04:12:45 minskim Exp $
-
---- configure.orig 2010-06-07 21:57:22.000000000 +0000
-+++ configure
-@@ -3158,6 +3158,14 @@ case "${canonical}" in
- sparc64-*) machine=sparc ;;
- esac
- ;;
-+ ## DragonFly ports
-+ *-*-dragonfly*)
-+ opsys=dragonfly
-+ case "${canonical}" in
-+ i[3456]86-*-dragonfly*) machine=intel386 ;;
-+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
-+ esac
-+ ;;
-
- ## FreeBSD kernel + glibc based userland
- *-*-kfreebsd*gnu* )
-@@ -7427,9 +7435,9 @@ if test "${HAVE_NS}" = yes; then
- window_system=nextstep
- with_xft=no
- # set up packaging dirs
-+ if test "${EN_NS_SELF_CONTAINED}" = yes; then
- exec_prefix=${ns_appbindir}
- libexecdir=${ns_appbindir}/libexec
-- if test "${EN_NS_SELF_CONTAINED}" = yes; then
- prefix=${ns_appresdir}
- fi
- ns_frag=$srcdir/src/ns.mk