Update package to "knews-1.0b0".

7 files changed, 76 insertions, 21 deletions

diff --git a/news/knews/Makefile b/news/knews/Makefile
index 35754d2a8a0..a28067ef10b 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,29 +1,38 @@
-# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:47 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 23:42:19 tron Exp $
 #
 
-DISTNAME=	knews-0.9.8
+DISTNAME=	knews-1.0b.0
+PKGNAME=	knews-1.0b0
 CATEGORIES=	news
-MASTER_SITES=	ftp://ftp.nada.kth.se/home/su95-kjo/knews/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/news/knews/
+MASTER_SITES=	http://www.matematik.su.se/~kjj/
 
 MAINTAINER=	tron@netbsd.org
 
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	png-0.96:../../graphics/png
 DEPENDS+=	xpm-3.4j:../../graphics/xpm
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/knews
 
+CAT1=		knews.0
+
 # Set DOMAIN_NAME to a string appended to the From: header or
 # assign it a file from which the domain name is read.
 post-extract:
-.if !defined(DOMAIN_NAME)
+.if !defined(DOMAIN_FILE) && !defined(DOMAIN_NAME)
 	@${ECHO_MSG} "Type \"make DOMAIN_NAME=xyz\" to set the domain name."
+.elif defined(DOMAIN_FILE)
+	@${ECHO_MSG} "Reading \"From:\" domain from file \"${DOMAIN_FILE}\"."
 .else
-	@${ECHO_MSG} "Using \"${DOMAIN_NAME}\" as the From: domain name."
+	@${ECHO_MSG} "Using \"${DOMAIN_NAME}\" as the \"From:\" domain name."
 .endif
 
 post-patch:
-.if defined(DOMAIN_NAME)
+.if defined(DOMAIN_FILE)
+	${ECHO_MSG} >>${WRKSRC}/configure.h \
+	"#define DOMAIN_FILE \"${DOMAIN_FILE}\""
+.elif defined(DOMAIN_NAME)
 	${ECHO_MSG} >>${WRKSRC}/configure.h \
 	"#define DOMAIN_NAME \"${DOMAIN_NAME}\""
 .endif
diff --git a/news/knews/files/md5 b/news/knews/files/md5
index 5faece1150c..37a9f0bd4f7 100644
--- a/news/knews/files/md5
+++ b/news/knews/files/md5
@@ -1 +1 @@
-MD5 (knews-0.9.8.tar.gz) = e262b6b7aed0e1478e72f09e5dc3ffd1
+MD5 (knews-1.0b.0.tar.gz) = 6ce4c5abc6378cbb043735b42d65a1ad
diff --git a/news/knews/patches/patch-aa b/news/knews/patches/patch-aa
index 3200889b8a2..2dd3ac2d615 100644
--- a/news/knews/patches/patch-aa
+++ b/news/knews/patches/patch-aa
@@ -1,5 +1,5 @@
---- configure.h.orig	Sun Aug 18 14:11:26 1996
-+++ configure.h	Sun Nov 30 16:33:59 1997
+--- configure.h.orig	Fri Jan  9 18:16:11 1998
++++ configure.h	Thu Apr 23 00:54:08 1998
 @@ -14,7 +14,7 @@
   *
   *  If you don't have sendmail, use /bin/false :-).
@@ -9,8 +9,8 @@
  /* #define MAIL_COMMAND "/usr/lib/sendmail -t"  */
  
  
-@@ -42,7 +42,7 @@
- /* #define DOMAIN_NAME "/your/file/here"  */
+@@ -34,7 +34,7 @@
+ /* #define DOMAIN_FILE "/your/file/here"  */
  /* #define DOMAIN_NAME "your_domain_here" */
  
 -#define DOMAIN_HACK	1
@@ -18,3 +18,23 @@
  
  
  
