pkg/36983: news/tin: add ncurses and ncursesw options

[lems%gmx.net@localhost]

>Number:         36983
>Category:       pkg
>Synopsis:       news/tin: add ncurses and ncursesw options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Sep 13 11:40:00 +0000 2007
>Originator:     L. Schmidt
>Release:        
>Organization:
>Environment:
>Description:
Hello,

I've added two new options to .../news/tin/options.mk, ``ncurses'' and
``ncursesw''.

I have one question, though:
I set PKG_SUGGESTED_OPTIONS to ``curses'' and have PKG_DEFAULT_OPTIONS set
to ncursesw (mk.conf).  Now when building news/tin with my modifications, it 
lists the following options as enabled:

These options are currently enabled:
        curses inet6 ncursesw

Is this correct?  I guess I have to set PKG_OPTIONS.tin to ``-curses 
ncursesw'', since this works as expected.

Regards

Leonard
>How-To-Repeat:

>Fix:
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/news/tin/options.mk,v
retrieving revision 1.6
diff -u -p -r1.6 options.mk
--- options.mk  30 Jan 2007 07:11:46 -0000      1.6
+++ options.mk  13 Sep 2007 11:25:44 -0000
@@ -2,15 +2,33 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.tin
-PKG_SUPPORTED_OPTIONS= curses icu inet6 tin-use-inn-spool
+PKG_OPTIONS_VAR=               PKG_OPTIONS.tin
+PKG_SUPPORTED_OPTIONS=         icu inet6 tin-use-inn-spool
+PKG_OPTIONS_NONEMPTY_SETS=     display
+PKG_OPTIONS_SET.display=       curses ncurses ncursesw
+PKG_SUGGESTED_OPTIONS=         curses
 # untested
 #PKG_SUPPORTED_OPTIONS+=       socks
 
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcurses)
+.  include "../../mk/curses.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-screen=curses
+CONFIGURE_ARGS+=       --with-curses-dir=${BUILDLINK_PREFIX.curses}/include
+.endif
+
+.if !empty(PKG_OPTIONS:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-screen=ncurses
+CONFIGURE_ARGS+=       --with-curses-dir=${BUILDLINK_PREFIX.ncurses}/include
+.endif
+
+.if !empty(PKG_OPTIONS:Mncursesw)
+.  include "../../devel/ncursesw/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-screen=ncursesw
+CONFIGURE_ARGS+=       --with-curses-dir=${BUILDLINK_PREFIX.ncursesw}/include
 .endif
 
 .if !empty(PKG_OPTIONS:Micu)