From ce9997829da127000dac5e744a01d051224f9bd8 Mon Sep 17 00:00:00 2001 From: Masafumi Max NAKANE Date: Fri, 20 Sep 1996 05:47:59 +0000 Subject: Upgrade, 3.91 -> 3.95lj1.1b3 --- japanese/pine/Makefile | 70 +++--- japanese/pine/distinfo | 7 +- japanese/pine/files/patch-aa | 54 ++--- japanese/pine/files/patch-ab | 138 ++++++++--- japanese/pine/files/patch-ac | 497 +++++++++++++++++++++++++++++++++------- japanese/pine/files/patch-ad | 192 +++++++++++----- japanese/pine/files/patch-ae | 187 ++++++++++++--- japanese/pine/files/patch-af | 205 +++++++++-------- japanese/pine/files/patch-ag | 46 +++- japanese/pine/files/patch-ah | 32 +-- japanese/pine/files/patch-ak | 37 ++- japanese/pine/files/patch-al | 85 +++++-- japanese/pine/pkg-comment | 2 +- japanese/pine/pkg-descr | 5 +- japanese/pine/pkg-plist | 9 + japanese/pine/scripts/configure | 21 +- 16 files changed, 1133 insertions(+), 454 deletions(-) (limited to 'japanese/pine') diff --git a/japanese/pine/Makefile b/japanese/pine/Makefile index 9ce1c591b986..ea0edb31c843 100644 --- a/japanese/pine/Makefile +++ b/japanese/pine/Makefile @@ -1,58 +1,62 @@ # New ports collection makefile for: jp-pine -# Version required: 3.91 -# Date created: 14 Apr 1996 +# Version required: 3.95lj1.1b3 +# Date created: 01 May 1996 # Whom: masafumi # -# $Id: Makefile,v 1.1.1.1 1996/04/30 05:59:28 asami Exp $ +# $Id: Makefile,v 1.11 1995/08/14 11:52:36 asami Exp $ # -DISTNAME= pine3.91 -PKGNAME= jp-pine-3.91 +DISTNAME= pine3.95 +PKGNAME= jp-pine-3.95 CATEGORIES+= japanese mail MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ - ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/pine/ -DISTFILES= pine3.91.tar.Z pine3.91j1.0.tar.gz - -PATCHFILES= pine3.91j1.0-1.0.1.gz pine3.91j1.0.1-1.0.2.gz -PATCH_SITES= ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/pine/ - + ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/pine/pine3.95/ +DISTFILES= pine3.95.tar.gz pine3.95lj1.1b2.tar.gz +PATCHFILES= pine3.95lj1.1b2-b3.diff.gz +PATCH_SITES= ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/pine/pine3.95/ MAINTAINER= max@FreeBSD.ORG -EXTRACT_ONLY= pine3.91.tar.Z +EXTRACT_ONLY= pine3.95.tar.gz pre-patch: @(cd ${WRKSRC}; \ - tar zxf ${DISTDIR}/pine3.91j1.0.tar.gz; \ - patch -s -p1 = 0 && err < sys_nerr) ? sys_errlist[err] : NULL); } - - /* Interfaces to C-client */ ---- 454,465 ---- - void prompt (char *msg,char *txt) - { -+ char *s; - printf ("%s",msg); -! *txt = '\0'; -! fgets (txt, MAILTMPLEN, stdin); -! if (s = strchr(txt, '\n')) -! *s = '\0'; + +--- 1527,1533 ---- + #endif + extern int sys_nerr; + +! return(((err >= 0) && (err < sys_nerr)) ? (char*)sys_errlist[err] : NULL); } - - /* Interfaces to C-client */ -*************** -*** 600,606 **** - puts (" Msg (end with a line with only a '.'):"); - body->type = TYPETEXT; - *text = '\0'; -! while (gets (line)) { - if (line[0] == '.') { - if (line[1] == '\0') break; - else strcat ((char *) text,"."); ---- 604,613 ---- - puts (" Msg (end with a line with only a '.'):"); - body->type = TYPETEXT; - *text = '\0'; -! while (fgets (line, sizeof(line), stdin)) { -! char *s = strchr(line, '\n'); -! if (s) -! *s = '\0'; - if (line[0] == '.') { - if (line[1] == '\0') break; - else strcat ((char *) text,"."); + + diff --git a/japanese/pine/files/patch-ab b/japanese/pine/files/patch-ab index 01df30769922..6f35325f6024 100644 --- a/japanese/pine/files/patch-ab +++ b/japanese/pine/files/patch-ab @@ -1,34 +1,106 @@ -*** imap/ANSI/c-client/Makefile.orig Tue Oct 11 00:13:08 1994 ---- imap/ANSI/c-client/Makefile Mon Nov 28 12:50:03 1994 +*** pico/makefile.bsf.orig Fri Sep 20 13:44:43 1996 +--- pico/makefile.bsf Fri Sep 20 13:44:43 1996 *************** -*** 36,42 **** - BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \ - news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \ - osdep.o sm_unix.o newsrc.o -! CFLAGS=$(EXTRACFLAGS) - DEFAULTDRIVERS=imap nntp pop3 mh mtx tenex mmdf bezerk news phile dummy - LN=ln -s - MAKE=make ---- 36,42 ---- - BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \ - news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \ - osdep.o sm_unix.o newsrc.o -! CFLAGS+=$(EXTRACFLAGS) - DEFAULTDRIVERS=imap nntp pop3 mh mtx tenex mmdf bezerk news phile dummy - LN=ln -s - MAKE=make -*************** -*** 84,89 **** ---- 84,95 ---- - $(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \ - STDPROTO=bezerkproto \ - RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe $(EXTRACFLAGS)" -+ -+ bsf: # FreeBSD -+ $(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \ -+ STDPROTO=bezerkproto \ -+ LDFLAGS="-lcrypt" \ -+ RSHPATH=/usr/bin/rsh CFLAGS="$(CFLAGS)" - - cvx: # Convex - $(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \ +*** 0 **** +--- 1,101 ---- ++ # ++ # Michael Seibel ++ # Networks and Distributed Computing ++ # Computing and Communications ++ # University of Washington ++ # Administration Builiding, AG-44 ++ # Seattle, Washington, 98195, USA ++ # Internet: mikes@cac.washington.edu ++ # ++ # Please address all bugs and comments to "pine-bugs@cac.washington.edu" ++ # ++ # ++ # Pine and Pico are registered trademarks of the University of Washington. ++ # No commercial use of these trademarks may be made without prior written ++ # permission of the University of Washington. ++ # ++ # Pine, Pico, and Pilot software and its included text are Copyright ++ # 1989-1996 by the University of Washington. ++ # ++ # The full text of our legal notices is contained in the file called ++ # CPYRIGHT, included with this distribution. ++ # ++ ++ # ++ # Makefile for the FreeBSD shared-lib version of the PINE composer library and ++ # stand-alone editor pico. ++ # ++ ++ #includes symbol info for debugging ++ DASHO= # -g ++ #for normal build ++ #DASHO= -O ++ ++ STDCFLAGS= -DBSDI -DBSDI2 -DPOSIX -DJOB_CONTROL -DANSI -DMOUSE \ ++ -I/usr/local/include ++ EXTRACFLAGS= -DKANJI -DCANNA -DHELPFILE ++ CFLAGS+= $(EXTRACFLAGS) $(DASHO) $(STDCFLAGS) ++ ++ # switches for library building ++ LIBCMD= ar ++ LIBARGS= ru ++ RANLIB= ranlib ++ ++ EXTRALIBES= -lcanna -L/usr/local/lib ++ LIBS= $(EXTRALIBES) -ltermcap ++ ++ OFILES= attach.o ansi.o basic.o bind.o browse.o buffer.o \ ++ composer.o display.o file.o fileio.o line.o osdep.o \ ++ pico.o random.o region.o search.o spell.o tcap.o window.o \ ++ word.o kanji.o jctype.o canna.o ++ ++ # Lets be elite and not retype in the above ++ SOFILES= ${OFILES:.o=.so} ++ ++ CFILES= attach.c ansi.c basic.c bind.c browse.c buffer.c \ ++ composer.c display.c file.c fileio.c line.c osdep.c \ ++ pico.c random.c region.c search.c spell.c tcap.c window.c \ ++ word.c kanji.c jctype.c canna.c ++ ++ HFILES= estruct.h edef.h efunc.h ebind.h pico.h osdep.h \ ++ kanji.h jctype.h canna.h ++ ++ # Need this for the shared library rule to work correctly ++ .SUFFIXES: .o .so ++ ++ # ++ # dependencies for the Unix versions of pico and libpico.a ++ # ++ all: pico pilot ++ ++ osdep.c: os_unix.c ++ rm -f osdep.c ++ cp os_unix.c osdep.c ++ ++ osdep.h: os_unix.h ++ rm -f osdep.h ++ cp os_unix.h osdep.h ++ ++ libpico.a: osdep.c osdep.h $(OFILES) ++ $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) ++ $(RANLIB) libpico.a ++ ++ libpico.so.1.3: osdep.c osdep.h $(SOFILES) ++ ld -Bshareable -o libpico.so.1.3 $(SOFILES) ++ ++ pico: main.c libpico.so.1.3 ++ $(CC) $(CFLAGS) main.c -L. -lpico $(LIBS) -o pico ++ ++ pilot: pilot.c libpico.so.1.3 ++ $(CC) $(CFLAGS) pilot.c -L. -lpico $(LIBS) -o pilot ++ ++ .c.so: ; $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@ ++ ++ .c.o: ; $(CC) -c $(CFLAGS) $*.c ++ ++ $(OFILES): $(HFILES) ++ ++ $(SOFILES): $(HFILES) ++ ++ clean: ++ rm -f *.a *.so.1.3 *.o *.so *~ osdep.c osdep.h pico pilot diff --git a/japanese/pine/files/patch-ac b/japanese/pine/files/patch-ac index 4a78f7ad85dc..050a058497bd 100644 --- a/japanese/pine/files/patch-ac +++ b/japanese/pine/files/patch-ac @@ -1,88 +1,421 @@ -*** imap/ANSI/c-client/os_bsf.c Thu Jan 1 01:00:00 1970 ---- imap/ANSI/c-client/os_bsf.c Fri Sep 2 02:35:44 1994 +*** pine/osdep/os-bsf.h.in.orig Fri Sep 20 13:44:43 1996 +--- pine/osdep/os-bsf.h.in Fri Sep 20 13:44:44 1996 *************** *** 0 **** ---- 1,83 ---- -+ /* -+ * Program: Operating-system dependent routines -- BSDI BSD/386 version -+ * -+ * Author: Mark Crispin -+ * Networks and Distributed Computing -+ * Computing & Communications -+ * University of Washington -+ * Administration Building, AG-44 -+ * Seattle, WA 98195 -+ * Internet: MRC@CAC.Washington.EDU -+ * -+ * Date: 1 August 1988 -+ * Last Edited: 11 July 1994 -+ * -+ * Copyright 1994 by the University of Washington -+ * -+ * Permission to use, copy, modify, and distribute this software and its -+ * documentation for any purpose and without fee is hereby granted, provided -+ * that the above copyright notice appears in all copies and that both the -+ * above copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of the University of Washington not be -+ * used in advertising or publicity pertaining to distribution of the software -+ * without specific, written prior permission. This software is made available -+ * "as is", and -+ * THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, -+ * WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN -+ * NO EVENT SHALL THE UNIVERSITY OF WASHINGTON BE LIABLE FOR ANY SPECIAL, -+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT -+ * (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION -+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ */ -+ -+ #include "tcp_unix.h" /* must be before osdep includes tcp.h */ -+ #include "mail.h" -+ #include "osdep.h" -+ #include -+ #include +--- 1,416 ---- ++ /*---------------------------------------------------------------------- ++ ++ T H E P I N E M A I L S Y S T E M ++ ++ Laurence Lundblade and Mike Seibel ++ Networks and Distributed Computing ++ Computing and Communications ++ University of Washington ++ Administration Builiding, AG-44 ++ Seattle, Washington, 98195, USA ++ Internet: lgl@CAC.Washington.EDU ++ mikes@CAC.Washington.EDU ++ ++ Please address all bugs and comments to "pine-bugs@cac.washington.edu" ++ ++ ++ Pine and Pico are registered trademarks of the University of Washington. ++ No commercial use of these trademarks may be made without prior written ++ permission of the University of Washington. ++ ++ Pine, Pico, and Pilot software and its included text are Copyright ++ 1989-1996 by the University of Washington. ++ ++ The full text of our legal notices is contained in the file called ++ CPYRIGHT, included with this distribution. ++ ++ ++ Pine is in part based on The Elm Mail System: ++ *********************************************************************** ++ * The Elm Mail System - Revision: 2.13 * ++ * * ++ * Copyright (c) 1986, 1987 Dave Taylor * ++ * Copyright (c) 1988, 1989 USENET Community Trust * ++ *********************************************************************** ++ ++ ++ ----------------------------------------------------------------------*/ ++ ++ #ifndef _OS_INCLUDED ++ #define _OS_INCLUDED ++ ++ ++ /*---------------------------------------------------------------------- ++ ++ This first section has some constants that you may want to change ++ for your configuration. This is the BSD/386 Gamma 4.1 version of the ++ os.h file. ++ Further down in the file are os-dependent things that need to be set up ++ correctly for each os. They aren't interesting, they just have to be ++ right. There are also a few constants down there that may be of ++ interest to some. ++ ++ ----*/ ++ ++ /*---------------------------------------------------------------------- ++ Define this if you want the disk quota to be checked on startup. ++ Of course, this only makes sense if your system has quotas. If it doesn't, ++ there should be a dummy disk_quota() routine in os-xxx.c so that defining ++ this won't be harmful anyway. ++ ----*/ ++ /* #define USE_QUOTAS /* comment out if you never want quotas checked */ ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ Define this if you want to allow the users to change their From header ++ line when they send out mail. The users will still have to configure ++ either default-composer-hdrs or customized-hdrs to get at the From ++ header, even if this is set. ++ ----*/ ++ #define ALLOW_CHANGING_FROM /* comment out to not allow changing From */ ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ Define this if you want to allow users to turn on the feature that ++ enables sending to take place in a fork()'d child. This may reduce ++ the time on the user's wall clock it takes to post mail. ++ NOTE: You'll also have to make sure the appropriate osdep/postreap.* ++ file is included in the os-*.ic file for your system. ++ ----*/ ++ #define BACKGROUND_POST /* comment out to disable posting from child */ ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ Turn this on if you want to disable the keyboard lock function. ++ ----*/ ++ /* #define NO_KEYBOARD_LOCK */ ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ Turn this on to trigger QP encoding of sent message text if it contains ++ "From " at the beginning of a line or "." on a line by itself. ++ ----*/ ++ /* #define ENCODE_FROMS */ ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ Timeouts (seconds) ++ ----*/ ++ #define DF_MAILCHECK "150" /* How often to check for new mail, by ++ default. There's some expense in doing ++ this so it shouldn't be done too ++ frequently. (Can be set in config ++ file now.) */ ++ ++ /*---------------------------------------------------------------------- ++ Check pointing (seconds) ++ ----*/ ++ #define CHECK_POINT_TIME (7*60) /* Check point the mail file (write changes ++ to disk) if more than CHECK_POINT_TIME ++ seconds have passed since the first ++ change was made. Depending on what is ++ happening, we may wait up to three times ++ this long, since we don't want to do the ++ slow check pointing and irritate the user. */ ++ ++ #define CHECK_POINT_FREQ (12) /* Check point the mail file if there have been ++ at least this many (status) changes to the ++ current mail file. We may wait longer if ++ it isn't a good time to do the checkpoint. */ ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ In scrolling through text, the number of lines from the previous ++ screen to overlap when showing the next screen. Usually set to two. ++ ----*/ ++ #define DF_OVERLAP "2" ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ When scrolling screens, the number of lines from top and bottom of ++ the screen to initiate single-line scrolling. ++ ----*/ ++ #define DF_MARGIN "0" ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ Default fill column for pine composer and maximum fill column. The max ++ is used to stop people from setting their custom fill column higher than ++ that number. Note that DF_FILLCOL is a string but MAX_FILLCOL is an integer. ++ ----*/ ++ #define DF_FILLCOL "74" ++ #define MAX_FILLCOL 80 ++ ++ ++ ++ /*----- System-wide config file ----------------------------------------*/ ++ #define SYSTEM_PINERC "@PREFIX@/etc/pine.conf" ++ #define SYSTEM_PINERC_FIXED "@PREFIX@/etc/pine.conf.fixed" ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ The default folder names and folder directories (some for backwards ++ compatibility). Think hard before changing any of these. ++ ----*/ ++ #define DF_DEFAULT_FCC "sent-mail" ++ #define DEFAULT_SAVE "saved-messages" ++ #define POSTPONED_MAIL "postponed-mail" ++ #define POSTPONED_MSGS "postponed-msgs" ++ #define INTERRUPTED_MAIL ".pine-interrupted-mail" ++ #define DEADLETTER "dead.letter" ++ #define DF_MAIL_DIRECTORY "mail" ++ #define INBOX_NAME "INBOX" ++ #define DF_SIGNATURE_FILE ".signature" ++ #define DF_ELM_STYLE_SAVE "no" ++ #define DF_HEADER_IN_REPLY "no" ++ #define DF_OLD_STYLE_REPLY "no" ++ #define DF_USE_ONLY_DOMAIN_NAME "no" ++ #define DF_FEATURE_LEVEL "sapling" ++ #define DF_SAVE_BY_SENDER "no" ++ #define DF_SORT_KEY "arrival" ++ #define DF_AB_SORT_RULE "fullname-with-lists-last" ++ #define DF_SAVED_MSG_NAME_RULE "default-folder" ++ #define DF_FCC_RULE "default-fcc" ++ #define DF_STANDARD_PRINTER "lpr" ++ #define ANSI_PRINTER "attached-to-ansi" ++ #define DF_ADDRESSBOOK ".addressbook" ++ #define DF_BUGS_FULLNAME "Pine Developers" ++ #define DF_BUGS_ADDRESS "pine-bugs@cac.washington.edu" ++ #define DF_SUGGEST_FULLNAME "Pine Developers" ++ #define DF_SUGGEST_ADDRESS "pine-suggestions@cac.washington.edu" ++ #define DF_PINEINFO_FULLNAME "Pine-Info News Group" ++ #define DF_PINEINFO_ADDRESS "pine-info@cac.washington.edu" ++ #define DF_LOCAL_FULLNAME "Local Support" ++ #define DF_LOCAL_ADDRESS "postmaster" ++ #define DF_KBLOCK_PASSWD_COUNT "1" ++ ++ /*---------------------------------------------------------------------- ++ The default printer when pine starts up for the first time with no printer ++ ----*/ ++ #define DF_DEFAULT_PRINTER ANSI_PRINTER ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ ++ OS dependencies, BSD/386 Gamma 4.1 version. See also the os-bsi.c files. ++ The following stuff may need to be changed for a new port, but once ++ the port is done, it won't change. At the bottom of the file are a few ++ constants that you may want to configure differently than they ++ are configured, but probably not. ++ ++ ----*/ ++ ++ ++ ++ /*----------------- Are we ANSI? ---------------------------------------*/ ++ #define ANSI /* this is an ANSI compiler */ ++ ++ /*------ If our compiler doesn't understand type void ------------------*/ ++ /* #define void char /* no void in compiler */ ++ ++ ++ ++ /*------- Some more includes that should usually be correct ------------*/ ++ #include ++ #include + #include -+ #include -+ #include -+ #include ++ #include + #include -+ #include -+ #include -+ extern int errno; /* just in case */ -+ #include -+ #include "misc.h" -+ extern char *crypt(); -+ -+ -+ #include "fs_unix.c" -+ #include "ftl_unix.c" -+ #include "nl_unix.c" -+ #define OWN_RFC_DATE -+ #include "env_unix.c" -+ #include "tcp_unix.c" -+ #include "log_std.c" -+ #include "gr_waitp.c" -+ #include "tz_bsd.c" -+ -+ /* Write current time in RFC 822 format -+ * Accepts: destination string ++ ++ ++ ++ /*----------------- locale.h -------------------------------------------*/ ++ /* #include /* To make matching and sorting work right */ ++ ++ ++ ++ /*----------------- time.h ---------------------------------------------*/ ++ #include ++ /* plain time.h isn't enough on some systems */ ++ /* #include /* For struct timeval usually in time.h */ ++ ++ ++ ++ /*--------------- signal.h ---------------------------------------------*/ ++ /* #include /* sometimes both required, sometimes */ ++ #include /* only one or the other */ ++ ++ #define SigType void /* value returned by sig handlers is void */ ++ /* #define SigType int /* value returned by sig handlers is int */ ++ ++ #define POSIX_SIGNALS /* use POSIX signal semantics (ttyin.c) */ ++ /* #define SYSV_SIGNALS /* use System-V signal semantics (ttyin.c) */ ++ ++ ++ ++ ++ /*-------------- A couple typedef's for integer sizes ------------------*/ ++ typedef unsigned int usign32_t; ++ typedef unsigned short usign16_t; ++ ++ ++ ++ /*-------------- qsort argument type -----------------------------------*/ ++ #define QSType void /* qsort arg is of type void * */ ++ /* #define QSType char /* qsort arg is of type char * */ ++ ++ ++ ++ /*-------------- fcntl flag to set non-blocking IO ---------------------*/ ++ #define NON_BLOCKING_IO O_NONBLOCK /* POSIX style */ ++ /* #define NON_BLOCKING_IO FNDELAY /* good ol' bsd style */ ++ ++ ++ #ifdef HELPFILE ++ #undef HELPFILE ++ #define HELPFILE "@PREFIX@/pine/lib/pine.hlp" ++ #define HELPINDEX "@PREFIX@/lib/pine/pine.ndx" ++ #endif ++ ++ /*------ how help text is referenced (always char ** on Unix) ----------*/ ++ #ifdef HELPFILE ++ #define HelpType char ** ++ #define HelpType short ++ #define NO_HELP (-1) ++ #else ++ #define HelpType char ** ++ #define NO_HELP (char **)NULL ++ #endif ++ ++ ++ /* ++ * Choose one of the following three terminal drivers + */ + -+ void rfc822_date (char *date) -+ { -+ int zone; -+ char *zonename; -+ struct tm *t; -+ struct timeval tv; -+ struct timezone tz; -+ gettimeofday (&tv,&tz); /* get time and timezone poop */ -+ t = localtime (&tv.tv_sec); /* convert to individual items */ -+ zone = t->tm_gmtoff/60; /* get timezone from TZ environment stuff */ -+ zonename = t->tm_zone; -+ /* and output it */ -+ sprintf (date,"%s, %d %s %d %02d:%02d:%02d %+03d%02d (%s)", -+ days[t->tm_wday],t->tm_mday,months[t->tm_mon],t->tm_year+1900, -+ t->tm_hour,t->tm_min,t->tm_sec,zone/60,abs (zone) % 60,zonename); -+ } ++ /*--------- Good 'ol BSD -----------------------------------------------*/ ++ /* #include /* BSD-based systems */ ++ ++ /*--------- System V terminal driver -----------------------------------*/ ++ /* #define HAVE_TERMIO /* this is for pure System V */ ++ /* #include /* Sys V */ ++ ++ /*--------- POSIX terminal driver --------------------------------------*/ ++ #define HAVE_TERMIOS /* this is an alternative */ ++ #include /* POSIX */ ++ ++ ++ ++ /*-------- Use poll system call instead of select ----------------------*/ ++ /* #define USE_POLL /* use the poll() system call instead of select() */ ++ ++ ++ ++ /*-------- Use terminfo database instead of termcap --------------------*/ ++ /* #define USE_TERMINFO /* use terminfo instead of termcap */ ++ ++ ++ ++ /*-- What argument does wait(2) take? Define this if it is a union -----*/ ++ /* #define HAVE_WAIT_UNION /* the arg to wait is a union wait * */ ++ ++ ++ ++ /*-------- Is window resizing available? -------------------------------*/ ++ #if defined(TIOCGWINSZ) && defined(SIGWINCH) ++ #define RESIZING /* SIGWINCH and friends */ ++ #endif ++ ++ ++ ++ /*-------- If no vfork, use regular fork -------------------------------*/ ++ /* #define vfork fork /* vfork is just a lightweight fork, so can use fork */ ++ ++ ++ ++ /*----- The usual sendmail configuration for sending mail on Unix ------*/ ++ #define SENDMAIL "/usr/sbin/sendmail" ++ #define SENDMAILFLAGS "-bs -odb -oem" /* send via smtp with backgroud ++ delivery and mail back errors */ ++ ++ ++ /*---------------------------------------------------------------------- ++ If no nntp-servers are defined, this program will be used to post news. ++ ----*/ ++ /* #define SENDNEWS "/usr/locale/bin/inews -h" /* news posting cmd */ ++ ++ ++ /*--------- Program employed by users to change their password ---------*/ ++ #define PASSWD_PROG "/usr/bin/passwd" ++ ++ ++ /*-------------- A couple constants used to size arrays ----------------*/ ++ #include /* Get it from param.h if available */ ++ #undef MAXPATH /* Sometimes defined in param.h differently */ ++ #define MAXPATH MAXPATHLEN /* Longest pathname we ever expect */ ++ /* #define MAXPATH (512) /* Longest pathname we ever expect */ ++ #define MAXFOLDER (64) /* Longest foldername we ever expect */ ++ ++ ++ /*-- Max screen pine will display on. Used to define some array sizes --*/ ++ #define MAX_SCREEN_COLS (170) ++ #define MAX_SCREEN_ROWS (200) ++ ++ ++ /*---- When no screen size can be discovered this is the size used -----*/ ++ #define DEFAULT_LINES_ON_TERMINAL (24) ++ #define DEFAULT_COLUMNS_ON_TERMINAL (80) ++ ++ ++ /*---------------------------------------------------------------------- ++ Where to put the output of pine in debug mode. Files are created ++ in the user's home directory and have a number appended to them when ++ there is more than one. ++ ----*/ ++ #define DEBUGFILE ".pine-debug" ++ ++ /*---------------------------------------------------------------------- ++ The number of debug files to save in the user's home diretory. The files ++ are useful for figuring out what a user did when he complains that something ++ went wrong. It's important to keep a bunch around, usually 4, so that the ++ debug file in question will still be around when the problem gets ++ investigated. Users tend to go in and out of Pine a few times and there ++ is one file for each pine invocation ++ ----*/ ++ #define NUMDEBUGFILES 4 ++ ++ /*---------------------------------------------------------------------- ++ The default debug level to set (approximate meanings): ++ 1 logs only highest level events and errors ++ 2 logs events like file writes ++ 3 ++ 4 logs each command ++ 5 ++ 6 ++ 7 logs details of command execution (7 is highest to run any production) ++ 8 ++ 9 logs gross details of command execution ++ ----*/ ++ #define DEFAULT_DEBUG 2 ++ ++ ++ ++ /*---------------------------------------------------------------------- ++ Various maximum field lengths, probably shouldn't be changed. ++ ----*/ ++ #define MAX_FULLNAME (100) ++ #define MAX_NICKNAME (40) ++ #define MAX_ADDRESS (200) ++ #define MAX_NEW_LIST (500) /* Max addrs to be added when creating list */ ++ #define MAX_SEARCH (100) /* Longest string to search for */ ++ #define MAX_ADDR_EXPN (1000) /* Longest expanded addr */ ++ #define MAX_ADDR_FIELD (10000) /* Longest fully-expanded addr field */ ++ ++ ++ #endif /* _OS_INCLUDED */ ++ ++ diff --git a/japanese/pine/files/patch-ad b/japanese/pine/files/patch-ad index 208c08faaaca..7291e4e445a4 100644 --- a/japanese/pine/files/patch-ad +++ b/japanese/pine/files/patch-ad @@ -1,58 +1,138 @@ -*** imap/ANSI/c-client/os_bsf.h Thu Jan 1 01:00:00 1970 ---- imap/ANSI/c-client/os_bsf.h Sat Sep 3 15:33:50 1994 +*** pine/osdep/os-bsf.ic.orig Fri Sep 20 13:44:44 1996 +--- pine/osdep/os-bsf.ic Fri Sep 20 13:44:44 1996 *************** *** 0 **** ---- 1,53 ---- -+ /* -+ * Program: Operating-system dependent routines -- BSDI BSD/386 version -+ * -+ * Author: Mark Crispin -+ * Networks and Distributed Computing -+ * Computing & Communications -+ * University of Washington -+ * Administration Building, AG-44 -+ * Seattle, WA 98195 -+ * Internet: MRC@CAC.Washington.EDU -+ * -+ * Date: 5 March 1993 -+ * Last Edited: 11 July 1994 -+ * -+ * Copyright 1994 by the University of Washington -+ * -+ * Permission to use, copy, modify, and distribute this software and its -+ * documentation for any purpose and without fee is hereby granted, provided -+ * that the above copyright notice appears in all copies and that both the -+ * above copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of the University of Washington not be -+ * used in advertising or publicity pertaining to distribution of the software -+ * without specific, written prior permission. This software is made available -+ * "as is", and -+ * THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, -+ * WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN -+ * NO EVENT SHALL THE UNIVERSITY OF WASHINGTON BE LIABLE FOR ANY SPECIAL, -+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT -+ * (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION -+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ */ -+ -+ #define MAILFILE "/var/mail/%s" -+ #define ACTIVEFILE "/usr/local/lib/news/active" -+ #define NEWSSPOOL "/var/news" -+ #define NEWSRC strcat (strcpy (tmp,myhomedir ()),"/.newsrc") -+ -+ #include -+ #include -+ #include -+ #include -+ #include /* needed for writev() prototypes */ -+ #include -+ #include -+ -+ #include "env_unix.h" -+ #include "fs.h" -+ #include "ftl.h" -+ #include "nl.h" -+ #include "tcp.h" +--- 1,133 ---- ++ ; ++ ; FreeBSD os-fbs.ic file for building os-fbs.c. ++ ; ++ ; Boilerplate header. ++ include(header) ++ ++ ; Can_access function. Just calls access. Only one version available. ++ include(canacces) ++ ++ ; File_size function. Only one version available. ++ include(filesize) ++ ++ ; Is_writable_dir function. Only one version available. ++ include(writ_dir) ++ ++ ; Create_mail_dir function. All Unixes use creatdir and DOS ++ ; uses creatdir.dos. ++ include(creatdir) ++ ++ ; Rename_file function. All Unixes use rename and DOS uses ++ ; rename.dos. There is also one called rename.hom which ++ ; is currently unused. Hom stands for homemade. ++ include(rename) ++ ++ ; Build_path function. All Unixes use bld_path and DOS ++ ; uses bld_path.dos. ++ include(bld_path) ++ ++ ; Last_cmpnt function. All Unixes use lstcmpnt and DOS ++ ; uses lstcmpnt.dos. ++ include(lstcmpnt) ++ ++ ; Expand_foldername function. All Unixes use expnfldr and DOS ++ ; uses expnfldr.dos. ++ include(expnfldr) ++ ++ ; Fnexpand function. All Unixes use fnexpand and DOS ++ ; uses fnexpand.dos. ++ include(fnexpand) ++ ++ ; Filter_filename function. All Unixes use fltrname and DOS ++ ; uses fltrname.dos. ++ include(fltrname) ++ ++ ; There are several versions of disk quotas. Standard BSD-style quotas ++ ; (Australian) include diskquot. Systems which don't have quotas use ++ ; diskquot.non. Systems which use Sun-style quotas are slightly more ++ ; complicated. They usually require different include files. They are ++ ; set up to include the file sunquota and prepend include file info to ++ ; that. See diskquot.*. ++ include(diskquot.non) ++ ++ ; Read_file function. All Unixes use readfile and DOS ++ ; uses readfile.dos. ++ include(readfile) ++ ++ ; Create_tmpfile function. This usually just calls the ANSI standard ++ ; tmpfile function if there is one. That is the version in the file tempfile. ++ ; There is also a tempfile.non for Unix systems which don't have a tmpfile ++ ; function already. ++ include(tempfile) ++ ++ ; Temp_nam function. This usually just calls the "standard" ++ ; tmpnam function if there is one. That is the version in the file tempnam. ++ include(tempnam) ++ ++ ; Coredump function. Version called coredump just calls abort, coredump.fpe ++ ; uses a floating point exception to cause the coredump on some systems. ++ include(coredump) ++ ++ ; This is usually a call to gethostname. That version is in the file hostname. ++ ; There is also a version called hostname.una which uses the uname system ++ ; call commonly found in SysV systems. An unused version called ++ ; hostname.hom also exists. ++ include(hostname) ++ ++ ; Getdomainnames function. All Unixes use domnames and DOS ++ ; uses domnames.dos. ++ include(domnames) ++ ++ ; Canonical_name function. All Unixes use canonicl and DOS ++ ; uses canonicl.dos. ++ include(canonicl) ++ ++ ; This file includes two functions, have_job_control and stop_process. ++ ; The Unix version is called jobcntrl and the slightly-different DOS ++ ; version is jobcntrl.dos. ++ include(jobcntrl) ++ ++ ; Error_desciption function. All Unixes use err_desc. The version ++ ; called err_desc.dos is the same except that it doesn't declare the ++ ; variable sys_errlist[], which is already declared. There ++ ; is also a version called err_desc.hom which is unused. ++ include(err_desc.dos) ++ ++ ; There are six functions in this include. They are get_system_login, ++ ; get_system_fullname, get_system_homedir, get_system_passwd, gcos_name, ++ ; and local_name_lookup. The Unix version is pw_stuff and the dos version ++ ; is pw_stuff.dos. There is also a pw_stuff.fun. Fun stands for funny ++ ; GCOS field. It's currently unused. ++ include(pw_stuff) ++ ++ ; Change_passwd function. Unixes use chnge_pw. ++ ; There is also a DOS version. ++ include(chnge_pw) ++ ++ ; Mime_can_display function. Only a single version of this now. ++ include(mimedisp) ++ ++ ; Most systems have the ANSI fgetpos and fsetpos functions. For those, ++ ; use fgetpos. If a system doesn't have it use fgetpos.non. ++ include(fgetpos) ++ ++ ; These functions are similar to popen(), but allow both an input stream ++ ; and an output buffer. ++ include(pipe) ++ ++ ; These functions are used to wait on a fork'd child doing our posting ++ include(postreap.wtp) ++ ++ ; These functions are used to hand messages off to local mail transport ++ ; and posting agents (typically, "sendmail"). ++ include(sendmail) ++ ++ ; This function is used to actually spawn the given command (usually dredged ++ ; from mailcap) on the given data file (usually on /tmp). ++ include(execview) ++ ++ ; This includes the various routines to support printing ++ include(print) ++ ++ ; Debug file maintenance. ++ include(debuging) diff --git a/japanese/pine/files/patch-ae b/japanese/pine/files/patch-ae index 625967455d30..bf473f608a5e 100644 --- a/japanese/pine/files/patch-ae +++ b/japanese/pine/files/patch-ae @@ -1,28 +1,161 @@ -*** imap/Makefile Sat Jun 18 04:53:04 1994 ---- imap/Makefile Sat Sep 3 17:38:37 1994 +*** pine/makefile.bsf.orig Fri Sep 20 13:44:43 1996 +--- pine/makefile.bsf Fri Sep 20 13:44:43 1996 *************** -*** 46,50 **** - @false - -! a32 aix bsi d-g lnx mct mnt neb nxt osf sco sgi: - $(MAKE) build SYSTYPE=ANSI OS=$@ - ---- 46,50 ---- - @false - -! a32 aix bsi bsf d-g lnx mct mnt neb nxt osf sco sgi: - $(MAKE) build SYSTYPE=ANSI OS=$@ - -*************** -*** 65,69 **** - - clean: -! $(RM) systype - cd ANSI/imapd;$(MAKE) clean - cd ANSI/ipopd;$(MAKE) clean ---- 65,69 ---- - - clean: -! $(RM) systype OSTYPE - cd ANSI/imapd;$(MAKE) clean - cd ANSI/ipopd;$(MAKE) clean +*** 0 **** +--- 1,156 ---- ++ # ++ # T H E P I N E M A I L S Y S T E M ++ # ++ # Laurence Lundblade and Mike Seibel ++ # Networks and Distributed Computing ++ # Computing and Communications ++ # University of Washington ++ # Administration Building, AG-44 ++ # Seattle, Washington, 98195, USA ++ # Internet: lgl@CAC.Washington.EDU ++ # mikes@CAC.Washington.EDU ++ # ++ # Please address all bugs and comments to "pine-bugs@cac.washington.edu" ++ # ++ # ++ # Pine and Pico are registered trademarks of the University of Washington. ++ # No commercial use of these trademarks may be made without prior written ++ # permission of the University of Washington. ++ # ++ # Pine, Pico, and Pilot software and its included text are Copyright ++ # 1989-1996 by the University of Washington. ++ # ++ # The full text of our legal notices is contained in the file called ++ # CPYRIGHT, included with this distribution. ++ # ++ # ++ # Pine is in part based on The Elm Mail System: ++ # *********************************************************************** ++ # * The Elm Mail System - Revision: 2.13 * ++ # * * ++ # * Copyright (c) 1986, 1987 Dave Taylor * ++ # * Copyright (c) 1988, 1989 USENET Community Trust * ++ # *********************************************************************** ++ # ++ # ++ ++ ++ # ++ # Make file for the Pine mail system for FreeBSD ++ # ++ # ++ # Most commonly fiddled flags for compiler. ++ # Uncomment the setttings desired here ++ # ++ RM= rm -f ++ LN= ln -s ++ MAKE= make ++ OPTIMIZE= -O ++ PROFILE= # -pg ++ DEBUG= # -g -DDEBUG ++ ++ IMAPDIR= ../c-client ++ PICODIR= ../pico ++ ++ STDLIBES= -ltermlib ++ #LOCLIBES= $(PICODIR)/libpico.a $(IMAPDIR)/c-client.a ++ LOCLIBES= -lpico -lc-client ++ LOCLIBDIR= -L$(PICODIR) -L$(IMAPDIR) ++ EXTRALIBES= -lcanna -L/usr/local/lib ++ LIBES= $(EXTRALIBES) $(LOCLIBDIR) $(LOCLIBES) $(STDLIBES) ++ ++ STDCFLAGS= -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include ++ EXTRACFLAGS= -DKANJI -DCANNA -DHELPFILE ++ CFLAGS+= $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS) ++ ++ obj= addrbook.o adrbklib.o args.o context.o filter.o \ ++ folder.o help.o imap.o init.o mailcap.o mailcmd.o \ ++ mailindx.o mailpart.o mailview.o newmail.o other.o pine.o \ ++ reply.o screen.o send.o signals.o status.o strings.o ttyin.o \ ++ ttyout.o os.o ++ ++ cfiles= addrbook.c adrbklib.c args.c context.c filter.c \ ++ folder.c help.c helptext.c imap.c init.c mailcap.c mailcmd.c \ ++ mailindx.c mailpart.c mailview.c newmail.c other.c pine.c \ ++ reply.c screen.c send.c signals.c status.c strings.c ttyin.c \ ++ ttyout.c os.c ++ ++ HELPSRCS= pine.hlp pine_ja.hlp ++ HELPINDXS= pine.ndx pine_ja.ndx ++ ++ pine: $(obj) $(LOCLIBES) ++ echo "char datestamp[]="\"`date`\"";" > date.c ++ echo "char hoststamp[]="\"`hostname`\"";" >> date.c ++ $(CC) $(LDFLAGS) $(CFLAGS) -o pine $(obj) date.c $(LIBES) ++ ++ $(HELPINDXS) helptext.h: helpindx $(HELPSRCS) ++ ./helpindx pine.hlp pine.ndx helptext.h ++ ./helpindx pine_ja.hlp pine_ja.ndx /dev/null ++ ++ helpindx: helpindx.c ++ $(CC) $(CFLAGS) -o $@ helpindx.c ++ ++ # this is not part of pine ++ pine-use: pine-use.c ++ $(CC) -o pine-use pine-use.c ++ ++ clean: ++ $(RM) *.o os.h os.c helptext.c helptext.h ++ cd osdep; make clean; cd .. ++ ++ ++ HEADERS= headers.h pine.h os.h helptext.h context.h \ ++ $(IMAPDIR)/mail.h $(IMAPDIR)/osdep.h ++ ++ addrbook.o: addrbook.c $(HEADERS) adrbklib.h $(PICODIR)/pico.h ++ adrbklib.o: adrbklib.c $(HEADERS) adrbklib.h ++ args.o: args.c $(HEADERS) ++ context.o: context.c $(HEADERS) $(IMAPDIR)/misc.h ++ filter.o: filter.c $(HEADERS) $(PICODIR)/pico.h ++ folder.o: folder.c $(HEADERS) ++ help.o: help.c $(HEADERS) ++ helptext.o: helptext.c ++ imap.o: imap.c $(HEADERS) ++ init.o: init.c $(HEADERS) ++ mailcap.o: mailcap.c $(HEADERS) ++ mailcmd.o: mailcmd.c $(HEADERS) $(PICODIR)/pico.h ++ mailindx.o: mailindx.c $(HEADERS) ++ mailpart.o: mailpart.c $(HEADERS) ++ mailview.o: mailview.c $(HEADERS) ++ newmail.o: newmail.c $(HEADERS) ++ os.o: os.c $(HEADERS) ++ other.o: other.c $(HEADERS) $(PICODIR)/pico.h ++ pine.o: pine.c $(HEADERS) ++ reply.o: reply.c $(HEADERS) ++ screen.o: screen.c $(HEADERS) ++ send.o: send.c $(HEADERS) $(IMAPDIR)/smtp.h $(PICODIR)/pico.h ++ signals.o: signals.c $(HEADERS) ++ status.o: status.c $(HEADERS) ++ strings.o: strings.c $(HEADERS) ++ ttyin.o: ttyin.c $(HEADERS) ++ ttyout.o: ttyout.c $(HEADERS) ++ ++ os.h: osdep/os-bsf.h ++ $(RM) os.h ++ $(LN) osdep/os-bsf.h os.h ++ ++ #helptext.c: pine.hlp ++ # ./cmplhelp.sh < pine.hlp > helptext.c ++ ++ #helptext.h: pine.hlp ++ # ./cmplhlp2.sh < pine.hlp > helptext.h ++ ++ os.c: osdep/os-bsf.c ++ $(RM) os.c ++ $(LN) osdep/os-bsf.c os.c ++ ++ osdep/os-bsf.c: osdep/bld_path osdep/canacces osdep/canonicl \ ++ osdep/chnge_pw osdep/coredump osdep/creatdir \ ++ osdep/diskquot.non osdep/domnames osdep/err_desc.dos \ ++ osdep/expnfldr osdep/fgetpos osdep/filesize osdep/fltrname \ ++ osdep/fnexpand osdep/header osdep/hostname \ ++ osdep/jobcntrl osdep/lstcmpnt osdep/mimedisp osdep/pipe \ ++ osdep/print osdep/pw_stuff osdep/readfile osdep/debuging \ ++ osdep/rename osdep/tempfile osdep/tempnam osdep/writ_dir \ ++ osdep/sendmail osdep/execview osdep/os-bsf.ic ++ cd osdep; $(MAKE) includer os-bsf.c; cd .. diff --git a/japanese/pine/files/patch-af b/japanese/pine/files/patch-af index 759d5792206a..694951fa0688 100644 --- a/japanese/pine/files/patch-af +++ b/japanese/pine/files/patch-af @@ -1,100 +1,107 @@ -*** pico/makefile.bsf.orig Tue Apr 9 04:04:05 1996 ---- pico/makefile.bsf Tue Apr 9 23:05:41 1996 +*** imap/ANSI/c-client/Makefile.orig Fri Sep 20 13:44:01 1996 +--- imap/ANSI/c-client/Makefile Fri Sep 20 13:44:42 1996 *************** -*** 0 **** ---- 1,95 ---- -+ # $Id: patch-aa,v 1.9 1995/11/20 00:40:51 ache Exp $ -+ # -+ # Michael Seibel -+ # Networks and Distributed Computing -+ # Computing and Communications -+ # University of Washington -+ # Administration Builiding, AG-44 -+ # Seattle, Washington, 98195, USA -+ # Internet: mikes@cac.washington.edu -+ # -+ # Please address all bugs and comments to "pine-bugs@cac.washington.edu" -+ # -+ # Copyright 1991-1994 University of Washington -+ # -+ # Permission to use, copy, modify, and distribute this software and its -+ # documentation for any purpose and without fee to the University of -+ # Washington is hereby granted, provided that the above copyright notice -+ # appears in all copies and that both the above copyright notice and this -+ # permission notice appear in supporting documentation, and that the name -+ # of the University of Washington not be used in advertising or publicity -+ # pertaining to distribution of the software without specific, written -+ # prior permission. This software is made available "as is", and -+ # THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, -+ # WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION ALL IMPLIED -+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND IN -+ # NO EVENT SHALL THE UNIVERSITY OF WASHINGTON BE LIABLE FOR ANY SPECIAL, -+ # INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -+ # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT -+ # (INCLUDING NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION -+ # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ # -+ # Pine and Pico are trademarks of the University of Washington. -+ # No commercial use of these trademarks may be made without prior -+ # written permission of the University of Washington. -+ # -+ -+ # -+ # Makefile for BSD/386 Gamma 4.1 version of the PINE composer library and -+ # stand-alone editor pico. -+ # -+ -+ #includes symbol info for debugging -+ #DASHO= -g -O -pipe -+ #for normal build -+ #DASHO= -O -+ -+ CFLAGS+= -DJOB_CONTROL -DANSI -DKANJI -+ -+ # switches for library building -+ LIBCMD= ar -+ LIBARGS= ru -+ RANLIB= ranlib -+ -+ LIBS= -ltermcap -+ -+ OFILES= attach.o ansi.o basic.o bind.o browse.o buffer.o \ -+ composer.o display.o file.o fileio.o line.o osdep.o \ -+ pico.o random.o region.o search.o spell.o tcap.o window.o word.o \ -+ jctype.o kanji.o -+ -+ CFILES= attach.c ansi.c basic.c bind.c browse.c buffer.c \ -+ composer.c display.c file.c fileio.c line.c osdep.c \ -+ pico.c random.c region.c search.c spell.c tcap.c window.c word.c \ -+ jctype.c kanji.c -+ -+ HFILES= estruct.h edef.h efunc.h ebind.h pico.h osdep.h \ -+ jctype.h kanji.h -+ -+ -+ # -+ # dependencies for the Unix versions of pico and libpico.a -+ # -+ all: pico -+ -+ osdep.c: os_unix.c -+ rm -f osdep.c -+ cp os_unix.c osdep.c -+ -+ osdep.h: os_unix.h -+ rm -f osdep.h -+ cp os_unix.h osdep.h -+ -+ libpico.a: osdep.c osdep.h $(OFILES) -+ $(LIBCMD) $(LIBARGS) libpico.a $(OFILES) -+ $(RANLIB) libpico.a -+ -+ pico: main.c libpico.a -+ $(CC) $(CFLAGS) $(DASHO) main.c libpico.a $(LIBS) -o pico -+ -+ .c.o: ; $(CC) -c $(CFLAGS) $(DASHO) $*.c -+ -+ $(OFILES): $(HFILES) -+ -+ clean: -+ rm -f pico *.a *.o *~ osdep.c osdep.h +*** 32,41 **** +--- 32,43 ---- + + + ARCHIVE=c-client.a ++ SHLIB=libc-client.so.1.3 + ARRC=ar rc + BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \ + news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \ + osdep.o sm_unix.o newsrc.o ++ SOFILES= ${BINARIES:.o=.so} + CC=cc + CFLAGS=$(EXTRACFLAGS) + DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy +*************** +*** 48,53 **** +--- 50,58 ---- + RSHPATH=/usr/ucb/rsh + SHELL=/bin/sh + ++ # Need this for the shared library rule to work correctly ++ .SUFFIXES: .o .so ++ + missing: + @echo "You must specify what type of system" + @false +*************** +*** 126,131 **** +--- 131,143 ---- + ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \ + RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" + ++ bsf: # FreeBSD ++ $(MAKE) mtest OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \ ++ STDPROTO=bezerkproto MAILSPOOL=/var/mail \ ++ ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \ ++ RSHPATH=/usr/bin/rsh CFLAGS="-O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \ ++ LDFLAGS="-lcrypt" ++ + cvx: # Convex + $(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \ + STDPROTO=bezerkproto MAILSPOOL=/usr/spool/mail \ +*************** +*** 409,417 **** + # From here on down is OS-independent + + clean: +! $(RM) *.o linkage.[ch] mtest $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS + +! mtest: $(ARCHIVE) mtest.o + $(CC) $(CFLAGS) -o mtest mtest.o $(ARCHIVE) $(LDFLAGS) + + $(ARCHIVE): $(BINARIES) +--- 421,429 ---- + # From here on down is OS-independent + + clean: +! $(RM) *.o *.so linkage.[ch] mtest $(SHLIB) $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS + +! mtest: $(ARCHIVE) $(SHLIB) mtest.o + $(CC) $(CFLAGS) -o mtest mtest.o $(ARCHIVE) $(LDFLAGS) + + $(ARCHIVE): $(BINARIES) +*************** +*** 419,424 **** +--- 431,443 ---- + $(ARRC) $(ARCHIVE) $(BINARIES) + $(RANLIB) $(ARCHIVE) + ++ $(SHLIB): $(SOFILES) ++ ld -Bshareable -o $(SHLIB) $(SOFILES) ++ strip $(SHLIB) ++ ++ .c.so: osdep.h ++ $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@ ++ + # Dependencies + + bezerk.o: mail.h bezerk.h rfc822.h misc.h osdep.h +*************** +*** 459,464 **** +--- 478,499 ---- + -DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \ + $(EXTRAOSDEFS) -c os_$(OS).c + $(MV) os_$(OS).o osdep.o ++ ++ osdep.so: mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ ++ osdep.h env_unix.h tcp_unix.h \ ++ os_$(OS).c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ ++ log_std.c log_sv4.c log_ssn.c log_ult.c \ ++ gr_wait.c gr_wait4.c gr_waitp.c \ ++ flock.c ingroups.c opendir.c scandir.c \ ++ memmove.c memmove2.c memset.c \ ++ write.c writev.c writevs.c \ ++ tz_bsd.c tz_nul.c tz_sv4.c \ ++ strerror.c strpbrk.c strstr.c strtok.c strtol.c strtoul.c ++ $(CC) -fpic -DPIC $(CFLAGS) -DSTDPROTO=$(STDPROTO) -DMAILSPOOL=\"$(MAILSPOOL)\" \ ++ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ ++ -DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \ ++ $(EXTRAOSDEFS) -c os_$(OS).c -o os_$(OS).so ++ $(MV) os_$(OS).so osdep.so + + osdep.h: os_$(OS).h linkage + $(RM) CCTYPE CFLAGS LDFLAGS osdep.h diff --git a/japanese/pine/files/patch-ag b/japanese/pine/files/patch-ag index e562fb4a67d3..62e141e4ddf6 100644 --- a/japanese/pine/files/patch-ag +++ b/japanese/pine/files/patch-ag @@ -1,12 +1,36 @@ -*** pico/os_unix.c Thu Aug 11 21:13:34 1994 ---- pico/os_unix.c Fri Sep 2 02:35:45 1994 +*** imap/ANSI/c-client/mh.c.orig Thu May 16 03:49:54 1996 +--- imap/ANSI/c-client/mh.c Fri Sep 20 13:44:42 1996 *************** -*** 952,956 **** ---- 952,958 ---- - int err; - { -+ #ifndef __FreeBSD__ - extern char *sys_errlist[]; -+ #endif - extern int sys_nerr; - +*** 807,813 **** + stat (LOCAL->dir,&sbuf); + if (sbuf.st_ctime != LOCAL->scantime) { + struct direct **names = NIL; +! long nfiles = scandir (LOCAL->dir,&names,mh_select,mh_numsort); + old = nmsgs ? mail_elt (stream,nmsgs)->data1 : 0; + /* note scanned now */ + LOCAL->scantime = sbuf.st_ctime; +--- 807,813 ---- + stat (LOCAL->dir,&sbuf); + if (sbuf.st_ctime != LOCAL->scantime) { + struct direct **names = NIL; +! long nfiles = scandir (LOCAL->dir,&names,mh_select,(void*)mh_numsort); + old = nmsgs ? mail_elt (stream,nmsgs)->data1 : 0; + /* note scanned now */ + LOCAL->scantime = sbuf.st_ctime; +*************** +*** 1049,1055 **** + return NIL; + } + mh_file (tmp,mailbox); /* build file name we will use */ +! if (nfiles = scandir (tmp,&names,mh_select,mh_numsort)) { + /* largest number */ + last = atoi (names[nfiles-1]->d_name); + for (i = 0; i < nfiles; ++i) /* free directory */ +--- 1049,1055 ---- + return NIL; + } + mh_file (tmp,mailbox); /* build file name we will use */ +! if (nfiles = scandir (tmp,&names,mh_select,(void*)mh_numsort)) { + /* largest number */ + last = atoi (names[nfiles-1]->d_name); + for (i = 0; i < nfiles; ++i) /* free directory */ diff --git a/japanese/pine/files/patch-ah b/japanese/pine/files/patch-ah index a09f8427e3f7..821655583887 100644 --- a/japanese/pine/files/patch-ah +++ b/japanese/pine/files/patch-ah @@ -1,15 +1,19 @@ -*** pico/os_unix.h Mon Jun 27 18:33:43 1994 ---- pico/os_unix.h Fri Sep 2 02:35:45 1994 +*** imap/ANSI/c-client/news.c.orig Thu May 16 03:50:02 1996 +--- imap/ANSI/c-client/news.c Fri Sep 20 13:44:42 1996 *************** -*** 104,108 **** - * type qsort() expects - */ -! #if defined(nxt) || defined(neb) - #define QSType void - #define QcompType const void ---- 104,108 ---- - * type qsort() expects - */ -! #if defined(nxt) || defined(neb) || defined(__FreeBSD__) - #define QSType void - #define QcompType const void +*** 309,315 **** + stream->mailbox + 1); + while (s = strchr (s,'.')) *s = '/'; + /* scan directory */ +! if ((nmsgs = scandir (tmp,&names,news_select,news_numsort)) >= 0) { + stream->local = fs_get (sizeof (NEWSLOCAL)); + LOCAL->dirty = NIL; /* no update to .newsrc needed yet */ + LOCAL->dir = cpystr (tmp); /* copy directory name for later */ +--- 309,315 ---- + stream->mailbox + 1); + while (s = strchr (s,'.')) *s = '/'; + /* scan directory */ +! if ((nmsgs = scandir (tmp,&names,news_select,(void*)news_numsort)) >= 0) { + stream->local = fs_get (sizeof (NEWSLOCAL)); + LOCAL->dirty = NIL; /* no update to .newsrc needed yet */ + LOCAL->dir = cpystr (tmp); /* copy directory name for later */ diff --git a/japanese/pine/files/patch-ak b/japanese/pine/files/patch-ak index de6b3321f5d8..568df38e0775 100644 --- a/japanese/pine/files/patch-ak +++ b/japanese/pine/files/patch-ak @@ -1,10 +1,31 @@ -*** pine/osdep/err_desc Fri Jul 16 01:06:44 1993 ---- pine/osdep/err_desc Fri Sep 2 02:35:46 1994 +*** imap/Makefile.orig Fri Sep 20 13:44:01 1996 +--- imap/Makefile Fri Sep 20 13:44:43 1996 *************** -*** 1,3 **** ---- 1,5 ---- -+ #if !defined(__FreeBSD__) - extern char *sys_errlist[]; -+ #endif +*** 47,53 **** - /*---------------------------------------------------------------------- + # ANSI compiler ports. Note for SCO you may have to set LN to "copy -rom" + +! a32 a41 aix bs2 bsi d-g drs lnx lyn mct mnt neb nxt osf sc5 sco sgi slx sos: + $(MAKE) build SYSTYPE=ANSI OS=$@ + + # Non-ANSI compiler ports. +--- 47,53 ---- + + # ANSI compiler ports. Note for SCO you may have to set LN to "copy -rom" + +! a32 a41 aix bs2 bsi bsf d-g drs lnx lyn mct mnt neb nxt osf sc5 sco sgi slx sos: + $(MAKE) build SYSTYPE=ANSI OS=$@ + + # Non-ANSI compiler ports. +*************** +*** 81,86 **** +--- 81,89 ---- + + #bs2: + # $(MAKE) build SYSTYPE=ANSI OS=bsi ++ ++ bsf: ++ $(MAKE) build OS=bsf PROCESS=an + + pt1: + $(MAKE) build SYSTYPE=non-ANSI OS=ptx diff --git a/japanese/pine/files/patch-al b/japanese/pine/files/patch-al index b96cbd8aa96a..1be043073eba 100644 --- a/japanese/pine/files/patch-al +++ b/japanese/pine/files/patch-al @@ -1,29 +1,64 @@ -*** pine/osdep/makefile.orig Tue Apr 9 04:03:23 1996 ---- pine/osdep/makefile Tue Apr 9 04:33:59 1996 +*** build.orig Fri Sep 20 13:44:00 1996 +--- build Fri Sep 20 13:44:42 1996 *************** -*** 7,13 **** - os-dyn.c os-gen.c os-hpp.c os-isc.c os-lnx.c os-nxt.c \ - os-osf.c os-ptx.c os-s40.c os-sgi.c \ - os-sun.c os-sv4.c os-ult.c os-aux.c \ -! os-ews.c +*** 169,181 **** + rm -f pine mtest imapd pico pilot + if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi + if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi + if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi + if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi + if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi + cd $PHOME + echo '' + echo "Links to executables are in bin directory:" +! size bin/pine bin/mtest bin/imapd bin/pico bin/pilot + echo "Done" + ;; - .SUFFIXES: .ic - ---- 7,13 ---- - os-dyn.c os-gen.c os-hpp.c os-isc.c os-lnx.c os-nxt.c \ - os-osf.c os-ptx.c os-s40.c os-sgi.c \ - os-sun.c os-sv4.c os-ult.c os-aux.c \ -! os-bsf.c os-ews.c - - .SUFFIXES: .ic +--- 169,191 ---- + rm -f pine mtest imapd pico pilot + if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi + if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi ++ if [ -s ../c-client/libc-client.so.1.3 ] ; ++ then ln ../c-client/libc-client.so.1.3 libc-client.so.1.3 ; fi + if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi ++ if [ -s ../imap/systype/ipopd/ipop2d ] ; ++ then ln ../imap/systype/ipopd/ipop2d ipop2d ; fi ++ if [ -s ../imap/systype/ipopd/ipop3d ] ; ++ then ln ../imap/systype/ipopd/ipop3d ipop3d ; fi + if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi + if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi ++ if [ -s ../pico/libpico.so.1.3 ] ; ++ then ln ../pico/libpico.so.1.3 libpico.so.1.3 ; fi + cd $PHOME + echo '' + echo "Links to executables are in bin directory:" +! size bin/pine bin/mtest bin/imapd bin/pico bin/pilot \ +! bin/ipop2d bin/ipop3d \ +! bin/libc-client.so.1.3 bin/libpico.so.1.3 + echo "Done" + ;; *************** -*** 43,48 **** ---- 43,49 ---- - os-aux.c: bld_path canacces canonicl chnge_pw coredump creatdir diskquot.non domnames err_desc execview expnfldr fgetpos.non filesize fltrname fnexpand header hostname jobcntrl lstcmpnt mimedisp pipe pw_stuff readfile rename.hom sendmail tempfile tempnam writ_dir os-aux.ic - os-bsd.c: bld_path canacces canonicl chnge_pw coredump creatdir diskquot domnames err_desc execview expnfldr fgetpos.non filesize fltrname fnexpand header hostname jobcntrl lstcmpnt mimedisp pipe pw_stuff readfile rename sendmail tempfile tempnam writ_dir os-bsd.ic - os-bsi.c: bld_path canacces canonicl chnge_pw coredump creatdir diskquot.non domnames err_desc execview expnfldr fgetpos filesize fltrname fnexpand header hostname jobcntrl lstcmpnt mimedisp pipe pw_stuff readfile rename sendmail tempfile tempnam writ_dir os-bsi.ic -+ os-bsf.c: bld_path canacces canonicl chnge_pw coredump creatdir diskquot.non domnames err_desc execview expnfldr fgetpos filesize fltrname fnexpand header hostname jobcntrl lstcmpnt mimedisp pipe pw_stuff readfile rename sendmail tempfile tempnam writ_dir os-bsf.ic - os-cvx.c: bld_path canacces canonicl chnge_pw coredump creatdir diskquot.non domnames err_desc execview expnfldr fgetpos.non filesize fltrname fnexpand header hostname jobcntrl lstcmpnt mimedisp pipe pw_stuff readfile rename sendmail tempfile tempnam writ_dir os-cvx.ic - os-dos.c: bld_path.dos canacces canonicl.dos chnge_pw.dos coredump creatdir.dos diskquot.non domnames.dos dosextra err_desc.dos execview.dos expnfldr.dos fgetpos filesize fltrname.dos fnexpand.dos header hostname jobcntrl.dos lstcmpnt.dos mimedisp pipe.dos pw_stuff.dos readfile.dos rename.dos sendmail.dos tempfile tempnam.dos writ_dir os-dos.ic - os-dyn.c: bld_path canacces canonicl chnge_pw coredump.fpe creatdir diskquot.sun domnames err_desc execview expnfldr fgetpos.non filesize fltrname fnexpand header hostname jobcntrl lstcmpnt mimedisp pipe pw_stuff readfile rename sendmail tempfile.non tempnam writ_dir os-dyn.ic +*** 186,195 **** + make clean + echo "Cleaning Pine" + cd $PHOME/pine +! make -f makefile.ult clean + echo "Cleaning pico" + cd $PHOME/pico +! make $makeargs -f makefile.ult clean + echo "Done" + cd $PHOME + ;; +--- 196,205 ---- + make clean + echo "Cleaning Pine" + cd $PHOME/pine +! make -f makefile.bsf clean + echo "Cleaning pico" + cd $PHOME/pico +! make $makeargs -f makefile.bsf clean + echo "Done" + cd $PHOME + ;; diff --git a/japanese/pine/pkg-comment b/japanese/pine/pkg-comment index 63ce3975802f..ad5c6194dd01 100644 --- a/japanese/pine/pkg-comment +++ b/japanese/pine/pkg-comment @@ -1 +1 @@ -Pine 3.91 - Program for Internet News and E-mail +Program for Internet News and E-mail with Japanese Support diff --git a/japanese/pine/pkg-descr b/japanese/pine/pkg-descr index ceabf7e4d56f..7cc83c75415b 100644 --- a/japanese/pine/pkg-descr +++ b/japanese/pine/pkg-descr @@ -6,9 +6,12 @@ RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs. This package also includes the Pico editor, the IMAP daemon, a POP2 server, and a POP3 server. +This version supports kanji input using Canna. Canna can be started +by ^@ (or ctrl-space) in the Pico editor. + If you want to use the spell checking feature of pine, set the environment variable SPELL to "/usr/local/bin/ispell -l". -An optional configuration file "pine.conf" can be put into /usr/local/etc +An optional configuration file "pine.conf" can be put into /usr/local/etc to set system wide defaults. The format of this file is identical to the .pinerc file that is auto-generated by pine in your home directory. diff --git a/japanese/pine/pkg-plist b/japanese/pine/pkg-plist index 22b343699aee..e41a76988659 100644 --- a/japanese/pine/pkg-plist +++ b/japanese/pine/pkg-plist @@ -3,8 +3,17 @@ libexec/ipop2d libexec/ipop3d bin/mtest bin/pico +bin/pilot bin/pine +lib/libc-client.so.1.3 +lib/libpico.so.1.3 +@exec /sbin/ldconfig -m %B +lib/pine/pine.hlp +lib/pine/pine.ndx +lib/pine/pine_ja.hlp +lib/pine/pine_ja.ndx man/man1/pico.1.gz +man/man1/pilot.1.gz man/man1/pine.1.gz man/man8/imapd.8c.gz man/man8/ipopd.8c.gz diff --git a/japanese/pine/scripts/configure b/japanese/pine/scripts/configure index 48a7979ef9b7..4b79832cc6ce 100644 --- a/japanese/pine/scripts/configure +++ b/japanese/pine/scripts/configure @@ -1,22 +1,3 @@ #!/bin/sh -if [ ! -f ${WRKSRC}/pine/pine-e.hlp ] ; then - mv ${WRKSRC}/pine/pine.hlp ${WRKSRC}/pine/pine-e.hlp -fi - -echo -n "Do you want pine to display its menu and help message in Japanese? (y/n)> " -read ans -case X$ans in -Xy*|XY*) -ln -fs ${WRKSRC}/pine/pine-j.hlp ${WRKSRC}/pine/pine.hlp -;; -*) -ln -fs ${WRKSRC}/pine/pine-e.hlp ${WRKSRC}/pine/pine.hlp -ed -s ${WRKSRC}/pico/kanji.h << EOP -46c -#undef KANJI_MSG -. -w -EOP -;; -esac +sed s+@PREFIX@+${PREFIX}+ ${WRKSRC}/pine/osdep/os-bsf.h.in >${WRKSRC}/pine/osdep/os-bsf.h -- cgit v1.2.3