4 files changed, 22 insertions, 50 deletions
diff --git a/www/snownews/patches/patch-aa b/www/snownews/patches/patch-aa
index 78ce458b2e0..03484e0fbf1 100644
--- a/www/snownews/patches/patch-aa
+++ b/www/snownews/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/04/09 00:04:23 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/11/20 00:30:29 wiz Exp $
 
---- Makefile.inc.orig	2004-03-07 14:41:07.000000000 -0700
-+++ Makefile.inc
-@@ -1,8 +1,6 @@
--CC = gcc
--MAKE = make
- INSTALL = install
--PREFIX = /usr/local
--LOCALEPATH = $(PREFIX)/share/locale
-+PREFIX = $(LOCALBASE)
-+LOCALEPATH = $(PREFIX)/$(PKGLOCALEDIR)/locale
- DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.colors README.patching INSTALL INSTALL.solaris INSTALL.FreeOpenNetBSD opml2snow \
- 	Makefile Makefile.inc Makefile.solaris \
- 	doc po scripts \
+--- interface.c.orig	2004-10-31 22:09:14.000000000 +0100
++++ interface.c
+@@ -1540,7 +1540,7 @@ void UIMainInterface (void) {
+ 					first_scr_ptr = first_ptr;
+ 					highlighted = first_ptr;
+ 					first_bak = NULL;
+-				} else if (highlighted->feedcategories != NULL) {
++				} else if ((highlighted != NULL) && (highlighted->feedcategories != NULL)) {
+ 					filters[0] = strdup (highlighted->feedcategories->name);
+ 					filteractivated = 1;
+ 				}
diff --git a/www/snownews/patches/patch-ab b/www/snownews/patches/patch-ab
deleted file mode 100644
index bcbd9eb4486..00000000000
--- a/www/snownews/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/04/09 00:04:23 wiz Exp $
-
---- conversions.c.orig	2004-03-01 08:12:03.000000000 -0700
-+++ conversions.c
-@@ -37,7 +37,7 @@
- 
- extern struct entity *first_entity;
- 
--char * iconvert (char * inbuf, char * from, char * to) {
-+char * iconvert (const char * inbuf, char * from, char * to) {
- 	iconv_t cd;							/* Iconvs conversion descriptor. */
- 	char *outbuf, *outbuf_first;		/* We need two pointers so we do not lose
- 	                                       the strings starting position. */
diff --git a/www/snownews/patches/patch-ac b/www/snownews/patches/patch-ac
index 724f3d56c77..b0553856cef 100644
--- a/www/snownews/patches/patch-ac
+++ b/www/snownews/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2004/04/09 00:04:23 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2004/11/20 00:30:29 wiz Exp $
 
---- Makefile.orig	2004-03-07 14:41:07.000000000 -0700
+--- Makefile.orig	2004-11-11 16:23:02.000000000 +0100
 +++ Makefile
-@@ -2,7 +2,7 @@ include Makefile.inc
+@@ -1,7 +1,5 @@
+-CC=         gcc
+-MAKE=       make
+ INSTALL=    install
+-LOCALEPATH= $(PREFIX)/share/locale
++LOCALEPATH= $(PREFIX)/${PKG_LOCALEDIR}/locale
  
- LDFLAGS = -lncurses `xml2-config --libs` $(EXTRA_LDFLAGS)
- OBJFILES = main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o digcalc.o md5.o filters.o
--CFLAGS = -Wall -O2 -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS)
-+CFLAGS = -Wall -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS)
- VERSION = `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
- MAN = doc/man
- DISTDIR = snownews-$(VERSION)
+ ### Compiler/linker flags   ###
+ ### Generated via configure ###
diff --git a/www/snownews/patches/patch-ad b/www/snownews/patches/patch-ad
deleted file mode 100644
index d849d2e865a..00000000000
--- a/www/snownews/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/04/20 18:28:11 minskim Exp $
-
---- conversions.h.orig	2004-03-07 15:41:07.000000000 -0600
-+++ conversions.h
-@@ -23,7 +23,7 @@
- #ifndef CONVERSIONS_H
- #define CONVERSIONS_H
- 
--char * iconvert (char * inbuf, char * from, char * to);
-+char * iconvert (const char * inbuf, char * from, char * to);
- char * UIDejunk (char * feed_description);
- char * WrapText (char * text, int width);
- void *zlib_uncompress(void *in_buf, int in_size, int *out_size, int voodoo_magic);