7 files changed, 71 insertions, 139 deletions

diff --git a/japanese/pine/Makefile b/japanese/pine/Makefile
index 1330132ff004..296567be98d8 100644
--- a/japanese/pine/Makefile
+++ b/japanese/pine/Makefile
@@ -3,7 +3,7 @@
 # Date created:		01 May 1996
 # Whom:			masafumi
 #
-# $Id: Makefile,v 1.8 1996/11/11 10:08:22 max Exp $
+# $Id: Makefile,v 1.9 1996/11/13 12:41:07 asami Exp $
 #
 
 DISTNAME=	pine3.95
@@ -21,9 +21,8 @@ MAINTAINER=	max@FreeBSD.ORG
 LIB_DEPENDS=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
 BUILD_DEPENDS=	${PREFIX}/lib/libcanna.a:${PORTSDIR}/japanese/Canna
 
-MAN1=		pine.1 pilot.1 pico.1
-MAN8=		imapd.8c ipopd.8c
 EXTRACT_ONLY=	pine3.95.tar.gz
+MAN1=		pine.1 pilot.1 pico.1
 
 pre-patch:
 	@(cd ${WRKSRC}; \
@@ -34,14 +33,9 @@ do-build:
 	(cd ${WRKSRC}; ./build bsf)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/imapd ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/ipop2d ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/ipop3d ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/mtest ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/bin/libc-client.so.1.3 $(PREFIX)/lib
 	${INSTALL_DATA} ${WRKSRC}/bin/libpico.so.1.3 $(PREFIX)/lib
 	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1
@@ -51,8 +45,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/pine/pine.ndx ${PREFIX}/lib/pine
 	${INSTALL_DATA} ${WRKSRC}/pine/pine_ja.hlp ${PREFIX}/lib/pine
 	${INSTALL_DATA} ${WRKSRC}/pine/pine_ja.ndx ${PREFIX}/lib/pine
-	${INSTALL_MAN} ${WRKSRC}/imap/systype/imapd/imapd.8c ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/imap/systype/ipopd/ipopd.8c ${PREFIX}/man/man8
 	ldconfig -vm /usr/local/lib
 
 .include <bsd.port.mk>
diff --git a/japanese/pine/files/patch-ab b/japanese/pine/files/patch-ab
index 6f35325f6024..a4a347426dbb 100644
--- a/japanese/pine/files/patch-ab
+++ b/japanese/pine/files/patch-ab
@@ -86,7 +86,7 @@
 + 		$(RANLIB) libpico.a
 + 
 + libpico.so.1.3:	osdep.c osdep.h $(SOFILES)
-+ 		ld -Bshareable -o libpico.so.1.3 $(SOFILES)
++ 		ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
 + 
 + pico:		main.c libpico.so.1.3
 + 		$(CC) $(CFLAGS) main.c -L. -lpico $(LIBS) -o pico
diff --git a/japanese/pine/files/patch-ac b/japanese/pine/files/patch-ac
index 050a058497bd..2c94716b8a02 100644
--- a/japanese/pine/files/patch-ac
+++ b/japanese/pine/files/patch-ac
@@ -235,7 +235,7 @@
 + 
 + 
 + /*----------------- locale.h -------------------------------------------*/
-+ /* #include <locale.h>  /* To make matching and sorting work right */
++ #include <locale.h>  /* To make matching and sorting work right */
 + 
 + 
 + 
@@ -247,8 +247,8 @@
 + 
 + 
 + /*--------------- signal.h ---------------------------------------------*/
-+ /* #include <signal.h>      /* sometimes both required, sometimes */
-+ #include <sys/signal.h>  /* only one or the other */
++ #include <signal.h>      /* sometimes both required, sometimes */
++ /* #include <sys/signal.h>  /* 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 */
@@ -346,7 +346,7 @@
 + /*----------------------------------------------------------------------
 +    If no nntp-servers are defined, this program will be used to post news.
 +  ----*/
-+ /* #define SENDNEWS	"/usr/locale/bin/inews -h"	/* news posting cmd */
++ #define SENDNEWS	"/usr/local/news/lib/inews -h"	/* news posting cmd */
 + 
 + 
 + /*--------- Program employed by users to change their password ---------*/
diff --git a/japanese/pine/files/patch-ae b/japanese/pine/files/patch-ae
index 1711adbf4aa3..21aff24f255d 100644
--- a/japanese/pine/files/patch-ae
+++ b/japanese/pine/files/patch-ae
@@ -50,17 +50,17 @@
 + RM=          rm -f
 + LN=          ln -s
 + MAKE=        make
-+ OPTIMIZE=    -O
++ #OPTIMIZE=    -O
 + PROFILE=     # -pg
 + DEBUG=       # -g -DDEBUG
 + 
 + IMAPDIR=     ../c-client
 + PICODIR=     ../pico
 + 
-+ STDLIBES=    -ltermlib
++ STDLIBES=    -ltermlib -lcrypt
 + #LOCLIBES=   $(PICODIR)/libpico.a $(IMAPDIR)/c-client.a
-+ LOCLIBES=    -lpico -lc-client
-+ LOCLIBDIR=   -L$(PICODIR) -L$(IMAPDIR)
++ LOCLIBES=    -lpico ${IMAPDIR}/c-client.a
++ LOCLIBDIR=   -L$(PICODIR)
 + EXTRALIBES=  -L/usr/local/lib -lcanna
 + LIBES=       $(LOCLIBDIR) $(LOCLIBES) $(EXTRALIBES) $(STDLIBES)
 + 
@@ -84,7 +84,7 @@
 + HELPINDXS=      pine.ndx pine_ja.ndx
 + 
 + pine:  $(obj) $(LOCLIBES)
-+ 	echo "char datestamp[]="\"`date`\"";" > date.c
++ 	echo "char datestamp[]="\"`LC_TIME=C date`\"";" > date.c
 + 	echo "char hoststamp[]="\"`hostname`\"";" >> date.c
 + 	$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(obj) date.c $(LIBES)
 + 
diff --git a/japanese/pine/files/patch-af b/japanese/pine/files/patch-af
index 694951fa0688..8c0b03077df9 100644
--- a/japanese/pine/files/patch-af
+++ b/japanese/pine/files/patch-af
@@ -1,107 +1,37 @@
-*** 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
+*** imap/ANSI/c-client/Makefile.orig	Tue Jan 21 14:26:05 1997
+--- imap/ANSI/c-client/Makefile	Tue Jan 21 14:38:27 1997
 ***************
-*** 32,41 ****
---- 32,43 ----
-  
-  
-  ARCHIVE=c-client.a
-+ SHLIB=libc-client.so.1.3
-  ARRC=ar rc
+*** 36,43 ****
   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)
