From df47ed65aa54e143fef7ab6b6a345d790c91673a Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 31 Mar 2009 13:31:18 +0000 Subject: [PATCH] - fix compilation with gcc2 --- net/epic4/Makefile | 3 ++- net/epic4/patches/patch-source_screen_c | 27 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 net/epic4/patches/patch-source_screen_c diff --git a/net/epic4/Makefile b/net/epic4/Makefile index b6b34844a8c..e3c951290ed 100644 --- a/net/epic4/Makefile +++ b/net/epic4/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.64 2008/06/14 02:01:10 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.65 2009/03/31 13:31:18 jasper Exp $ COMMENT= (E)nhanced (P)rogrammable (I)RC-II (C)lient VERSION= 2.10 HELP_DATE= 20050315 DISTNAME= epic4-${VERSION} +PKGNAME= ${DISTNAME}p0 CATEGORIES= net MASTER_SITES= ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ DISTFILES= epic4-${VERSION}.tar.bz2 epic4-help-${HELP_DATE}.tar.gz diff --git a/net/epic4/patches/patch-source_screen_c b/net/epic4/patches/patch-source_screen_c new file mode 100644 index 00000000000..aa6530e17af --- /dev/null +++ b/net/epic4/patches/patch-source_screen_c @@ -0,0 +1,27 @@ +$OpenBSD: patch-source_screen_c,v 1.1 2009/03/31 13:31:18 jasper Exp $ + +Fix compilation with GCC2. + +--- source/screen.c.orig Tue Mar 31 15:32:24 2009 ++++ source/screen.c Tue Mar 31 15:33:21 2009 +@@ -1799,6 +1799,8 @@ const u_char *ptr; + { + int lhs_count = 0; + int continued_count = 0; ++ char *copy; ++ size_t cont_len; + + if (indent > max_cols / 3) + indent = max_cols / 3; +@@ -1806,9 +1808,9 @@ const u_char *ptr; + /* refined this to use proper logic to + ** decide the length of cont. - pegasus + */ +- char *copy = LOCAL_COPY(cont_ptr); ++ copy = LOCAL_COPY(cont_ptr); + copy = normalize_string(copy, 0); +- size_t cont_len = output_with_count(copy, 0, 0); ++ cont_len = output_with_count(copy, 0, 0); + if (do_indent && (cont_len < indent)) + { + size_t size = indent + 1 +