Update to 3.0.1 -- big thanks to upstream for getting patches integrated!

This commit is contained in:
bcallah 2015-06-22 22:38:56 +00:00
parent 8808a2fb41
commit 300c1b601e
5 changed files with 9 additions and 34 deletions

View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2015/06/21 14:45:38 bcallah Exp $
# $OpenBSD: Makefile,v 1.5 2015/06/22 22:38:56 bcallah Exp $
COMMENT = nice console editor
DISTNAME = ne-3.0
REVISION = 0
DISTNAME = ne-3.0.1
CATEGORIES = editors
HOMEPAGE = http://ne.di.unimi.it/

View File

@ -1,2 +1,2 @@
SHA256 (ne-3.0.tar.gz) = qwNZ7P8xz9uROxMThKJP8YKNpDxzFXeYGsXuR8C/dxQ=
SIZE (ne-3.0.tar.gz) = 1186858
SHA256 (ne-3.0.1.tar.gz) = krZG3SumQFLmLeqkI5NzghBQoD4bfQnSA84E8q370OQ=
SIZE (ne-3.0.1.tar.gz) = 1193311

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_makefile,v 1.2 2015/06/20 01:39:24 bcallah Exp $
--- src/makefile.orig Fri Jun 19 20:43:32 2015
+++ src/makefile Fri Jun 19 20:45:49 2015
$OpenBSD: patch-src_makefile,v 1.3 2015/06/22 22:38:56 bcallah Exp $
--- src/makefile.orig Mon Jun 22 18:26:15 2015
+++ src/makefile Mon Jun 22 18:28:55 2015
@@ -81,25 +81,17 @@ NE_NOWCHAR=
NE_DEBUG=
NE_TEST=
@ -13,13 +13,13 @@ $OpenBSD: patch-src_makefile,v 1.2 2015/06/20 01:39:24 bcallah Exp $
-endif
CFLAGS=$(OPTS) $(GCCFLAGS) \
- -D_GNU_SOURCE -D__USE_GNU -DSTDC_HEADERS -Dinline=__inline__ \
- -D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -Dinline=__inline__ \
- $(if $(NE_NOWCHAR), -DNOWCHAR,) \
- $(if $(NE_TEST), -DNE_TEST -coverage,) \
- $(if $(NE_DEBUG), -g,-O3 -DNDEBUG) \
- $(if $(NE_TERMCAP), -DTERMCAP,) \
- $(if $(NE_ANSI), -DTERMCAP -DANSI,)
+ -D_GNU_SOURCE -D__USE_GNU -DSTDC_HEADERS -Dinline=__inline__
+ -D_REGEX_LARGE_OFFSETS -D_GNU_SOURCE -DSTDC_HEADERS -Dinline=__inline__
-
LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lcurses)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_ne_c,v 1.1 2015/06/20 01:39:24 bcallah Exp $
--- src/ne.c.orig Fri Jun 19 20:59:42 2015
+++ src/ne.c Fri Jun 19 21:00:00 2015
@@ -332,7 +332,7 @@ int main(int argc, char **argv) {
const int error = load_fh_in_buffer(cur_buffer, fileno(stdin));
print_error(error);
- if (!(stdin = freopen("/dev/tty", "r", stdin))) {
+ if (!(freopen("/dev/tty", "r", stdin))) {
fprintf(stderr, "Cannot reopen input tty\n");
abort();
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_regex_internal_h,v 1.1.1.1 2014/10/12 22:32:27 bcallah Exp $
--- src/regex_internal.h.orig Sun Sep 28 00:59:27 2014
+++ src/regex_internal.h Sun Sep 28 00:59:37 2014
@@ -418,8 +418,6 @@ static unsigned int re_string_context_at (const re_str
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
-#include <alloca.h>
-
#ifndef _LIBC
# if HAVE_ALLOCA
/* The OS usually guarantees only one guard page at the bottom of the stack,