Update to 2.6.2 with a `few' changes...

4 files changed, 104 insertions, 136 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 927e910a924d..438fae372c38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,28 @@
 pkgbase = tin
-	pkgdesc = Threaded NNTP and spool based UseNet newsreader
-	pkgver = 2.6.1
+	pkgdesc = A threaded NNTP and spool based UseNet newsreader.
+	pkgver = 2.6.2
 	pkgrel = 1
 	url = http://www.tin.org
-	changelog = CHANGES
 	arch = i686
 	arch = x86_64
 	license = BSD
+	makedepends = dante
+	makedepends = gnupg
+	makedepends = ispell
+	makedepends = libidn
+	makedepends = pcre
+	depends = gsasl
+	depends = icu
 	depends = ncurses
-	depends = ispell
 	depends = perl
-	depends = gnupg
-	depends = dante
-	depends = icu
-	depends = libidn
-	depends = gsasl
-	options = zipman
-	source = ftp://ftp.tin.org/pub/news/clients/tin/v2.6/tin-2.6.1.tar.gz
+	conflicts = tin-unstable
+	source = ftp://ftp.tin.org/pub/news/clients/tin/v2.6/tin-2.6.2.tar.gz
 	source = LICENSE
-	sha256sums = 6b1bc8c8ab07467bc8dbc845a1c7389339e1beb0244894d7911457efd25a83b5
-	sha256sums = 5ccb431a94c2d2f093b8f93325075e5ad886772ba2a452478120b86ce71c0683
+	md5sums = 6c815789ba41d74f16e60d131b78f9c1
+	md5sums = d11b33b8a9dd5c45c8ce290cf52fa764
+	sha1sums = c7939b0a60cd029070f7a7a44bd5065ff3594c35
+	sha1sums = 47b435e30e21815386db3123175d9a3bf9d63c76
+	sha256sums = 81b8c07ed60e2c97d3677d78c21f320f8c97b84173b9a7a001fed742aaad1c70
+	sha256sums = bf3c5eae73413ca2a64ef3a047ad3551a0613227b0aa99020b25cc96d9813f65
 
 pkgname = tin
diff --git a/CHANGES b/CHANGES
deleted file mode 100644
index c91b56e3564f..000000000000
--- a/CHANGES
+++ /dev/null
@@ -1,32 +0,0 @@
--- 2.6.1 release 20211226 "Convalmore" --
-
- 004) Michael Baeuerle <michael.baeuerle@stz-e.de>
-      BUG. wrong pkg-config file name for libcanlock3
-      FIX. aclocal.m4
-
- 003) Urs Janssen <urs@tin.org>
-      ADD. config.guess, config.sub update
-      ADD. don't count comment and empty lines in newsrc-file
-      ADD. fixed mixed declarations and code
-      ADD. const qualification for free_if_not_default() and strfpath_cp()
-      ADD. allow to cancel wait_message() via key press
-      BUG. missing bounds checking in *highlight_string()
-      BUG. use of wint_t in !MULTIBYTE_ABLE code
-      FIX. curses.c, help.c, memory.c, misc.c, newsrc.c, page.c, prompt.c
-           rfc2046.c, screen.c, select.c, tcurses.c, extern.h, tin.5
-           config.guess, config.sub
-
- 002) Thomas E. Dickey <dickey@invisible-island.net>
-      BUG. missing configure check for get_wch and wget_wch
-      ADD. workaround for possible redefinition of bool type when using
-           pdcurses
-      FIX. autoconf.hin, tcurses.h, tin.h, Makefile.in, aclocal.m4
-           configure[.in]
-
- 001) Matt Anton <tin@lv223.org>
-      ADD. updated French translation
-      FIX. fr.po
-
--- 2.6.0 release 20210823 "Coleburn" --
-
-For changes made till the 2.6.0 release look at CHANGES.old
diff --git a/LICENSE b/LICENSE
index b39f06bc1cc0..6591f1f7d00d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,35 +1,26 @@
-/*
- *  Project   : tin - a Usenet reader
- *  Module    : main.c
- *  Author    : I. Lea & R. Skrenta
- *  Created   : 1991-04-01
- *  Updated   : 2005-08-14
- *  Notes     :
- *
- * Copyright (c) 1991-2006 Iain Lea <iain@bricbrac.de>, Rich Skrenta <skrenta@pbm.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/PKGBUILD b/PKGBUILD
index e8928b8d4261..8a2ce530f727 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,71 @@
-# Maintainer :  Kr1ss  $(tr +- .@ <<<'<kr1ss+x-yandex+com>')
-# Contributor : aksr <aksr at t-com dot me>
-# Contributor : dorphell <dorphell@archlinux.org>
-# Contributor : akojo
-# Contributor : quizzlo
-
-
+# Contributor: dorphell <dorphell@archlinux.org>
+# Contributor: akojo
+# Contributor: quizzlo
+# Contributor: Kr1ss $(tr +- .@ <<<'<kr1ss+x-yandex+com>')
+# Maintainer: aksr <aksr at t-com dot me>
 pkgname=tin
-
-pkgver=2.6.1
+pkgver=2.6.2
 pkgrel=1
-
-pkgdesc='Threaded NNTP and spool based UseNet newsreader'
+pkgdesc='A threaded NNTP and spool based UseNet newsreader.'
 arch=('i686' 'x86_64')
-url="http://www.$pkgname.org"
+url='http://www.tin.org'
 license=('BSD')
-
-depends=('ncurses' 'ispell' 'perl' 'gnupg' 'dante' 'icu' 'libidn' 'gsasl')
-
-changelog=CHANGES
-source=("ftp://ftp.$pkgname.org/pub/news/clients/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz"
-        'LICENSE')
-sha256sums=('6b1bc8c8ab07467bc8dbc845a1c7389339e1beb0244894d7911457efd25a83b5'
-            '5ccb431a94c2d2f093b8f93325075e5ad886772ba2a452478120b86ce71c0683')
-
-options=('zipman')
-
+depends=('gsasl' 'icu' 'ncurses' 'perl')
+makedepends=('dante' 'gnupg' 'ispell' 'libidn' 'pcre')
+conflicts=('tin-unstable')
+source=("ftp://ftp.tin.org/pub/news/clients/tin/v${pkgver%.*}/$pkgname-$pkgver.tar.gz" 'LICENSE')
+md5sums=('6c815789ba41d74f16e60d131b78f9c1'
+         'd11b33b8a9dd5c45c8ce290cf52fa764')
+sha1sums=('c7939b0a60cd029070f7a7a44bd5065ff3594c35'
+          '47b435e30e21815386db3123175d9a3bf9d63c76')
+sha256sums=('81b8c07ed60e2c97d3677d78c21f320f8c97b84173b9a7a001fed742aaad1c70'
+            'bf3c5eae73413ca2a64ef3a047ad3551a0613227b0aa99020b25cc96d9813f65')
 
 build() {
-  cd "$pkgname-$pkgver"
-  unset CFLAGS CPPFLAGS
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shell-escape --enable-nntp --enable-nls \
-    --enable-ipv6 --enable-append-pid --enable-posting --enable-piping --enable-locale \
-    --enable-xhdr-xref --with-spool-dir=/var/spool/news --with-ispell=/usr/bin/ispell \
-    --with-pcre=/usr --with-gpg=/usr/bin/gpg --with-screen=ncursesw \
-    --with-coffee --with-socks --with-socks5 --disable-prototypes --disable-echo \
-    --with-inews-dir=/var/lib/news --with-libdir=/var/lib/news
-#   --with-domain-name         (default: unset)
-#   --with-nntp-default-server (default: news.$DOMAIN_NAME)
-#   --with-shell=PROG          (default: sh, except on BSD where csh is used)
-#   --with-defaults-dir=PATH   (default: /etc/tin)
-#   --with-editor=PROG         (default: empty)
-#   --with-mailer=PROG         (default: empty)
-#   --with-mailbox=PATH        (default: empty)
-  make build
-  make
+	cd "$srcdir/$pkgname-$pkgver"
+	unset CFLAGS
+	unset CPPFLAGS
+	./configure --prefix=/usr --mandir=/usr/share/man \
+	--enable-shell-escape \
+	--enable-nntp \
+	--enable-nls \
+	--enable-ipv6 \
+	--enable-append-pid \
+	--enable-posting \
+	--enable-piping \
+	--enable-locale \
+	--enable-xhdr-xref \
+	--with-spool-dir=/var/spool/news \
+	--with-ispell=/usr/bin/ispell \
+	--with-gpg=/usr/bin/gpg \
+	--with-pcre=/usr \
+	--with-screen=ncursesw \
+	--with-inews-dir=/usr/lib/news \
+	--with-libdir=/usr/lib \
+	--with-coffee \
+	--with-socks \
+	--with-socks5 \
+	--disable-prototypes \
+	--disable-echo
+#	--with-domain-name         (default: unset)
+#	--with-nntp-default-server (default: news.$DOMAIN_NAME)
+#	--with-shell=PROG          (default: sh, except on BSD where csh is used)
+#	--with-defaults-dir=PATH   (default: /etc/tin)
+#	--with-editor=PROG         (default: empty)
+#	--with-mailer=PROG         (default: empty)
+#	--with-mailbox=PATH        (default: empty)
+	make build
+	make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm755 {tools/,"$pkgdir/usr/bin/$pkgname"_}url_handler.sh
-  install -Dm644 README      -t"$pkgdir/usr/share/doc/$_name/"
-  install -Dm644 ../LICENSE  -t"$pkgdir/usr/share/licenses/$pkgname/"
-  cd doc
-  install -Dm644 *.3         -t"$pkgdir/usr/share/man/man3/"
-  install -Dm644 l10n/es/*.1 -t"$pkgdir/usr/share/man/es/man1/"
-  install -Dm644 l10n/es/*.5 -t"$pkgdir/usr/share/man/es/man5/"
-  install -Dm644 l10n/de/*.1 -t"$pkgdir/usr/share/man/de/man1/"
-  install -Dm644 l10n/de/*.5 -t"$pkgdir/usr/share/man/de/man5/"
-  ln -s {,"$pkgdir/usr/bin/$pkgname"_}url_handler.pl
-  rm "$pkgdir/usr/share/man/man5"/m{box,mdf}.5  # conflicts with the `mutt` package
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+	rm -f $pkgdir/usr/share/man/man5/{mbox.5,mmdf.5} # conflict with mutt package
+	mv $pkgdir/usr/bin/url_handler.pl $pkgdir/usr/bin/tin_url_handler.pl
+	install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+	cd doc/
+	install -D -m644 *.3 -t"$pkgdir/usr/share/man/man3/"
+	install -D -m644 l10n/de/*.1 -t"$pkgdir/usr/share/man/de/man1/"
+	install -D -m644 l10n/de/*.5 -t"$pkgdir/usr/share/man/de/man5/"
 }
-
-
-# vim: ts=2 sw=2 et ft=PKGBUILD: