termcap.patch (2441B)
1 --- termcap-1.3.1.org/Makefile.in 1995-08-17 00:54:29.000000000 +0000 2 +++ termcap-1.3.1/Makefile.in 2012-10-13 03:13:56.988000002 +0000 3 @@ -24,8 +24,8 @@ 4 AR = ar 5 RANLIB = @RANLIB@ 6 7 -INSTALL = @INSTALL@ 8 -INSTALL_DATA = @INSTALL_DATA@ 9 +INSTALL = install -D 10 +INSTALL_DATA = $(INSTALL) -m 644 11 12 MAKEINFO = makeinfo 13 14 @@ -42,12 +42,6 @@ 15 # Directory in which to install termcap.h. 16 includedir = $(prefix)/include 17 18 -# Directory in which to optionally also install termcap.h, 19 -# so compilers besides gcc can find it by default. 20 -# If it is empty or not defined, termcap.h will only be installed in 21 -# includedir. 22 -oldincludedir = /usr/include 23 - 24 # Directory in which to install the documentation info files. 25 infodir = $(prefix)/info 26 27 @@ -72,13 +66,10 @@ 28 $(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $< 29 30 install: all installdirs @installdata@ 31 - $(INSTALL_DATA) libtermcap.a $(libdir)/libtermcap.a 32 - -$(RANLIB) $(libdir)/libtermcap.a 33 - cd $(srcdir); $(INSTALL_DATA) termcap.h $(includedir)/termcap.h 34 - -cd $(srcdir); test -z "$(oldincludedir)" || \ 35 - $(INSTALL_DATA) termcap.h $(oldincludedir)/termcap.h 36 + $(INSTALL_DATA) libtermcap.a $(DESTDIR)$(libdir)/libtermcap.a 37 + cd $(srcdir); $(INSTALL_DATA) termcap.h $(DESTDIR)$(includedir)/termcap.h 38 cd $(srcdir); for f in termcap.info*; \ 39 - do $(INSTALL_DATA) $$f $(infodir)/$$f; done 40 + do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$f; done 41 42 uninstall: @uninstalldata@ 43 rm -f $(libdir)/libtermcap.a $(includedir)/termcap.h 44 --- termcap-1.3.1.org/termcap.h 1995-07-26 18:09:50.000000000 +0000 45 +++ termcap-1.3.1/termcap.h 2012-10-13 03:17:18.366000002 +0000 46 @@ -18,6 +18,9 @@ 47 #ifndef _TERMCAP_H 48 #define _TERMCAP_H 1 49 50 +/* prevent ncurses headers from defining different prototypes */ 51 +#define NCURSES_TERMCAP_H_incl 52 + 53 #if __STDC__ 54 55 extern int tgetent (char *buffer, const char *termtype); 56 --- termcap-1.3.1.org/tparam.c 57 +++ termcap-1.3.1/tparam.c 58 @@ -17,21 +17,14 @@ 59 Boston, MA 02111-1307, USA. */ 60 61 /* Emacs config.h may rename various library functions such as malloc. */ 62 -#ifdef HAVE_CONFIG_H 63 -#include <config.h> 64 -#endif 65 66 #ifdef emacs 67 #include "lisp.h" /* for xmalloc */ 68 #else 69 70 -#ifdef STDC_HEADERS 71 #include <stdlib.h> 72 #include <string.h> 73 -#else 74 -char *malloc (); 75 -char *realloc (); 76 -#endif 77 +#include <unistd.h> 78 79 /* Do this after the include, in case string.h prototypes bcopy. */ 80 #if (defined(HAVE_STRING_H) || defined(STDC_HEADERS)) && !defined(bcopy)