upgrade to tin 1.8.2
from Joachim Schipper <j.schipper at math.uu.nl> with a wide character bug fix by naddy@, thanks
This commit is contained in:
steven
parent
0c7ad009de
commit
cee15d61b0
@ -1,22 +1,27 @@
|
||||
# $OpenBSD: Makefile,v 1.28 2004/12/02 19:19:59 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.29 2007/01/26 23:19:32 steven Exp $
|
||||
|
||||
COMMENT= 'threaded NNTP and spool based UseNet newsreader'
|
||||
|
||||
DISTNAME= tin-1.6.2
|
||||
DISTNAME= tin-${VERSION}.${PATCHLEVEL}
|
||||
VERSION= 1.8
|
||||
PATCHLEVEL= 2
|
||||
CATEGORIES= news
|
||||
|
||||
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
|
||||
ftp://ftp.funet.fi/pub/unix/news/tin-unoff/stable/ \
|
||||
ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/ \
|
||||
ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/ \
|
||||
ftp://ftp.sunet.se/pub/news/readers/tin/stable/
|
||||
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${VERSION}/ \
|
||||
ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/v${VERSION}/ \
|
||||
ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/v${VERSION}/ \
|
||||
ftp://ftp.sunet.se/pub/news/readers/tin/v${VERSION}/ \
|
||||
ftp://ftp.funet.fi/pub/unix/news/tin-unoff/
|
||||
|
||||
HOMEPAGE= http://www.tin.org/
|
||||
|
||||
MAINTAINER= Federico G. Schwindt <fgsch@openbsd.org>
|
||||
MAINTAINER= Joachim Schipper <j.schipper@math.uu.nl>
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
# This software cannot be redistributed freely due to a few files having
|
||||
# licenses that prohibit making money from redistribution - see src/nntplib.c,
|
||||
# vms/vms.c
|
||||
PERMIT_PACKAGE_CDROM= "no fee"
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= "no fee"
|
||||
@ -24,6 +29,7 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c ncurses
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
# --with-x does not affect the build, but let's be safe.
|
||||
CONFIGURE_ARGS+= --with-ispell=${LOCALBASE}/bin/ispell \
|
||||
--without-metamail \
|
||||
--without-pgp \
|
||||
@ -31,24 +37,17 @@ CONFIGURE_ARGS+= --with-ispell=${LOCALBASE}/bin/ispell \
|
||||
--with-gpg=${LOCALBASE}/bin/gpg \
|
||||
--with-screen=ncurses \
|
||||
--with-pcre=${LOCALBASE} \
|
||||
--with-libdir=${PREFIX}/lib/news \
|
||||
--with-spooldir=/var/news \
|
||||
--enable-break-long-lines \
|
||||
--enable-ipv6
|
||||
--enable-ipv6 \
|
||||
--without-x
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
LIB_DEPENDS+= pcre::devel/pcre \
|
||||
utf8::misc/libutf8
|
||||
|
||||
FLAVORS= nntp_only
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:L:Mnntp_only}
|
||||
CONFIGURE_ARGS+= --enable-nntp-only
|
||||
.else
|
||||
CONFIGURE_ARGS+= --with-libdir=${PREFIX}/lib/news \
|
||||
--with-spooldir=/var/news
|
||||
.endif
|
||||
|
||||
ALL_TARGET= build
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (tin-1.6.2.tar.gz) = 8f34747809b6fe5c135694fcbe2c8f46
|
||||
RMD160 (tin-1.6.2.tar.gz) = 651a6709f09346c2276866968d1efcafefb5080e
|
||||
SHA1 (tin-1.6.2.tar.gz) = f2113583c93105ca518fe4b56dc9d2825e6a15f5
|
||||
SIZE (tin-1.6.2.tar.gz) = 1548753
|
||||
MD5 (tin-1.8.2.tar.gz) = 397b6e22861d1ed4fc0fdb0e4a9f8876
|
||||
RMD160 (tin-1.8.2.tar.gz) = cc72f22f4b85091b8968a63ef8b36568cb484c6f
|
||||
SHA1 (tin-1.8.2.tar.gz) = 6a0b4505d9d769cb58dea483fadab8e86a08ec69
|
||||
SIZE (tin-1.8.2.tar.gz) = 1996960
|
||||
|
||||
@ -1,15 +1,7 @@
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.2 2003/08/19 16:48:00 fgsch Exp $
|
||||
--- src/Makefile.in.orig 2003-07-24 11:18:45.000000000 -0300
|
||||
+++ src/Makefile.in 2003-08-19 13:47:24.000000000 -0300
|
||||
@@ -36,6 +36,7 @@ VERSION = @VERSION@
|
||||
|
||||
SHELL = /bin/sh
|
||||
prefix = @prefix@
|
||||
+datadir = @datadir@
|
||||
exec_prefix = @exec_prefix@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = ..
|
||||
@@ -69,6 +70,7 @@ LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS@ @I
|
||||
$OpenBSD: patch-src_Makefile_in,v 1.3 2007/01/26 23:19:32 steven Exp $
|
||||
--- src/Makefile.in.orig Sat Jul 16 21:49:36 2005
|
||||
+++ src/Makefile.in Sat Jan 27 00:06:24 2007
|
||||
@@ -78,6 +78,7 @@ LINK_LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS
|
||||
# Where do you want the binary & manual page installed?
|
||||
DESTDIR = @DESTDIR@
|
||||
INS_BINARY_DIR = @bindir@
|
||||
@ -17,7 +9,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2003/08/19 16:48:00 fgsch Exp $
|
||||
INS_MANUAL_DIR = @mandir@/man
|
||||
INS_SYSDEF_DIR = @TIN_DEFAULTS_DIR@
|
||||
INS_MANUAL_EXT = 1
|
||||
@@ -318,16 +320,15 @@ help:
|
||||
@@ -328,6 +329,7 @@ help :
|
||||
$(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) \
|
||||
$(DESTDIR)$(INS_MANUAL_DIR)5 \
|
||||
$(DESTDIR)$(INS_BINARY_DIR) \
|
||||
@ -25,36 +17,41 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 2003/08/19 16:48:00 fgsch Exp $
|
||||
$(DESTDIR)$(INS_SYSDEF_DIR) :
|
||||
$(top_srcdir)/mkdirs.sh $@
|
||||
|
||||
-install_manpage: $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) $(DESTDIR)$(INS_MANUAL_DIR)5
|
||||
+install_manpage: $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) $(DESTDIR)$(INS_MANUAL_DIR)5 $(DESTDIR)$(INS_DATA_DIR)
|
||||
@$(ECHO) "Installing $(PROJECT) manual pages to $(DESTDIR)$(INS_MANUAL_DIR) ..."
|
||||
@@ -336,8 +338,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
|
||||
@$(INSTALL) -m 444 $(DOCDIR)/tin.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT)
|
||||
@( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) r$(PROJECT).$(INS_MANUAL_EXT) )
|
||||
@$(INSTALL) -m 444 $(DOCDIR)/tin.5 $(DESTDIR)$(INS_MANUAL_DIR)5/$(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:
|
||||
uninstall_manpage :
|
||||
@$(ECHO) "Uninstalling $(PROJECT) manual page in $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) ..."
|
||||
@@ -349,14 +350,14 @@ uninstall_sysdefs:
|
||||
@@ -359,13 +359,13 @@ uninstall_sysdefs :
|
||||
@-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults
|
||||
@-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types
|
||||
|
||||
-install_helpers: $(DESTDIR)$(INS_BINARY_DIR) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)
|
||||
+install_helpers: $(DESTDIR)$(INS_DATA_DIR)
|
||||
-install_helpers : $(DESTDIR)$(INS_BINARY_DIR) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)
|
||||
+install_helpers : $(DESTDIR)$(INS_BINARY_DIR) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) $(DESTDIR)$(INS_DATA_DIR)
|
||||
@$(ECHO) "Installing helper applications ..."
|
||||
- @-if test ! -f $(DESTDIR)$(INS_BINARY_DIR)/url_handler.sh ; then $(INSTALL) -m 755 $(TOLDIR)/url_handler.sh $(DESTDIR)$(INS_BINARY_DIR)/url_handler.sh ; fi
|
||||
- @-if test ! -f $(DESTDIR)$(INS_BINARY_DIR)/metamutt ; then $(INSTALL) -m 755 $(TOLDIR)/metamutt $(DESTDIR)$(INS_BINARY_DIR)/metamutt ; fi
|
||||
- @$(INSTALL) -m 755 $(TOLDIR)/w2r.pl $(DESTDIR)$(INS_BINARY_DIR)/w2r.pl
|
||||
- @$(INSTALL) -m 755 $(TOLDIR)/opt-case.pl $(DESTDIR)$(INS_BINARY_DIR)/opt-case.pl
|
||||
- @$(INSTALL) -m 444 $(DOCDIR)/w2r.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/w2r.pl.$(INS_MANUAL_EXT)
|
||||
- @$(INSTALL) -m 444 $(DOCDIR)/opt-case.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/opt-case.pl.$(INS_MANUAL_EXT)
|
||||
+ @-if test ! -f $(DESTDIR)$(INS_DATA_DIR)/url_handler.sh ; then $(INSTALL) -m 755 $(TOLDIR)/url_handler.sh $(DESTDIR)$(INS_DATA_DIR)/url_handler.sh ; fi
|
||||
+ @-if test ! -f $(DESTDIR)$(INS_DATA_DIR)/metamutt ; then $(INSTALL) -m 755 $(TOLDIR)/metamutt $(DESTDIR)$(INS_DATA_DIR)/metamutt ; fi
|
||||
- @$(INSTALL) -m 755 $(TOLDIR)/tinews.pl $(DESTDIR)$(INS_BINARY_DIR)/tinews.pl
|
||||
+ @$(INSTALL) -m 755 $(TOLDIR)/url_handler.sh $(DESTDIR)$(INS_DATA_DIR)/url_handler.sh
|
||||
+ @$(INSTALL) -m 755 $(TOLDIR)/metamutt $(DESTDIR)$(INS_DATA_DIR)/metamutt
|
||||
+ @$(INSTALL) -m 755 $(TOLDIR)/w2r.pl $(DESTDIR)$(INS_DATA_DIR)/w2r.pl
|
||||
+ @$(INSTALL) -m 755 $(TOLDIR)/opt-case.pl $(DESTDIR)$(INS_DATA_DIR)/opt-case.pl
|
||||
+ @$(INSTALL) -m 444 $(DOCDIR)/w2r.1 $(DESTDIR)$(INS_DATA_DIR)/w2r.pl.$(INS_MANUAL_EXT)
|
||||
+ @$(INSTALL) -m 444 $(DOCDIR)/opt-case.1 $(DESTDIR)$(INS_DATA_DIR)/opt-case.pl.$(INS_MANUAL_EXT)
|
||||
+ @$(INSTALL) -m 755 $(TOLDIR)/tinews.pl $(DESTDIR)$(INS_DATA_DIR)/tinews.pl
|
||||
@$(INSTALL) -m 444 $(DOCDIR)/w2r.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/w2r.pl.$(INS_MANUAL_EXT)
|
||||
@$(INSTALL) -m 444 $(DOCDIR)/opt-case.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/opt-case.pl.$(INS_MANUAL_EXT)
|
||||
@$(INSTALL) -m 444 $(DOCDIR)/tinews.1 $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/tinews.pl.$(INS_MANUAL_EXT)
|
||||
@@ -474,7 +474,7 @@ makecfg$X : $(SRCDIR)/makecfg.c \
|
||||
$(INCDIR)/tin.h \
|
||||
../include/autoconf.h
|
||||
@SHOW_CC@
|
||||
- @ECHO_CC@$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -o $@ makecfg.c #$(BUILD_LIBS)
|
||||
+ @ECHO_CC@$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -o $@ makecfg.c $(BUILD_LIBS)
|
||||
|
||||
uninstall_helpers:
|
||||
@$(ECHO) "Removing helper applications ..."
|
||||
TIN_DEP = \
|
||||
Makefile \
|
||||
|
||||
28
news/tin/patches/patch-src_tcurses_c
Normal file
28
news/tin/patches/patch-src_tcurses_c
Normal file
@ -0,0 +1,28 @@
|
||||
$OpenBSD: patch-src_tcurses_c,v 1.1 2007/01/26 23:19:32 steven Exp $
|
||||
--- src/tcurses.c.orig Thu Jan 25 17:02:09 2007
|
||||
+++ src/tcurses.c Thu Jan 25 17:04:32 2007
|
||||
@@ -582,6 +582,7 @@ again:
|
||||
/* read in the multibyte sequence */
|
||||
char *mbs = my_malloc(MB_CUR_MAX + 1);
|
||||
int i, ch;
|
||||
+ wchar_t wc;
|
||||
|
||||
mbs[0] = (char) wch;
|
||||
nodelay(stdscr, TRUE);
|
||||
@@ -594,12 +595,14 @@ again:
|
||||
nodelay(stdscr, FALSE);
|
||||
|
||||
mbs[i] = '\0';
|
||||
- res = mbtowc((wchar_t *) (&wch), mbs, MB_CUR_MAX);
|
||||
+ res = mbtowc(&wc, mbs, MB_CUR_MAX);
|
||||
free(mbs);
|
||||
if (res == -1)
|
||||
return WEOF; /* error */
|
||||
- else
|
||||
+ else {
|
||||
res = OK;
|
||||
+ wch = wc;
|
||||
+ }
|
||||
} else {
|
||||
res = KEY_CODE_YES;
|
||||
# if defined(KEY_RESIZE) && defined(USE_CURSES)
|
||||
@ -2,6 +2,3 @@ tin is a full-screen easy to use Usenet newsreader. It can read
|
||||
news locally or remotely via a NNTP (Network News Transport Protocol)
|
||||
server. It will automatically utilize NOV newsoverview style index
|
||||
files if available locally or via the NNTP [X]OVER command (RFC2980).
|
||||
|
||||
Flavors:
|
||||
nntp_only - only read news remotely via a NNTP server.
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
@comment $OpenBSD: PLIST,v 1.8 2004/09/15 18:21:22 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.9 2007/01/26 23:19:32 steven Exp $
|
||||
@pkgpath news/tin,nntp_only
|
||||
bin/rtin
|
||||
bin/tin
|
||||
@man man/man1/opt-case.pl.1
|
||||
@man man/man1/rtin.1
|
||||
@man man/man1/tin.1
|
||||
@man man/man1/tinews.pl.1
|
||||
@man man/man1/w2r.pl.1
|
||||
@man man/man5/tin.5
|
||||
share/locale/de/LC_MESSAGES/tin.mo
|
||||
share/locale/en_GB/
|
||||
@ -10,12 +14,17 @@ share/locale/en_GB/LC_MESSAGES/
|
||||
share/locale/en_GB/LC_MESSAGES/tin.mo
|
||||
share/locale/et/LC_MESSAGES/tin.mo
|
||||
share/locale/fr/LC_MESSAGES/tin.mo
|
||||
share/locale/ru/LC_MESSAGES/tin.mo
|
||||
share/locale/rw/
|
||||
share/locale/rw/LC_MESSAGES/
|
||||
share/locale/rw/LC_MESSAGES/tin.mo
|
||||
share/locale/sv/LC_MESSAGES/tin.mo
|
||||
share/locale/tr/LC_MESSAGES/tin.mo
|
||||
share/tin/
|
||||
share/tin/metamutt
|
||||
share/tin/mime.types
|
||||
share/tin/opt-case.pl
|
||||
share/tin/opt-case.pl.1
|
||||
share/tin/tin.defaults
|
||||
share/tin/tinews.pl
|
||||
share/tin/url_handler.sh
|
||||
share/tin/w2r.pl
|
||||
share/tin/w2r.pl.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user