cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove no_shared check and fix errno definition

Browse Source
This commit is contained in:
naddy 2016-03-11 16:06:01 +00:00
parent 2339660906
commit 4fd7f6425c
5 changed files with 86 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
japanese/Wnn/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.77 2015/07/25 16:47:12 espie Exp $
# $OpenBSD: Makefile,v 1.78 2016/03/11 16:06:01 naddy Exp $
COMMENT-main = Japanese input method
COMMENT-dict = dictionaries for Japanese Wnn
@ -16,19 +16,19 @@ CATEGORIES = japanese
MULTI_PACKAGES = -main -dict -zh -zhdict -ko -kodict -xwnmo -data
PKGNAME-main = ja-Wnn-4.2
REVISION-main = 12
REVISION-main = 13
PKGNAME-dict = ja-Wnndict-4.2
REVISION-dict = 0
PKGNAME-zh = zh-Wnn-4.2
REVISION-zh = 6
REVISION-zh = 7
PKGNAME-zhdict = zh-Wnndict-4.2
REVISION-zhdict = 0
PKGNAME-ko = ko-Wnn-4.2
REVISION-ko = 6
REVISION-ko = 7
PKGNAME-kodict = ko-Wnndict-4.2
REVISION-kodict = 0
PKGNAME-xwnmo = Wnn-xwnmo-4.2
REVISION-xwnmo = 7
REVISION-xwnmo = 8
PKGNAME-data = Wnn-data-4.2
WNNDICBASE = /var
@ -150,7 +150,3 @@ post-install:
chmod u-s ${PREFIX}/bin/*server
.include <bsd.port.mk>
.if ${PROPERTIES:Mno_shared}
MAKE_FLAGS += XONLYLIB='-lX11 -lxcb -lXau -lXdmcp'
.endif

18
japanese/Wnn/patches/patch-Wnn_jlib_js_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Wnn_jlib_js_c,v 1.2 2015/07/25 16:47:12 espie Exp $
$OpenBSD: patch-Wnn_jlib_js_c,v 1.3 2016/03/11 16:06:01 naddy Exp $
--- Wnn/jlib/js.c.orig Fri Aug 19 03:30:48 1994
+++ Wnn/jlib/js.c Fri Jul 24 11:01:24 2015
+++ Wnn/jlib/js.c Fri Mar 11 17:01:24 2016
@@ -71,8 +71,7 @@ extern Variables
*/
@ -11,7 +11,15 @@ $OpenBSD: patch-Wnn_jlib_js_c,v 1.2 2015/07/25 16:47:12 espie Exp $
#include <stdio.h>
#include <ctype.h>
#ifdef UX386
@@ -104,8 +103,6 @@ extern int errno;
@@ -86,7 +85,6 @@ extern char *malloc();
#endif
#include <sys/stat.h>
#include <errno.h>
-extern int errno;
#include <signal.h>
#include "jd_sock.h"
#include "commonhd.h"
@@ -104,8 +102,6 @@ extern int errno;
#include "../etc/bdic.c"
#include "../etc/pwd.c"
@ -20,7 +28,7 @@ $OpenBSD: patch-Wnn_jlib_js_c,v 1.2 2015/07/25 16:47:12 espie Exp $
#ifdef SYSVR2
#define bzero(adr,n) memset((adr),0,(n))
#endif
@@ -221,7 +218,7 @@ register char *lang;
@@ -221,7 +217,7 @@ register char *lang;
#endif
return -1;
}
@ -29,7 +37,7 @@ $OpenBSD: patch-Wnn_jlib_js_c,v 1.2 2015/07/25 16:47:12 espie Exp $
#if DEBUG
xerror("jslib:Can't connect socket.\n");
@@ -294,7 +291,7 @@ register int timeout;
@@ -294,7 +290,7 @@ register int timeout;
signal(SIGALRM, connect_timeout);
alarm(timeout);
}

14
japanese/Wnn/patches/patch-Wnn_jserver_error_c
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-Wnn_jserver_error_c,v 1.1 2015/07/25 16:47:12 espie Exp $
--- Wnn/jserver/error.c.orig Fri Jul 24 10:33:44 2015
+++ Wnn/jserver/error.c Fri Jul 24 10:34:05 2015
@@ -55,6 +55,8 @@
$OpenBSD: patch-Wnn_jserver_error_c,v 1.2 2016/03/11 16:06:01 naddy Exp $
--- Wnn/jserver/error.c.orig Tue Jun 28 04:06:55 1994
+++ Wnn/jserver/error.c Fri Mar 11 17:01:32 2016
@@ -55,8 +55,8 @@
#include "commonhd.h"
#include "de_header.h"
#include <pwd.h>
-
-extern int errno;
+#include <stdlib.h>
+#include <time.h>
extern int errno;
static void my_error(), exit_hand();
void error1();

