original distribution updated to 1.36.

PR:		6034

6 files changed, 103 insertions, 80 deletions

diff --git a/japanese/gn-gnspool/Makefile b/japanese/gn-gnspool/Makefile
index 14c5dc71a323..b519c453c752 100644
--- a/japanese/gn-gnspool/Makefile
+++ b/japanese/gn-gnspool/Makefile
@@ -3,21 +3,23 @@
 # Date created:				14 Feb. 1997
 # Whom:					Kiroh HARADA <kiroh@kh.rim.or.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/02/15 11:09:03 max Exp $
+# $Id: Makefile,v 1.2 1997/09/14 21:34:37 max Exp $
 #
 
-DISTNAME=	gn-1.35
-PKGNAME=	ja-gn-gnspool-1.35
+DISTNAME=	gn-1.36
+PKGNAME=	ja-gn-gnspool-1.36
 CATEGORIES=	japanese news
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/misc/gn/
 
 MAINTAINER=	kiroh@kh.rim.or.jp
 
-WRKSRC=		${WRKDIR}/gn-1.35/src
+WRKSRC=		${WRKDIR}/gn-1.36/src
 
 pre-configure:
-	@${CP} ${WRKDIR}/${DISTNAME}/mkfiles/unix/freebsd ${WRKSRC}/Makefile
-	@${SED} s+@PREFIX@+${PREFIX}+ ${FILESDIR}/site.def.in > ${WRKSRC}/site.def
+	@${CP} ${WRKDIR}/${DISTNAME}/mkfiles/unix/common ${WRKSRC}/Makefile
+	@${PATCH} -d ${WRKSRC} < ${FILESDIR}/Makefile.patch
+	@${SED} s+@PREFIX@+${PREFIX}+ ${FILESDIR}/site.def.in \
+		> ${WRKSRC}/site.def
 	@(cd ${WRKSRC}; ${MAKE} configur)
 
 do-configure:
