CVS commit: pkgsrc/www/snownews

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Wed Jan  4 15:53:56 UTC 2017

Modified Files:
        pkgsrc/www/snownews: Makefile options.mk

Log Message:
Use the curses framework.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/www/snownews/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/snownews/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/snownews/Makefile
diff -u pkgsrc/www/snownews/Makefile:1.50 pkgsrc/www/snownews/Makefile:1.51
--- pkgsrc/www/snownews/Makefile:1.50   Sat Jul  9 06:39:14 2016
+++ pkgsrc/www/snownews/Makefile        Wed Jan  4 15:53:56 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2016/07/09 06:39:14 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2017/01/04 15:53:56 roy Exp $
 
 DISTNAME=      snownews-1.5.12
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    www
 MASTER_SITES=  http://kiza.kcore.de/software/snownews/download/
 
@@ -16,8 +16,6 @@ HAS_CONFIGURE=                yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            msgfmt perl
 
-.include "options.mk"
-
 REPLACE_PERL+=         configure opml2snow
 
 CONFIG_SHELL=          perl
@@ -25,6 +23,9 @@ CONFIGURE_ARGS+=      --prefix=${PREFIX}
 MAKE_ENV+=             EXTRA_CFLAGS=${CFLAGS:Q}
 
 INCOMPAT_CURSES=       NetBSD-[0-4].*-*        #WA_BOLD, WA_REVERSE, KEY_RESIZE
+FAKE_NCURSES=          yes
+
+.include "options.mk"
 
 post-configure:
        ${ECHO} LOCALEPATH=${PREFIX}/${PKGLOCALEDIR}/locale >> ${WRKSRC}/platform_settings

Index: pkgsrc/www/snownews/options.mk
diff -u pkgsrc/www/snownews/options.mk:1.5 pkgsrc/www/snownews/options.mk:1.6
--- pkgsrc/www/snownews/options.mk:1.5  Thu Sep 18 14:54:55 2014
+++ pkgsrc/www/snownews/options.mk      Wed Jan  4 15:53:56 2017
@@ -1,25 +1,12 @@
-# $NetBSD: options.mk,v 1.5 2014/09/18 14:54:55 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2017/01/04 15:53:56 roy Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.snownews
 
 PKG_OPTIONS_REQUIRED_GROUPS=   screen
-PKG_OPTIONS_GROUP.screen=      ncurses ncursesw
+PKG_OPTIONS_GROUP.screen=      curses wide-curses
+PLG_OPTIONS_LEGACY_OPTS+=      ncurses:curses ncursesw:wide-curses
 
-PKG_SUGGESTED_OPTIONS= ncurses
+PKG_SUGGESTED_OPTIONS= curses
 
 .include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mncurses)
-USE_NCURSES=           YES
-.  include "../../devel/ncurses/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mncursesw)
-LIBS+=                 -lncursesw
-SUBST_CLASSES+=                configure
-SUBST_MESSAGE.configure= Fixing LDFLAGS for ncursesw
-SUBST_STAGE.configure= pre-configure
-SUBST_FILES.configure= configure
-SUBST_SED.configure=   -e 's,-lncurses,-lncursesw,'
-.  include "../../devel/ncursesw/buildlink3.mk"
-.endif
+.include "../../mk/curses.buildlink3.mk"