Date: Mon, 28 Jul 2014 14:37:20 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363162 - in head/chinese: bg5ps bg5ps/files c2t/files celvis/files cless cless/files enscript/files gb2ps gb2ps/files hc/files lunar/files telnet/files Message-ID: <201407281437.s6SEbKar094351@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 14:37:20 2014 New Revision: 363162 URL: http://svnweb.freebsd.org/changeset/ports/363162 QAT: https://qat.redports.org/buildarchive/r363162/ Log: Rename chinese/ patch-xy patches to reflect the files the modify. Added: head/chinese/bg5ps/files/patch-Makefile - copied unchanged from r363137, head/chinese/bg5ps/files/patch-aa head/chinese/bg5ps/files/patch-bg5ps - copied unchanged from r363137, head/chinese/bg5ps/files/patch-ac head/chinese/bg5ps/files/patch-bg5ps.conf - copied unchanged from r363137, head/chinese/bg5ps/files/patch-ab head/chinese/bg5ps/files/patch-gb2312-bg5ps.conf - copied unchanged from r363137, head/chinese/bg5ps/files/patch-ae head/chinese/c2t/files/patch-Makefile - copied unchanged from r363137, head/chinese/c2t/files/patch-01 head/chinese/c2t/files/patch-c2t.c - copied unchanged from r363137, head/chinese/c2t/files/patch-02 head/chinese/celvis/files/patch-Makefile - copied unchanged from r363137, head/chinese/celvis/files/patch-aa head/chinese/celvis/files/patch-blk.c - copied unchanged from r363137, head/chinese/celvis/files/patch-ad head/chinese/celvis/files/patch-cmd1.c - copied unchanged from r363137, head/chinese/celvis/files/patch-ag head/chinese/celvis/files/patch-config.h - copied unchanged from r363137, head/chinese/celvis/files/patch-ab head/chinese/celvis/files/patch-recycle.c - copied unchanged from r363137, head/chinese/celvis/files/patch-ae head/chinese/celvis/files/patch-tmp.c - copied unchanged from r363137, head/chinese/celvis/files/patch-af head/chinese/celvis/files/patch-vi.h - copied unchanged from r363137, head/chinese/celvis/files/patch-ac head/chinese/cless/files/patch-Makefile.in - copied unchanged from r363137, head/chinese/cless/files/patch-aa head/chinese/cless/files/patch-defines.h.in - copied unchanged from r363137, head/chinese/cless/files/patch-ab head/chinese/cless/files/patch-less.nro - copied unchanged from r363137, head/chinese/cless/files/patch-ac head/chinese/cless/files/patch-lesskey.nro - copied unchanged from r363137, head/chinese/cless/files/patch-ad head/chinese/enscript/files/patch-chinese-escript - copied unchanged from r363137, head/chinese/enscript/files/patch-aa head/chinese/enscript/files/patch-lib_enscript.cfg.in - copied unchanged from r363137, head/chinese/enscript/files/patch-ab head/chinese/gb2ps/files/patch-Makefile - copied unchanged from r363137, head/chinese/gb2ps/files/patch-01 head/chinese/hc/files/patch-Makefile - copied unchanged from r363137, head/chinese/hc/files/patch-01 head/chinese/lunar/files/patch-Makefile - copied unchanged from r363137, head/chinese/lunar/files/patch-01 head/chinese/lunar/files/patch-lunar.1 - copied unchanged from r363137, head/chinese/lunar/files/patch-04 head/chinese/lunar/files/patch-lunar.c_1 - copied unchanged from r363137, head/chinese/lunar/files/patch-02 head/chinese/lunar/files/patch-lunar.c_2 - copied unchanged from r363137, head/chinese/lunar/files/patch-03 head/chinese/telnet/files/patch-sys_bsd.c - copied unchanged from r363137, head/chinese/telnet/files/patch-aa Deleted: head/chinese/bg5ps/files/patch-aa head/chinese/bg5ps/files/patch-ab head/chinese/bg5ps/files/patch-ac head/chinese/bg5ps/files/patch-ae head/chinese/c2t/files/patch-01 head/chinese/c2t/files/patch-02 head/chinese/celvis/files/patch-aa head/chinese/celvis/files/patch-ab head/chinese/celvis/files/patch-ac head/chinese/celvis/files/patch-ad head/chinese/celvis/files/patch-ae head/chinese/celvis/files/patch-af head/chinese/celvis/files/patch-ag head/chinese/cless/files/patch-aa head/chinese/cless/files/patch-ab head/chinese/cless/files/patch-ac head/chinese/cless/files/patch-ad head/chinese/enscript/files/patch-aa head/chinese/enscript/files/patch-ab head/chinese/gb2ps/files/patch-01 head/chinese/hc/files/patch-01 head/chinese/lunar/files/patch-01 head/chinese/lunar/files/patch-02 head/chinese/lunar/files/patch-03 head/chinese/lunar/files/patch-04 head/chinese/telnet/files/patch-aa Modified: head/chinese/bg5ps/Makefile head/chinese/bg5ps/pkg-plist head/chinese/cless/Makefile head/chinese/gb2ps/Makefile Modified: head/chinese/bg5ps/Makefile ============================================================================== --- head/chinese/bg5ps/Makefile Mon Jul 28 14:29:49 2014 (r363161) +++ head/chinese/bg5ps/Makefile Mon Jul 28 14:37:20 2014 (r363162) @@ -16,7 +16,7 @@ LIB_DEPENDS= libttf.so:${PORTSDIR}/print USE_PYTHON= yes SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS EXAMPLES do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${STAGEDIR}${PREFIX}/bin @@ -24,7 +24,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${STAGEDIR}${PREFIX}/etc/bg5ps.conf.sample ${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${STAGEDIR}${PREFIX}/etc/gb2312-bg5ps.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/netscape.ps ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/test.big5 ${STAGEDIR}${EXAMPLESDIR} Copied: head/chinese/bg5ps/files/patch-Makefile (from r363137, head/chinese/bg5ps/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/bg5ps/files/patch-Makefile Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/bg5ps/files/patch-aa) @@ -0,0 +1,38 @@ + +$FreeBSD$ + +--- Makefile.orig 2000-02-14 21:41:27.000000000 +0100 ++++ Makefile 2014-01-25 19:07:23.000000000 +0100 +@@ -17,23 +17,24 @@ + + OBJS = ttf2psm.o b5tou8.o b5_in.o gb_in.o gbtou8.o + +-CC = gcc ++CC ?= gcc + INSTALL = install +-CFLAGS = ++CFLAGS += -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include + LIBS = -lttf -lm +-INCLUDEDIR = ++LIBSDIR = -L${LOCALBASE}/lib + +-prefix = /usr +-BINDIR = $(prefix)/bin +-ETCDIR = /etc/chinese/ ++ ++PREFIX?= /usr/local ++BINDIR = $(PREFIX)/bin ++ETCDIR = $(PREFIX)/etc + + all: ttf2psm + + %.o : %.c +- $(CC) -c $(CFLAGS) $(INCLUDEDIR) $< -o $@ ++ $(CC) -c $(CFLAGS) $< -o $@ + + ttf2psm: $(OBJS) +- $(CC) $(CFLAGS) $(INCLUDEDIR) $(LIBS) -o ttf2psm $(OBJS) ++ $(CC) $(CFLAGS) $(LIBSDIR) $(LIBS) -o ttf2psm $(OBJS) + + install: all bg5ps bg5ps.conf + mkdir -p $(ETCDIR) Copied: head/chinese/bg5ps/files/patch-bg5ps (from r363137, head/chinese/bg5ps/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/bg5ps/files/patch-bg5ps Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/bg5ps/files/patch-ac) @@ -0,0 +1,23 @@ +--- bg5ps.orig Thu Nov 2 23:50:38 2000 ++++ bg5ps Thu Nov 2 23:55:25 2000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/local/bin/python + ################################################################################ + # bg5ps.py which use the ttf2ps program to convert the Big5 Coding chinese # + # text into printable postscript file. Since it uses true type font, the # +@@ -443,10 +443,10 @@ + exec l + cf.close() + else: +- sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying /etc/chinese/bg5ps.conf.") +- if os.path.isfile("/etc/chinese/bg5ps.conf"): +- sys.stderr.write("\n /etc/chinese/bg5ps.conf found. Use configuration file /etc/chinese/bg5ps.conf") +- cf=open("/etc/chinese/bg5ps.conf","r") ++ sys.stderr.write("\n~/.bg5ps.conf not found.\n Trying /usr/local/etc/bg5ps.conf.") ++ if os.path.isfile("/usr/local/etc/bg5ps.conf"): ++ sys.stderr.write("\n /usr/local/etc/bg5ps.conf found. Use configuration file /usr/local/etc/bg5ps.conf") ++ cf=open("/usr/local/etc/bg5ps.conf","r") + for l in cf.readlines(): + exec l + cf.close() Copied: head/chinese/bg5ps/files/patch-bg5ps.conf (from r363137, head/chinese/bg5ps/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/bg5ps/files/patch-bg5ps.conf Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/bg5ps/files/patch-ab) @@ -0,0 +1,11 @@ +--- bg5ps.conf.orig Thu Nov 2 23:47:35 2000 ++++ bg5ps.conf Thu Nov 2 23:50:27 2000 +@@ -4,7 +4,7 @@ + Encoding="big5" + + #chineseFontPath: 指定中文字型的路徑(預設值: 與 bg5ps 同) +-chineseFontPath="/usr/share/fonts/ttf/" ++chineseFontPath="/usr/X11R6/lib/X11/fonts/TrueType" + + #modify the above line + Copied: head/chinese/bg5ps/files/patch-gb2312-bg5ps.conf (from r363137, head/chinese/bg5ps/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/bg5ps/files/patch-gb2312-bg5ps.conf Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/bg5ps/files/patch-ae) @@ -0,0 +1,9 @@ +--- gb2312-bg5ps.conf.orig Fri Nov 3 01:31:43 2000 ++++ gb2312-bg5ps.conf Fri Nov 3 01:31:49 2000 +@@ -1,5 +1,5 @@ + #chineseFontPath: 指定中文字型的路徑(預設值: 與 bg5ps 同) +-chineseFontPath="/usr/share/fonts/ttf/" ++chineseFontPath="/usr/X11R6/lib/X11/fonts/TrueType" + + #modify the above line + Modified: head/chinese/bg5ps/pkg-plist ============================================================================== --- head/chinese/bg5ps/pkg-plist Mon Jul 28 14:29:49 2014 (r363161) +++ head/chinese/bg5ps/pkg-plist Mon Jul 28 14:37:20 2014 (r363162) @@ -11,14 +11,14 @@ %%PORTDOCS%%%%DOCSDIR%%/html/bg5ps.html %%PORTDOCS%%%%DOCSDIR%%/makeps %%PORTDOCS%%%%DOCSDIR%%/ttf2ps.doc -%%EXAMPLESDIR%%/netscape.ps -%%EXAMPLESDIR%%/test.big5 -%%EXAMPLESDIR%%/test.gb2312 -%%EXAMPLESDIR%%/test.sh +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netscape.ps +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.big5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.gb2312 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.sh bin/bg5ps bin/ttf2psm etc/bg5ps.conf.sample etc/gb2312-bg5ps.conf.sample -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% Copied: head/chinese/c2t/files/patch-Makefile (from r363137, head/chinese/c2t/files/patch-01) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/c2t/files/patch-Makefile Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/c2t/files/patch-01) @@ -0,0 +1,15 @@ +--- Makefile.orig 1993-02-24 14:21:39.000000000 +0800 ++++ Makefile 2011-09-05 14:22:03.000000000 +0800 +@@ -1,9 +1,9 @@ +-CC=cc ++DEFINE= -DCHINDICT=\"$(PREFIX)/share/chinese/gb/TONEPY.tit\" + + all: c2t + + c2t: c2t.o +- $(CC) -O -o c2t c2t.o ++ $(CC) $(CFLAGS) $(DEFINE) -o c2t c2t.o + + c2t.o: c2t.c +- $(CC) -O -c c2t.c ++ $(CC) $(CFLAGS) $(DEFINE) -c c2t.c Copied: head/chinese/c2t/files/patch-c2t.c (from r363137, head/chinese/c2t/files/patch-02) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/c2t/files/patch-c2t.c Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/c2t/files/patch-02) @@ -0,0 +1,54 @@ +--- c2t.c.orig 1993-02-24 14:29:23.000000000 +0800 ++++ c2t.c 2011-09-05 14:25:34.000000000 +0800 +@@ -18,14 +18,18 @@ + + #define MEMAREA 4096 /* max number of lines in DICT file, wc -l DICT */ + +-main(argc, argv) ++int main(argc, argv) + int argc; + char **argv; + { ++#ifndef CHINDICT + char *DICT="/home/ftp/software/unix/X-Window/cxterm-dictionary/TONEPY.tit"; ++#else ++ char *DICT=CHINDICT; ++#endif + register int eka=0, toka=0, i=0; + register char hz[4], **pipo=0; +- register char **taulu=0, rivi[82]; ++ char **taulu=0, rivi[82]; + register int rpit=0, tila=0, rraja=0, mulpin=0; + int monitila=0; + FILE *piffi=0; +@@ -57,12 +61,12 @@ char **argv; + i =0; + } /*if argc > 1 */ + if ((piffi = fopen (DICT, "r")) == 0) { +- printf (stderr, "Error: unable to open pinyin dictionnary %s\n", ++ fprintf (stderr, "Error: unable to open pinyin dictionnary %s\n", + DICT); + exit (-1); + } + if ((taulu = (char **)malloc (MEMAREA*sizeof(char *))) == 0) { +- printf (stderr, "Error: out of memory when allocating taulu(MEMAREA too large)\n"); ++ fprintf (stderr, "Error: out of memory when allocating taulu(MEMAREA too large)\n"); + exit (-2); + } + pipo = taulu; +@@ -81,13 +85,13 @@ char **argv; + } else { + if (rivi[0] == '#') continue; + if ((*pipo = (char *)malloc (rpit+8)) == 0) { +- printf (stderr, "Error: out of memory when allocating *pipo\n"); ++ fprintf (stderr, "Error: out of memory when allocating *pipo\n"); + exit (-3); + } + strcpy (*pipo, rivi); + pipo++; + if (++rraja >= MEMAREA) { +- printf (stderr, "Error: out of memory when allocating *pipo(MEMAREA too small)...\n"); ++ fprintf (stderr, "Error: out of memory when allocating *pipo(MEMAREA too small)...\n"); + exit (-4); + } + } Copied: head/chinese/celvis/files/patch-Makefile (from r363137, head/chinese/celvis/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/celvis/files/patch-Makefile Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/celvis/files/patch-aa) @@ -0,0 +1,11 @@ +--- Makefile.orig Thu May 16 03:09:50 1991 ++++ Makefile Sun Apr 2 11:44:47 2000 +@@ -22,7 +22,7 @@ + SRC5= regexp.c regexp.h regsub.c sysdos.c system.c tinytcap.c tio.c tmp.c + SRC6= vars.c vcmd.c vi.c vi.h ctags.c ref.c virec.c wildcard.c shell.c + EXTRA= +-CFLAGS= -O ++CFLAGS+= -D_HAVE_PARAM_H + LIBS= -ltermcap + + all: $(PROGS) Copied: head/chinese/celvis/files/patch-blk.c (from r363137, head/chinese/celvis/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/celvis/files/patch-blk.c Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/celvis/files/patch-ad) @@ -0,0 +1,12 @@ +--- blk.c.orig Tue Nov 6 11:53:55 1990 ++++ blk.c Thu Aug 15 04:47:18 1996 +@@ -19,7 +19,9 @@ + # define NBUFS 5 /* must be at least 3 -- more is better */ + #endif + ++#if !(defined(BSD) && (BSD >= 199103)) + extern long lseek(); ++#endif + + /*------------------------------------------------------------------------*/ + Copied: head/chinese/celvis/files/patch-cmd1.c (from r363137, head/chinese/celvis/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/celvis/files/patch-cmd1.c Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/celvis/files/patch-ag) @@ -0,0 +1,22 @@ +--- cmd1.c.orig Tue Nov 6 11:53:55 1990 ++++ cmd1.c Sat Aug 17 15:18:01 1996 +@@ -882,9 +882,6 @@ + #else + msg("%s (%s)", VERSION, DATE); + #endif +-#ifdef COMPILED_BY +- msg("Compiled by %s", COMPILED_BY); +-#endif + #ifdef CREDIT + msg("%s", CREDIT); + #endif +@@ -893,6 +890,9 @@ + #endif + #ifdef CVERSION + msg("%s", CVERSION); ++#endif ++#ifdef COMPILED_BY ++ msg("Compiled by %s", COMPILED_BY); + #endif + #ifdef COPYING + msg("%s", COPYING); Copied: head/chinese/celvis/files/patch-config.h (from r363137, head/chinese/celvis/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/celvis/files/patch-config.h Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/celvis/files/patch-ab) @@ -0,0 +1,30 @@ +--- config.h.orig Tue Nov 6 11:53:55 1990 ++++ config.h Thu Aug 15 05:42:16 1996 +@@ -5,6 +5,10 @@ + */ + + /*************************** autoconf section ************************/ ++/* Can we tell a little more about this system? */ ++#ifdef _HAVE_PARAM_H ++# include <sys/param.h> ++#endif + + /* standard unix V (?) */ + #ifdef M_SYSV +@@ -175,9 +179,15 @@ + #endif + + /******************* Names of files and environment vars **********************/ ++#if (defined(BSD) && (BSD >= 199103)) ++# define TMPDIR "/var/tmp" /* directory where temp files live */ ++# define COMPILED_BY "{Free,Net,Open,4.4,4.3/Reno}BSD (ported by David O'Brien)" ++#endif + + #if ANY_UNIX +-# define TMPDIR "/usr/tmp" /* directory where temp files live */ ++# ifndef TMPDIR ++# define TMPDIR "/usr/tmp" /* directory where temp files live */ ++# endif + # define TMPNAME "%s/elvt%04x%03x" /* temp file */ + # define CUTNAME "%s/elvc%04x%03x" /* cut buffer's temp file */ + # define EXRC ".exrc" /* init file in current directory */ Copied: head/chinese/celvis/files/patch-recycle.c (from r363137, head/chinese/celvis/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/celvis/files/patch-recycle.c Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/celvis/files/patch-ae) @@ -0,0 +1,12 @@ +--- recycle.c.orig Tue Nov 6 11:53:56 1990 ++++ recycle.c Thu Aug 15 04:51:43 1996 +@@ -18,7 +18,9 @@ + #ifndef NO_RECYCLE + /* this whole file would have be skipped if NO_RECYCLE is defined */ + ++#if !(defined(BSD) && (BSD >= 199103)) + extern long lseek(); ++#endif + + #define BTST(bitno, byte) ((byte) & (1 << (bitno))) + #define BSET(bitno, byte) ((byte) |= (1 << (bitno))) Copied: head/chinese/celvis/files/patch-tmp.c (from r363137, head/chinese/celvis/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/celvis/files/patch-tmp.c Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/celvis/files/patch-af) @@ -0,0 +1,28 @@ +--- tmp.c.orig Thu Aug 15 04:45:57 1996 ++++ tmp.c Thu Aug 15 05:14:50 1996 +@@ -21,6 +21,7 @@ + + /* The FAIL() macro prints an error message and then exits. */ + #define FAIL(why,arg) mode = MODE_EX; msg(why, arg); endwin(); HZ_abort(9) ++#define FAIL2(why,arg1,arg2) mode = MODE_EX; msg(why, arg1, arg2); endwin(); HZ_abort(9) + + /* This is the name of the temp file */ + static char tmpname[80]; +@@ -91,7 +92,7 @@ + if (*o_readonly || (statb.st_mode & S_IJRON)) + #endif + #if OS9 +- if we don't have write permission... ++ /* if we don't have write permission... */ + #endif + #if ANY_UNIX + if (*o_readonly || !(statb.st_mode & +@@ -149,7 +150,7 @@ + tmpfd = open(tmpname, O_RDWR | O_BINARY); + if (tmpfd < 0) + { +- FAIL("Can't create temporary file, errno=%d", errno); ++ FAIL2("Can't create temporary file (%s), errno=%d", tmpname, errno); + return 1; + } + Copied: head/chinese/celvis/files/patch-vi.h (from r363137, head/chinese/celvis/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/celvis/files/patch-vi.h Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/celvis/files/patch-ac) @@ -0,0 +1,11 @@ +--- vi.h.orig Sun Oct 20 19:08:33 1991 ++++ vi.h Thu Aug 15 04:45:45 1996 +@@ -101,7 +101,7 @@ + #define READONLY 0x0002 /* the file is read-only */ + #define HADNUL 0x0004 /* the file contained NUL characters */ + #define MODIFIED 0x0008 /* the file has been modified */ +-#define NOFILE 0x0010 /* no name is known for the current text */ ++#define NOFILENAME 0x0010 /* no name is known for the current text */ + #define ADDEDNL 0x0020 /* newlines were added to the file */ + + /* macros used to set/clear/test flags */ Modified: head/chinese/cless/Makefile ============================================================================== --- head/chinese/cless/Makefile Mon Jul 28 14:29:49 2014 (r363161) +++ head/chinese/cless/Makefile Mon Jul 28 14:37:20 2014 (r363162) @@ -15,12 +15,9 @@ CPP= # OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cless - ${INSTALL_DATA} ${WRKSRC}/README.CLESS ${STAGEDIR}${PREFIX}/share/doc/cless -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.CLESS ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Copied: head/chinese/cless/files/patch-Makefile.in (from r363137, head/chinese/cless/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/cless/files/patch-Makefile.in Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/cless/files/patch-aa) @@ -0,0 +1,39 @@ +--- Makefile.in.orig 1995-04-25 10:41:39.000000000 +0800 ++++ Makefile.in 2014-01-08 23:13:25.000000000 +0800 +@@ -73,24 +73,24 @@ lesskey: lesskey.${O} version.${O} + ${OBJ}: less.h defines.h funcs.h + + filename.${O}: filename.c +- ${CC} -c -DHELPFILE=\"${datadir}/less.hlp\" -I. ${CPPFLAGS} ${CFLAGS} ${srcdir}/filename.c ++ ${CC} -c -DHELPFILE=\"${datadir}/cless.gb\" -I. ${CPPFLAGS} ${CFLAGS} ${srcdir}/filename.c + + install: all less.hlp less.bg5 less.gb less.nro installdirs +- ${INSTALL_PROGRAM} less ${bindir}/${binprefix}less +- ${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}lesskey +- ${INSTALL_DATA} ${srcdir}/less.hlp ${datadir}/less.hlp +- ${INSTALL_DATA} ${srcdir}/less.bg5 ${datadir}/less.bg5 +- ${INSTALL_DATA} ${srcdir}/less.gb ${datadir}/less.gb +- ${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/${manprefix}less.${manext} +- ${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/${manprefix}lesskey.${manext} ++ ${INSTALL_PROGRAM} less $(DESTDIR)${bindir}/${binprefix}cless ++ ${INSTALL_PROGRAM} lesskey $(DESTDIR)${bindir}/${binprefix}clesskey ++ ${INSTALL_DATA} ${srcdir}/less.hlp $(DESTDIR)${datadir}/cless.hlp ++ ${INSTALL_DATA} ${srcdir}/less.bg5 $(DESTDIR)${datadir}/cless.bg5 ++ ${INSTALL_DATA} ${srcdir}/less.gb $(DESTDIR)${datadir}/cless.gb ++ ${INSTALL_DATA} ${srcdir}/less.nro $(DESTDIR)${mandir}/${manprefix}cless.${manext} ++ ${INSTALL_DATA} ${srcdir}/lesskey.nro $(DESTDIR)${mandir}/${manprefix}clesskey.${manext} + + installdirs: mkinstalldirs +- ${srcdir}/mkinstalldirs ${bindir} ${datadir} ${mandir} ++ ${srcdir}/mkinstalldirs $(DESTDIR)${bindir} $(DESTDIR)${datadir} $(DESTDIR)${mandir} + + uninstall: +- rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey +- rm -f ${datadir}/less.hlp ${datadir}/less.bg5 ${datadir}/less.gb +- rm -f ${mandir}/less.${manext} ${mandir}/lesskey.${manext} ++ rm -f ${bindir}/${binprefix}cless ${bindir}/${binprefix}clesskey ++ rm -f ${datadir}/cless.hlp ${datadir}/cless.bg5 ${datadir}/cless.gb ++ rm -f ${mandir}/cless.${manext} ${mandir}/clesskey.${manext} + + info: + install-info: Copied: head/chinese/cless/files/patch-defines.h.in (from r363137, head/chinese/cless/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/cless/files/patch-defines.h.in Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/cless/files/patch-ab) @@ -0,0 +1,13 @@ +--- defines.h.in.orig Sun Sep 15 22:58:20 1996 ++++ defines.h.in Sun Sep 15 22:58:27 1996 +@@ -104,8 +104,8 @@ + * DEF_LESSKEYINFILE is the filename of the default lesskey input + * (in the HOME directory). + */ +-#define LESSKEYFILE ".less" +-#define DEF_LESSKEYINFILE ".lesskey" ++#define LESSKEYFILE ".cless" ++#define DEF_LESSKEYINFILE ".clesskey" + + + /* Settings always true on Unix. */ Copied: head/chinese/cless/files/patch-less.nro (from r363137, head/chinese/cless/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/cless/files/patch-less.nro Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/cless/files/patch-ac) @@ -0,0 +1,433 @@ +--- less.nro.orig Sun Sep 15 23:00:49 1996 ++++ less.nro Sun Sep 15 23:06:46 1996 +@@ -1,12 +1,12 @@ + .TH LESS 1 + .SH NAME +-less \- opposite of more ++cless \- opposite of more + .SH SYNOPSIS +-.B "less -?" ++.B "cless -?" + .br +-.B "less -V" ++.B "cless -V" + .br +-.B "less [-[+]aBcCdeEfgGiImMnNqQrsSuUVwX]" ++.B "cless [-[+]aBcCdeEfgGiImMnNqQrsSuUVwX]" + .br + .B " [-b \fIbufs\fP] [-h \fIlines\fP] [-j \fIline\fP] [-k \fIkeyfile\fP]" + .br +@@ -23,7 +23,7 @@ + (1), but which allows backward movement + in the file as well as forward movement. + Also, +-.I less ++.I cless + does not have to read the entire input file before starting, + so with large input files it starts up faster than text editors like + .I vi +@@ -114,7 +114,7 @@ + Go to a position N percent into the file. + N should be between 0 and 100. + (This works if standard input is being read, but only if +-.I less ++.I cless + has already read to the end of the file. + It is always fast, but not always useful.) + .PP +@@ -329,18 +329,18 @@ + .IP +cmd + Causes the specified cmd to be executed each time a new file is examined. + For example, +G causes +-.I less ++.I cless + to initially display each file starting at the end + rather than the beginning. + .PP + .IP V + Prints the version number of +-.I less ++.I cless + being run. + .PP + .IP "q or :q or :Q or ZZ" + Exits +-.I less. ++.I cless. + .PP + The following + three +@@ -374,13 +374,13 @@ + .SH OPTIONS + Command line options are described below. + Most options may be changed while +-.I less ++.I cless + is running, via the "\-" command. + .PP + Options are also taken from the environment variable "LESS". + For example, +-to avoid typing "less -options ..." each time +-.I less ++to avoid typing "cless -options ..." each time ++.I cless + is invoked, you might tell + .I csh: + .sp +@@ -402,10 +402,10 @@ + following string. + .IP -? + This option displays a summary of the commands accepted by +-.I less ++.I cless + (the same as the h command). + If this option is given, all other options are ignored, and +-.I less ++.I cless + exits after the help screen is viewed. + (Depending on how your shell interprets the question mark, + it may be necessary to quote the question mark, thus: "-\\?".) +@@ -417,7 +417,7 @@ + (or after the last found line; see the -j option). + .IP -b\fIn\fP + Specifies the number of buffers +-.I less ++.I cless + will use for each file. + Buffers are 1K, and by default 10 buffers are used for each file + (except if the file is a pipe; see the -B option). +@@ -444,7 +444,7 @@ + that is, lacks some important capability, + such as the ability to clear the screen or scroll backward. + The -d option does not otherwise change the behavior of +-.I less ++.I cless + on a dumb terminal). + .IP -D\fBx\fP\fIcolor\fP + [MS-DOS only] +@@ -457,31 +457,31 @@ + A single number \fIN\fP is the same as \fIN.0\fP. + .IP -e + Causes +-.I less ++.I cless + to automatically exit + the second time it reaches end-of-file. + By default, the only way to exit +-.I less ++.I cless + is via the "q" command. + .IP -E + Causes +-.I less ++.I cless + to automatically exit the first time it reaches end-of-file. + .IP -f + Forces non-regular files to be opened. + (A non-regular file is a directory or a device special file.) + Also suppresses the warning message when a binary file is opened. + By default, +-.I less ++.I cless + will refuse to open non-regular files. + .IP -g + Normally, +-.I less ++.I cless + will highlight ALL strings which match the last search command. + The -g flag changes this behavior to highlight only the particular string + which was found by the last search command. + This can cause +-.I less ++.I cless + to run somewhat faster than the default. + .IP -G + The -G flag suppresses all highlighting of strings found by search commands. +@@ -519,32 +519,32 @@ + on the screen. + .IP -k\fIfilename\fP + Causes +-.I less ++.I cless + to open and interpret the named file as a +-.I lesskey ++.I clesskey + (1) file. + Multiple -k options may be specified. +-If a file called .less exists in the user's home directory, this ++If a file called .cless exists in the user's home directory, this + file is also used as a +-.I lesskey ++.I clesskey + file. + .IP -m + Causes +-.I less ++.I cless + to prompt verbosely (like \fImore\fP), + with the percent into the file. + By default, +-.I less ++.I cless + prompts with a colon. + .IP -M + Causes +-.I less ++.I cless + to prompt even more verbosely than + .I more. + .IP -n + Suppresses line numbers. + The default (to use line numbers) may cause +-.I less ++.I cless + to run more slowly in some cases, especially with a very large input file. + Suppressing line numbers with the -n flag will avoid this problem. + Using line numbers means: the line number will be displayed in the verbose +@@ -556,12 +556,12 @@ + each line in the display. + .IP -o\fIfilename\fP + Causes +-.I less ++.I cless + to copy its input to the named file as it is being viewed. + This applies only when the input file is a pipe, + not an ordinary file. + If the file already exists, +-.I less ++.I cless + will ask for confirmation before overwriting it. + .IP -O\fIfilename\fP + The -O option is like -o, but it will overwrite an existing +@@ -569,23 +569,23 @@ + .sp + If no log file has been specified, + the -o and -O options can be used from within +-.I less ++.I cless + to specify a log file. + Without a file name, they will simply report the name of the log file. + The "s" command is equivalent to specifying -o from within +-.I less. ++.I cless. + .IP -p\fIpattern\fP + The -p option on the command line is equivalent to + specifying +/\fIpattern\fP; + that is, it tells +-.I less ++.I cless + to start at the first occurrence of \fIpattern\fP in the file. + .IP -P\fIprompt\fP + Provides a way to tailor the three prompt + styles to your own preference. + This option would normally be put in the LESS environment + variable, rather than being typed in with each +-.I less ++.I cless + command. + Such an option must either be the last option in the LESS variable, + or be terminated by a dollar sign. +@@ -613,7 +613,7 @@ + The default is to display control characters using the caret notation; + for example, a control-A (octal 001) is displayed as "^A". + Warning: when the -r flag is used, +-.I less ++.I cless + cannot keep track of the actual appearance of the screen + (since this depends on how the screen responds to + each type of control character). +@@ -638,10 +638,10 @@ + .I ctags + (1) command. + This option may also be specified from within +-.I less ++.I cless + (using the \- command) as a way of examining a new file. + The command ":t" is equivalent to specifying -t from within +-.I less. ++.I cless. + .IP -T\fItagsfile\fP + Specifies a tags file to be used instead of "tags". + .IP -u +@@ -667,7 +667,7 @@ + if neither -u nor -U is in effect. + .IP -V + Displays the version number of +-.I less. ++.I cless. + .IP -w + Causes blank lines to be used to represent lines + past the end of the file. +@@ -705,9 +705,9 @@ + .IP + + If a command line option begins with \fB+\fP, + the remainder of that option is taken to be an initial command to +-.I less. ++.I cless. + For example, +G tells +-.I less ++.I cless + to start at the end of the file rather than the beginning, + and +/xyz tells it to start at the first occurrence of "xyz" in the file. + As a special case, +<number> acts like +<number>g; +@@ -777,25 +777,25 @@ + + .SH "KEY BINDINGS" + You may define your own +-.I less ++.I cless + commands by using the program +-.I lesskey ++.I clesskey + (1) +-to create a file called ".less" in your home directory. ++to create a file called ".cless" in your home directory. + This file specifies a set of command keys and an action + associated with each key. + You may also use +-.I lesskey ++.I clesskey + to change the line-editing keys (see LINE EDITING). + See the +-.I lesskey ++.I clesskey + manual page for more details. + + .SH "INPUT PREPROCESSOR" + You may define an "input preprocessor" for +-.I less. ++.I cless. + Before +-.I less ++.I cless + opens a file, it first gives your input preprocessor a chance to modify the + way the contents of the file are displayed. + An input preprocessor is simply an executable program (or shell script), +@@ -805,7 +805,7 @@ + in place of the contents of the original file. + However, it will appear to the user as if the original file is opened; + that is, +-.I less ++.I cless + will display the original filename as the name of the current file. + .PP + An input preprocessor receives one command line argument, the original filename, +@@ -813,7 +813,7 @@ + It should create the replacement file, and when finished, + print the name of the replacement file to its standard output. + If the input preprocessor does not output a replacement filename, +-.I less ++.I cless + uses the original file, as normal. + The input preprocessor is not called when viewing standard input. + To set up an input preprocessor, set the LESSOPEN environment variable +@@ -823,7 +823,7 @@ + when the input preprocessor command is invoked. + .PP + When +-.I less ++.I cless + closes a file opened in such a way, it will call another program, + called the input postprocessor, + which may perform any desired clean-up action (such as deleting the +@@ -839,24 +839,24 @@ + .PP + For example, on many Unix systems, these two scripts will allow you + to keep files in compressed format, but still let +-.I less ++.I cless + view them directly: + .PP +-lessopen.sh: ++clessopen.sh: + .br + #! /bin/sh + .br + case "$1" in + .br +- *.Z) uncompress -c $1 >/tmp/less.$$ 2>/dev/null ++ *.Z) uncompress -c $1 >/tmp/cless.$$ 2>/dev/null + .br +- if [ -s /tmp/less.$$ ]; then ++ if [ -s /tmp/cless.$$ ]; then + .br +- echo /tmp/less.$$ ++ echo /tmp/cless.$$ + .br + else + .br +- rm -f /tmp/less.$$ ++ rm -f /tmp/cless.$$ + .br + fi + .br +@@ -878,7 +878,7 @@ + .PP + It is also possible to set up an input preprocessor to + pipe the file data directly to +-.I less, ++.I cless, + rather than putting the data into a replacement file. + This avoids the need to decompress the entire file before + starting to view it. +@@ -888,7 +888,7 @@ + writes the entire contents of the replacement file on its standard output. + If the input pipe does not write any characters on its standard output, + then there is no replacement file and +-.I less ++.I cless + uses the original file, as normal. + To use an input pipe, + make the first character in the LESSOPEN environment variable a +@@ -950,7 +950,7 @@ + Selects a character set appropriate for NeXT computers. + .PP + In special cases, it may be desired to tailor +-.I less ++.I cless + to use a character set other than the ones definable by LESSCHARSET. + In this case, the environment variable LESSCHARDEF can be used + to define a character set. +@@ -983,7 +983,7 @@ + but your system supports the + .I setlocale + interface, +-.I less ++.I cless + will use setlocale to determine the character set. + setlocale is controlled by setting the LANG or LC_CTYPE environment variables. + .PP +@@ -1173,14 +1173,14 @@ + .IP EDITOR + The name of the editor (used for the v command). + .IP HOME +-Name of the user's home directory (used to find a .less file). ++Name of the user's home directory (used to find a .cless file). + .IP LANG + Language for determining the character set. + .IP LC_CTYPE + Language for determining the character set. + .IP LESS + Flags which are passed to +-.I less ++.I cless + automatically. + .IP LESSBINFMT + Format for displaying non-printable, non-control characters. +@@ -1204,13 +1204,14 @@ + The shell used to execute the ! command, as well as to expand filenames. + .IP TERM + The type of terminal on which +-.I less ++.I cless + is being run. + .IP VISUAL + The name of the editor (used for the v command). + + .SH "SEE ALSO" +-lesskey(1) ++clesskey(1) ++less(1) + + .SH WARNINGS + The = command and prompts (unless changed by -P) Copied: head/chinese/cless/files/patch-lesskey.nro (from r363137, head/chinese/cless/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/cless/files/patch-lesskey.nro Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/cless/files/patch-ad) @@ -0,0 +1,103 @@ +--- lesskey.nro.orig Sun Sep 15 23:00:54 1996 ++++ lesskey.nro Sun Sep 15 23:03:28 1996 +@@ -1,22 +1,22 @@ + .TH LESSKEY 1 + .SH NAME +-lesskey \- specify key bindings for less ++clesskey \- specify key bindings for cless + .SH SYNOPSIS +-.B "lesskey [-o output] [input]" ++.B "clesskey [-o output] [input]" + .br +-.B "lesskey -V" ++.B "clesskey -V" + .SH DESCRIPTION + .I Lesskey + is used to specify a set of key bindings to be used by +-.I less. ++.I cless. + The input file is a text file which describes the key bindings, + If the input file is "-", standard input is read. +-If no input file is specified, $HOME/.lesskey is read. ++If no input file is specified, $HOME/.clesskey is read. + The output file is a binary file which is used by +-.I less. +-If no output file is specified, $HOME/.less is written. ++.I cless. ++If no output file is specified, $HOME/.cless is written. + If the output file already exists, +-.I lesskey ++.I clesskey + will overwrite it. + .PP + The input file consists of lines of the form: +@@ -26,7 +26,7 @@ + Whitespace is any sequence of one or more spaces and/or tabs. + The \fIstring\fP is the command key(s) which invoke the action. + The \fIstring\fP may be a single command key, or a sequence of up to 15 keys. +-The \fIaction\fP is the name of the less action, from the list below. ++The \fIaction\fP is the name of the cless action, from the list below. + The characters in the \fIstring\fP may appear literally, or be + prefixed by a caret to indicate a control key. + A backslash followed by one to three octal digits may be used to +@@ -41,22 +41,22 @@ + .PP + An action may be followed by an "extra" string. + When such a command is entered while running +-.I less, ++.I cless, + the action is performed, and then the extra + string is parsed, just as if it were typed in to +-.I less. ++.I cless. + This feature can be used in certain cases to extend + the functionality of a command. + For example, see the "{" and ":t" commands in the example below. + .PP + The -V flag causes +-.I lesskey ++.I clesskey + to print its version number and immediately exit. + Other flags and arguments are ignored. + + .SH EXAMPLE + The following input file describes the set of +-default command keys used by less: ++default command keys used by cless: + .sp + .nf + \er forw-line +@@ -147,14 +147,14 @@ + .sp + .SH PRECEDENCE + Commands specified by +-.I lesskey ++.I clesskey + take precedence over the default commands. + A default command key may be disabled by including it in the + input file with the action "invalid". + Alternatively, a key may be defined + to do nothing by using the action "noaction". + "noaction" is similar to "invalid", but +-.I less ++.I cless + will give an error beep for an "invalid" command, + but not for a "noaction" command. + In addition, ALL default commands may be disabled by +@@ -185,7 +185,7 @@ + + .SH EXAMPLE + The following input file describes the set of +-default line-editing keys used by less: ++default line-editing keys used by cless: + .sp + .nf + #line-edit +@@ -210,6 +210,7 @@ + .sp + + .SH "SEE ALSO" ++cless(1) + less(1) + + .SH COPYRIGHT Copied: head/chinese/enscript/files/patch-chinese-escript (from r363137, head/chinese/enscript/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/enscript/files/patch-chinese-escript Mon Jul 28 14:37:20 2014 (r363162, copy of r363137, head/chinese/enscript/files/patch-aa) @@ -0,0 +1,235 @@ +diff -ruN src.orib/gsint.h src/gsint.h +--- src.orib/gsint.h Thu May 13 12:41:04 2004 ++++ src/gsint.h Thu May 13 12:58:29 2004 +@@ -190,7 +190,9 @@ + ENC_VMS, + ENC_HP8, + ENC_KOI8, +- ENC_PS ++ ENC_PS, ++ ENC_BIG5, ++ ENC_UNICNS_UTF8, + } InputEncoding; + + struct encoding_registry_st +diff -ruN src.orib/main.c src/main.c +--- src.orib/main.c Thu May 13 12:41:04 2004 ++++ src/main.c Thu May 13 12:42:28 2004 +@@ -817,6 +817,8 @@ + {{"koi8", NULL, NULL}, ENC_KOI8, '\n', 8}, + {{"ps", "PS", NULL}, ENC_PS, '\n', 8}, + {{"pslatin1", "ISOLatin1Encoding", NULL}, ENC_ISO_8859_1, '\n', 8}, ++ {{"big5", "Formal Chinese", NULL}, ENC_BIG5, '\n', 8}, ++ {{"UniCNS-UTF8", "Formal Chinese", NULL}, ENC_UNICNS_UTF8, '\n', 8}, *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281437.s6SEbKar094351>