diff --git a/japanese/gn-gnspool/distinfo b/japanese/gn-gnspool/distinfo
index 1c1e041d874a..16132a6cb1da 100644
--- a/japanese/gn-gnspool/distinfo
+++ b/japanese/gn-gnspool/distinfo
@@ -1 +1 @@
-MD5 (gn-1.35.tar.gz) = 61a08795253220d40b7e90b14f281d21
+MD5 (gn-1.36.tar.gz) = 710c4fb59a494166af20b237fa5fd683
diff --git a/japanese/gn-gnspool/files/Makefile.patch b/japanese/gn-gnspool/files/Makefile.patch
new file mode 100644
index 000000000000..b9cbf74c4fdb
--- /dev/null
+++ b/japanese/gn-gnspool/files/Makefile.patch
@@ -0,0 +1,37 @@
+--- Makefile.orig	Wed Feb  4 16:39:44 1998
++++ Makefile	Wed Feb  4 16:42:02 1998
+@@ -13,11 +13,11 @@
+ COLUMNS		= 80
+ 
+ BINDIR		= /usr/local/bin
+-MANDIR		= /usr/local/man/man1
++MANDIR		= /usr/local/man/ja_JP.EUC/cat1
+ MANEXT		= .1
+ 
+-NEWSSPOOL	= /usr/spool/news
+-NEWSLIB		= /usr/lib/news
++NEWSSPOOL	= /var/spool/gnspool
++NEWSLIB		= /usr/local/news/lib
+ 
+ NEWSRC		= .newsrc
+ SIGNATURE	= .signature
+@@ -30,7 +30,7 @@
+ MAILER		= /usr/lib/sendmail -t
+ 
+ CC		= cc
+-OPTCFLAGS	= -O
++OPTCFLAGS	= -UHAS_MALLOC_H
+ OPTGNOBJS	= 
+ OPTGNSPOOLOBJS	= 
+ OPTLFLAGS	= 
+@@ -38,7 +38,9 @@
+ 
+ SHELL		= /bin/sh
+ DEFINES		= -DUNIX
+-HEADER_DEFINES	=
++HEADER_DEFINES = -DHAS_STRING_H -DHAS_STDLIB_H -DHAS_MALLOC_H -DHAS_UNISTD_H \
++	-DHAS_NETDB_H -DHAS_SYS_IOCTL_H -DHAS_SYS_SOCKET_H -DHAS_NETINET_IN_H \
++	-DHAS_ARPA_INET_H
+ CFLAGS		= $(DEFINES) $(HEADER_DEFINES) $(OPTCFLAGS)
+ LFLAGS		= $(OPTLFLAGS)
+ LIBS		= $(OPTLIBS)
diff --git a/japanese/gn-gnspool/files/patch-aa b/japanese/gn-gnspool/files/patch-aa
index 2c1e506bd10c..1a3b9046afb5 100644
--- a/japanese/gn-gnspool/files/patch-aa
+++ b/japanese/gn-gnspool/files/patch-aa
@@ -1,30 +1,13 @@
-*** smtp.c.orig	Mon May 27 21:04:14 1996
---- smtp.c	Thu Feb  6 05:10:18 1997
-***************
-*** 318,329 ****
-        if ( smtp_get_resp(220) )
-  	return(ERROR);
-      }
-!   }  
-!   sprintf(resp,"helo %s",gn.hostname);
-!   if ( smtp_put_server(resp) != CONT )
-!     return(ERROR);
-!   if ( smtp_get_resp(250) )
-!     return(ERROR);
-    
-    sprintf( resp, "mail from: <%s>", gn.usrname);
-    if ( smtp_put_server( resp ) != CONT )
---- 318,330 ----
-        if ( smtp_get_resp(220) )
-  	return(ERROR);
-      }
-! 
-!     sprintf(resp,"helo %s",gn.hostname);
-!     if ( smtp_put_server(resp) != CONT )
-!       return(ERROR);
-!     if ( smtp_get_resp(250) )
-!       return(ERROR);
-!   }
-    
-    sprintf( resp, "mail from: <%s>", gn.usrname);
-    if ( smtp_put_server( resp ) != CONT )
+--- key.c.orig	Tue Apr  1 17:44:50 1997
++++ key.c	Wed Feb  4 16:11:02 1998
+@@ -47,6 +47,10 @@
+ #	define	exit(n) Exit(n)
+ #endif /* UNIX */
+ 
++#ifdef __FreeBSD__
++#	include <sgtty.h>
++#endif /* __FreeBSD__ */
++
+ #include	"nntp.h"
+ #include	"gn.h"
+ 
diff --git a/japanese/gn-gnspool/pkg-descr b/japanese/gn-gnspool/pkg-descr
index fa9cc92896c8..3bf5ae1fca11 100644
--- a/japanese/gn-gnspool/pkg-descr
+++ b/japanese/gn-gnspool/pkg-descr
@@ -15,4 +15,3 @@ the author.  Walnut Creek CDROM is granted to include this software
 into FreeBSD CDROMs.
 
 - Kiroh HARADA
-
diff --git a/japanese/gn-gnspool/pkg-plist b/japanese/gn-gnspool/pkg-plist
index 6a401a0d8254..e3d81a95c857 100644
--- a/japanese/gn-gnspool/pkg-plist
+++ b/japanese/gn-gnspool/pkg-plist
@@ -6,61 +6,63 @@ man/ja_JP.EUC/cat1/gn.1.gz
 man/ja_JP.EUC/cat1/gnspool.1.gz
 share/examples/gn-gnspool/_gnrc
 share/doc/gn-gnspool/Changes.FreeBSD.port
+share/doc/gn-gnspool/bin-dist
+share/doc/gn-gnspool/change.log
 share/doc/gn-gnspool/copyrigh.t
-share/doc/gn-gnspool/faq/old
+share/doc/gn-gnspool/define
+share/doc/gn-gnspool/dos/etherppp
+share/doc/gn-gnspool/dos/inetbios
+share/doc/gn-gnspool/dos/lanwp
+share/doc/gn-gnspool/dos/packet
+share/doc/gn-gnspool/dos/pathway
+share/doc/gn-gnspool/dos/pc-nfs
+share/doc/gn-gnspool/dos/pctcp4
+share/doc/gn-gnspool/dos/readme
+share/doc/gn-gnspool/dos/slimtcp
+share/doc/gn-gnspool/faq/about
+share/doc/gn-gnspool/faq/customiz
+share/doc/gn-gnspool/faq/dir_file
 share/doc/gn-gnspool/faq/dos
-share/doc/gn-gnspool/faq/unix
-share/doc/gn-gnspool/faq/newsrc
 share/doc/gn-gnspool/faq/env
