| 1 |
haubi 13/10/29 21:00:57 |
| 2 |
|
| 3 |
Added: einfo-1.0.4-termcap-check.patch |
| 4 |
Removed: einfo-1.0.3-checkfuncs-aix.patch |
| 5 |
Log: |
| 6 |
baselayout-prefix-2.2-r3: Fix termcap check and conditional. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A630CCB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sys-apps/baselayout-prefix/files/einfo-1.0.4-termcap-check.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/einfo-1.0.4-termcap-check.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout-prefix/files/einfo-1.0.4-termcap-check.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: einfo-1.0.4-termcap-check.patch |
| 17 |
=================================================================== |
| 18 |
#diff -ru einfo-1.0.4/configure.ac einfo/configure.ac |
| 19 |
#--- einfo-1.0.4/configure.ac 2013-10-27 17:39:07.000000000 +0100 |
| 20 |
#+++ einfo/configure.ac 2013-10-29 18:01:51.975745907 +0100 |
| 21 |
#@@ -22,7 +22,7 @@ |
| 22 |
# ) |
| 23 |
# ) |
| 24 |
# fi |
| 25 |
#-AC_DEFINE([HAVE_TERMCAP], test "x$HAVE_TERMCAP" != "x", |
| 26 |
#+AC_DEFINE_UNQUOTED([HAVE_TERMCAP], `test "x$HAVE_TERMCAP" = "x"; echo $?`, |
| 27 |
# [Define if termcap.h and library exist]) |
| 28 |
# AC_SUBST([TERMCAP_LIBS], [$HAVE_TERMCAP]) |
| 29 |
# |
| 30 |
diff -ru einfo-1.0.4/configure einfo/configure |
| 31 |
--- einfo-1.0.4/configure 2013-10-27 17:42:20.000000000 +0100 |
| 32 |
+++ einfo/configure 2013-10-29 18:02:08.405707018 +0100 |
| 33 |
@@ -11447,7 +11432,9 @@ |
| 34 |
|
| 35 |
fi |
| 36 |
|
| 37 |
-$as_echo "#define HAVE_TERMCAP test \"x\$HAVE_TERMCAP\" != \"x\"" >>confdefs.h |
| 38 |
+cat >>confdefs.h <<_ACEOF |
| 39 |
+#define HAVE_TERMCAP `test "x$HAVE_TERMCAP" = "x"; echo $?` |
| 40 |
+_ACEOF |
| 41 |
|
| 42 |
TERMCAP_LIBS=$HAVE_TERMCAP |
| 43 |
|
| 44 |
diff -ru einfo-1.0.4/src/libeinfo/libeinfo.c einfo/src/libeinfo/libeinfo.c |
| 45 |
--- einfo-1.0.4/src/libeinfo/libeinfo.c 2013-10-27 17:37:25.000000000 +0100 |
| 46 |
+++ einfo/src/libeinfo/libeinfo.c 2013-10-29 18:05:38.081876730 +0100 |
| 47 |
@@ -50,7 +50,7 @@ |
| 48 |
#include <string.h> |
| 49 |
#include <strings.h> |
| 50 |
#include <syslog.h> |
| 51 |
-#ifdef HAVE_TERMCAP |
| 52 |
+#if HAVE_TERMCAP |
| 53 |
# include <termcap.h> |
| 54 |
#endif |
| 55 |
#include <unistd.h> |
| 56 |
@@ -155,7 +155,7 @@ |
| 57 |
|
| 58 |
/* Termcap buffers and pointers |
| 59 |
* Static buffers suck hard, but some termcap implementations require them */ |
| 60 |
-#ifdef HAVE_TERMCAP |
| 61 |
+#if HAVE_TERMCAP |
| 62 |
static char termcapbuf[2048]; |
| 63 |
static char tcapbuf[512]; |
| 64 |
#else |
| 65 |
@@ -287,7 +287,7 @@ |
| 66 |
} |
| 67 |
|
| 68 |
/* Fake tgoto call - very crapy, but works for our needs */ |
| 69 |
-#ifndef HAVE_TERMCAP |
| 70 |
+#if !HAVE_TERMCAP |
| 71 |
static char * |
| 72 |
tgoto(const char *cap, int col, int line) |
| 73 |
{ |
| 74 |
@@ -363,7 +363,7 @@ |
| 75 |
const char *bold; |
| 76 |
char tmp[100]; |
| 77 |
unsigned int i = 0; |
| 78 |
-#ifdef HAVE_TERMCAP |
| 79 |
+#if HAVE_TERMCAP |
| 80 |
char *bp; |
| 81 |
#endif |
| 82 |
|
| 83 |
@@ -387,7 +387,7 @@ |
| 84 |
if (strcmp(term, "cons25") == 0) |
| 85 |
term_is_cons25 = true; |
| 86 |
|
| 87 |
-#ifdef HAVE_TERMCAP |
| 88 |
+#if HAVE_TERMCAP |
| 89 |
/* Check termcap to see if we can do colour or not */ |
| 90 |
if (tgetent(termcapbuf, term) == 1) { |
| 91 |
bp = tcapbuf; |
| 92 |
@@ -433,7 +433,7 @@ |
| 93 |
_me = ME; |
| 94 |
if (!_up) |
| 95 |
_up = UP; |
| 96 |
-#ifdef HAVE_TERMCAP |
| 97 |
+#if HAVE_TERMCAP |
| 98 |
} |
| 99 |
|
| 100 |
if (!_af || !_ce || !_me || !_md || !_up) { |
Archives