Wed Jan 11 02:15:56 2017 UTC ()
Allow tin to build using termcap instead of curses.
Workaround for PR plg/51819.


(roy)
diff -r1.71 -r1.72 pkgsrc/news/tin/Makefile
diff -r1.16 -r1.17 pkgsrc/news/tin/options.mk
cvs diff -r1.71 -r1.72 pkgsrc/news/tin/Makefile (expand / switch to unified diff)

--- pkgsrc/news/tin/Makefile 2017/01/05 12:37:08 1.71
+++ pkgsrc/news/tin/Makefile 2017/01/11 02:15:56 1.72
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.71 2017/01/05 12:37:08 roy Exp $ 1# $NetBSD: Makefile,v 1.72 2017/01/11 02:15:56 roy Exp $
2# 2#
3 3
4DISTNAME= tin-2.2.1 4DISTNAME= tin-2.2.1
5PKGREVISION= 10 5PKGREVISION= 11
6CATEGORIES= news 6CATEGORIES= news
7MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/stable/ \ 7MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
8 ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \ 8 ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \
9 ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/ \ 9 ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/ \
10 ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/ \ 10 ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/ \
11 ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/stable/ \ 11 ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/stable/ \
12 ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/ \ 12 ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/ \
13 ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/ 13 ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://www.tin.org/ 17HOMEPAGE= http://www.tin.org/
18COMMENT= TIN newsreader (termcap based) 18COMMENT= TIN newsreader (termcap based)
@@ -37,36 +37,32 @@ BUILD_TARGET= build @@ -37,36 +37,32 @@ BUILD_TARGET= build
37 37
38CONFIGURE_ARGS+= --with-nntp-default-server=news 38CONFIGURE_ARGS+= --with-nntp-default-server=news
39CONFIGURE_ARGS+= --with-mime-default-charset=ISO-8859-1 39CONFIGURE_ARGS+= --with-mime-default-charset=ISO-8859-1
40CONFIGURE_ARGS+= --enable-break-long-lines 40CONFIGURE_ARGS+= --enable-break-long-lines
41CONFIGURE_ARGS+= --with-gpg=${PREFIX}/bin/gpg 41CONFIGURE_ARGS+= --with-gpg=${PREFIX}/bin/gpg
42CONFIGURE_ARGS+= --with-ispell=${PREFIX}/bin/ispell 42CONFIGURE_ARGS+= --with-ispell=${PREFIX}/bin/ispell
43CONFIGURE_ARGS+= --with-metamail=${PREFIX}/bin/metamail 43CONFIGURE_ARGS+= --with-metamail=${PREFIX}/bin/metamail
44CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} 44CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
45CONFIGURE_ARGS+= --disable-mime-strict-charset 45CONFIGURE_ARGS+= --disable-mime-strict-charset
46CONFIGURE_ARGS+= --with-defaults-dir=${PKG_SYSCONFDIR} 46CONFIGURE_ARGS+= --with-defaults-dir=${PKG_SYSCONFDIR}
47CONFIGURE_ARGS+= --enable-mh-mail-handling 47CONFIGURE_ARGS+= --enable-mh-mail-handling
48CONFIGURE_ARGS+= --with-coffee 48CONFIGURE_ARGS+= --with-coffee
49 49
50CONFIGURE_ARGS+= --with-screen=${CURSES_TYPE} 
51CONFIGURE_ARGS+= --with-curses-dir=${BUILDLINK_PREFIX.curses} 
52 
53SUBST_CLASSES+= tin 50SUBST_CLASSES+= tin
54SUBST_STAGE.tin= pre-configure 51SUBST_STAGE.tin= pre-configure
55SUBST_MESSAGE.tin= Adjusting path to the configuration directory. 52SUBST_MESSAGE.tin= Adjusting path to the configuration directory.
56SUBST_FILES.tin= doc/tin.1 53SUBST_FILES.tin= doc/tin.1
57SUBST_SED.tin= -e 's:/etc/nntpserver:${PKG_SYSCONFDIR}/nntp/server:' 54SUBST_SED.tin= -e 's:/etc/nntpserver:${PKG_SYSCONFDIR}/nntp/server:'
58 55
59post-configure: 56post-configure:
60 ${ECHO} '#define NNTP_SERVER_FILE "${PKG_SYSCONFDIR}/nntp/server"' >>${WRKSRC}/include/autoconf.h 57 ${ECHO} '#define NNTP_SERVER_FILE "${PKG_SYSCONFDIR}/nntp/server"' >>${WRKSRC}/include/autoconf.h
61 ${ECHO} '#define SMTP_SERVER_FILE "${PKG_SYSCONFDIR}/smtpserver"' >>${WRKSRC}/include/autoconf.h 58 ${ECHO} '#define SMTP_SERVER_FILE "${PKG_SYSCONFDIR}/smtpserver"' >>${WRKSRC}/include/autoconf.h
62 59
63post-install: 60post-install:
64 ${INSTALL_DATA} ${WRKSRC}/doc/WHATSNEW ${DESTDIR}${PREFIX}/share/doc/tin 61 ${INSTALL_DATA} ${WRKSRC}/doc/WHATSNEW ${DESTDIR}${PREFIX}/share/doc/tin
65 62
66.include "../../converters/libiconv/buildlink3.mk" 63.include "../../converters/libiconv/buildlink3.mk"
67.include "../../converters/uulib/buildlink3.mk" 64.include "../../converters/uulib/buildlink3.mk"
68.include "../../devel/gettext-lib/buildlink3.mk" 65.include "../../devel/gettext-lib/buildlink3.mk"
69.include "../../devel/libidn/buildlink3.mk" 66.include "../../devel/libidn/buildlink3.mk"
70.include "../../devel/pcre/buildlink3.mk" 67.include "../../devel/pcre/buildlink3.mk"
71.include "../../mk/curses.buildlink3.mk" 
72.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/news/tin/options.mk (expand / switch to unified diff)

