CVS commit: pkgsrc/news/tin

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

Module Name:    pkgsrc
Committed By:   roy
Date:           Wed Jan  4 22:45:33 UTC 2017

Modified Files:
        pkgsrc/news/tin: Makefile options.mk

Log Message:
Use the curses framework.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/news/tin/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/news/tin/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/news/tin/Makefile
diff -u pkgsrc/news/tin/Makefile:1.69 pkgsrc/news/tin/Makefile:1.70
--- pkgsrc/news/tin/Makefile:1.69       Sun Dec  4 05:17:39 2016
+++ pkgsrc/news/tin/Makefile    Wed Jan  4 22:45:33 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2016/12/04 05:17:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2017/01/04 22:45:33 roy Exp $
 #
 
 DISTNAME=      tin-2.2.1
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    news
 MASTER_SITES=  ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
                ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \

Index: pkgsrc/news/tin/options.mk
diff -u pkgsrc/news/tin/options.mk:1.14 pkgsrc/news/tin/options.mk:1.15
--- pkgsrc/news/tin/options.mk:1.14     Wed Sep 30 08:25:37 2015
+++ pkgsrc/news/tin/options.mk  Wed Jan  4 22:45:33 2017
@@ -1,36 +1,16 @@
-# $NetBSD: options.mk,v 1.14 2015/09/30 08:25:37 tnn Exp $
+# $NetBSD: options.mk,v 1.15 2017/01/04 22:45:33 roy Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.tin
 PKG_SUPPORTED_OPTIONS=         icu inet6 tin-use-inn-spool
-PKG_OPTIONS_OPTIONAL_GROUPS=   display
-PKG_OPTIONS_GROUP.display=     curses ncurses ncursesw
-PKG_SUGGESTED_OPTIONS=         curses inet6
+PKG_SUGGESTED_OPTIONS=         inet6
 # 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
-.  if !empty(BUILDLINK_PREFIX.curses)
+.include "../../mk/curses.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-screen=${CURSES_TYPE}
 CONFIGURE_ARGS+=       --with-curses-dir=${BUILDLINK_PREFIX.curses}
-.  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mncurses)
-.  include "../../devel/ncurses/buildlink3.mk"
-USE_NCURSES=           yes
-CONFIGURE_ARGS+=       --with-screen=ncurses
-CONFIGURE_ARGS+=       --with-curses-dir=${BUILDLINK_PREFIX.ncurses}
-.endif
-
-.if !empty(PKG_OPTIONS:Mncursesw)
-.  include "../../devel/ncursesw/buildlink3.mk"
-USE_NCURSES=           yes
-CONFIGURE_ARGS+=       --with-screen=ncursesw
-CONFIGURE_ARGS+=       --with-curses-dir=${BUILDLINK_PREFIX.ncursesw}
-.endif
 
 .if !empty(PKG_OPTIONS:Micu)
 .include "../../textproc/icu/buildlink3.mk"