restyle and regen patches, wow old stuff
This commit is contained in:
espie
parent
168e87d97f
commit
6ddc3ddfc4
@ -1,94 +1,95 @@
|
||||
# From FreeBSD: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
|
||||
#
|
||||
# $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
|
||||
# $OpenBSD: Makefile,v 1.54 2008/08/30 11:08:12 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.55 2008/08/30 11:16:59 espie Exp $
|
||||
|
||||
COMMENT-main= Japanese input method
|
||||
COMMENT-dict= dictionaries for Japanese Wnn
|
||||
COMMENT-ko= Korean input method
|
||||
COMMENT-kodict= dictionaries for Korean Wnn
|
||||
COMMENT-zh= Chinese input method
|
||||
COMMENT-zhdict= dictionaries for Chinese Wnn
|
||||
COMMENT-data= common files to all languages of Wnn
|
||||
COMMENT-xwnmo= X11 input method for Wnn
|
||||
COMMENT-main = Japanese input method
|
||||
COMMENT-dict = dictionaries for Japanese Wnn
|
||||
COMMENT-ko = Korean input method
|
||||
COMMENT-kodict = dictionaries for Korean Wnn
|
||||
COMMENT-zh = Chinese input method
|
||||
COMMENT-zhdict = dictionaries for Chinese Wnn
|
||||
COMMENT-data = common files to all languages of Wnn
|
||||
COMMENT-xwnmo = X11 input method for Wnn
|
||||
|
||||
DISTNAME= Wnn4.2
|
||||
DISTNAME = Wnn4.2
|
||||
|
||||
CATEGORIES= japanese
|
||||
CATEGORIES = japanese
|
||||
|
||||
# If you are building this manually, you can override MULTI_PACKAGES
|
||||
# on the command line, and thus avoid building all three languages
|
||||
|
||||
MULTI_PACKAGES=-main -dict -zh -zhdict -ko -kodict -xwnmo -data
|
||||
MULTI_PACKAGES = -main -dict -zh -zhdict -ko -kodict -xwnmo -data
|
||||
|
||||
PKGNAME-main= ja-Wnn-4.2p3
|
||||
PKGNAME-dict= ja-Wnndict-4.2p0
|
||||
PKGNAME-zh= zh-Wnn-4.2p0
|
||||
PKGNAME-zhdict= zh-Wnndict-4.2p0
|
||||
PKGNAME-ko= ko-Wnn-4.2p0
|
||||
PKGNAME-kodict= ko-Wnndict-4.2p0
|
||||
PKGNAME-xwnmo= Wnn-xwnmo-4.2
|
||||
PKGNAME-data= Wnn-data-4.2
|
||||
PKGNAME-main = ja-Wnn-4.2p3
|
||||
PKGNAME-dict = ja-Wnndict-4.2p0
|
||||
PKGNAME-zh = zh-Wnn-4.2p0
|
||||
PKGNAME-zhdict = zh-Wnndict-4.2p0
|
||||
PKGNAME-ko = ko-Wnn-4.2p0
|
||||
PKGNAME-kodict = ko-Wnndict-4.2p0
|
||||
PKGNAME-xwnmo = Wnn-xwnmo-4.2
|
||||
PKGNAME-data = Wnn-data-4.2
|
||||
|
||||
WNNDICBASE=/var
|
||||
WNNDICDIR=${WNNDICBASE}/dict/Wnn
|
||||
WNNBASE=${LOCALBASE}
|
||||
SUBST_VARS=WNNBASE
|
||||
WNNDICBASE = /var
|
||||
WNNDICDIR = ${WNNDICBASE}/dict/Wnn
|
||||
WNNBASE = ${LOCALBASE}
|
||||
SUBST_VARS = WNNBASE
|
||||
|
||||
CATEGORIES-zh= chinese
|
||||
CATEGORIES-zhdict= chinese
|
||||
CATEGORIES-ko= korean
|
||||
CATEGORIES-kodict= korean
|
||||
CATEGORIES-data= japanese chinese korean
|
||||
CATEGORIES-wnmo= japanese chinese korean
|
||||
CATEGORIES-zh = chinese
|
||||
CATEGORIES-zhdict = chinese
|
||||
CATEGORIES-ko = korean
|
||||
CATEGORIES-kodict = korean
|
||||
CATEGORIES-data = japanese chinese korean
|
||||
CATEGORIES-wnmo = japanese chinese korean
|
||||
|
||||
PREFIX-dict= ${WNNDICBASE}
|
||||
PREFIX-zhdict= ${WNNDICBASE}
|
||||
PREFIX-kodict= ${WNNDICBASE}
|
||||
PREFIX-dict = ${WNNDICBASE}
|
||||
PREFIX-zhdict = ${WNNDICBASE}
|
||||
PREFIX-kodict = ${WNNDICBASE}
|
||||
|
||||
WANTLIB-main= c curses
|
||||
WANTLIB-zh= c curses
|
||||
WANTLIB-ko= c curses
|
||||
WANTLIB-xwnmo= c Xt SM Xmu X11 Xext ICE
|
||||
WANTLIB-main = c curses
|
||||
WANTLIB-zh = c curses
|
||||
WANTLIB-ko = c curses
|
||||
WANTLIB-xwnmo = c Xt SM Xmu X11 Xext ICE
|
||||
|
||||
RUN_DEPENDS= ::japanese/Wnn,-data
|
||||
RUN_DEPENDS-data=
|
||||
RUN_DEPENDS = ::japanese/Wnn,-data
|
||||
RUN_DEPENDS-data =
|
||||
|
||||
MASTER_SITES= ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
|
||||
MASTER_SITES = ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
|
||||
ftp://ports.jp.FreeBSD.org/pub/incoming/distfiles/
|
||||
DISTFILES= Wnn4.2.tar.gz Wnn4.2.patch.tar.gz
|
||||
DISTFILES = Wnn4.2.tar.gz Wnn4.2.patch.tar.gz
|
||||
|
||||
MAINTAINER= Marc Espie <espie@openbsd.org>
|
||||
MAINTAINER = Marc Espie <espie@openbsd.org>
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM = Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
EXTRACT_ONLY= Wnn4.2.tar.gz
|
||||
WRKDIST= ${WRKDIR}/Xsi
|
||||
EXTRACT_ONLY = Wnn4.2.tar.gz
|
||||
WRKDIST = ${WRKDIR}/Xsi
|
||||
# `User' configuration file
|
||||
CONFIG_FILE= ${WRKDIST}/config/config.h
|
||||
CONFIG_FILE = ${WRKDIST}/config/config.h
|
||||
|
||||
PORT_JDOCDIR= ${PREFIX}/share/doc/ja-Wnn
|
||||
JDOC_FROM= ${WRKSRC}/Wnn
|
||||
PORT_JDOCDIR = ${PREFIX}/share/doc/ja-Wnn
|
||||
JDOC_FROM = ${WRKSRC}/Wnn
|
||||
|
||||
PORT_CDOCDIR= ${PREFIX}/share/doc/zh-cWnn
|
||||
CDOC_FROM= ${WRKSRC}/cWnn
|
||||
PORT_CDOCDIR = ${PREFIX}/share/doc/zh-cWnn
|
||||
CDOC_FROM = ${WRKSRC}/cWnn
|
||||
|
||||
# Will turn into a RUN_DEPENDS when we install non-formatted manpages
|
||||
BUILD_DEPENDS= :ja-groff-*:japanese/groff
|
||||
BUILD_DEPENDS = :ja-groff-*:japanese/groff
|
||||
# Run depends ensure this does not turn into infinite recursion, since
|
||||
# this is not needed before package build time.
|
||||
|
||||
USE_X11= Yes
|
||||
USE_X11 = Yes
|
||||
|
||||
do-distpatch:
|
||||
cd ${WRKDIR} && tar zxf ${FULLDISTDIR}/Wnn4.2.patch.tar.gz
|
||||
cd ${WRKSRC} && patch ${PATCH_DIST_ARGS} < ${WRKDIR}/Wnn4.2.patch
|
||||
|
||||
SRCDOCDIRS=Wnn/man Wnn/manual Wnn/manual.en cWnn/man cWnn/manual cWnn/manual.en
|
||||
SRCDOCDIRS = Wnn/man Wnn/manual Wnn/manual.en cWnn/man cWnn/manual \
|
||||
cWnn/manual.en
|
||||
|
||||
# do those as post-patch, because of the $Id
|
||||
post-patch:
|
||||
@ -116,18 +117,20 @@ do-configure:
|
||||
|
||||
# Xfree4 believes it can build html documentation, fat chance...
|
||||
#MAKE_FLAGS=IMAKE='imake -DBuildHtmlManPages=0 -DPorts' WNNOWNER_INDIRECT=_wnn
|
||||
MAKE_FLAGS=IMAKE='imake -DPorts' WNNOWNER_INDIRECT=_wnn COPTS="${COPTS}"
|
||||
FAKE_FLAGS=WNNOWNER_INDIRECT=bin
|
||||
MAKE_FLAGS = IMAKE='imake -DPorts' WNNOWNER_INDIRECT=_wnn COPTS="${COPTS}"
|
||||
FAKE_FLAGS = WNNOWNER_INDIRECT=bin
|
||||
|
||||
MAKE_ENV = IMAKEINCLUDE=-I${WRKSRC}/config
|
||||
|
||||
MAKE_ENV=IMAKEINCLUDE=-I${WRKSRC}/config
|
||||
# These are necessary because this package uses a different Makefile for
|
||||
# building and installing etc.
|
||||
|
||||
do-build:
|
||||
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} make ${MAKE_FLAGS} -f Makefile.inst ${ALL_TARGET}
|
||||
ALL_TARGET=World
|
||||
INSTALL_TARGET=install install.man
|
||||
NO_REGRESS=Yes
|
||||
|
||||
ALL_TARGET = World
|
||||
INSTALL_TARGET = install install.man
|
||||
NO_REGRESS = Yes
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PORT_JDOCDIR}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Wnn_conv_cvt_read_c,v 1.1 2000/04/16 21:53:30 espie Exp $
|
||||
$OpenBSD: patch-Wnn_conv_cvt_read_c,v 1.2 2008/08/30 11:16:59 espie Exp $
|
||||
--- Wnn/conv/cvt_read.c.orig Thu Apr 8 03:59:13 1993
|
||||
+++ Wnn/conv/cvt_read.c Sun Apr 16 02:05:08 2000
|
||||
+++ Wnn/conv/cvt_read.c Sat Aug 30 13:13:01 2008
|
||||
@@ -72,6 +72,13 @@
|
||||
#endif /* TERMINFO */
|
||||
#include <term.h>
|
||||
@ -15,7 +15,7 @@ $OpenBSD: patch-Wnn_conv_cvt_read_c,v 1.1 2000/04/16 21:53:30 espie Exp $
|
||||
|
||||
#define ENTRY_LEN 10 /* コンバート表のエントリ名の最大長 */
|
||||
|
||||
@@ -437,6 +444,40 @@ int flg; /* verbose¥â¡¼¥É¤Çµ¯¤³¤¹¤«¤Î¥Õ¥
|
||||
@@ -437,6 +444,40 @@ int flg; /* verboseモードで起こすかのフラグ（今の所そ<EFBFBD>
|
||||
keydef_key[i++] = stradd(&tdataptr, key_f29);
|
||||
keydef_key[i++] = stradd(&tdataptr, key_f30);
|
||||
keydef_key[i++] = stradd(&tdataptr, key_f31);
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Wnn_jlib_V3_Imakefile,v 1.1 2000/04/16 21:53:30 espie Exp $
|
||||
$OpenBSD: patch-Wnn_jlib_V3_Imakefile,v 1.2 2008/08/30 11:17:00 espie Exp $
|
||||
--- Wnn/jlib.V3/Imakefile.orig Wed Aug 17 03:10:13 1994
|
||||
+++ Wnn/jlib.V3/Imakefile Thu Apr 13 20:41:39 2000
|
||||
+++ Wnn/jlib.V3/Imakefile Sat Aug 30 13:13:01 2008
|
||||
@@ -19,6 +19,10 @@ SRC3= $(WNNETCSRC)/sstrings.c
|
||||
OBJ3= sstrings.o
|
||||
SRCS= $(SRC1) $(SRC2) $(SRC3)
|
||||
@ -21,7 +21,7 @@ $OpenBSD: patch-Wnn_jlib_V3_Imakefile,v 1.1 2000/04/16 21:53:30 espie Exp $
|
||||
|
||||
#if DebugLibJd
|
||||
DebuggedLibraryTarget(jd,$(OBJS))
|
||||
@@ -42,4 +46,5 @@ NamedMakeSubdirs($(WNNJLIB),$(WNNJLIBSRC
|
||||
@@ -42,4 +46,5 @@ NamedMakeSubdirs($(WNNJLIB),$(WNNJLIBSRC))
|
||||
|
||||
WnnSpecialObjectRule($(OBJ2),$(SRC2),$(WNNETCSRC),)
|
||||
WnnSpecialObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Xwnmo_xjutil_Imakefile,v 1.1 2000/04/22 12:05:57 espie Exp $
|
||||
--- Xwnmo/xjutil/Imakefile.orig Fri Apr 21 17:44:45 2000
|
||||
+++ Xwnmo/xjutil/Imakefile Fri Apr 21 17:45:00 2000
|
||||
@@ -30,7 +30,7 @@ XCOMM CONNECTION WITH THE USE OR PERFORM
|
||||
$OpenBSD: patch-Xwnmo_xjutil_Imakefile,v 1.2 2008/08/30 11:17:00 espie Exp $
|
||||
--- Xwnmo/xjutil/Imakefile.orig Thu Aug 25 01:36:51 1994
|
||||
+++ Xwnmo/xjutil/Imakefile Sat Aug 30 13:13:01 2008
|
||||
@@ -30,7 +30,7 @@ XCOMM CONNECTION WITH THE USE OR PERFORMANCE OF THIS S
|
||||
XCOMM
|
||||
|
||||
LOCAL_INSTFLAGS = $(INSTBINFLAGS) -o $(WNNOWNER)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Xwnmo_xjutil_jutil_c,v 1.1 2000/04/22 12:05:57 espie Exp $
|
||||
--- Xwnmo/xjutil/jutil.c.orig Fri Apr 21 17:58:01 2000
|
||||
+++ Xwnmo/xjutil/jutil.c Fri Apr 21 17:58:32 2000
|
||||
@@ -664,10 +664,7 @@ int (*error_handler)(), (*message_handl
|
||||
$OpenBSD: patch-Xwnmo_xjutil_jutil_c,v 1.2 2008/08/30 11:17:00 espie Exp $
|
||||
--- Xwnmo/xjutil/jutil.c.orig Thu Jan 21 09:05:44 1993
|
||||
+++ Xwnmo/xjutil/jutil.c Sat Aug 30 13:13:01 2008
|
||||
@@ -664,10 +664,7 @@ int (*error_handler)(), (*message_handler)();
|
||||
extern int srand();
|
||||
extern long rand();
|
||||
#else
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Xwnmo_xwnmo_Imakefile,v 1.1 2000/04/22 12:05:57 espie Exp $
|
||||
--- Xwnmo/xwnmo/Imakefile.orig Fri Apr 21 17:44:22 2000
|
||||
+++ Xwnmo/xwnmo/Imakefile Fri Apr 21 17:44:39 2000
|
||||
@@ -30,7 +30,7 @@ XCOMM CONNECTION WITH THE USE OR PERFORM
|
||||
$OpenBSD: patch-Xwnmo_xwnmo_Imakefile,v 1.2 2008/08/30 11:17:00 espie Exp $
|
||||
--- Xwnmo/xwnmo/Imakefile.orig Thu Aug 25 01:26:16 1994
|
||||
+++ Xwnmo/xwnmo/Imakefile Sat Aug 30 13:13:02 2008
|
||||
@@ -30,7 +30,7 @@ XCOMM CONNECTION WITH THE USE OR PERFORMANCE OF THIS S
|
||||
XCOMM
|
||||
|
||||
LOCAL_INSTFLAGS = $(INSTBINFLAGS) -o $(WNNOWNER)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- config/Project.tmpl.orig 1994-08-29 10:40:17.000000000 +0200
|
||||
+++ config/Project.tmpl 2004-01-02 20:21:26.000000000 +0100
|
||||
@@ -14,6 +14,20 @@ XCOMM $XConsortium: Project.tmpl,v 1.242
|
||||
--- config/Project.tmpl.orig Mon Aug 29 10:40:17 1994
|
||||
+++ config/Project.tmpl Sat Aug 30 13:13:02 2008
|
||||
@@ -14,6 +14,20 @@ XCOMM $XConsortium: Project.tmpl,v 1.242 94/04/13 14:5
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
#define ProjectX 6 /* do *not* change this line */
|
||||
|
||||
/* The following project-specific rules are defined at the end of this file:
|
||||
@@ -70,9 +84,9 @@ XCOMM $XConsortium: Project.tmpl,v 1.242
|
||||
@@ -70,9 +84,9 @@ XCOMM $XConsortium: Project.tmpl,v 1.242 94/04/13 14:5
|
||||
#ifndef BuildXKB
|
||||
#define BuildXKB NO
|
||||
#endif
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-kWnn_jlib_Imakefile,v 1.2 2000/04/20 23:11:48 espie Exp $
|
||||
$OpenBSD: patch-kWnn_jlib_Imakefile,v 1.3 2008/08/30 11:17:00 espie Exp $
|
||||
--- kWnn/jlib/Imakefile.orig Wed Aug 17 03:11:40 1994
|
||||
+++ kWnn/jlib/Imakefile Fri Apr 21 01:05:04 2000
|
||||
+++ kWnn/jlib/Imakefile Sat Aug 30 13:13:02 2008
|
||||
@@ -10,7 +10,9 @@ XCOMM
|
||||
LINKS = getopt.c jl.c js.c wnnerrmsg.c
|
||||
JLIBDEFINES = -DWRITE_CHECK
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-kWnn_jlib_Imakefile,v 1.2 2000/04/20 23:11:48 espie Exp $
|
||||
LOCAL_RKSRCS= $(KWNNROMKANSRC)/rk_bltinfn.c \
|
||||
$(KWNNROMKANSRC)/rk_main.c \
|
||||
$(KWNNROMKANSRC)/rk_modread.c \
|
||||
@@ -40,8 +51,8 @@ LOCAL_RKOBJS= $(KWNNROMKANSRC)/rk_bltinf
|
||||
@@ -40,8 +51,8 @@ LOCAL_RKOBJS= $(KWNNROMKANSRC)/rk_bltinfn.o \
|
||||
$(KWNNROMKANSRC)/rk_read.o \
|
||||
$(KWNNROMKANSRC)/rk_vars.o
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user