many bug fixes

6 files changed, 119 insertions, 79 deletions

diff --git a/net-news/knews/ChangeLog b/net-news/knews/ChangeLog
index 9b8f88646ce8..225f8ee33d8d 100644
--- a/net-news/knews/ChangeLog
+++ b/net-news/knews/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-news/knews
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-news/knews/ChangeLog,v 1.1 2002/04/12 21:38:58 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/knews/ChangeLog,v 1.2 2002/09/27 12:09:01 seemant Exp $
+
+*knews-1.0.1b-r2 (27 Sep 2002)
+
+  27 Sep 2002; Seemant Kulleen <seemant@gentoo.org> knews-1.0.1b-r2.ebuild
+  files/digest-knews-1.0.1b-r2 :
+
+  Applied a set of debian patches to make this more solid.  Also, changed
+  configure flags depending on USE flags. (of course, there is no
+  ./configure script -- why would there be? that's just silly...)  Thanks
+  to: achim.linder@nikocity.de (Achim Linder) in bug #7506 
 
 *knews-1.0.1b-r1 (12 Apr 2002)
   12 Apr 2002; Spider <spider@gentoo.org>:
diff --git a/net-news/knews/files/digest-knews-1.0.1b-r2 b/net-news/knews/files/digest-knews-1.0.1b-r2
new file mode 100644
index 000000000000..04b31682ea01
--- /dev/null
+++ b/net-news/knews/files/digest-knews-1.0.1b-r2
@@ -0,0 +1,2 @@
+MD5 850ebff7772d576314060ebe6ef81b73 knews-1.0b.1.tar.gz 392225
+MD5 19dba49bee12dea7f75060da577f0b81 knews-1.0b.1-gentoo.diff.bz2 3892
diff --git a/net-news/knews/files/knews-1.0.1b-r1.patch b/net-news/knews/files/knews-1.0.1b-r1.patch
index 35d3d735044d..81447c4fcc07 100644
--- a/net-news/knews/files/knews-1.0.1b-r1.patch
+++ b/net-news/knews/files/knews-1.0.1b-r1.patch
@@ -1,38 +1,32 @@
-diff -urP knews-1.0b.1.orig/configure.h knews-1.0b.1/configure.h
---- knews-1.0b.1.orig/configure.h	Tue Dec 29 04:47:02 1998
-+++ knews-1.0b.1/configure.h	Sun Apr 22 19:42:04 2001
-@@ -16,6 +16,7 @@
-  */
- /* #define MAIL_COMMAND "/usr/sbin/sendmail -t" */
- /* #define MAIL_COMMAND "/usr/lib/sendmail -t"  */
-+#define MAIL_COMMAND "/bin/false"
+--- /util/knewsd.c	Mon Aug 31 15:40:05 1998
++++ util/knewsd.c	Thu Aug  1 18:16:04 2002
+@@ -619,6 +619,7 @@
+     FILE	*fp = NULL;
+     long	first, last, no;
+     char	*c;
++    char	*lfl = NULL;
  
+     if (!group_path) {
+ 	printf(CODE_TO_STR(NNTP_ERR_NCING) " Not in a newsgroup.\r\n");
+@@ -677,15 +678,18 @@
+ 	    if (no > last)
+ 		break;
  
++	    lfl = strchr(buffer, '\n');
++	    if (lfl)
++		lfl[0]=0;
+ 	    fputs(buffer, stdout);
+-	    if (!strchr(buffer, '\n')) {
++	    if (!lfl) {
+ 		int	ch;
  
-@@ -84,9 +85,9 @@
-  *  libcompface.
-  */
- 
--#define HAVE_JPEG	0
--#define HAVE_PNG	0
--#define HAVE_COMPFACE	0
-+#define HAVE_JPEG	1
-+#define HAVE_PNG	1
-+#define HAVE_COMPFACE	1
- 
- 
- 
-diff -urP knews-1.0b.1.orig/knews.tmpl knews-1.0b.1/knews.tmpl
---- knews-1.0b.1.orig/knews.tmpl	Tue Dec 29 05:14:55 1998
-+++ knews-1.0b.1/knews.tmpl	Sun Apr 22 19:42:04 2001
-@@ -83,4 +83,9 @@
-  *  If you need to add include paths for e.g. libjpeg, libpng or libzlib
-  *  include files, do it here.
-  */
--KNEWS_INCLUDES	=
-+KNEWS_INCLUDES = -I/usr/include
-+
-+CC		= gcc
-+CCOPTIONS	= -Wall
-+CDEBUGFLAGS	= -O2
+ 		while ((ch = getc(fp)) != EOF && ch != '\n')
+ 		    putchar(ch);
+-
+-		printf("\r\n");
+ 	    }
 +
++	    printf("\r\n");
+ 	}
+ 
+ 	fclose(fp);
diff --git a/net-news/knews/files/knews-1.0.1b.patch b/net-news/knews/files/knews-1.0.1b.patch
deleted file mode 100644
index 35d3d735044d..000000000000
--- a/net-news/knews/files/knews-1.0.1b.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urP knews-1.0b.1.orig/configure.h knews-1.0b.1/configure.h
---- knews-1.0b.1.orig/configure.h	Tue Dec 29 04:47:02 1998
-+++ knews-1.0b.1/configure.h	Sun Apr 22 19:42:04 2001
-@@ -16,6 +16,7 @@
-  */
- /* #define MAIL_COMMAND "/usr/sbin/sendmail -t" */
- /* #define MAIL_COMMAND "/usr/lib/sendmail -t"  */
-+#define MAIL_COMMAND "/bin/false"
- 
- 
- 
-@@ -84,9 +85,9 @@
-  *  libcompface.
-  */
- 
--#define HAVE_JPEG	0
--#define HAVE_PNG	0
--#define HAVE_COMPFACE	0
-+#define HAVE_JPEG	1
-+#define HAVE_PNG	1
-+#define HAVE_COMPFACE	1
- 
- 
- 
-diff -urP knews-1.0b.1.orig/knews.tmpl knews-1.0b.1/knews.tmpl
---- knews-1.0b.1.orig/knews.tmpl	Tue Dec 29 05:14:55 1998
-+++ knews-1.0b.1/knews.tmpl	Sun Apr 22 19:42:04 2001
-@@ -83,4 +83,9 @@
-  *  If you need to add include paths for e.g. libjpeg, libpng or libzlib
-  *  include files, do it here.
-  */
--KNEWS_INCLUDES	=
-+KNEWS_INCLUDES = -I/usr/include
-+
-+CC		= gcc
-+CCOPTIONS	= -Wall
-+CDEBUGFLAGS	= -O2
-+
diff --git a/net-news/knews/knews-1.0.1b-r1.ebuild b/net-news/knews/knews-1.0.1b-r1.ebuild
index 77e93df9595d..6638f15cd72f 100644
--- a/net-news/knews/knews-1.0.1b-r1.ebuild
+++ b/net-news/knews/knews-1.0.1b-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/net-news/knews/knews-1.0.1b-r1.ebuild,v 1.4 2002/07/17 02:39:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/knews/knews-1.0.1b-r1.ebuild,v 1.5 2002/09/27 12:09:02 seemant Exp $
 
 MY_P=${PN}-1.0b.1
 S=${WORKDIR}/${MY_P}
@@ -19,11 +19,6 @@ DEPEND=">=x11-base/xfree-4.0
 	>=media-libs/compface-1.4"
 
 # If knews used autoconf, we wouldn't need this patch.
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}.patch
-}
 
 src_compile() {
 	xmkmf || die
diff --git a/net-news/knews/knews-1.0.1b-r2.ebuild b/net-news/knews/knews-1.0.1b-r2.ebuild
new file mode 100644
index 000000000000..534d14d2760e
--- /dev/null
+++ b/net-news/knews/knews-1.0.1b-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
+# $Header: /var/cvsroot/gentoo-x86/net-news/knews/knews-1.0.1b-r2.ebuild,v 1.1 2002/09/27 12:09:02 seemant Exp $
+
+MY_P=${PN}-1.0b.1
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A threaded newsreader for X."
+SRC_URI="http://www.matematik.su.se/~kjj/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-gentoo.diff.bz2"
+HOMEPAGE="http://www.matematik.su.se/~kjj/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="virtual/x11
+	virtual/mta
+	sys-apps/supersed
+	jpeg? ( >=media-libs/jpeg-6 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	xface? ( >=media-libs/compface-1.4 )"
+
+# If knews used autoconf, we wouldn't need this patch.
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use jpeg \
+		&& ssed -i "s:\(#define HAVE_JPEG\).*:\1\t1:" configure.h
+
+	use png \
+		&& ssed -i "s:\(#define HAVE_PNG\).*:\1\t1:" configure.h
+
+	use xface \
+		&& ssed -i "s:\(#define HAVE_COMPFACE\).*:\1\t1:" configure.h
+
+	ssed -i "s:\(#define HAVE_XPM\).*:\1\t1:" configure.h
+
+	ssed -i "s:\(#define DEFAULT_EDIT_COMMAND\).*:\1 \"${EDITOR} %s\":" configure.h
+
+	patch -p1 < ${WORKDIR}/${MY_P}-gentoo.diff || die
+}
+
+src_compile() {
+	xmkmf || die
+	make Makefiles || die
+	make clean || die
+	make all || die
+	pushd util/knewsd || die
+	xmkmf || die
+	make all || die
+	popd || die
+}
+
+src_install () {
+	#Install knews
+	make DESTDIR=${D} install || die
+	make DESTDIR=${D} DOCHTMLDIR=/usr/share/doc/${P} \
+	MANPATH=/usr/share/man MANSUFFIX=1 install.man || die
+
+	dodir /etc/knews
+	touch ${D}/etc//knews/mailname
+	touch ${D}/etc/knews/newsserver
+
+	#Other docs.
+	dodoc COPYING COPYRIGHT Changes README
+}
+
+
+pkg_postinst() {
+
+	einfo "Please be sure to set your local domain in"
+	einfo "    /etc/knews/mailname"
+	einfo ""
+	einfo "And please set your news server in"
+	einfo "    /etc/knews/newsserver"
+}