85
japanese/Wnn/patches/patch-Wnn_uum_jhlp_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
--- Wnn/uum/jhlp.c.orig Fri Jul 24 17:43:06 2015
+++ Wnn/uum/jhlp.c Fri Jul 24 18:05:03 2015
$OpenBSD: patch-Wnn_uum_jhlp_c,v 1.6 2016/03/11 16:06:01 naddy Exp $
--- Wnn/uum/jhlp.c.orig Fri Mar 11 16:32:33 2016
+++ Wnn/uum/jhlp.c Fri Mar 11 16:40:00 2016
@@ -49,6 +49,7 @@ static char *rcs_id = "$Id: jhlp.c,v 1.40 1994/08/19 0
/* Version 4.0
*/
@ -9,6 +9,15 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
#include <signal.h>
#include "jllib.h"
#include "commonhd.h"
@@ -61,7 +62,7 @@ static char *rcs_id = "$Id: jhlp.c,v 1.40 1994/08/19 0
#ifndef SYSVR2
#include <fcntl.h>
#endif /* !SYSVR2 */
-#include <sys/errno.h>
+#include <errno.h>
#include <pwd.h>
#include <sys/time.h>
#ifdef UX386
@@ -80,6 +81,9 @@ struct passwd *getpwuid();
jmp_buf kk_env;
@ -51,7 +60,11 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
#include <termios.h>
#endif
@@ -137,7 +153,7 @@ extern int errno;
@@ -133,11 +149,10 @@ char *cmdnm = "csh"; /* char *cmdnm = "csh"; */
int child_id;
char *prog;
-extern int errno;
extern char *optarg;
extern int optind;
@ -60,7 +73,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
static void save_signals();
static void restore_signals();
@@ -148,7 +164,7 @@ static void do_end(), open_pty(), open_ttyp(), do_main
@@ -148,7 +163,7 @@ static void do_end(), open_pty(), open_ttyp(), do_main
change_size(), default_usage();
/** メイン */
@ -69,7 +82,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
main(argc, argv)
int argc;
char **argv;
@@ -166,14 +182,14 @@ char **argv;
@@ -166,14 +181,14 @@ char **argv;
flow_control = FLOW_CONTROL;
code_trans = default_code_trans;
@ -87,7 +100,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
for (;i < argc; i++) {
argv[i - 2] = argv[i];
}
@@ -185,12 +201,7 @@ char **argv;
@@ -185,12 +200,7 @@ char **argv;
if(*lang_dir == '\0') {
if ((p = getenv("LANG")) != NULL) {
@ -101,7 +114,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
}
}
for (f = function_db; *lang_dir && f && f->lang; f++) {
@@ -233,8 +244,8 @@ char **argv;
@@ -233,8 +243,8 @@ char **argv;
server_env = WNN_DEF_SERVER_ENV;
}
if(name = getenv(server_env)) {
@ -112,7 +125,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
}
}
@@ -244,7 +255,7 @@ char **argv;
@@ -244,7 +254,7 @@ char **argv;
}
if((p = getenv(WNN_COUNTDOWN_ENV)) == NULL) {
@ -121,7 +134,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
} else if (atoi(p) <= 0) {
puteustring(MSG_GET(4), stdout);
/*
@@ -253,7 +264,7 @@ char **argv;
@@ -253,7 +263,7 @@ char **argv;
exit(126);
} else {
sprintf(p,"%d",atoi(p) - 1);
@ -130,7 +143,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
}
if((tname = getenv("TERM")) == NULL) {
@@ -263,9 +274,11 @@ char **argv;
@@ -263,9 +273,11 @@ char **argv;
#if defined(BSD42) && !defined(DGUX)
@ -142,7 +155,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
#endif /* BSD42 */
@@ -312,7 +325,7 @@ char **argv;
@@ -312,7 +324,7 @@ char **argv;
#endif /* TERMCAP */
open_pty();
@ -151,7 +164,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
open_ttyp();
#endif
exec_cmd(argv);
@@ -492,7 +505,7 @@ static int do_X_opt()
@@ -492,7 +504,7 @@ static int do_X_opt()
static int do_k_opt()
{
@ -160,7 +173,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
if (*uumkey_name_in_uumrc == '\0') {
return -1;
}
@@ -502,7 +515,7 @@ static int do_k_opt()
@@ -502,7 +514,7 @@ static int do_k_opt()
static int do_c_opt()
{
@ -169,7 +182,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
if (*convkey_name_in_uumrc == '\0') {
return -1;
}
@@ -512,7 +525,7 @@ static int do_c_opt()
@@ -512,7 +524,7 @@ static int do_c_opt()
static int do_r_opt()
{
@ -178,7 +191,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
if (*rkfile_name_in_uumrc == '\0') {
return -1;
}
@@ -528,8 +541,8 @@ static int do_l_opt()
@@ -528,8 +540,8 @@ static int do_l_opt()
static int do_D_opt()
{
@ -189,7 +202,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
if (*def_servername == '\0') {
return -1;
}
@@ -538,7 +551,7 @@ static int do_D_opt()
@@ -538,7 +550,7 @@ static int do_D_opt()
static int do_n_opt()
{
@ -198,7 +211,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
if (*username == '\0') {
return -1;
}
@@ -581,14 +594,14 @@ char **argv;
@@ -581,14 +593,14 @@ char **argv;
#endif /* SYSVR2 */
extern char *index();
@ -217,7 +230,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
usage(ostr);
}
}
@@ -600,7 +613,7 @@ char **argv;
@@ -600,7 +612,7 @@ char **argv;
/** tty に対する ioctl のセット */
@ -226,7 +239,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
struct sgttyb savetmio;
/*
struct sgttyb ttyb =
@@ -642,11 +655,11 @@ j_term_init()
@@ -642,11 +654,11 @@ j_term_init()
}
#endif /* BSD42 */
@ -241,7 +254,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
IGNBRK | ICRNL | IXON, /* c_iflag */
ONLCR | OPOST, /* c_oflag */
B9600 | CS8 | CSTOPB | CREAD | CLOCAL, /* c_cflag */
@@ -678,13 +691,13 @@ get_rubout()
@@ -678,13 +690,13 @@ get_rubout()
int
j_term_init()
{
@ -257,7 +270,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
buf1.c_lflag &= ~(ECHONL | ECHOK | ECHOE | ECHO | XCASE | ICANON | ISIG);
buf1.c_iflag = 0;
buf1.c_oflag &= ~OPOST;
@@ -705,7 +718,7 @@ j_term_init()
@@ -705,7 +717,7 @@ j_term_init()
buf1.c_cc[VEOF] = 1; /* cf. ICANON */
buf1.c_cc[VEOL] = 0;
#endif /* linux */
@ -266,7 +279,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
fprintf(stderr, "error in ioctl TCSETA.\n");
exit(1);
}
@@ -764,14 +777,15 @@ intfntype
@@ -764,14 +776,15 @@ intfntype
chld_handler()
{
#ifdef HAVE_WAIT3
@ -287,7 +300,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
if (WIFSTOPPED(status)) {
#ifdef SIGCONT
kill(pid, SIGCONT);
@@ -1107,7 +1121,7 @@ char **argv;
@@ -1107,7 +1120,7 @@ char **argv;
#ifdef BSD42
int pid;
#endif
@ -296,7 +309,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
struct winsize win;
extern Term_RowWidth,crow;
#endif
@@ -1140,16 +1154,18 @@ char **argv;
@@ -1140,16 +1153,18 @@ char **argv;
setpgrp(0, pid);
#endif /* BSD42 */
@ -317,7 +330,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
dup2(ttypfd, 0);
dup2(ttypfd, 1);
dup2(ttypfd, 2);
@@ -1187,7 +1203,7 @@ char **argv;
@@ -1187,7 +1202,7 @@ char **argv;
err("Can't set utmp.");
}
*/
@ -326,7 +339,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
crow = win.ws_row = Term_RowWidth = win.ws_row - conv_lines;
ioctl(ttyfd, TIOCSWINSZ, &win);
setgid(getgid());
@@ -1198,6 +1214,7 @@ char **argv;
@@ -1198,6 +1213,7 @@ char **argv;
}
}
@ -334,7 +347,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
/** 環境変数のセット */
void
setenv(var, value)
@@ -1234,6 +1251,7 @@ char *value;
@@ -1234,6 +1250,7 @@ char *value;
strcat(environ[i], "=");
strcat(environ[i], value);
}
@ -342,7 +355,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
#ifdef SVR4
static int
@@ -1342,7 +1360,7 @@ open_ttyp()
@@ -1342,7 +1359,7 @@ open_ttyp()
chown(nmbuf, getuid(), getgid());
chmod(nmbuf, 0622);
#endif /* !linux */
@ -351,7 +364,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
ioctl(ttyfd, TIOCGETC, &tcharsv);
ioctl(ttyfd, TIOCGLTC, &ltcharsv);
ioctl(ttyfd, TIOCGETP, &ttyb);
@@ -1446,11 +1464,23 @@ open_ttyp()
@@ -1446,11 +1463,23 @@ open_ttyp()
close(open(ttyname(ttypfd), O_WRONLY, 0));
*/
#endif /* defined(SYSVR2) && !defined(linux) */
@ -375,7 +388,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
}
/** pty のオープン */
@@ -1524,15 +1554,13 @@ do_end()
@@ -1524,15 +1553,13 @@ do_end()
signal(SIGCHLD, SIG_DFL);
fcntl(ttyfd, F_SETFL, 0);
@ -394,7 +407,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
fprintf(stderr, "error in ioctl TCSETA.\n");
exit(1);
}
@@ -1562,9 +1590,11 @@ do_end()
@@ -1562,9 +1589,11 @@ do_end()
perror(prog);
}
@ -406,7 +419,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
#ifdef TIOCSSIZE
pty_rowcol.ts_lines = 0;
pty_rowcol.ts_cols = 0;
@@ -1636,7 +1666,16 @@ ptyname(b, pty, no)
@@ -1636,7 +1665,16 @@ ptyname(b, pty, no)
char *b, *pty;
int no;
{
@ -423,7 +436,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
}
#endif /* !sgi */
@@ -1755,14 +1794,14 @@ change_size()
@@ -1755,14 +1793,14 @@ change_size()
if ((i = win.ws_row) != 0) {
crow = Term_RowWidth = i - conv_lines;
@ -440,7 +453,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
ioctl(ttypfd, TIOCSWINSZ, &win);
#else /* linux */
#ifdef TIOCSSIZE
@@ -1770,7 +1809,8 @@ change_size()
@@ -1770,7 +1808,8 @@ change_size()
pty_rowcol.ts_cols = maxlength; /* instead of columns */
ioctl(ttypfd, TIOCSSIZE, &pty_rowcol);
#endif /* TIOCSSIZE */
@ -450,7 +463,7 @@ $OpenBSD: patch-Wnn_uum_jhlp_c,v 1.5 2015/07/25 16:47:12 espie Exp $
{
int grp;
ioctl(ptyfd, TIOCGPGRP, &grp);
@@ -1781,7 +1821,6 @@ change_size()
@@ -1781,7 +1820,6 @@ change_size()
#endif
}
#endif /* sun */

14
japanese/Wnn/patches/patch-Xwnmo_xwnmo_do_socket_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Xwnmo_xwnmo_do_socket_c,v 1.1 2002/02/28 06:03:27 pvalchev Exp $
--- Xwnmo/xwnmo/do_socket.c.orig Tue Aug 23 02:11:30 1994
+++ Xwnmo/xwnmo/do_socket.c Wed Feb 27 22:48:53 2002
$OpenBSD: patch-Xwnmo_xwnmo_do_socket_c,v 1.2 2016/03/11 16:06:01 naddy Exp $
--- Xwnmo/xwnmo/do_socket.c.orig Tue Aug 23 10:11:30 1994
+++ Xwnmo/xwnmo/do_socket.c Fri Mar 11 17:01:40 2016
@@ -116,8 +116,6 @@ static int rc = 0;
#define sock_clr(array,pos) (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE)))
#define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE)))
@ -10,3 +10,11 @@ $OpenBSD: patch-Xwnmo_xwnmo_do_socket_c,v 1.1 2002/02/28 06:03:27 pvalchev Exp $
#define _Read(fd, data, size) read((fd), (data), (size))
#define _Write(fd, data, size) write((fd), (data), (size))
@@ -588,7 +586,6 @@ wait_for_socket()
{
register int i;
int n, ret;
- extern int errno;
extern int select();
/*