-share/doc/gn-gnspool/faq/index
-share/doc/gn-gnspool/faq/dir_file
 share/doc/gn-gnspool/faq/gnspool
-share/doc/gn-gnspool/faq/about
-share/doc/gn-gnspool/faq/customiz
 share/doc/gn-gnspool/faq/howtoget
-share/doc/gn-gnspool/mime
-share/doc/gn-gnspool/unix/readme
-share/doc/gn-gnspool/unix/mvux
-share/doc/gn-gnspool/windows.31/readme
-share/doc/gn-gnspool/windows.31/winsock.qw
-share/doc/gn-gnspool/windows.31/winsock.vc
-share/doc/gn-gnspool/os2/tcpip16
-share/doc/gn-gnspool/os2/mime
-share/doc/gn-gnspool/os2/readme
-share/doc/gn-gnspool/os2/spool
-share/doc/gn-gnspool/os2/tcpip32
-share/doc/gn-gnspool/wanted
-share/doc/gn-gnspool/gnspool/readme
+share/doc/gn-gnspool/faq/index
+share/doc/gn-gnspool/faq/newsrc
+share/doc/gn-gnspool/faq/old
+share/doc/gn-gnspool/faq/unix
 share/doc/gn-gnspool/gnspool/gnspool.gon
-share/doc/gn-gnspool/gnspool/mnews
 share/doc/gn-gnspool/gnspool/gnus
+share/doc/gn-gnspool/gnspool/mh
+share/doc/gn-gnspool/gnspool/mnews
+share/doc/gn-gnspool/gnspool/readme
 share/doc/gn-gnspool/gnspool/winvn
-share/doc/gn-gnspool/readme
-share/doc/gn-gnspool/human68k/offline
+share/doc/gn-gnspool/history
 share/doc/gn-gnspool/human68k/espx
+share/doc/gn-gnspool/human68k/offline
 share/doc/gn-gnspool/human68k/readme
-share/doc/gn-gnspool/log/110-120
+share/doc/gn-gnspool/info
+share/doc/gn-gnspool/install
+share/doc/gn-gnspool/jnames
 share/doc/gn-gnspool/log/100-110
+share/doc/gn-gnspool/log/110-120
 share/doc/gn-gnspool/log/120-130
-share/doc/gn-gnspool/bin-dist
-share/doc/gn-gnspool/jnames
-share/doc/gn-gnspool/dos/readme
-share/doc/gn-gnspool/dos/inetbios
-share/doc/gn-gnspool/dos/lanwp
-share/doc/gn-gnspool/dos/packet
-share/doc/gn-gnspool/dos/pathway
-share/doc/gn-gnspool/dos/pc-nfs
-share/doc/gn-gnspool/dos/pctcp4
-share/doc/gn-gnspool/dos/slimtcp
-share/doc/gn-gnspool/dos/etherppp
-share/doc/gn-gnspool/windows.95/winsock.vc
-share/doc/gn-gnspool/windows.95/readme
-share/doc/gn-gnspool/define
-share/doc/gn-gnspool/install
-share/doc/gn-gnspool/change.log
+share/doc/gn-gnspool/mime
 share/doc/gn-gnspool/new
-share/doc/gn-gnspool/info
-share/doc/gn-gnspool/history
+share/doc/gn-gnspool/os2/mime
+share/doc/gn-gnspool/os2/readme
+share/doc/gn-gnspool/os2/spool
+share/doc/gn-gnspool/os2/tcpip16
+share/doc/gn-gnspool/os2/tcpip32
+share/doc/gn-gnspool/readme
+share/doc/gn-gnspool/unix/mvux
+share/doc/gn-gnspool/unix/readme
+share/doc/gn-gnspool/wanted
+share/doc/gn-gnspool/windows.31/readme
+share/doc/gn-gnspool/windows.31/winsock.qw
+share/doc/gn-gnspool/windows.31/winsock.vc
+share/doc/gn-gnspool/windows.95/readme
+share/doc/gn-gnspool/windows.95/winsock.vc
+@dirrm share/examples/gn-gnspool
 @dirrm share/doc/gn-gnspool/dos
 @dirrm share/doc/gn-gnspool/faq
 @dirrm share/doc/gn-gnspool/gnspool