tin: Update to release 2.4.3

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: tin: Update to release 2.4.3
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Thu, 10 Jan 2019 15:37:28 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Jan 10 16:37:28 2019 +0100
Changeset:	47074a28c9dd7279c41ba031a66b02feb97043f0

Added Files:
	tin/DESCR
	tin/Makefile
	tin/PLIST
	tin/TODO
	tin/distinfo
	tin/options.mk
	tin/patches/patch-Makefile
	tin/patches/patch-configure
	tin/patches/patch-include_tin.h
	tin/patches/patch-src_Makefile.in

Log Message:
tin: Update to release 2.4.3

Modified the handling of "termcap" option according to pkglint.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=47074a28c9dd7279c41ba031a66b02feb97043f0

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

diffstat:
 tin/DESCR                         |  1 +
 tin/Makefile                      | 64 +++++++++++++++++++++++++++++++++++++++
 tin/PLIST                         | 28 +++++++++++++++++
 tin/TODO                          |  4 +++
 tin/distinfo                      | 10 ++++++
 tin/options.mk                    | 59 ++++++++++++++++++++++++++++++++++++
 tin/patches/patch-Makefile        | 15 +++++++++
 tin/patches/patch-configure       | 16 ++++++++++
 tin/patches/patch-include_tin.h   | 15 +++++++++
 tin/patches/patch-src_Makefile.in | 24 +++++++++++++++
 10 files changed, 236 insertions(+)

