Update snownews to 1.5.11.

Inspirerd by PR#39887.

Pkgsrc changes:
 * Allow NetBSD>=5 cuurses
 * LICENS=gnu-gpl-v2

Changes:

i(not available for 1.5.11, but it seems small changes).

Version 1.5.10 released

2008-07-28, 09:40 GMT
- shift+t now force reloads a selected feed, ignoring the last modified value
- Added a lot of OpenBSD supplied patches (Martynas Venckus)
- net-support.c: HTTP header only needs to be ASCII in the token
- conversions.c: Determine output charset with nl_langinfo()
- xmlparse.c: Convert feed title to target charset, too. Should probaly be in interface.c
- main.c, interface.h, interface.c: Add a signal handler for resizing to work on many other ncurses implementations

5 files changed, 24 insertions, 72 deletions

diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index f9a72dbd21d..ab96e9adaef 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,55 +1,35 @@
-# $NetBSD: Makefile,v 1.33 2008/04/16 08:54:28 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2009/06/01 11:56:43 obache Exp $
 
-DISTNAME=	snownews-1.5.9
+DISTNAME=	snownews-1.5.11
 CATEGORIES=	www
 MASTER_SITES=	http://kiza.kcore.de/software/snownews/download/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://kiza.kcore.de/software/snownews/
 COMMENT=	Small, curses based RSS feed reader
+LICENSE=	gnu-gpl-v2
 
 DEPENDS+=		p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 HAS_CONFIGURE=		yes
-USE_NCURSES=		yes	# missing WA_BOLD, WA_REVERSE, KEY_RESIZE
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		msgfmt perl:run
+USE_TOOLS+=		msgfmt perl
 
-REPLACE_PERL+=		configure opml2snow snowsync
+REPLACE_PERL+=		configure opml2snow
 
 CONFIG_SHELL=		perl
-CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-MAKE_ENV+=		PKG_LOCALEDIR=${PKGLOCALEDIR:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 MAKE_ENV+=		EXTRA_CFLAGS=${CFLAGS:Q}
 
-# XXX -lintl hack suggested by Jeremy C. Reed: blocking on PR #23369
-.include "../../devel/gettext-lib/buildlink3.mk"
-MAKE_ENV+=	EXTRA_LDFLAGS=${LDFLAGS:Q}" "${BUILDLINK_LDADD.gettext:Q}
-
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+post-configure:
+	${ECHO} LOCALEPATH=${PREFIX}/${PKGLOCALEDIR}/locale >> ${WRKSRC}/platform_settings
+	${ECHO} MANPATH=${PREFIX}/${PKGMANDIR} >> ${WRKSRC}/platform_settings
 
 .include "options.mk"
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/snownews ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${DESTDIR}${PREFIX}/bin
-.for lang in de fr it nl ru_RU.KOI8-R
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${lang}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/${lang}/snownews.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/${lang}/man1
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.for lang in de es ja nl pl pt_BR ru sl zh_TW zh_CN
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/${lang}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo	\
-		${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/${lang}/LC_MESSAGES/snownews.mo
-.endfor
-
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/snownews/PLIST b/www/snownews/PLIST
index 890af1ecda2..d5d7ab1fcd1 100644
--- a/www/snownews/PLIST
+++ b/www/snownews/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/01 11:56:43 obache Exp $
 bin/opml2snow
+bin/snow2opml
 bin/snownews
 man/de/man1/snownews.1
 man/fr/man1/snownews.1
@@ -8,19 +9,18 @@ man/man1/opml2snow.1
 man/man1/snownews.1
 man/nl/man1/snownews.1
 man/ru_RU.KOI8-R/man1/snownews.1
+share/locale/be@latin/LC_MESSAGES/snownews.mo
 share/locale/de/LC_MESSAGES/snownews.mo
 share/locale/es/LC_MESSAGES/snownews.mo
+share/locale/fr/LC_MESSAGES/snownews.mo
+share/locale/it/LC_MESSAGES/snownews.mo
 share/locale/ja/LC_MESSAGES/snownews.mo
 share/locale/nl/LC_MESSAGES/snownews.mo
 share/locale/pl/LC_MESSAGES/snownews.mo
 share/locale/pt_BR/LC_MESSAGES/snownews.mo
 share/locale/ru/LC_MESSAGES/snownews.mo
+share/locale/se/LC_MESSAGES/snownews.mo
 share/locale/sl/LC_MESSAGES/snownews.mo
+share/locale/uk_UA/LC_MESSAGES/snownews.mo
 share/locale/zh_CN/LC_MESSAGES/snownews.mo
 share/locale/zh_TW/LC_MESSAGES/snownews.mo
-@unexec ${RMDIR} %D/man/ru_RU.KOI8-R/man1 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru_RU.KOI8-R 2> /dev/null || ${TRUE}
-@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}
-@unexec ${RMDIR} %D/man/it 2> /dev/null || ${TRUE}
diff --git a/www/snownews/distinfo b/www/snownews/distinfo
index 35951ace05d..ddc49ff01bb 100644
--- a/www/snownews/distinfo
+++ b/www/snownews/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2008/04/16 08:54:28 wiz Exp $
+$NetBSD: distinfo,v 1.11 2009/06/01 11:56:43 obache Exp $
 
-SHA1 (snownews-1.5.9.tar.gz) = a3c778272c1ae599e11f283fab1bd267ca3af011
-RMD160 (snownews-1.5.9.tar.gz) = 478c8b60e3bfb1f0eb13268c6deb2a258831aa6b
-Size (snownews-1.5.9.tar.gz) = 170666 bytes
-SHA1 (patch-ac) = f724a970df5626272c1ea2a9ce0213d471c6ce74
+SHA1 (snownews-1.5.11.tar.gz) = 64ed1c648ed50cada294bc503e100496a7dd9f09
+RMD160 (snownews-1.5.11.tar.gz) = ccb1e021ad25ef2f4f420fe44f1c81833f97ad88
+Size (snownews-1.5.11.tar.gz) = 172814 bytes
diff --git a/www/snownews/options.mk b/www/snownews/options.mk
index 53710690acb..85a8f4577ea 100644
--- a/www/snownews/options.mk
+++ b/www/snownews/options.mk
@@ -1,19 +1,18 @@
-# $NetBSD: options.mk,v 1.2 2008/02/21 22:47:28 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2009/06/01 11:56:43 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.snownews
 PKG_SUPPORTED_OPTIONS=	wide-curses
-PKG_LEGACY_OPTS+=	ncursesw:wide-curses
+PKG_OPTIONS_LEGACY_OPTS+=	ncursesw:wide-curses
 
 .include "../../mk/bsd.options.mk"
 
 ###
 ### Wide curses support; otherwise, default to using narrow curses.
 ###
-USE_NCURSES=		yes	# WA_BOLD, WA_REVERSE, KEY_RESIZE
+INCOMPAT_CURSES=	NetBSD-[0-4].*-*	#WA_BOLD, WA_REVERSE, KEY_RESIZE
 
 .if !empty(PKG_OPTIONS:Mwide-curses)
 .  include "../../devel/ncursesw/buildlink3.mk"
-CONFIGURE_ARGS+=	--charset=UTF-8
 .else
 .  include "../../devel/ncurses/buildlink3.mk"
 .endif
diff --git a/www/snownews/patches/patch-ac b/www/snownews/patches/patch-ac
deleted file mode 100644
index a2dd8c54b74..00000000000
--- a/www/snownews/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2008/04/16 08:54:28 wiz Exp $
-
---- Makefile.orig	2008-02-17 13:43:58.000000000 +0000
-+++ Makefile
-@@ -1,8 +1,8 @@
--CC=         gcc
--MAKE=       make
-+CC?=         gcc
-+MAKE?=       make
- INSTALL=    install
--LOCALEPATH= $(PREFIX)/share/locale
--MANPATH=    $(PREFIX)/share/man
-+LOCALEPATH= $(PREFIX)/${PKG_LOCALEDIR}/locale
-+MANPATH=    $(PREFIX)/${PKGMANDIR}
- 
- ### Compiler/linker flags   ###
- ### Generated via configure ###
-@@ -39,7 +39,7 @@ snownews-static: manpages locales
- 
- locales:
- 	for L in $(LOCALES); do \
--		msgfmt -o $(LOC)/$$L.mo $(LOC)/$$L; \
-+		msgfmt -o $(LOC)/$$L.mo $(LOC)/$$L.po; \
- 	done
- 
- manpages: