diff -wrc1N qpopper2.1.4/Makefile qpopper2.1.4-news/Makefile
*** qpopper2.1.4/Makefile	Thu May 11 02:14:36 1995
--- qpopper2.1.4-news/Makefile	Wed Oct 25 20:20:57 1995
***************
*** 96,97 ****
--- 96,100 ----
  
+ news:
+ 	make -f make.news
+ 
  tar: ${SRCS} ${DOCS} ${MAKEFILE}
diff -wrc1N qpopper2.1.4/make.news qpopper2.1.4-news/make.news
*** qpopper2.1.4/make.news
--- qpopper2.1.4-news/make.news	Wed Oct 25 20:20:40 1995
***************
*** 0 ****
--- 1,82 ----
+ #@(#)@(#)Makefile	2.5  2.5 4/3/91
+ 
+ CSRCS		=	flock.c pop_dele.c pop_dropcopy.c \
+ 			pop_get_command.c pop_get_subcommand.c pop_init.c \
+ 			pop_last.c pop_list.c pop_log.c pop_lower.c \
+ 			pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
+ 			pop_rset.c pop_send.c pop_stat.c pop_updt.c \
+ 			pop_user.c pop_xtnd.c pop_xmit.c popper.c \
+ 			pop_bull.c xtnd_xlst.c pop_uidl.c mktemp.c pop_rpop.c
+ 
+ OBJS		=	flock.o pop_dele.o pop_dropcopy.o \
+ 			pop_get_command.o pop_get_subcommand.o pop_init.o \
+ 			pop_last.o pop_list.o pop_log.o pop_lower.o \
+ 			pop_msg.o pop_parse.o pop_pass.o pop_quit.o \
+ 			pop_rset.o pop_send.o pop_stat.o pop_updt.o \
+ 			pop_user.o pop_xtnd.o pop_xmit.o popper.o \
+ 			pop_bull.o xtnd_xlst.o pop_uidl.o mktemp.o pop_rpop.o
+ 
+ DOCS		=	README pop3.rfc1081 pop3e.rfc1082 popper.8
+ 
+ INCLUDES	=	popper.h version.h
+ 
+ SRCS		=	${CSRCS} ${INCLUDES}
+ 
+ SCCS		=	
+ 
+ REL		=
+ 
+ CC = gcc -fstrength-reduce -fpcc-struct-return 
+ #CC = cc
+ 
+ MAKEFILE	=	Makefile
+ 
+ #               Defines are described in the INSTALL document.
+ 
+ CFLAGS		=	-DHAVE_VSPRINTF -DHAVE_PARAM_H
+ 
+ LDFLAGS		=	-lmissing
+ 
+ TARGET		=	popper.news
+ 
+ TAR		=	${TARGET}.tar
+ 
+ INSTALLDIR	=	/usr/local/lib
+ 
+ MANPAGE		=	popper.8
+ 
+ CATPAGE		=	popper.0
+ 
+ MANDIR		=	/usr/local/man/cat8
+ 
+ 
+ 
+ ${TARGET}: ${OBJS}
+ 	${CC}  ${OBJS} -o ${TARGET} ${LDFLAGS}
+ 
+ tar: ${SRCS} ${DOCS} ${MAKEFILE}
+ 	rm -f ${TAR} *.Z*
+ 	tar -cvf ${TAR} ${SRCS} ${DOCS} ${MAKEFILE}
+ 	compress ${TAR}
+ 	uuencode ${TAR}.Z ${TAR}.Z > ${TAR}.Z.uuencoded
+ 	split -300 ${TAR}.Z.uuencoded
+ 	mv xaa ${TAR}.Z.uuencoded.xaa
+ 	mv xab ${TAR}.Z.uuencoded.xab
+ 	mv xac ${TAR}.Z.uuencoded.xac
+ 	mv xad ${TAR}.Z.uuencoded.xad
+ 	mv xae ${TAR}.Z.uuencoded.xae
+ 
+ clean:
+ 	rm -f core *.o *.Z*
+ 	${SCCS} clean
+ 
+ sources: ${SRCS}
+ 
+ ${SRCS}:
+ 	${SCCS} get ${REL} $@ -p | expand -4 > $@
+ 
+ ${DOCS}:
+ 	${SCCS} get README -p | expand -4 > README
+ 	${SCCS} get popper.8 -p | expand -4 > popper.8
+ 	
+ ${OBJS}:    popper.h version.h
diff -wrc1N qpopper2.1.4/pop_bull.c qpopper2.1.4-news/pop_bull.c
*** qpopper2.1.4/pop_bull.c	Wed May 24 05:28:07 1995
--- qpopper2.1.4-news/pop_bull.c	Wed Oct 25 19:43:46 1995
***************
*** 12,13 ****
--- 12,16 ----
  #else
+ #ifdef sony_news
+ #include <sys/types.h>
+ #endif
  #include <dirent.h>
diff -wrc1N qpopper2.1.4/pop_xmit.c qpopper2.1.4-news/pop_xmit.c
*** qpopper2.1.4/pop_xmit.c	Fri May 26 01:53:04 1995
--- qpopper2.1.4-news/pop_xmit.c	Wed Oct 25 20:24:18 1995
***************
*** 47,49 ****
--- 47,53 ----
  */
+ #ifdef	sony_news
+     union	wait		stat;
+ #else
      int				stat;
+ #endif
  /*
diff -wrc1N qpopper2.1.4/popper.h qpopper2.1.4-news/popper.h
*** qpopper2.1.4/popper.h	Fri May 26 02:19:09 1995
--- qpopper2.1.4-news/popper.h	Wed Oct 25 19:42:20 1995
***************
*** 158,160 ****
  #define OFF_T		off_t
! #define PID_T		pid_t
  #define UID_T		uid_t
--- 158,160 ----
  #define OFF_T		off_t
! #define PID_T		int
  #define UID_T		uid_t