CVS commit: pkgsrc/inputmethod/skkfep

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jul 10 08:12:15 UTC 2023

Modified Files:
        pkgsrc/inputmethod/skkfep: Makefile distinfo
        pkgsrc/inputmethod/skkfep/patches: patch-ba patch-terms.c

Log Message:
skkfep: Bring package a bit closer to the 21st century.

- Add missing termcap dependency.
- Honour CFLAGS/LDFLAGS.
- Don't prototype own libc/libtermcap functions.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/inputmethod/skkfep/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/inputmethod/skkfep/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/skkfep/patches/patch-ba
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/skkfep/patches/patch-terms.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/skkfep/Makefile
diff -u pkgsrc/inputmethod/skkfep/Makefile:1.15 pkgsrc/inputmethod/skkfep/Makefile:1.16
--- pkgsrc/inputmethod/skkfep/Makefile:1.15     Mon Sep  4 18:00:56 2017
+++ pkgsrc/inputmethod/skkfep/Makefile  Mon Jul 10 08:12:15 2023
@@ -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"

Index: pkgsrc/inputmethod/skkfep/distinfo
diff -u pkgsrc/inputmethod/skkfep/distinfo:1.9 pkgsrc/inputmethod/skkfep/distinfo:1.10
--- pkgsrc/inputmethod/skkfep/distinfo:1.9      Tue Oct 26 10:49:43 2021
+++ pkgsrc/inputmethod/skkfep/distinfo  Mon Jul 10 08:12:15 2023
@@ -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) = b294b095581e2438596b86
 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) = fb441a766f225a64
 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

Index: pkgsrc/inputmethod/skkfep/patches/patch-ba
diff -u pkgsrc/inputmethod/skkfep/patches/patch-ba:1.2 pkgsrc/inputmethod/skkfep/patches/patch-ba:1.3
--- pkgsrc/inputmethod/skkfep/patches/patch-ba:1.2      Sat Feb 18 22:08:50 2006
+++ pkgsrc/inputmethod/skkfep/patches/patch-ba  Mon Jul 10 08:12:15 2023
@@ -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

Index: pkgsrc/inputmethod/skkfep/patches/patch-terms.c
diff -u pkgsrc/inputmethod/skkfep/patches/patch-terms.c:1.1 pkgsrc/inputmethod/skkfep/patches/patch-terms.c:1.2
--- pkgsrc/inputmethod/skkfep/patches/patch-terms.c:1.1 Thu Dec 20 21:50:47 2012
+++ pkgsrc/inputmethod/skkfep/patches/patch-terms.c     Mon Jul 10 08:12:15 2023
@@ -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()
        }
  }