+! CC=cc
+! CFLAGS=$(EXTRACFLAGS)
   DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
+  LN=ln -s
+  MAKE=make
+--- 36,43 ----
+  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
+! #CC=cc
+! #CFLAGS=$(EXTRACFLAGS)
+  DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
+  LN=ln -s
+  MAKE=make
 ***************
-*** 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 ----
+*** 125,130 ****
+--- 125,137 ----
+  		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
   		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)" \
++ 	$(MAKE) $(ARCHIVE) 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)" \
++               RSHPATH=/usr/bin/rsh CFLAGS="${CFLAGS} -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-ak b/japanese/pine/files/patch-ak
index 568df38e0775..c9f014c50282 100644
--- a/japanese/pine/files/patch-ak
+++ b/japanese/pine/files/patch-ak
@@ -1,5 +1,5 @@
-*** imap/Makefile.orig	Fri Sep 20 13:44:01 1996
---- imap/Makefile	Fri Sep 20 13:44:43 1996
+*** imap/Makefile.orig	Tue Jan 21 11:08:23 1997
+--- imap/Makefile	Tue Jan 21 11:04:47 1997
 ***************
 *** 47,53 ****
   
@@ -18,14 +18,33 @@
   
   # Non-ANSI compiler ports.
 ***************
-*** 81,86 ****
---- 81,89 ----
-  
+*** 82,87 ****
+--- 82,90 ----
   #bs2:
   #	$(MAKE) build SYSTYPE=ANSI OS=bsi
-+ 
+  
 + bsf:
 + 	$(MAKE) build OS=bsf PROCESS=an
-  
++ 
   pt1:
   	$(MAKE) build SYSTYPE=non-ANSI OS=ptx
+  
+***************
+*** 92,99 ****
+  	$(LN) $(SYSTYPE) systype
+  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
+  	cd $(SYSTYPE)/ms;$(MAKE)
+! 	cd $(SYSTYPE)/ipopd;$(MAKE)
+! 	cd $(SYSTYPE)/imapd;$(MAKE)
+  
+  clean:
+  	$(RM) systype
+--- 95,102 ----
+  	$(LN) $(SYSTYPE) systype
+  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
+  	cd $(SYSTYPE)/ms;$(MAKE)
+! #       cd $(SYSTYPE)/ipopd;$(MAKE)
+! #       cd $(SYSTYPE)/imapd;$(MAKE)
+  
+  clean:
+  	$(RM) systype
diff --git a/japanese/pine/files/patch-al b/japanese/pine/files/patch-al
index 1be043073eba..8418f09adcfe 100644
--- a/japanese/pine/files/patch-al
+++ b/japanese/pine/files/patch-al
@@ -1,31 +1,25 @@
-*** build.orig	Fri Sep 20 13:44:00 1996
---- build	Fri Sep 20 13:44:42 1996
+*** build.orig	Tue Jan 21 14:26:05 1997
+--- build	Tue Jan 21 14:55:43 1997
 ***************
-*** 169,181 ****
+*** 168,181 ****
+          cd $PHOME/bin
           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 ../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
+-         size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
           echo "Done"
           ;;
   
---- 169,191 ----
+--- 168,180 ----
+          cd $PHOME/bin
           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 ] ;     
@@ -33,9 +27,6 @@
           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"
           ;;
   
@@ -51,7 +42,7 @@
           echo "Done"
           cd $PHOME
           ;;
---- 196,205 ----
+--- 185,194 ----
   	make clean
           echo "Cleaning Pine"
           cd $PHOME/pine