--- pkgsrc/news/tin/options.mk 2017/01/05 12:37:08 1.16
+++ pkgsrc/news/tin/options.mk 2017/01/11 02:15:56 1.17
@@ -1,23 +1,33 @@ @@ -1,23 +1,33 @@
1# $NetBSD: options.mk,v 1.16 2017/01/05 12:37:08 roy Exp $ 1# $NetBSD: options.mk,v 1.17 2017/01/11 02:15:56 roy Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.tin 3PKG_OPTIONS_VAR= PKG_OPTIONS.tin
 4PKG_OPTIONS_REQUIRED_GROUPS= display
 5PKG_OPTIONS_GROUP.display= curses wide-curses termcap
4PKG_SUPPORTED_OPTIONS= icu inet6 tin-use-inn-spool 6PKG_SUPPORTED_OPTIONS= icu inet6 tin-use-inn-spool
5PKG_SUGGESTED_OPTIONS= inet6 7PKG_SUGGESTED_OPTIONS= inet6 termcap # see PR #51819
6# untested 8# untested
7#PKG_SUPPORTED_OPTIONS+= socks 9#PKG_SUPPORTED_OPTIONS+= socks
8 10
9.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
10 12
 13.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
 14.include "../../mk/curses.buildlink3.mk"
 15CONFIGURE_ARGS+= --with-screen=${CURSES_TYPE}
 16CONFIGURE_ARGS+= --with-curses-dir=${BUILDLINK_PREFIX.curses}
 17.else
 18.include "../../mk/termcap.buildlink3.mk"
 19.endif
 20
11.if !empty(PKG_OPTIONS:Micu) 21.if !empty(PKG_OPTIONS:Micu)
12.include "../../textproc/icu/buildlink3.mk" 22.include "../../textproc/icu/buildlink3.mk"
13.endif 23.endif
14 24
15.if !empty(PKG_OPTIONS:Minet6) 25.if !empty(PKG_OPTIONS:Minet6)
16CONFIGURE_ARGS+= --enable-ipv6 26CONFIGURE_ARGS+= --enable-ipv6
17.endif 27.endif
18 28
19.if !empty(PKG_OPTIONS:Mtin-use-inn-spool) 29.if !empty(PKG_OPTIONS:Mtin-use-inn-spool)
20BUILD_DEFS+= INN_DATA_DIR VARBASE 30BUILD_DEFS+= INN_DATA_DIR VARBASE
21INN_DATA_DIR?= ${VARBASE}/news 31INN_DATA_DIR?= ${VARBASE}/news
22CONFIGURE_ARGS+= --with-inews-dir=${PREFIX}/inn/bin \ 32CONFIGURE_ARGS+= --with-inews-dir=${PREFIX}/inn/bin \
23 --with-libdir=${INN_DATA_DIR}/db \ 33 --with-libdir=${INN_DATA_DIR}/db \