+@@ -86,8 +86,8 @@
+  *  library search paths in knews.tmpl for libjpeg and libpng.
+  */
+ 
+-#define HAVE_JPEG	0
+-#define HAVE_PNG	0
++#define HAVE_JPEG	1
++#define HAVE_PNG	1
+ 
+ 
+ 
+@@ -139,7 +139,7 @@
+  *
+  *  Knews*backgroundPixmap:	~/dir/texture.xpm
+  */
+-#define HAVE_XPM		0
++#define HAVE_XPM		1
+ 
+ 
+ /*  If your system doesn't have the POSIX sigaction() function, defining
diff --git a/news/knews/patches/patch-ab b/news/knews/patches/patch-ab
index 4a42c0c8683..998e123a336 100644
--- a/news/knews/patches/patch-ab
+++ b/news/knews/patches/patch-ab
@@ -1,6 +1,6 @@
---- src/global.h.orig	Tue Aug 13 16:30:33 1996
-+++ src/global.h	Sun Nov 30 18:32:48 1997
-@@ -109,6 +109,7 @@
+--- src/global.h.orig	Fri Jan  9 18:16:21 1998
++++ src/global.h	Thu Apr 23 00:52:42 1998
+@@ -100,6 +100,7 @@
      long		no_unread;
      long		first_art;
      long		last_art;
diff --git a/news/knews/patches/patch-ac b/news/knews/patches/patch-ac
index a4cd5fe7aa9..e472b64dbdf 100644
--- a/news/knews/patches/patch-ac
+++ b/news/knews/patches/patch-ac
@@ -1,6 +1,6 @@
---- src/procs.c.orig	Fri Aug  2 12:52:44 1996
-+++ src/procs.c	Sun Nov 30 18:32:48 1997
-@@ -75,7 +75,10 @@
+--- src/procs.c.orig	Fri Jan  9 18:16:22 1998
++++ src/procs.c	Thu Apr 23 00:52:42 1998
+@@ -66,7 +66,10 @@
  	    (ART_LIST_NODE *)XtMalloc(sizeof *temp);
  	temp->next  = NULL;
  	temp->first = 1;
diff --git a/news/knews/patches/patch-ad b/news/knews/patches/patch-ad
index 6652f050936..60a5924b25e 100644
--- a/news/knews/patches/patch-ad
+++ b/news/knews/patches/patch-ad
@@ -1,6 +1,6 @@
---- src/thread.c.orig	Fri Jul 26 11:59:43 1996
-+++ src/thread.c	Sun Nov 30 18:32:48 1997
-@@ -1120,6 +1120,7 @@
+--- src/thread.c.orig	Fri Jan  9 18:16:23 1998
++++ src/thread.c	Thu Apr 23 00:52:42 1998
+@@ -1108,6 +1108,7 @@
      if (!reply || atoi(reply) != NNTP_OK_GROUP)
  	return reply;
  
diff --git a/news/knews/patches/patch-ae b/news/knews/patches/patch-ae
new file mode 100644
index 00000000000..52934f5c8cf
--- /dev/null
+++ b/news/knews/patches/patch-ae
@@ -0,0 +1,26 @@
+--- knews.tmpl.orig	Fri Jan  9 18:16:12 1998
++++ knews.tmpl	Thu Apr 23 01:07:29 1998
+@@ -23,11 +23,10 @@
+  */
+ 
+ /* gcc on decent systems */
+-#if 0
++EXTRA_INCLUDES	= -I${LOCALBASE}/include
+ CC		= gcc
+ CCOPTIONS	= -ansi -pedantic -Wall
+ CDEBUGFLAGS	= -O2
+-#endif
+ 
+ /* gcc on SunOS 4.1.x (and maybe other non-decent systems) */
+ #if 0
+@@ -74,8 +73,8 @@
+  *  be changed to -lz.
+  */
+ 
+-JPEG_LIB	= -ljpeg
+-PNG_LIB		= -lpng -lgz -lm
++JPEG_LIB	= -L${LOCALBASE}/lib -ljpeg
++PNG_LIB		= -L${LOCALBASE}/lib -lpng -lz -lm
+ 
+ 
+ /*