8 files changed, 65 insertions, 110 deletions

diff --git a/news/knews/Makefile b/news/knews/Makefile
index 79c4867071d7..9b7c56cc3f7d 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,23 +1,29 @@
 # New ports collection makefile for:	knews
-# Version required:     0.9.3
-# Date created:         Sat Nov 18 15:23:47 MET 1995
+# Version required:     0.9.6
+# Date created:         Sun Apr 14 09:23:59 MET DST 1996
 # Whom:                 Andreas Klemm <andreas@knobel.gun.de>
 #
 #
 
-DISTNAME=	knews-0.9.3
-PKGNAME=	knews-0.9.3
+DISTNAME=	knews-0.9.6
+PKGNAME=	knews-0.9.6
 CATEGORIES+=	x11
 CATEGORIES+=	news
+
+LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
+MASTER_SITES+=	ftp://ftp.nada.kth.se/home/su95-kjo/knews/
 MASTER_SITES+=	ftp://sunsite.unc.edu/pub/Linux/X11/xapps/networked/
 MASTER_SITES+=	ftp://ftp.cc.gatech.edu/ac88/linux/X11/xapps/networked/
 MASTER_SITES+=	ftp://ftp.germany.eu.net/pub/os/Linux/Mirror.SunSITE/X11/xapps/networked/
 MASTER_SITES+=	ftp://ftp.funet.fi/pub/mirrors/sunsite.unc.edu/pub/Linux/X11/xapps/networked/
 
 # perhaps Andreas is going to maintain it personally some day... :)
-#MAINTAINER=	andreas@knobel.gun.de
-MAINTAINER=	joerg
+#MAINTAINER=	joerg
+# this time ;-)
+MAINTAINER=	andreas@knobel.gun.de
 
+WRKSRC=		${WRKDIR}/knews
 USE_IMAKE=	yes
 MAKE_FLAGS=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 \
 		XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults  -f
diff --git a/news/knews/distinfo b/news/knews/distinfo
index 75f0abdd2331..12c7a6f7f2e0 100644
--- a/news/knews/distinfo
+++ b/news/knews/distinfo
@@ -1 +1 @@
-MD5 (knews-0.9.3.tar.gz) = a334f15710040284d74246b7d4c20fe4
+MD5 (knews-0.9.6.tar.gz) = 3cbcac73641fbdd1f0cec4b791a68e06
diff --git a/news/knews/files/patch-aa b/news/knews/files/patch-aa
index dbdce59d2c17..81c03099cd20 100644
--- a/news/knews/files/patch-aa
+++ b/news/knews/files/patch-aa
@@ -1,36 +1,10 @@
-*** configure.h.orig	Sat Nov 18 17:06:08 1995
---- configure.h	Sat Nov 18 17:08:26 1995
-***************
-*** 6,12 ****
-   *  You'll probably want to leave this as sendmail, but make sure the path
-   *  is right.  If you don't have sendmail, use /bin/false :-).
-   */
-! #define MAIL_COMMAND "/usr/lib/sendmail -t"
-  
-  
-  /*  This macro controls the generation of email addresses.
---- 6,12 ----
-   *  You'll probably want to leave this as sendmail, but make sure the path
-   *  is right.  If you don't have sendmail, use /bin/false :-).
-   */
-! #define MAIL_COMMAND "/usr/sbin/sendmail -t"
-  
-  
-  /*  This macro controls the generation of email addresses.
-***************
-*** 33,39 ****
-   *  Both %s and %i are optional, although the editor will not be much use
-   *  if you don't specify %s...
-   */
-! #define DEFAULT_EDIT_COMMAND "xterm -e vi +%i %s"
-  
-  
-  /*  The default NNTPSERVER.  Basically: don't set this, use $NNTPSERVER
---- 33,39 ----
-   *  Both %s and %i are optional, although the editor will not be much use
-   *  if you don't specify %s...
-   */
-! #define DEFAULT_EDIT_COMMAND "xterm -cr red -fn 10x20 -bg lightsteelblue -e vi +%i %s"
-  
-  
-  /*  The default NNTPSERVER.  Basically: don't set this, use $NNTPSERVER
+--- configure.h.orig	Thu Mar 28 17:30:55 1996
++++ configure.h	Sun Apr 14 08:41:35 1996
+@@ -15,7 +15,7 @@
+  *
+  *  If you don't have sendmail, use /bin/false :-).
+  */
+-/* #define MAIL_COMMAND "/usr/sbin/sendmail -t" */
++#define MAIL_COMMAND "/usr/sbin/sendmail -t"
+ /* #define MAIL_COMMAND "/usr/lib/sendmail -t"  */
+ 
diff --git a/news/knews/files/patch-ab b/news/knews/files/patch-ab
new file mode 100644
index 000000000000..f2e765dd454e
--- /dev/null
+++ b/news/knews/files/patch-ab
@@ -0,0 +1,10 @@
+--- src/Knews.ad.orig	Sun Apr 14 08:44:59 1996
++++ src/Knews.ad	Sun Apr 14 08:45:42 1996
+@@ -35,6 +35,7 @@
+ !Knews.editCommand:	xterm -e $EDITOR +%i %s
+ !Knews.editCommand:	xemacs +%i %s
+ !Knews.editCommand:	xterm -e vi +%i %s
++!Knews.editCommand:	xterm -fn 10x20 -cr red -bg grey90 -e vi +%i %s
+ !
+ ! You might need a few stty settings for vi:
+ !
diff --git a/news/knews/files/patch-ac b/news/knews/files/patch-ac
deleted file mode 100644
index f4245ba8e00f..000000000000
--- a/news/knews/files/patch-ac
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/pedit.c.orig	Thu Oct  5 11:50:50 1995
-+++ src/pedit.c	Sun Nov 19 16:54:27 1995
-@@ -394,38 +394,34 @@
-     }
- }
- 
--#define MAX_REFS	8
- static int print_references_header(FILE *fp, ARTICLE *art)
- {
--    ARTICLE	*arts[MAX_REFS + 2];
--    int		i = MAX_REFS + 1, col, rows;
-+    ARTICLE	**arts, *a;
-+    int		i, j;
- 
-+    j = 0;
-+    a = art;
-     do {
--	arts[i--] = art;
--	art = A_PARENT(art);
--    } while (i > 0 && art);
--
--    if (art) {
--	while (A_PARENT(art))
--	    art = A_PARENT(art);
--	arts[i] = art;
--    } else {
--	i++;
--    }
--
--    rows = 1;
--    col = 11 + fprintf(fp, " <%s>", arts[i++]->msgid);
--    while (i < MAX_REFS + 2) {
--	if (col + arts[i]->hash_len > 75) {
--	    rows++;
--	    fprintf(fp, "\n ");
--	    col = 1;
--	}
--	col += fprintf(fp, " <%s>", arts[i++]->msgid);
--    }
--    fprintf(fp, "\n");
-+	a = A_PARENT(a);
-+	j++;
-+    } while (a);
- 
--    return rows;
-+    arts = (ARTICLE **)XtMalloc(sizeof(ARTICLE *) * j);
-+
-+    a = art;
-+    i = j;
-+    do {
-+	arts[--i] = a;
-+	a = A_PARENT(a);
-+    } while(i);
-+
-+    for (i = 0; i < j; i++)
-+	(void)fprintf(fp, " <%s>", arts[i]->msgid);
-+    (void)fprintf(fp, "\n");
-+
-+    XtFree((char *)arts);
-+
-+    return 1;
- }
- 
- static void print_attribution(FILE *fp, char *attr, ARTICLE *art)
diff --git a/news/knews/pkg-comment b/news/knews/pkg-comment
index f47e0ead431a..862d2c428a62 100644
--- a/news/knews/pkg-comment
+++ b/news/knews/pkg-comment
@@ -1 +1 @@
-knews-0.9.3: Knews is a threaded nntp newsreader for X
+Knews is a threaded nntp newsreader for X
diff --git a/news/knews/pkg-descr b/news/knews/pkg-descr
index 2f3961442d94..5115b559b362 100644
--- a/news/knews/pkg-descr
+++ b/news/knews/pkg-descr
@@ -1,8 +1,10 @@
-True threading, with a graphical tree for the threads. 
+Knews is a threaded newsreader with an X Window interface that uses
+NNTP to get news. It displays the threads in a graphical tree.
+
 Full support for reading MIME articles, except message/partial. 
 Some options that will improve things for people reading over slow lines: 
 
