CVS commit: pkgsrc/chat/weechat

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

Module Name:    pkgsrc
Committed By:   roy
Date:           Tue Jan  3 20:49:23 UTC 2017

Modified Files:
        pkgsrc/chat/weechat: Makefile options.mk

Log Message:
Use curses framework, may fix PR pkg/47472.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/chat/weechat/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/chat/weechat/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/chat/weechat/Makefile
diff -u pkgsrc/chat/weechat/Makefile:1.66 pkgsrc/chat/weechat/Makefile:1.67
--- pkgsrc/chat/weechat/Makefile:1.66   Sun Jan  1 16:06:05 2017
+++ pkgsrc/chat/weechat/Makefile        Tue Jan  3 20:49:23 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2017/01/01 16:06:05 adam Exp $
+# $NetBSD: Makefile,v 1.67 2017/01/03 20:49:23 roy Exp $
 
 DISTNAME=      weechat-1.5
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    chat
 MASTER_SITES=  http://www.weechat.org/files/src/
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +18,7 @@ USE_TOOLS+=           msgfmt pkg-config
 USE_LANGUAGES=         c99
 USE_LIBTOOL=           yes
 USE_CMAKE=             yes
+FAKE_NCURSES=          yes
 
 CMAKE_ARGS+=           -DENABLE_ASPELL:BOOL=OFF
 CMAKE_ARGS+=           -DENABLE_GUILE:BOOL=OFF
@@ -39,4 +40,5 @@ LDFLAGS+=             ${BUILDLINK_LDADD.gettext}
 .include "../../www/curl/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/chat/weechat/options.mk
diff -u pkgsrc/chat/weechat/options.mk:1.15 pkgsrc/chat/weechat/options.mk:1.16
--- pkgsrc/chat/weechat/options.mk:1.15 Thu May 19 10:51:40 2016
+++ pkgsrc/chat/weechat/options.mk      Tue Jan  3 20:49:23 2017
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.15 2016/05/19 10:51:40 jperkin Exp $
+# $NetBSD: options.mk,v 1.16 2017/01/03 20:49:23 roy Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.weechat
 PKG_SUPPORTED_OPTIONS= gnutls python lua wide-curses perl ruby
 PKG_SUGGESTED_OPTIONS= gnutls
 
 .include "../../mk/bsd.options.mk"
+# mk/curses wull handle wide-curses
 
 PLIST_VARS+=           lua plugin python perl ruby
 
@@ -12,12 +13,6 @@ PLIST_VARS+=         lua plugin python perl rub
 .include "../../security/gnutls/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mwide-curses)
-.include "../../devel/ncursesw/buildlink3.mk"
-.else
-.include "../../devel/ncurses/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mpython)
 .include "../../lang/python/extension.mk"
 CMAKE_ARGS+=           -DENABLE_PYTHON:BOOL=ON