From 19af48646feaa01e95800b6c972ce97cce4af5ef Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 13 Sep 2007 23:24:04 +0000
Subject: Add ncursesw option. pkglint cleanup while here.

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

(limited to 'www')

diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 732c3f9ccc9..6e9fac306cf 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -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 @@ COMMENT=	Small, curses based RSS feed reader
 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 @@ REPLACE_PERL+=		configure opml2snow snowsync
 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 --git a/www/snownews/options.mk b/www/snownews/options.mk
new file mode 100644
index 00000000000..f5c1fb06ff1
--- /dev/null
+++ b/www/snownews/options.mk
@@ -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
-- 
cgit v1.2.3