summaryrefslogtreecommitdiff
path: root/news
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1999-03-14 15:07:20 +0000
committertron <tron@pkgsrc.org>1999-03-14 15:07:20 +0000
commit6f2e8d1a646e27ec5413d5d62f1aa0b6a06599ee (patch)
treec4cea60b91c52a8baddf8fde8ff173589199b8b8 /news
parentbc5559f55cdf0b0c84e6e6a87255bf6386e03597 (diff)
downloadpkgsrc-6f2e8d1a646e27ec5413d5d62f1aa0b6a06599ee.tar.gz
Update for "knews" package to version 1.0b1 supplied by Frederick Bruckman
in PR pkg/7151: - XFace support. - Misc. bugfixes based on patches from Matthias Scheler, Christian Bauernfeind and Greg Ubben.
Diffstat (limited to 'news')
-rw-r--r--news/knews/Makefile13
-rw-r--r--news/knews/files/md54
-rw-r--r--news/knews/patches/patch-aa23
-rw-r--r--news/knews/patches/patch-ab50
-rw-r--r--news/knews/patches/patch-ac16
-rw-r--r--news/knews/patches/patch-ad12
-rw-r--r--news/knews/patches/patch-ae28
-rw-r--r--news/knews/patches/patch-af35
-rw-r--r--news/knews/patches/patch-ag13
9 files changed, 56 insertions, 138 deletions
diff --git a/news/knews/Makefile b/news/knews/Makefile
index a6dd931814a..878b18a6411 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.18 1999/03/08 10:53:57 agc Exp $
-#
+# $NetBSD: Makefile,v 1.19 1999/03/14 15:07:20 tron Exp $
-DISTNAME= knews-1.0b.0
-PKGNAME= knews-1.0b0
+DISTNAME= knews-1.0b.1
+PKGNAME= knews-1.0b1
CATEGORIES= news x11
MASTER_SITES= http://www.matematik.su.se/~kjj/
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.matematik.su.se/~kjj/
+DEPENDS+= faces-1.6.1:../../mail/faces
DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png-1.0.3:../../graphics/png
DEPENDS+= xpm-3.4k:../../graphics/xpm
+CONFLICTS= knews-1.0b0
+
USE_IMAKE= yes
-WRKSRC= ${WRKDIR}/knews
.include "../../mk/bsd.prefs.mk"
@@ -22,7 +23,7 @@ WRKSRC= ${WRKDIR}/knews
# DOMAIN_FILE to a file from which the domain name will be read.
post-extract:
.if !defined(DOMAIN_FILE) && !defined(DOMAIN_NAME)
- @${ECHO_MSG} "Type \"${MAKE} DOMAIN_NAME=xyz\" to set the 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
diff --git a/news/knews/files/md5 b/news/knews/files/md5
index 1ab9997be8e..69d4b5f6f16 100644
--- a/news/knews/files/md5
+++ b/news/knews/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:25:13 agc Exp $
+$NetBSD: md5,v 1.4 1999/03/14 15:07:21 tron Exp $
-MD5 (knews-1.0b.0.tar.gz) = 6ce4c5abc6378cbb043735b42d65a1ad
+MD5 (knews-1.0b.1.tar.gz) = 850ebff7772d576314060ebe6ef81b73
diff --git a/news/knews/patches/patch-aa b/news/knews/patches/patch-aa
index c309bfd3b6d..87a7ee457b4 100644
--- a/news/knews/patches/patch-aa
+++ b/news/knews/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:11:08 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/03/14 15:07:21 tron Exp $
---- configure.h.orig Fri Jan 9 18:16:11 1998
-+++ configure.h Thu Apr 23 00:54:08 1998
+--- configure.h.orig Tue Dec 29 04:47:02 1998
++++ configure.h Tue Mar 9 06:26:51 1999
@@ -14,7 +14,7 @@
*
* If you don't have sendmail, use /bin/false :-).
@@ -11,27 +11,20 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:11:08 agc Exp $
/* #define MAIL_COMMAND "/usr/lib/sendmail -t" */
-@@ -34,7 +34,7 @@
- /* #define DOMAIN_FILE "/your/file/here" */
- /* #define DOMAIN_NAME "your_domain_here" */
-
--#define DOMAIN_HACK 1
-+#define DOMAIN_HACK 0
-
-
-
-@@ -86,8 +86,8 @@
- * library search paths in knews.tmpl for libjpeg and libpng.
+@@ -84,9 +84,9 @@
+ * libcompface.
*/
-#define HAVE_JPEG 0
-#define HAVE_PNG 0
+-#define HAVE_COMPFACE 0
++#define HAVE_COMPFACE 1
+#define HAVE_JPEG 1
+#define HAVE_PNG 1
-@@ -139,7 +139,7 @@
+@@ -138,7 +138,7 @@
*
* Knews*backgroundPixmap: ~/dir/texture.xpm
*/
diff --git a/news/knews/patches/patch-ab b/news/knews/patches/patch-ab
index c79732818ed..bf592c6ec47 100644
--- a/news/knews/patches/patch-ab
+++ b/news/knews/patches/patch-ab
@@ -1,12 +1,40 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:11:08 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/03/14 15:07:21 tron Exp $
---- 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;
-+ long active_last_art;
- ART_LIST_NODE *read_arts;
- long disp;
- char subscribed;
+--- knews.tmpl.orig Tue Dec 29 05:14:55 1998
++++ knews.tmpl Tue Mar 9 06:30:33 1999
+@@ -1,4 +1,4 @@
+-/*
++ /*
+ * This file is included into all Imakefiles. If your default compiler
+ * is not ISO/ANSI compliant, you have to fix it here. Below are a few
+ * example settings for systems I have access to.
+@@ -23,11 +23,9 @@
+ */
+
+ /* gcc on decent systems */
+-#if 0
+ CC = gcc
+ CCOPTIONS = -ansi -pedantic -Wall
+ CDEBUGFLAGS = -O2
+-#endif
+
+ /* gcc on SunOS 4.1.x (and maybe other non-decent systems) */
+ #if 0
+@@ -74,13 +72,13 @@
+ * be changed to -lgz.
+ */
+
+-JPEG_LIB = -ljpeg
+-PNG_LIB = -lpng -lz -lm
+-COMPFACE_LIB = -lcompface
++JPEG_LIB = -L${LOCALBASE}/lib -ljpeg
++PNG_LIB = -L${LOCALBASE}/lib -lpng -lz -lm
++COMPFACE_LIB = -L${LOCALBASE}/lib -lcompface
+
+
+ /*
+ * If you need to add include paths for e.g. libjpeg, libpng or libzlib
+ * include files, do it here.
+ */
+-KNEWS_INCLUDES =
++KNEWS_INCLUDES = -I${LOCALBASE}/include
diff --git a/news/knews/patches/patch-ac b/news/knews/patches/patch-ac
deleted file mode 100644
index 074897f8611..00000000000
--- a/news/knews/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 11:11:08 agc Exp $
-
---- 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;
-- temp->last = global.curr_group->last_art;
-+ temp->last = (global.curr_group->active_last_art >
-+ global.curr_group->last_art ) ?
-+ global.curr_group->active_last_art :
-+ global.curr_group->last_art;
-
- if (res_process_xrefs())
- for (art = get_articles(main_thr) ; art ; art = art->next)
diff --git a/news/knews/patches/patch-ad b/news/knews/patches/patch-ad
deleted file mode 100644
index e46ddec6860..00000000000
--- a/news/knews/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 11:11:09 agc Exp $
-
---- 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;
-
-+ global.curr_group->active_last_art = global.curr_group->last_art;
- sscanf(reply, "%*d%ld%ld%ld",
- &main_thr->total,
- &global.curr_group->first_art,
diff --git a/news/knews/patches/patch-ae b/news/knews/patches/patch-ae
deleted file mode 100644
index ace2b2189e4..00000000000
--- a/news/knews/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:11:09 agc Exp $
-
---- 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
-
-
- /*
diff --git a/news/knews/patches/patch-af b/news/knews/patches/patch-af
deleted file mode 100644
index 1c7fb892102..00000000000
--- a/news/knews/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/01/25 19:41:37 tron Exp $
-
---- Widgets/ArtText.c.orig Fri Jan 9 18:16:12 1998
-+++ Widgets/ArtText.c Mon Jan 25 20:29:37 1999
-@@ -476,7 +476,7 @@
- if (str[i] != '\t')
- res[j++] = str[i];
- else {
-- int m = 8 - (j & 7);
-+ int m = 7 - (j % 8);
-
- while (m-- >= 0)
- res[j++] = ' ';
-@@ -1750,16 +1750,17 @@
- {
- ArtTextWidget w = (ArtTextWidget)gw;
- TSNode *node;
-- long n;
-+ long n,j=0;
-
- for (n = 0 ; str[n] != '\0' ; n++) {
- if (str[n] == '\t') {
-- long i = 8 - (n % 8);
-+ long i = 7 - ((n + j) % 8);
-
-- if (sel_start > n)
-+ if (sel_start > (n + j))
- sel_start += i;
-- if (sel_stop > n)
-+ if (sel_stop > (n + j))
- sel_stop += i;
-+ j += i;
- }
- }
-
diff --git a/news/knews/patches/patch-ag b/news/knews/patches/patch-ag
deleted file mode 100644
index f537fb6c93f..00000000000
--- a/news/knews/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/01/25 19:41:37 tron Exp $
-
---- src/save.c.orig Fri Jan 9 18:16:23 1998
-+++ src/save.c Mon Jan 25 20:29:37 1999
-@@ -1049,7 +1049,7 @@
- }
-
- if (report->stop - report->start < MIN_URL_LEN) {
-- set_message("Url to short!", True);
-+ set_message("Url too short!", True);
- return;
- }
-