-  o Background threading of groups in advance. 
+  o Background threading of newsgroups
   o Doesn't have to read the active file or group descriptions on startup. 
   o A mechansim for reading the spool directory. 
   o Kill file support. Articles can be 
@@ -15,3 +17,12 @@ Some options that will improve things for people reading over slow lines:
   o Supports multiple nntp servers. 
   o Tagging of articles and saving or piping them in order. 
   o Uudecode function. Not perfect, but handles most cases. 
+  o article text widget is able to display wide-character fonts
+  o article tree has a 'vertical' layout by popular demand
+  o experimental: Decoding of 16 bit encoded charsets
+  o Mailcap file support
+  o save thread data between sessions 
+  o article prefetch cache and 'trailing' cache.
+  o Less restrictive locking of the interface,
+    edit killfile and such while knews is busy.
+  o Message-id lookup of articles.
diff --git a/news/knews/scripts/pre-configure b/news/knews/scripts/pre-configure
index 15a1b97edce3..63ca355bc85a 100644
--- a/news/knews/scripts/pre-configure
+++ b/news/knews/scripts/pre-configure
@@ -3,4 +3,22 @@ echo "You should tell knews the name of your NNTP server"
 echo "You can do this by setting the environment variable NNTPSERVER"
 echo "csh users: in .cshrc:   setenv NNTPSERVER host.domain"
 echo "sh  users: in .profile: NNTPSERVER=host.domain; export NNTPSERVER"
+
+# work around a problem with bmake regarding files ending in .l
+#
+FILES_TO_PATCH="kedit.c widgets.c save.c search.c"
+for file in $FILES_TO_PATCH
+do
+	ed -s ${WRKSRC}/src/${file} <<-EOF
+		g/^#include.*\.l/s/\.l/.h/
+		w
+		q
+		EOF
+done
+
+for file in ${WRKSRC}/src/layouts/*
+do
+	mv $file `echo $file | sed -e 's/\.l/.h/'`
+done
+
 exit 0