1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00

Fix for 3.0-current. (Caused by regex.h difference)

PR:		ports/7747
Submitted by:	Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
This commit is contained in:
Jun Kuriyama 1998-09-27 05:07:14 +00:00
parent 98317e7de4
commit 40ac7bbee8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=13443
8 changed files with 52 additions and 4 deletions

View File

@ -1,7 +1,7 @@
WNNINC = -I%X11BASE%/include/wnn
WNNLIB = -L%X11BASE%/lib -ljd
WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
WNN_DICLIST = '"kihon tankan tankan3 zip ikeiji symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"'
CANNAINC = -I%LOCALBASE%/include
CANNAOBJ = Canna.o CannaRk.o

View File

@ -1,7 +1,7 @@
WNNINC = -I%X11BASE%/include/wnn
WNNLIB = -L%X11BASE%/lib -ljd
WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
WNN_DICLIST = '"kihon tankan tankan3 zip ikeiji symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"'
RKKLIBS = $(WNNLIB)
RKKOBJS = $(WNNOBJ)

View File

@ -0,0 +1,12 @@
--- sys/regex.c.orig Fri Jun 30 13:56:01 1995
+++ ./sys/regex.c Wed Aug 26 03:14:57 1998
@@ -41,6 +41,9 @@
#include <stdio.h>
#include <sys/types.h>
#endif
+#if __FreeBSD__ >= 3
+#include <sys/types.h>
+#endif
#include <regex.h>
static regex_t REXP;

View File

@ -0,0 +1,12 @@
--- conf.c.~1~ Thu Jun 23 11:42:33 1994
+++ conf.c Mon Sep 14 15:48:41 1998
@@ -220,7 +220,8 @@
#define IR(func) (romkan_select() ? func : 0)
#define ONEWromkan_ready(rkpath) IR((*RP->rk_ready)(rkpath))
#define ONEWromkan_modesw(mode) IR((*RP->rk_modesw)(mode))
-#define ONEWromkan_clear() IR((*RP->rk_gotch)())
+/*#define ONEWromkan_clear() IR((*RP->rk_gotch)())*/
+#define ONEWromkan_clear() IR((*RP->rk_clear)())
#define ONEWromkan_getc() IR((*RP->rk_getc)())
#define ONEWromkan_next() IR((*RP->rk_next)())
#define ONEWromkan_dispmode() IR((*RP->rk_dispmode)())

View File

@ -1,7 +1,7 @@
WNNINC = -I%X11BASE%/include/wnn
WNNLIB = -L%X11BASE%/lib -ljd
WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
WNN_DICLIST = '"kihon tankan tankan3 zip ikeiji symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"'
CANNAINC = -I%LOCALBASE%/include
CANNAOBJ = Canna.o CannaRk.o

View File

@ -1,7 +1,7 @@
WNNINC = -I%X11BASE%/include/wnn
WNNLIB = -L%X11BASE%/lib -ljd
WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
WNN_DICLIST = '"kihon tankan tankan3 zip ikeiji symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"'
WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"'
RKKLIBS = $(WNNLIB)
RKKOBJS = $(WNNOBJ)

View File

@ -0,0 +1,12 @@
--- sys/regex.c.orig Fri Jun 30 13:56:01 1995
+++ ./sys/regex.c Wed Aug 26 03:14:57 1998
@@ -41,6 +41,9 @@
#include <stdio.h>
#include <sys/types.h>
#endif
+#if __FreeBSD__ >= 3
+#include <sys/types.h>
+#endif
#include <regex.h>
static regex_t REXP;

View File

@ -0,0 +1,12 @@
--- conf.c.~1~ Thu Jun 23 11:42:33 1994
+++ conf.c Mon Sep 14 15:48:41 1998
@@ -220,7 +220,8 @@
#define IR(func) (romkan_select() ? func : 0)
#define ONEWromkan_ready(rkpath) IR((*RP->rk_ready)(rkpath))
#define ONEWromkan_modesw(mode) IR((*RP->rk_modesw)(mode))
-#define ONEWromkan_clear() IR((*RP->rk_gotch)())
+/*#define ONEWromkan_clear() IR((*RP->rk_gotch)())*/
+#define ONEWromkan_clear() IR((*RP->rk_clear)())
#define ONEWromkan_getc() IR((*RP->rk_getc)())
#define ONEWromkan_next() IR((*RP->rk_next)())
#define ONEWromkan_dispmode() IR((*RP->rk_dispmode)())