summaryrefslogtreecommitdiff
path: root/editors/emacs22
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2011-09-24 00:54:52 +0000
committerryoon <ryoon@pkgsrc.org>2011-09-24 00:54:52 +0000
commitc2bfb59b147e65599148735779c227585208e2b1 (patch)
tree39e1ee464821d084c24aee5180adbd2c4598a75f /editors/emacs22
parent2e64cedbe1153bd49e7834eaca7c1bfb2ea64038 (diff)
downloadpkgsrc-c2bfb59b147e65599148735779c227585208e2b1.tar.gz
* Fix build on Linux (conflict with glibc).
* patch-ag does not exist, regen distinfo. Tested on Gentoo Linux, DragonFly 2.10.1, and NetBSD current.
Diffstat (limited to 'editors/emacs22')
-rw-r--r--editors/emacs22/Makefile4
-rw-r--r--editors/emacs22/distinfo3
2 files changed, 3 insertions, 4 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index a84c307bb62..981baa15aa6 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/07/21 01:35:44 tron Exp $
+# $NetBSD: Makefile,v 1.18 2011/09/24 00:54:52 ryoon Exp $
PKGNAME?= ${DISTNAME}
COMMENT?= GNU editing macros (editor)
@@ -65,7 +65,7 @@ CPPFLAGS+= -DDFLY_CRT_USRLIB
# of newer GCC version is designed to break this by purpose. We work around
# that using the traditional mode to generate makefiles.
.if !empty(CC_VERSION:Mgcc-[4-9].*)
-CPP+= -traditional
+CPP+= -P
CONFIGURE_ENV+= CPP=${CPP:Q}
.endif
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo
index b835796332a..a0172ac9548 100644
--- a/editors/emacs22/distinfo
+++ b/editors/emacs22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2011/07/21 01:17:42 tron Exp $
+$NetBSD: distinfo,v 1.11 2011/09/24 00:54:52 ryoon Exp $
SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
@@ -9,7 +9,6 @@ SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
SHA1 (patch-af) = 9a30adf280d660c58e841ddb25dfcf1613a5f9fe
-SHA1 (patch-ag) = 4c8ca4878f4688900222cd273d9beb1fe25e1d14
SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831