diffs:
diff --git a/tin/DESCR b/tin/DESCR
new file mode 100644
index 0000000000..a99b0fa123
--- /dev/null
+++ b/tin/DESCR
@@ -0,0 +1 @@
+TIN:  Easy to use threaded newsreader with NOV/NNTP support.
diff --git a/tin/Makefile b/tin/Makefile
new file mode 100644
index 0000000000..a0b316086a
--- /dev/null
+++ b/tin/Makefile
@@ -0,0 +1,64 @@
+# $NetBSD$
+
+DISTNAME=	tin-2.4.3
+CATEGORIES=	news
+MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/stable/
+MASTER_SITES+=	ftp://ftp.funet.fi/pub/unix/news/tin-unoff/
+MASTER_SITES+=	ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/
+MASTER_SITES+=	ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/
+MASTER_SITES+=	ftp://sunsite.icm.edu.pl/pub/unix/news/tin/stable/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://www.tin.org/
+COMMENT=	USENET newsreader (termcap based)
+# See src/nntplib.c, vms/vms.c
+LICENSE=	tin-license
+
+RESTRICTED=		Profit from use, sale, trade, or reproduction disallowed
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+
+GNU_CONFIGURE=	yes
+USE_PKGLOCALEDIR=yes
+
+INSTALLATION_DIRS=	share/doc/tin
+
+# for tinews.pl
+USE_TOOLS+=	msgfmt perl:run yacc
+REPLACE_PERL=	tools/*.pl
+BUILD_TARGET=	build
+
+.include "options.mk"
+
+CONFIGURE_ARGS+=	--with-nntp-default-server=news
+CONFIGURE_ARGS+=	--with-mime-default-charset=ISO-8859-1
+CONFIGURE_ARGS+=	--enable-break-long-lines
+CONFIGURE_ARGS+=	--with-gpg=${PREFIX}/bin/gpg
+CONFIGURE_ARGS+=	--with-ispell=${PREFIX}/bin/ispell
+CONFIGURE_ARGS+=	--with-metamail=${PREFIX}/bin/metamail
+CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre}
+CONFIGURE_ARGS+=	--disable-mime-strict-charset
+CONFIGURE_ARGS+=	--with-defaults-dir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--enable-mh-mail-handling
+CONFIGURE_ARGS+=	--with-coffee
+
+SUBST_CLASSES+=		tin
+SUBST_STAGE.tin=	pre-configure
+SUBST_MESSAGE.tin=	Adjusting path to the configuration directory.
+SUBST_FILES.tin=	doc/tin.1
+SUBST_SED.tin=		-e 's:/etc/nntpserver:${PKG_SYSCONFDIR}/nntp/server:'
+
+post-configure:
+	${ECHO} '#define NNTP_SERVER_FILE "${PKG_SYSCONFDIR}/nntp/server"' >>${WRKSRC}/include/autoconf.h
+	${ECHO} '#define SMTP_SERVER_FILE "${PKG_SYSCONFDIR}/smtpserver"' >>${WRKSRC}/include/autoconf.h
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/WHATSNEW ${DESTDIR}${PREFIX}/share/doc/tin
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/mmdf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/tin-mmdf.5
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../converters/uulib/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/tin/PLIST b/tin/PLIST
new file mode 100644
index 0000000000..1010faf7af
--- /dev/null
+++ b/tin/PLIST
@@ -0,0 +1,28 @@
+@comment $NetBSD$
+bin/metamutt
+bin/opt-case.pl
+bin/rtin
+bin/tin
+bin/tinews.pl
+bin/url_handler.pl
+bin/w2r.pl
+man/man1/opt-case.pl.1
+man/man1/rtin.1
+man/man1/tin.1
+man/man1/tinews.pl.1
+man/man1/url_handler.pl.1
+man/man1/w2r.pl.1
+man/man5/rtin.5
+man/man5/tin-mmdf.5
+man/man5/tin.5
+share/doc/tin/WHATSNEW
+${PLIST.nls}share/locale/da/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/en_GB/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/et/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/tin.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/tin.mo
diff --git a/tin/TODO b/tin/TODO
new file mode 100644
index 0000000000..6659084350
--- /dev/null
+++ b/tin/TODO
@@ -0,0 +1,4 @@
+[X] Update to latest release 2.4.3
+[ ] Rework patches to apply without offset
+[ ] Suggest option "termcap" for "mk/defaults/options.description"
+    (from pkglint warning)
diff --git a/tin/distinfo b/tin/distinfo
new file mode 100644
index 0000000000..ff0d4d5948
--- /dev/null
+++ b/tin/distinfo
@@ -0,0 +1,10 @@
+$NetBSD$
+
+SHA1 (tin-2.4.3.tar.xz) = f0460e6e9aa555864df8d12986c06e3c0c27f70a
+RMD160 (tin-2.4.3.tar.xz) = ca9404b46705b75b615b79e6d0434c85e009c616
+SHA512 (tin-2.4.3.tar.xz) = 9d4b22ec889cc0b468d9d5488907b6b4a6fc864dcbd18ef2e91a463734e651bc7ff149d6c74805f82cbf0d4f6e7f28b005ba07268966e3c96928b5b20be59eba
+Size (tin-2.4.3.tar.xz) = 1538960 bytes
+SHA1 (patch-Makefile) = 5dfed6b037755fd632d71fd5c58b5982b24a598e
+SHA1 (patch-configure) = dd738e58ffe3b39396928ebb881b7b269bf21315
+SHA1 (patch-include_tin.h) = 557a75eeff1114018dca247e15eceddf70af8b91
+SHA1 (patch-src_Makefile.in) = f65cfcc6da2be21edf80317b94a98e1512e086a0
diff --git a/tin/options.mk b/tin/options.mk
new file mode 100644
index 0000000000..e36b90b688
--- /dev/null
+++ b/tin/options.mk
@@ -0,0 +1,59 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.tin
+PKG_OPTIONS_REQUIRED_GROUPS=	display
+PKG_OPTIONS_GROUP.display=	curses wide-curses termcap
+PKG_SUPPORTED_OPTIONS=		canlock icu inet6 nls tin-use-inn-spool
+PKG_SUGGESTED_OPTIONS=		canlock inet6 nls termcap # see PR #51819
+# untested
+#PKG_SUPPORTED_OPTIONS+=	socks
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcanlock)
+.include "../../news/libcanlock/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-cancel-locks
+.endif
+
+.if !empty(PKG_OPTIONS:Mcurses) || !empty(PKG_OPTIONS:Mwide-curses)
+.include "../../mk/curses.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-screen=${CURSES_TYPE}
+CONFIGURE_ARGS+=	--with-curses-dir=${BUILDLINK_PREFIX.curses}
+.endif
+
+.if !empty(PKG_OPTIONS:Mtermcap)
+.include "../../mk/termcap.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Micu)
+.include "../../textproc/icu/buildlink3.mk"
+.endif
+
+.if empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+PLIST_VARS+=	nls
+.if !empty(PKG_OPTIONS:Mnls)
+PLIST.nls=	yes
+.include "../../devel/gettext-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-nls
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
+
+.if !empty(PKG_OPTIONS:Mtin-use-inn-spool)
+BUILD_DEFS+=		INN_DATA_DIR VARBASE
+INN_DATA_DIR?=		${VARBASE}/news
+CONFIGURE_ARGS+=	--with-inews-dir=${PREFIX}/inn/bin \
+			--with-libdir=${INN_DATA_DIR}/db \
+			--with-spooldir=${INN_DATA_DIR}/spool/articles \
+			--with-nov-dir=${INN_DATA_DIR}/spool/overview
+.else
+CONFIGURE_ARGS+=	--enable-nntp-only
+.endif
+
+#.if !empty(PKG_OPTIONS:Msocks)
+#.include "../../net/dante/buildlink3.mk"
+#CONFIGURE_ARGS+=	--with-socks=${BUILDLINK_PREFIX.dante}
+#.endif
diff --git a/tin/patches/patch-Makefile b/tin/patches/patch-Makefile
new file mode 100644
index 0000000000..fa50d7e591
--- /dev/null
+++ b/tin/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Do not ignore error for missing src/Makefile.
+
+--- Makefile.orig	2007-02-01 13:11:14.000000000 +0000
++++ Makefile
+@@ -400,7 +400,7 @@ all:
+ 	@$(ECHO) " "
+ 
+ build:
+-	@-if $(TEST) -r $(SRCDIR)/Makefile ; then $(CD) $(SRCDIR) && $(MAKE) ; else $(ECHO) "You need to run configure first - didn't you read README?" ; fi
++	@if $(TEST) -r $(SRCDIR)/Makefile ; then $(CD) $(SRCDIR) && $(MAKE) ; else $(ECHO) "You need to run configure first - didn't you read README?" ; fi
+ 
+ install:
+ 	@$(CD) $(SRCDIR) && $(MAKE) install
diff --git a/tin/patches/patch-configure b/tin/patches/patch-configure
new file mode 100644
index 0000000000..7a088ef166
--- /dev/null
+++ b/tin/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Skip missing include directories.
+
+--- configure.orig	2017-12-24 11:52:06.000000000 +0000
++++ configure
+@@ -9202,6 +9202,9 @@ echo "$ac_t""$cf_cv_ncurses_h2" 1>&6
+ if test -n "$cf_1st_incdir" ; then
+   for cf_add_incdir in $cf_1st_incdir
+   do
++    if ! [ -d $cf_add_incdir ]; then
++      continue;
++    fi
+ 	while test $cf_add_incdir != /usr/include
+ 	do
+ 	  if test -d $cf_add_incdir
diff --git a/tin/patches/patch-include_tin.h b/tin/patches/patch-include_tin.h
new file mode 100644
index 0000000000..5401ac01a1
--- /dev/null
+++ b/tin/patches/patch-include_tin.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use system libcanlock.
+
+--- include/tin.h.orig	2017-12-08 07:52:23.000000000 +0000
++++ include/tin.h
+@@ -2366,7 +2366,7 @@ extern struct tm *localtime(time_t *);
+ 
+ /* libcanlock */
+ #ifdef USE_CANLOCK
+-#	include "../libcanlock/include/canlock.h"
++#	include <libcanlock-3/canlock.h>
+ #endif /* USE_CANLOCK */
+ 
+ /* gsasl */
diff --git a/tin/patches/patch-src_Makefile.in b/tin/patches/patch-src_Makefile.in
new file mode 100644
index 0000000000..e27198b243
--- /dev/null
+++ b/tin/patches/patch-src_Makefile.in
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Do not link internal static libcanlock.
+Do not install mbox manpage.
+
+--- src/Makefile.in.orig	2017-12-08 07:55:34.000000000 +0000
++++ src/Makefile.in
+@@ -209,7 +209,7 @@ EXTRAOBJS = @EXTRAOBJS@
+ EXTRA_INTLLIBS = @INTLDIR_MAKE@ @INTLLIBS@
+ EXTRA_PCREHDRS = @PCREDIR_MAKE@ ../pcre/pcre.h
+ EXTRA_PCRELIBS = @PCREDIR_MAKE@ ../pcre/$(PRELIB)pcre.a
+-EXTRA_CANLIBS = @CANDIR_MAKE@ ../libcanlock/$(PRELIB)canlock.a
++#EXTRA_CANLIBS = @CANDIR_MAKE@ ../libcanlock/$(PRELIB)canlock.a
+ EXTRALIBS = $(EXTRA_INTLLIBS) $(EXTRA_PCRELIBS) $(EXTRA_CANLIBS)
+ 
+ OFILES	= @ALLOCA@ $(EXTRAOBJS) \
+@@ -341,7 +341,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
+ 	@-$(RM) -f $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
+ 	@$(ECHO) ".so $(INS_MANUAL_DIR)5/$(PROJECT).5" > $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
+ 	@$(CHMOD) 444 $(DESTDIR)$(INS_MANUAL_DIR)5/r$(PROJECT).5
+-	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi
+ 	@-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) "  ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi
+ 
+ uninstall_manpage :
Prev by Date: posh: Added README file
Next by Date: cleanscore: Added README file
Previous by Thread: posh: Added README file
Next by Thread: cleanscore: Added README file
Indexes:
Home | Main Index | Thread Index | Old Index