Update to 1.5.1, provided by Bruce J.A. Nourish in private mail.

1.5.1:
This release fixes a crash on Solaris, improves behaviour with
compressed HTTP content, adds support for combining multiple category
filters, and fixes a few user interface inconsistencies.
1.5.0:
This release adds digest authentication support, improved handling
of HTML feed descriptions, user customizable conversion of HTML
entities, many GUI improvements, and other smaller bugfixes.

5 files changed, 37 insertions, 44 deletions

diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index f9511d31bfd..a18922fe832 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/02/15 23:52:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/09 00:04:23 wiz Exp $
 
-DISTNAME=	snownews-1.4.4
+DISTNAME=	snownews-1.5.1
 CATEGORIES=	www
 MASTER_SITES=	http://home.kcore.de/~kiza/software/snownews/download/
 
@@ -15,22 +15,26 @@ USE_GNU_TOOLS+=		make
 USE_NCURSES=		# missing WA_BOLD, WA_REVERSE, KEY_RESIZE
 USE_PKGLOCALEDIR=	YES
 
-MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}" GMAKE="${GMAKE}"
+MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}" MAKE="${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
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/snownews ${LOCALBASE}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${LOCALBASE}/bin
+.for M in de fr it nl
+	${INSTALL_DATA_DIR} ${LOCALBASE}/man/${M}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/${M}/snownews.1 ${LOCALBASE}/man/${M}/man1
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 ${LOCALBASE}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 ${LOCALBASE}/man/man1
+.for L in de es fr it nl sl zh_TW
+	${INSTALL_DATA_DIR} ${LOCALBASE}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/${L}.mo ${LOCALBASE}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES/snownews.mo
+.endfor
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
diff --git a/www/snownews/distinfo b/www/snownews/distinfo
index 337529e74c6..207a36b658c 100644
--- a/www/snownews/distinfo
+++ b/www/snownews/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2004/02/15 23:52:29 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/04/09 00:04:23 wiz Exp $
 
-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 (snownews-1.5.1.tar.gz) = 328ec03c48d10bb434a22157725a9a1f2608e14f
+Size (snownews-1.5.1.tar.gz) = 111095 bytes
+SHA1 (patch-aa) = 05faea2cd77c2a92ab0f6d7238a2af3caa86d614
+SHA1 (patch-ab) = 70e30d145f673db2cb7b87568470b41179cb1a84
+SHA1 (patch-ac) = 224547ea2bf0a4565eaf48ae137a12c609fa7f2b
 SHA1 (patch-ad) = 216bb67bf96295dbd96a7c535b76318e34243123
diff --git a/www/snownews/patches/patch-aa b/www/snownews/patches/patch-aa
index 144bedc1d7e..78ce458b2e0 100644
--- a/www/snownews/patches/patch-aa
+++ b/www/snownews/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2004/02/15 23:52:29 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/09 00:04:23 wiz Exp $
 
---- Makefile.inc.orig	2004-01-23 05:13:29.000000000 -0700
+--- Makefile.inc.orig	2004-03-07 14:41:07.000000000 -0700
 +++ Makefile.inc
 @@ -1,8 +1,6 @@
 -CC = gcc
 -MAKE = make
--INSTALL = install
+ INSTALL = install
 -PREFIX = /usr/local
 -LOCALEPATH = $(PREFIX)/share/locale
-+MAKE = $(GMAKE)
 +PREFIX = $(LOCALBASE)
 +LOCALEPATH = $(PREFIX)/$(PKGLOCALEDIR)/locale
- DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.colors INSTALL INSTALL.solaris INSTALL.FreeOpenNetBSD TODO opml2snow \
+ 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 \
+ 	doc po scripts \
diff --git a/www/snownews/patches/patch-ab b/www/snownews/patches/patch-ab
index a51d50d21e2..bcbd9eb4486 100644
--- a/www/snownews/patches/patch-ab
+++ b/www/snownews/patches/patch-ab
@@ -1,9 +1,10 @@
-$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
+$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) {
diff --git a/www/snownews/patches/patch-ac b/www/snownews/patches/patch-ac
index 6e8e21066c5..724f3d56c77 100644
--- a/www/snownews/patches/patch-ac
+++ b/www/snownews/patches/patch-ac
@@ -1,24 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2004/02/15 23:52:29 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2004/04/09 00:04:23 wiz Exp $
 
---- Makefile.orig	2004-01-23 05:13:29.000000000 -0700
+--- Makefile.orig	2004-03-07 14:41:07.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 about.o cookies.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 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)
-@@ -29,8 +29,8 @@ install: snownews snownews.1 locales
- 	if [ ! -d "$(PREFIX)/bin" ]; then \
- 	  mkdir -p $(PREFIX)/bin; \
- 	fi
--	$(INSTALL) -s snownews $(PREFIX)/bin
--	$(INSTALL) opml2snow $(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM) snownews $(PREFIX)/bin
-+	$(BSD_INSTALL_SCRIPT) opml2snow $(PREFIX)/bin
- 	$(MAKE) -C $(MAN) install-man
- 	$(MAKE) -C po install
- 	@echo ""