Update to 1.4.4, based on an update sent by Bruce J.A. Nourish.

1.4.4:
  1.4.3 crashes on systems where it runs the first time.
  Cookie support
1.4.3:
  Feed overview menu can now be assigned a color via the colors config file
  HTTP Authentication
  Code rewrites
  Translation updates
  '?' brings help menu
  'M' sets item to unread
  Bug fixes

7 files changed, 50 insertions, 31 deletions

diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 6d1e413b718..f9511d31bfd 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/15 23:52:29 wiz Exp $
 
-DISTNAME=	snownews-1.4.2
-PKGREVISION=	1
+DISTNAME=	snownews-1.4.4
 CATEGORIES=	www
 MASTER_SITES=	http://home.kcore.de/~kiza/software/snownews/download/
 
@@ -16,13 +15,23 @@ USE_GNU_TOOLS+=		make
 USE_NCURSES=		# missing WA_BOLD, WA_REVERSE, KEY_RESIZE
 USE_PKGLOCALEDIR=	YES
 
-MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR} GMAKE=${GMAKE}
-MAKE_ENV+=	EXTRA_CFLAGS="${CFLAGS}"
+MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}" GMAKE="${GMAKE}"
+MAKE_ENV+=	EXTRA_CFLAGS="${CFLAGS}" LOCALBASE="${LOCALBASE}"
 
 # XXX -lintl hack suggested by Jeremy C. Reed: blocking on PR #23369
 .include "../../devel/gettext-lib/buildlink2.mk"
 MAKE_ENV+=	EXTRA_LDFLAGS="${LDFLAGS} ${_BLNK_INTL_LDFLAGS}"
 
