diff options
author | Masafumi Max NAKANE <max@FreeBSD.org> | 1996-09-20 05:47:59 +0000 |
---|---|---|
committer | Masafumi Max NAKANE <max@FreeBSD.org> | 1996-09-20 05:47:59 +0000 |
commit | ce9997829da127000dac5e744a01d051224f9bd8 (patch) | |
tree | b6f82f3f5eb57930b4d9621985bd4cb15f2a2a3c /japanese/pine/files/patch-af | |
parent | Check on /etc/services will be performed upon pkg_add, too. (diff) |
Upgrade, 3.91 -> 3.95lj1.1b3
Notes
Notes:
svn path=/head/; revision=3821
Diffstat (limited to 'japanese/pine/files/patch-af')
-rw-r--r-- | japanese/pine/files/patch-af | 205 |
1 files changed, 106 insertions, 99 deletions
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 |