[Gsrc-commit] trunk r10116: termutils, fix compile problems

[Carl Hansen]

------------------------------------------------------------
revno: 10116
revision-id: carlhansen@gnu.org-20240404004703-gtlffgq06chkyny2
parent: carlhansen@gnu.org-20240403232825-2ho7gdqjrofxv83m
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Thu 2024-04-04 00:47:03 +0000
message:
  termutils, fix compile problems
removed:
  pkg/gnu/termutils/files/termutils-2.0-fix-build.diff 
termutils2.0fixbuild-20160617014725-uokjfnggs70iry9h-2240
  pkg/gnu/termutils/files/termutils-2.0-fix-install.diff 
termutils2.0fixinsta-20160617014725-uokjfnggs70iry9h-2241
added:
  pkg/gnu/termutils/files/termutils.2.0.diff 
termutils.2.0.diff-20240404004612-oswyhgdwo1dha6cq-1
modified:
  pkg/gnu/termutils/Makefile     makefile-20160617014725-uokjfnggs70iry9h-1872
  pkg/gnu/termutils/sha256sums   sha256sums-20160617014725-uokjfnggs70iry9h-1877

=== modified file 'pkg/gnu/termutils/Makefile'
--- a/pkg/gnu/termutils/Makefile        2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/termutils/Makefile        2024-04-04 00:47:03 +0000
@@ -1,4 +1,5 @@
 # Copyright © 2013 Brandon Invergo <brandon@invergo.net>
+# Copyright © 2024 Carl Hansen
 #
 # This file is part of GSRC.
 #
@@ -34,7 +35,7 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES =
-PATCHFILES = $(DISTNAME)-fix-build.diff $(DISTNAME)-fix-install.diff
+PATCHFILES = termutils.2.0.diff
 INFO_FILES = tput.info
 
 BUILDDEPS =
@@ -42,6 +43,11 @@
 
 ######################################################################
 
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
 include ../../../gar/gar.lib/info.mk
 include config.mk
+
+
+BUILD_ARGS = CFLAGS=-Wno-implicit-function-declaration
+
+

=== removed file 'pkg/gnu/termutils/files/termutils-2.0-fix-build.diff'
--- a/pkg/gnu/termutils/files/termutils-2.0-fix-build.diff      2016-06-17 
19:08:15 +0000
+++ b/pkg/gnu/termutils/files/termutils-2.0-fix-build.diff      1970-01-01 
00:00:00 +0000
@@ -1,15 +0,0 @@
-This patch fixes a conflict between the bcopy macro defined via 
-preprocessor directives and the one contained in string.h.
-
-diff -x config.log -x config.status -ru work/termutils-2.0/tparam.c 
work/termutils-2.0/tparam.c
---- work/termutils-2.0/tparam.c        1995-09-03 01:53:43.000000000 +0200
-+++ work/termutils-2.0/tparam.c        2013-03-18 00:06:38.159273382 +0100
-@@ -21,7 +21,7 @@
- #endif
- 
- #ifndef emacs
--#if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
-+#if !defined(HAVE_STRING_H) || !defined(STDC_HEADERS)
- #define bcopy(s, d, n) memcpy ((d), (s), (n))
- #endif
- 

