From b4e0dc4b8efc9d4d1ccd166ca5a17268ead2aed8 Mon Sep 17 00:00:00 2001
From: nia <nia@pkgsrc.org>
Date: Mon, 10 Jul 2023 08:12:15 +0000
Subject: [PATCH] skkfep: Bring package a bit closer to the 21st century.

- Add missing termcap dependency.
- Honour CFLAGS/LDFLAGS.
- Don't prototype own libc/libtermcap functions.
---
 inputmethod/skkfep/Makefile              |  5 +++--
 inputmethod/skkfep/distinfo              |  6 ++---
 inputmethod/skkfep/patches/patch-ba      | 10 +++++----
 inputmethod/skkfep/patches/patch-terms.c | 28 +++++++++++++++++++++---
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile
index 113d3ad4a731..ae55b187b8f8 100644
--- a/inputmethod/skkfep/Makefile
+++ b/inputmethod/skkfep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2017/09/04 18:00:56 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2023/07/10 08:12:15 nia Exp $
 
 DISTNAME=	skkfep0.86c
 PKGNAME=	skkfep-0.86c
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	japanese inputmethod
 MASTER_SITES=	# ftp://ei5nazha.yz.yamagata-u.ac.jp/skkfep/
 
@@ -28,4 +28,5 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/skk.conf \
 		${DESTDIR}${PREFIX}/share/examples/skk/skk.conf
 
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/skkfep/distinfo b/inputmethod/skkfep/distinfo
index 9bed3a30612e..2218e6f3e99e 100644
--- a/inputmethod/skkfep/distinfo
+++ b/inputmethod/skkfep/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:49:43 nia Exp $
+$NetBSD: distinfo,v 1.10 2023/07/10 08:12:15 nia Exp $
 
 BLAKE2s (skkfep0.86c.tar.gz) = d95116cfb7c13ab446e58ce6b0ab67b88585c12ee41c2409d9b81743ba89ebdb
 SHA512 (skkfep0.86c.tar.gz) = f4134cda91e740ff184e8d93018fb0b53341afa7836f2bc0c88facd249ca4f0a9449e1341963b16a9fdb04176ce89dbf41215cb6818e3138506b027ac9396a57
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = b294b095581e2438596b869052e772a1fc2824d9
 SHA1 (patch-ab) = f913b929b6857bf29b2936edde6c87d9d17c4309
 SHA1 (patch-ac) = a55de012abb00d22a9a209c265b72a508c333d47
 SHA1 (patch-ad) = 2756635d4c92bdeb42bcd537b67cacfe8de9d053
-SHA1 (patch-ba) = c814f8315aa904bc1e395544060378df6608d8c3
+SHA1 (patch-ba) = 496963325fa48b18bd76e6271ae96c1536d6aa9c
 SHA1 (patch-bb) = 9eb7fb317c661ebc293fdf02d2128b31a465c4ab
 SHA1 (patch-bc) = d5f63071cfd9f5cc73abb683c610b04df419c932
 SHA1 (patch-bd) = 5dc60197f1733d2f2375764da710346f01626475
@@ -20,4 +20,4 @@ SHA1 (patch-kkconv.c) = fb441a766f225a6452d5bf778f05e19bdf0b3f07
 SHA1 (patch-romkan-org.c) = 3da9260274e7cd218bddb020134fdbf1a061dc87
 SHA1 (patch-simpledic.c) = 7760ffebed845a67fc8751c7b59b680676211a4f
 SHA1 (patch-skklib.c) = 8c47ad293b67478f2b27941f47e7ceff3dc7a0af
-SHA1 (patch-terms.c) = 2ce090605e1bf4f591dcc2226f4f6e65d9378e59
+SHA1 (patch-terms.c) = 1ab149aaf5e526dcdf501ffa513ee73e0a9604ca
diff --git a/inputmethod/skkfep/patches/patch-ba b/inputmethod/skkfep/patches/patch-ba
index d9d966fc9164..4969935ebe19 100644
--- a/inputmethod/skkfep/patches/patch-ba
+++ b/inputmethod/skkfep/patches/patch-ba
@@ -1,11 +1,13 @@
-$NetBSD: patch-ba,v 1.2 2006/02/18 22:08:50 wiz Exp $
+$NetBSD: patch-ba,v 1.3 2023/07/10 08:12:15 nia Exp $
 
 --- protoMakefile.orig	1998-07-06 15:31:15.000000000 +0000
 +++ protoMakefile
-@@ -1,4 +1,5 @@
+@@ -1,5 +1,6 @@
 -CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
-+CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE) \
+-LIBS  =$(SYSLIBS) $(EXTRALIBS) -ltermcap
++CFLAGS+=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE) \
 +	-DSKK_CONF=\"$(PKG_SYSCONFDIR)/skk.conf\"
- LIBS  =$(SYSLIBS) $(EXTRALIBS) -ltermcap
++LIBS  =$(LDFLAGS) $(SYSLIBS) $(EXTRALIBS) -ltermcap
  
  OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
+ 	kkconv.o keymap.o version.o
diff --git a/inputmethod/skkfep/patches/patch-terms.c b/inputmethod/skkfep/patches/patch-terms.c
index 7b409fd874ee..2a2097736802 100644
--- a/inputmethod/skkfep/patches/patch-terms.c
+++ b/inputmethod/skkfep/patches/patch-terms.c
@@ -1,8 +1,30 @@
-$NetBSD: patch-terms.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+$NetBSD: patch-terms.c,v 1.2 2023/07/10 08:12:15 nia Exp $
 
---- terms.c.orig	2012-12-20 14:38:09.000000000 +0000
+--- terms.c.orig	1998-09-21 16:45:15.000000000 +0000
 +++ terms.c
-@@ -124,7 +124,7 @@ getTCstr()
+@@ -1,5 +1,7 @@
+ #include	"config.h"
+ #include	"fep.h"
++#include	<termcap.h>
++#include	<stdlib.h>
+ 
+ /*#define SHOW_ESCSEQ		/* show escape sequences for debugging */
+ 
+@@ -17,13 +19,8 @@ char	*T_TS, *T_FS, *T_SS,*T_HS,*T_ES;
+ int     columns, lines;
+ StatusType status;
+ 
+-extern char *getenv();
+ extern char ReverseStatus;
+ 
+-/* termcap functions */
+-extern char *tgetstr();
+-extern char *tgoto();
+-
+ #ifdef SHOW_ESCSEQ
+ printe(s,v)
+ char *s,*v;
+@@ -124,7 +121,7 @@ getTCstr()
  	}
  }