+post-patch:
+	for FILE in ${WRKSRC}/doc/man/Makefile ${WRKSRC}/doc/man/*/Makefile;do \
+		${MV} $${FILE} $${FILE}.orig; \
+		${SED} -e 's/$$(INSTALL) -m 0644/$$(BSD_INSTALL_MAN)/' $${FILE}.orig > $${FILE}; \
+	done
+	for FILE in ${WRKSRC}/po/Makefile;do \
+		${MV} $${FILE} $${FILE}.orig; \
+		${SED} -e 's/$$(INSTALL) -m 0644/$$(BSD_INSTALL_DATA)/' $${FILE}.orig > $${FILE}; \
+	done
+
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../devel/ncurses/buildlink2.mk"
diff --git a/www/snownews/PLIST b/www/snownews/PLIST
index 3dfe8ca6e53..965b1668117 100644
--- a/www/snownews/PLIST
+++ b/www/snownews/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/27 23:04:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/15 23:52:29 wiz Exp $
 bin/opml2snow
 bin/snownews
 man/de/man1/snownews.1
 man/fr/man1/snownews.1
 man/it/man1/snownews.1
+man/man1/opml2snow.1
 man/man1/snownews.1
 man/nl/man1/snownews.1
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snownews.mo
@@ -12,6 +13,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/snownews.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/snownews.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/snownews.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/snownews.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/snownews.mo
 @unexec ${RMDIR} %D/man/nl/man1 2> /dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/nl 2> /dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/it/man1 2> /dev/null || ${TRUE}
diff --git a/www/snownews/distinfo b/www/snownews/distinfo
index 4e943516f3c..337529e74c6 100644
--- a/www/snownews/distinfo
+++ b/www/snownews/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/27 23:04:23 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/02/15 23:52:29 wiz Exp $
 
-SHA1 (snownews-1.4.2.tar.gz) = 6a935496d707f6fb456b6b259ca3ceb69b44505c
-Size (snownews-1.4.2.tar.gz) = 88822 bytes
-SHA1 (patch-aa) = e84554ea5d7919b21ea47f5de160d23eb95b2a7a
-SHA1 (patch-ab) = b1daaff6a08e855c6a5e8126f90370db6c7873a8
-SHA1 (patch-ac) = 95f21e21c99bbb4cecf271709904c27f3b2cd42a
+SHA1 (snownews-1.4.4.tar.gz) = 174d894c74b5da3fc627f84bd7094a1d2e298160
+Size (snownews-1.4.4.tar.gz) = 99098 bytes
+SHA1 (patch-aa) = 0d64431a647815e36db4fb10ae75f18a47a877c5
+SHA1 (patch-ab) = 3edf88c85bc2f1af10f814c7a02fedb5f7399f19
+SHA1 (patch-ac) = 6b0f9a7bcae9503025c30a9d2c86375147fad76d
+SHA1 (patch-ad) = 216bb67bf96295dbd96a7c535b76318e34243123
diff --git a/www/snownews/patches/patch-aa b/www/snownews/patches/patch-aa
index 418198f1b93..144bedc1d7e 100644
--- a/www/snownews/patches/patch-aa
+++ b/www/snownews/patches/patch-aa
@@ -1,15 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/27 23:04:23 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/15 23:52:29 wiz Exp $
 
---- Makefile.inc.orig	Tue Dec 23 19:28:09 2003
+--- Makefile.inc.orig	2004-01-23 05:13:29.000000000 -0700
 +++ Makefile.inc
-@@ -1,8 +1,7 @@
+@@ -1,8 +1,6 @@
 -CC = gcc
 -MAKE = make
 -INSTALL = install
 -PREFIX = /usr/local
 -LOCALEPATH = $(PREFIX)/share/locale
 +MAKE = $(GMAKE)
-+INSTALL = ${BSD_INSTALL_DATA} -c
 +PREFIX = $(LOCALBASE)
 +LOCALEPATH = $(PREFIX)/$(PKGLOCALEDIR)/locale
  DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.colors INSTALL INSTALL.solaris INSTALL.FreeOpenNetBSD TODO opml2snow \
diff --git a/www/snownews/patches/patch-ab b/www/snownews/patches/patch-ab
index 8f7d69c1ad5..a51d50d21e2 100644
--- a/www/snownews/patches/patch-ab
+++ b/www/snownews/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/27 23:04:23 wiz Exp $
-
---- ../snownews-1.4.2.orig/conversions.c	2003-12-23 04:10:35.000000000 -0700
-+++ conversions.c	2003-12-23 15:19:48.000000000 -0700
-@@ -55,7 +55,7 @@
- 		return NULL;
- 	}
- 
--	if (iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft) == -1) {
-+	if (iconv (cd, (const char **)&inbuf, &inbytesleft, &outbuf, &outbytesleft) == -1) {
- 		return NULL;
- 	}
+$NetBSD: patch-ab,v 1.2 2004/02/15 23:52:29 wiz Exp $
+--- conversions.c.orig	2003-12-07 07:14:40.000000000 -0600
++++ conversions.c	2003-12-16 01:01:13.000000000 -0600
+@@ -38,7 +38,7 @@
+ #	include "os-support.h"
+ #endif
  
+-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 0a305b8a094..6e8e21066c5 100644
--- a/www/snownews/patches/patch-ac
+++ b/www/snownews/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/12/27 23:04:23 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2004/02/15 23:52:29 wiz Exp $
 
---- Makefile.orig	Tue Dec 23 19:28:09 2003
+--- Makefile.orig	2004-01-23 05:13:29.000000000 -0700
 +++ Makefile
 @@ -2,7 +2,7 @@ include Makefile.inc
  
  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
+ OBJFILES = main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o dialog.o ui-support.o categories.o about.o cookies.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\ //`
diff --git a/www/snownews/patches/patch-ad b/www/snownews/patches/patch-ad
new file mode 100644
index 00000000000..1a1507d0bc4
--- /dev/null
+++ b/www/snownews/patches/patch-ad
@@ -0,0 +1,9 @@
+$NetBSD: patch-ad,v 1.1 2004/02/15 23:52:29 wiz Exp $
+--- conversions.h.orig	2003-11-02 14:41:22.000000000 -0600
++++ conversions.h	2003-11-04 18:27:51.000000000 -0600
+@@ -1,4 +1,4 @@
+-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);