=== removed file 'pkg/gnu/termutils/files/termutils-2.0-fix-install.diff'
--- a/pkg/gnu/termutils/files/termutils-2.0-fix-install.diff    2016-06-17 
19:08:15 +0000
+++ b/pkg/gnu/termutils/files/termutils-2.0-fix-install.diff    1970-01-01 
00:00:00 +0000
@@ -1,30 +0,0 @@
-This patch adds support for DESTDIR-based staged installation in the 
-Makefile.
-
-diff -x config.log -x config.status -ru work/termutils-2.0/Makefile.in 
work/termutils-2.0/Makefile.in
---- work/termutils-2.0/Makefile.in     1995-12-01 16:39:01.000000000 +0100
-+++ work/termutils-2.0/Makefile.in     2013-03-18 00:10:29.929286310 +0100
-@@ -103,9 +103,9 @@
- install:: install-programs
- 
- install-programs: $(PROGRAMS) $(SCRIPTS)
--      $(top_srcdir)/mkinstalldirs $(bindir)
-+      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-       for p in $(PROGRAMS) $(SCRIPTS); do \
--        $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+        $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 
'$(transform)'`; \
-       done
- 
- uninstall:: uninstall-programs
-@@ -149,9 +149,9 @@
- install:: install-info
- 
- install-info: $(INFO_DEPS)
--      $(top_srcdir)/mkinstalldirs $(infodir)
-+      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
-       cd $(srcdir); for file in *.info*; do \
--        $(INSTALL_DATA) $$file $(infodir)/$$file; \
-+        $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
-       done
- 
- uninstall:: uninstall-info

=== added file 'pkg/gnu/termutils/files/termutils.2.0.diff'
--- a/pkg/gnu/termutils/files/termutils.2.0.diff        1970-01-01 00:00:00 
+0000
+++ b/pkg/gnu/termutils/files/termutils.2.0.diff        2024-04-04 00:47:03 
+0000
@@ -0,0 +1,91 @@
+diff -x config.log -x config.status -ru tmp/termutils-2.0/Makefile.in 
work/termutils-2.0/Makefile.in
+--- tmp/termutils-2.0/Makefile.in      1995-12-01 07:39:01.000000000 -0800
++++ work/termutils-2.0/Makefile.in     2024-04-03 17:35:08.575542558 -0700
+@@ -103,9 +103,9 @@
+ install:: install-programs
+ 
+ install-programs: $(PROGRAMS) $(SCRIPTS)
+-      $(top_srcdir)/mkinstalldirs $(bindir)
++      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       for p in $(PROGRAMS) $(SCRIPTS); do \
+-        $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++        $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 
'$(transform)'`; \
+       done
+ 
+ uninstall:: uninstall-programs
+@@ -149,9 +149,9 @@
+ install:: install-info
+ 
+ install-info: $(INFO_DEPS)
+-      $(top_srcdir)/mkinstalldirs $(infodir)
++      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+       cd $(srcdir); for file in *.info*; do \
+-        $(INSTALL_DATA) $$file $(infodir)/$$file; \
++        $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
+       done
+ 
+ uninstall:: uninstall-info
+diff -x config.log -x config.status -ru tmp/termutils-2.0/conversions.c 
work/termutils-2.0/conversions.c
+--- tmp/termutils-2.0/conversions.c    1995-09-02 17:04:46.000000000 -0700
++++ work/termutils-2.0/conversions.c   2024-04-03 17:35:08.575542558 -0700
+@@ -19,6 +19,7 @@
+ #include "config.h"
+ #endif
+ 
++#include <string.h>
+ #include "tput.h"
+ 
+ /* `conversions' is binary-searched to retrieve the termcap equivalent
+diff -x config.log -x config.status -ru tmp/termutils-2.0/tcutil.c 
work/termutils-2.0/tcutil.c
+--- tmp/termutils-2.0/tcutil.c 1995-09-02 17:05:05.000000000 -0700
++++ work/termutils-2.0/tcutil.c        2024-04-03 17:35:08.575542558 -0700
+@@ -19,6 +19,8 @@
+ #include "config.h"
+ #endif
+ 
++#include <stdlib.h>
++#include <unistd.h>
+ #include <tcutil.h>
+ #include <termcap.h>
+ #define ERROR_EXIT 5          /* Real error or signal. */
+diff -x config.log -x config.status -ru tmp/termutils-2.0/tcutil.h 
work/termutils-2.0/tcutil.h
+--- tmp/termutils-2.0/tcutil.h 1995-09-02 17:04:16.000000000 -0700
++++ work/termutils-2.0/tcutil.h        2024-04-03 17:39:24.037465953 -0700
+@@ -23,4 +23,5 @@
+ void enable_xtabs ();
+ void disable_xtabs ();
+ 
++
+ #endif /* TCUTIL_H */
+diff -x config.log -x config.status -ru tmp/termutils-2.0/tparam.c 
work/termutils-2.0/tparam.c
+--- tmp/termutils-2.0/tparam.c 1995-09-02 16:53:43.000000000 -0700
++++ work/termutils-2.0/tparam.c        2024-04-03 17:35:08.575542558 -0700
+@@ -15,13 +15,15 @@
+ along with this program; see the file COPYING.  If not, write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+ 
++#include <unistd.h>
++
+ /* Emacs config.h may rename various library functions such as malloc.  */
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
+ 
+ #ifndef emacs
+-#if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
++#if !defined(HAVE_STRING_H) || !defined(STDC_HEADERS)
+ #define bcopy(s, d, n) memcpy ((d), (s), (n))
+ #endif
+ 
+diff -x config.log -x config.status -ru tmp/termutils-2.0/tput.c 
work/termutils-2.0/tput.c
+--- tmp/termutils-2.0/tput.c   1995-11-30 13:39:00.000000000 -0800
++++ work/termutils-2.0/tput.c  2024-04-03 17:35:08.575542558 -0700
+@@ -32,6 +32,8 @@
+ #include <termcap.h>
+ #include <getopt.h>
+ #include <errno.h>
++#include <fcntl.h>
++#include <unistd.h>
+ 
+ #if STDC_HEADERS || HAVE_STRING_H
+ # include <string.h>

=== modified file 'pkg/gnu/termutils/sha256sums'
--- a/pkg/gnu/termutils/sha256sums      2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/termutils/sha256sums      2024-04-04 00:47:03 +0000
@@ -1,3 +1,2 @@
 4c2b3721a88b58b8a3918bf57b043fbd446ba334a2153a88305c9bf66f31f403  
download/termutils-2.0.tar.gz
-b88bef678150d353c8b18919afffd6f16211e9cbbd3fe8fa389bad5e19485e12  
download/termutils-2.0-fix-build.diff
-43015f41d539d8cf334a037db4a94fb7c8950817e9bb2afd95124576dd703068  
download/termutils-2.0-fix-install.diff
+73292c00f6e12d84459eab86b98866613a2ae23d2ad8e3597d4c716e18012d28  
download/termutils.2.0.diff