[pkgsrc/trunk]: pkgsrc/www/snownews Add ncursesw option.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/405e538c5812
branches:  trunk
changeset: 533285:405e538c5812
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 13 23:24:04 2007 +0000

description:
Add ncursesw option.
pkglint cleanup while here.

diffstat:

 www/snownews/Makefile   |  23 ++++++++++++-----------
 www/snownews/options.mk |  17 +++++++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diffs (79 lines):

diff -r 0584577dc36f -r 405e538c5812 www/snownews/Makefile
--- a/www/snownews/Makefile     Thu Sep 13 23:15:31 2007 +0000
+++ b/www/snownews/Makefile     Thu Sep 13 23:24:04 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/04/16 04:14:15 obache Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/13 23:24:04 wiz Exp $
 
 DISTNAME=      snownews-1.5.7
 PKGREVISION=   4
@@ -12,7 +12,7 @@
 DEPENDS+=              p5-XML-LibXML>=1.58:../../textproc/p5-XML-LibXML
 
 HAS_CONFIGURE=         YES
-USE_NCURSES=           # missing WA_BOLD, WA_REVERSE, KEY_RESIZE
+USE_NCURSES=           YES # missing WA_BOLD, WA_REVERSE, KEY_RESIZE
 USE_PKGLOCALEDIR=      YES
 USE_TOOLS+=            msgfmt perl:run
 
@@ -21,29 +21,30 @@
 CONFIG_SHELL=          perl
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 MAKE_ENV+=     PKG_LOCALEDIR=${PKGLOCALEDIR:Q}
-MAKE_ENV+=     EXTRA_CFLAGS=${CFLAGS:M*:Q}
+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} ${BUILDLINK_LDADD.gettext}"
+MAKE_ENV+=     EXTRA_LDFLAGS=${LDFLAGS:Q}" "${BUILDLINK_LDADD.gettext:Q}
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
+.include "options.mk"
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/snownews ${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${PREFIX}/bin
-.for M in de fr it nl ru_RU.KOI8-R
-       ${INSTALL_DATA_DIR} ${PREFIX}/${PKGMANDIR}/${M}/man1
-       ${INSTALL_MAN} ${WRKSRC}/doc/man/${M}/snownews.1 ${PREFIX}/${PKGMANDIR}/${M}/man1
+.for lang in de fr it nl ru_RU.KOI8-R
+       ${INSTALL_DATA_DIR} ${PREFIX}/${PKGMANDIR}/${lang}/man1
+       ${INSTALL_MAN} ${WRKSRC}/doc/man/${lang}/snownews.1 ${PREFIX}/${PKGMANDIR}/${lang}/man1
 .endfor
        ${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 ${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 ${PREFIX}/${PKGMANDIR}/man1
-.for L in de es ja nl pl pt_BR ru sl zh_TW zh_CN
-       ${INSTALL_DATA_DIR} ${PREFIX}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES
-       ${INSTALL_DATA} ${WRKSRC}/po/${L}.mo ${PREFIX}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES/snownews.mo
+.for lang in de es ja nl pl pt_BR ru sl zh_TW zh_CN
+       ${INSTALL_DATA_DIR} ${PREFIX}/${PKGLOCALEDIR}/locale/${lang}/LC_MESSAGES
+       ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo ${PREFIX}/${PKGLOCALEDIR}/locale/${lang}/LC_MESSAGES/snownews.mo
 .endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0584577dc36f -r 405e538c5812 www/snownews/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/snownews/options.mk   Thu Sep 13 23:24:04 2007 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2007/09/13 23:24:04 wiz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.snownews
+PKG_OPTIONS_REQUIRED_GROUPS=   display
+PKG_OPTIONS_GROUP.display=     ncurses ncursesw
+PKG_SUGGESTED_OPTIONS=         ncurses
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mncursesw)
+.  include "../../devel/ncursesw/buildlink3.mk"
+CONFIGURE_ARGS+=       --charset=UTF-8
+.endif