update to new version 1.0b.0

port dependency to jpeg an png lib, because inline imaging is enabled now
the pre-configure script edits knews.tmpl after it has been patched
enable automatic jump into threaded mode in Knews.ad
port dependency to mp port, because default print command now uses newsp

6 files changed, 73 insertions, 23 deletions

diff --git a/news/knews/Makefile b/news/knews/Makefile
index c2611f084216..d5673381aef8 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -3,16 +3,19 @@
 # Date created:         Sun Apr 14 09:23:59 MET DST 1996
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.8 1996/11/18 10:36:41 asami Exp $
+# $Id: Makefile,v 1.9 1997/07/21 06:52:04 andreas Exp $
 #
 
-DISTNAME=	knews-0.9.8
+DISTNAME=	knews-1.0b.0
 CATEGORIES=	x11 news
-MASTER_SITES=	ftp://ftp.nada.kth.se/home/su95-kjo/knews/
+MASTER_SITES=	http://www.matematik.su.se/~kjj/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
+		png\\.0\\.:${PORTSDIR}/graphics/png
+RUN_DEPENDS=    newsp:${PORTSDIR}/print/mp
 
 WRKSRC=		${WRKDIR}/knews
 USE_IMAKE=	yes
diff --git a/news/knews/distinfo b/news/knews/distinfo
index 5faece1150c3..37a9f0bd4f75 100644
--- a/news/knews/distinfo
+++ b/news/knews/distinfo
@@ -1 +1 @@
-MD5 (knews-0.9.8.tar.gz) = e262b6b7aed0e1478e72f09e5dc3ffd1
+MD5 (knews-1.0b.0.tar.gz) = 6ce4c5abc6378cbb043735b42d65a1ad
diff --git a/news/knews/files/patch-aa b/news/knews/files/patch-aa
index cf1104798b89..12431f599109 100644
--- a/news/knews/files/patch-aa
+++ b/news/knews/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.h.orig	Sun Aug 18 21:11:26 1996
-+++ configure.h	Mon May  5 01:09:11 1997
+--- configure.h.orig	Fri Jan  9 18:16:11 1998
++++ configure.h	Sat Mar 14 16:36:46 1998
 @@ -14,7 +14,7 @@
   *
   *  If you don't have sendmail, use /bin/false :-).
@@ -9,3 +9,35 @@
  /* #define MAIL_COMMAND "/usr/lib/sendmail -t"  */
  
  
+@@ -34,7 +34,10 @@
+ /* #define DOMAIN_FILE "/your/file/here"  */
+ /* #define DOMAIN_NAME "your_domain_here" */
+ 
+-#define DOMAIN_HACK	1
++#define DOMAIN_HACK	0	/* if set to 1 and if you have a dialup 
++				   connection to internet and use the 
++				   resolver, then knews causes a dialup 
++				   on start */
+ 
+ 
+ 
+@@ -86,8 +89,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 +142,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/files/patch-ab b/news/knews/files/patch-ab
index f2e765dd454e..cfe33c66899c 100644
--- a/news/knews/files/patch-ab
+++ b/news/knews/files/patch-ab
@@ -1,5 +1,5 @@
---- src/Knews.ad.orig	Sun Apr 14 08:44:59 1996
-+++ src/Knews.ad	Sun Apr 14 08:45:42 1996
+--- src/Knews.ad.orig	Fri Jan  9 18:16:22 1998
++++ src/Knews.ad	Sat Mar 14 16:59:53 1998
 @@ -35,6 +35,7 @@
  !Knews.editCommand:	xterm -e $EDITOR +%i %s
  !Knews.editCommand:	xemacs +%i %s
@@ -8,3 +8,30 @@
  !
  ! You might need a few stty settings for vi:
  !
+@@ -45,12 +46,13 @@
+ ! measure, knews will not allow quotes, parentheses, white space
+ ! or ampersands in the url.
+ !
+-!Knews.urlCommand:	netscape -remote 'openUrl(%s)'
++Knews.urlCommand:	netscape -remote 'openUrl(%s)'
+ 
+ 
+ ! Command for printing.
+ !
+-Knews.printCommand:	/bin/false
++!Knews.printCommand:	/usr/bin/lpr
++Knews.printCommand:	newsp | /usr/bin/lpr
+ 
+ 
+ ! Whether knews should generate a Path header.
+@@ -224,8 +226,8 @@
+ ! Some people want double clicking on a subject to go directly into thread
+ ! mode. This will do it.
+ !
+-!*threadlist.translations: #override \
+-!	<Btn1Down>(2):	notify() view-thread(true)
++*threadlist.translations: #override \
++	<Btn1Down>(2):	notify() view-thread(true)
+ 
+ 
+ ! The initial directory of the filechooser. Make sure it exists
diff --git a/news/knews/files/patch-ac b/news/knews/files/patch-ac
deleted file mode 100644
index 066aae7be020..000000000000
--- a/news/knews/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.h.orig	Tue Aug 13 21:39:02 1996
-+++ configure.h	Tue Aug 13 21:40:51 1996
-@@ -42,7 +42,10 @@
- /* #define DOMAIN_NAME "/your/file/here"  */
- /* #define DOMAIN_NAME "your_domain_here" */
- 
--#define DOMAIN_HACK	1
-+#define DOMAIN_HACK	0	/* if set to 1 and if you have a dialup 
-+				   connection to internet and use the 
-+				   resolver, then knews causes a dialup 
-+				   on start */
- 
- 
- 
diff --git a/news/knews/scripts/pre-configure b/news/knews/scripts/pre-configure
index 63ca355bc85a..e74060657262 100644
--- a/news/knews/scripts/pre-configure
+++ b/news/knews/scripts/pre-configure
@@ -21,4 +21,6 @@ do
 	mv $file `echo $file | sed -e 's/\.l/.h/'`
 done
 
+perl -pi -e "s|!!LOCALBASE!!|$LOCALBASE|" ${WRKSRC}/knews.tmpl
+
 exit 0