diff options
author | obache <obache> | 2009-10-07 10:56:40 +0000 |
---|---|---|
committer | obache <obache> | 2009-10-07 10:56:40 +0000 |
commit | 888f3fe8e8ae30770667d8a28457ff3c3994c50e (patch) | |
tree | 80f230ca36b0ee42e2ca20e8cad8c66f0a1ded8a /editors | |
parent | b3b942b598c09e92cc52df5a59c95b52a2b1807f (diff) | |
download | pkgsrc-888f3fe8e8ae30770667d8a28457ff3c3994c50e.tar.gz |
fit for NetBSD-mips variants, do not use pmax configuration.
prevent unrequisite warning messages on NetBSD-alpha (patch-ac) and NetBSD-mips
variants (patch-af). fixes PR 39027.
Bump PKGREVISION.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/emacs-nox11/Makefile | 3 | ||||
-rw-r--r-- | editors/emacs/Makefile | 4 | ||||
-rw-r--r-- | editors/emacs/distinfo | 7 | ||||
-rw-r--r-- | editors/emacs/patches/patch-aa | 17 | ||||
-rw-r--r-- | editors/emacs/patches/patch-ab | 25 | ||||
-rw-r--r-- | editors/emacs/patches/patch-ac | 13 | ||||
-rw-r--r-- | editors/emacs/patches/patch-af | 22 |
7 files changed, 80 insertions, 11 deletions
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile index 88fe8afa697..393cf5ecf00 100644 --- a/editors/emacs-nox11/Makefile +++ b/editors/emacs-nox11/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2009/08/05 22:04:51 minskim Exp $ +# $NetBSD: Makefile,v 1.30 2009/10/07 10:56:40 obache Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} +PKGREVISION= 1 CONFLICTS+= emacs-[0-9]* diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 9d693b2970f..a508b034b2f 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.124 2009/08/26 19:58:43 sno Exp $ +# $NetBSD: Makefile,v 1.125 2009/10/07 10:56:40 obache Exp $ -PKGREVISION= 1 +PKGREVISION= 2 CONFLICTS+= emacs-nox11-[0-9]* diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 8ebfe381260..ef256c45e0a 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.41 2009/08/06 04:46:04 minskim Exp $ +$NetBSD: distinfo,v 1.42 2009/10/07 10:56:40 obache Exp $ SHA1 (emacs-23.1.tar.gz) = e993445d14d2fdedd1418bc32c8c4ea30442bc51 RMD160 (emacs-23.1.tar.gz) = c557149f59916b82f0ae156f87406126b03671b4 Size (emacs-23.1.tar.gz) = 42904117 bytes -SHA1 (patch-ab) = 53fd489995efae908827d7a3de4811daf156fd0a +SHA1 (patch-aa) = 3e65b93fad3fb436ec573148e5681333d1c58e3a +SHA1 (patch-ab) = dcd6903d62b58b5c587001b26f0d300bcb54fe6d +SHA1 (patch-ac) = 9afbc10d2bd0f32cdfde8ae6a32236182dbac558 SHA1 (patch-ae) = 2b016d6b4bb796cf5bddc55f104139e01209adb6 +SHA1 (patch-af) = c888cd3863e533d38f437292d9f800bcd3159529 diff --git a/editors/emacs/patches/patch-aa b/editors/emacs/patches/patch-aa new file mode 100644 index 00000000000..febdb6f8e5d --- /dev/null +++ b/editors/emacs/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.16 2009/10/07 10:56:40 obache Exp $ + +--- configure.in.orig 2009-07-30 00:09:49.000000000 +0900 ++++ configure.in +@@ -329,9 +329,9 @@ dnl see the `changequote' comment above. + case "${canonical}" in + alpha*-*-netbsd*) machine=alpha ;; + i[3456]86-*-netbsd*) machine=intel386 ;; +- mips-*-netbsd*) machine=pmax ;; +- mipsel-*-netbsd*) machine=pmax ;; +- mipseb-*-netbsd*) machine=pmax ;; ++ mips-*-netbsd*) machine=mips ;; ++ mipsel-*-netbsd*) machine=mips ;; ++ mipseb-*-netbsd*) machine=mips ;; + powerpc-*-netbsd*) machine=macppc ;; + sparc*-*-netbsd*) machine=sparc ;; + vax-*-netbsd*) machine=vax ;; diff --git a/editors/emacs/patches/patch-ab b/editors/emacs/patches/patch-ab index 4513eb52b07..01398ecaded 100644 --- a/editors/emacs/patches/patch-ab +++ b/editors/emacs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.27 2009/08/06 04:46:04 minskim Exp $ +$NetBSD: patch-ab,v 1.28 2009/10/07 10:56:40 obache Exp $ ---- configure.orig 2009-06-04 20:29:50 +0300 -+++ configure 2009-06-07 21:41:16 +0300 -@@ -1979,7 +1979,7 @@ archlibdir='${libexecdir}/emacs/${versio +--- configure.orig 2009-07-30 00:12:00.000000000 +0900 ++++ configure +@@ -1856,7 +1856,7 @@ archlibdir='${libexecdir}/emacs/${versio docdir='${datadir}/emacs/${version}/etc' gamedir='${localstatedir}/games/emacs' @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.27 2009/08/06 04:46:04 minskim Exp $ -@@ -2529,6 +2529,15 @@ case "${canonical}" in +@@ -2406,6 +2406,15 @@ case "${canonical}" in esac ;; @@ -27,7 +27,20 @@ $NetBSD: patch-ab,v 1.27 2009/08/06 04:46:04 minskim Exp $ ## FreeBSD kernel + glibc based userland *-*-kfreebsd*gnu* ) opsys=gnu-kfreebsd -@@ -9605,9 +9614,9 @@ if test "${HAVE_NS}" = yes; then +@@ -2434,9 +2443,9 @@ _ACEOF + case "${canonical}" in + alpha*-*-netbsd*) machine=alpha ;; + i[3456]86-*-netbsd*) machine=intel386 ;; +- mips-*-netbsd*) machine=pmax ;; +- mipsel-*-netbsd*) machine=pmax ;; +- mipseb-*-netbsd*) machine=pmax ;; ++ mips-*-netbsd*) machine=mips ;; ++ mipsel-*-netbsd*) machine=mips ;; ++ mipseb-*-netbsd*) machine=mips ;; + powerpc-*-netbsd*) machine=macppc ;; + sparc*-*-netbsd*) machine=sparc ;; + vax-*-netbsd*) machine=vax ;; +@@ -9408,9 +9417,9 @@ if test "${HAVE_NS}" = yes; then window_system=nextstep with_xft=no # set up packaging dirs diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac new file mode 100644 index 00000000000..e920835781f --- /dev/null +++ b/editors/emacs/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.18 2009/10/07 10:56:40 obache Exp $ + +--- src/m/alpha.h.orig 2009-06-21 13:38:20.000000000 +0900 ++++ src/m/alpha.h +@@ -95,7 +95,7 @@ NOTE-END + + #undef UNEXEC + #define UNEXEC unexelf.o +-#ifndef GNU_LINUX ++#if !defined(GNU_LINUX) && !defined(__NetBSD__) + #define DATA_START 0x140000000 + #endif + diff --git a/editors/emacs/patches/patch-af b/editors/emacs/patches/patch-af new file mode 100644 index 00000000000..ca981d7ae9f --- /dev/null +++ b/editors/emacs/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.13 2009/10/07 10:56:40 obache Exp $ + +--- src/m/mips.h.orig 2009-06-21 13:38:20.000000000 +0900 ++++ src/m/mips.h +@@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <http + USUAL-OPSYS="note" + + NOTE-START +-This is only used on GNU/Linux. ++This is used on GNU/Linux and netbsd. + NOTE-END */ + + /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word +@@ -50,7 +50,7 @@ NOTE-END */ + + #define TEXT_START 0x00400000 + +-#ifndef GNU_LINUX ++#if !defined(GNU_LINUX) && !defined(__NetBSD__) + #define DATA_START 0x10000000 + #endif + |