diff --git a/news/tin/Makefile b/news/tin/Makefile index 98f68716f3a..6fb310720e3 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -2,11 +2,9 @@ COMMENT= threaded NNTP- and spool-based UseNet newsreader DISTNAME= tin-${MAJORVERSION}.${PATCHLEVEL} MAJORVERSION= 2.6 -PATCHLEVEL= 4 +PATCHLEVEL= 5 CATEGORIES= news -REVISION= 0 - # stable first will allow pprtroach to find updates for a new major version, # v${MAJORVERSION} as a fallback allows fetching distfiles from an old stable SITES= https://sunsite.icm.edu.pl/pub/unix/news/tin/stable/ \ @@ -21,33 +19,38 @@ HOMEPAGE= http://www.tin.org/ # vms/vms.c PERMIT_PACKAGE= Yes -WANTLIB += c curses iconv icui18n icuuc idn2 intl pcre2-8 uriparser z +WANTLIB += c crypto curses iconv icui18n icuuc idn2 intl pcre2-8 +WANTLIB += tls uriparser z -CONFIGURE_STYLE= autoconf no-autoheader -AUTOCONF_VERSION= 2.69 +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 \ - --without-pgpk \ - --with-gpg=${LOCALBASE}/bin/gpg \ - --without-socks \ - --without-socks5 \ - --without-slrnface \ - --disable-gsasl \ - --with-screen=ncurses \ - --with-pcre2-config=${LOCALBASE}/bin/pcre2-config \ - --with-libdir=${PREFIX}/lib/news \ - --with-spooldir=${VARBASE}/spool/news \ - --enable-break-long-lines \ - --enable-ipv6 \ - --without-x +CONFIGURE_ARGS= --enable-break-long-lines \ + --enable-ipv6 \ + --with-gpg=${LOCALBASE}/bin/gpg \ + --disable-gsasl \ + --with-ispell=${LOCALBASE}/bin/ispell \ + --with-libdir=${PREFIX}/lib/news \ + --without-metamail \ + --with-nntps=libtls \ + --without-pgp \ + --without-pgpk \ + --with-pcre2-config=${LOCALBASE}/bin/pcre2-config \ + --without-socks \ + --without-socks5 \ + --without-slrnface \ + --with-screen=ncurses \ + --with-spooldir=${VARBASE}/spool/news \ + --without-x + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + ac_cv_header_uudeview_h=no \ + ac_cv_lib_uu_UUInitialize=yes \ + ac_cv_sys_long_file_names=yes BUILD_DEPENDS= devel/gettext,-tools -LIB_DEPENDS+= devel/pcre2 \ +LIB_DEPENDS= devel/pcre2 \ devel/gettext,-runtime \ devel/libidn2 \ textproc/icu4c \ diff --git a/news/tin/distinfo b/news/tin/distinfo index bc8c6a7f884..da85a02656d 100644 --- a/news/tin/distinfo +++ b/news/tin/distinfo @@ -1,2 +1,2 @@ -SHA256 (tin-2.6.4.tar.gz) = Ulrenmauz6CpiD018s9M3MjiS5eel2I7EM6ljWP2S3g= -SIZE (tin-2.6.4.tar.gz) = 3486058 +SHA256 (tin-2.6.5.tar.gz) = Zdd/wZ8YjtNLBiKL/K2y0WTJAaSVNE/imRJYLLmG1Do= +SIZE (tin-2.6.5.tar.gz) = 3926828 diff --git a/news/tin/patches/patch-configure_in b/news/tin/patches/patch-configure_in deleted file mode 100644 index 1a813f3f3fc..00000000000 --- a/news/tin/patches/patch-configure_in +++ /dev/null @@ -1,43 +0,0 @@ -Index: configure.in ---- configure.in.orig -+++ configure.in -@@ -1174,16 +1174,19 @@ if test $ac_cv_nl_item = yes; then - AC_DEFINE(HAVE_NL_ITEM,1,[Define this to 1 if we have header nl_types.h]) - fi - -+ -+ # ICU - International Components for Unicode - ### Checks for libraries. - # libuu/uudeview - # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found --AC_CHECK_LIB(uu, UUInitialize, -- [AC_CHECK_HEADER(uudeview.h, -- [AC_DEFINE(HAVE_LIBUU,1,[Define this to 1 if we have library uu]) -- AC_DEFINE(HAVE_UUDEVIEW_H,1,[Define this to 1 if we have header uudeview.h]) -- LIBS="$LIBS -luu"] -- )] --) -+dnl Disable to make sure the package does not change if someone ever ports this -+dnl AC_CHECK_LIB(uu, UUInitialize, -+dnl [AC_CHECK_HEADER(uudeview.h, -+dnl [AC_DEFINE(HAVE_LIBUU,1,[Define this to 1 if we have library uu]) -+dnl AC_DEFINE(HAVE_UUDEVIEW_H,1,[Define this to 1 if we have header uudeview.h]) -+dnl LIBS="$LIBS -luu"] -+dnl )] -+dnl ) - - - # ICU - International Components for Unicode -@@ -1584,7 +1587,11 @@ CF_TERMIOS - CF_PW_GECOS - CF_TM_GMTOFF - --AC_SYS_LONG_FILE_NAMES -+dnl AC_SYS_LONG_FILE_NAMES tries to write to /usr and thus fails if /usr is -+dnl mounted read-only. Since OpenBSD always supports long filenames, set the -+dnl flag unconditionally. -+dnl AC_SYS_LONG_FILE_NAMES -+AC_DEFINE(HAVE_LONG_FILE_NAMES) - CF_FUNC_SYSTEM - - # Check if we are trying to use curses+color, but cannot diff --git a/news/tin/patches/patch-src_Makefile_in b/news/tin/patches/patch-src_Makefile_in index 70b31288bf0..140b19f1d0e 100644 --- a/news/tin/patches/patch-src_Makefile_in +++ b/news/tin/patches/patch-src_Makefile_in @@ -7,9 +7,9 @@ Index: src/Makefile.in INS_BINARY_DIR = @bindir@ +INS_DATA_DIR = @datadir@/tin INS_MANUAL_DIR = @mandir@/man - INS_SYSDEF_DIR = @TIN_DEFAULTS_DIR@ - INS_MANUAL_EXT = 1 -@@ -333,6 +334,7 @@ help : + MANUAL_DIR = @mandir@ + DEST_MAN = $(DESTDIR)$(MANUAL_DIR) +@@ -339,6 +340,7 @@ help : $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) \ $(DESTDIR)$(INS_MANUAL_DIR)5 \ $(DESTDIR)$(INS_BINARY_DIR) \ @@ -17,7 +17,7 @@ Index: src/Makefile.in $(DESTDIR)$(INS_SYSDEF_DIR) : mkdir -p $@ -@@ -341,11 +343,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MAN +@@ -347,11 +349,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MAN @$(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 @@ -29,7 +29,7 @@ Index: src/Makefile.in uninstall_manpage : @$(ECHO) "Uninstalling $(PROJECT) manual page in $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) ..." -@@ -383,13 +380,13 @@ uninstall_sysdefs : +@@ -410,13 +407,13 @@ uninstall_sysdefs : @-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults @-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types diff --git a/news/tin/patches/patch-src_parsdate_y b/news/tin/patches/patch-src_parsdate_y index 1073d73d9a7..34340378c6a 100644 --- a/news/tin/patches/patch-src_parsdate_y +++ b/news/tin/patches/patch-src_parsdate_y @@ -1,7 +1,7 @@ Index: src/parsdate.y --- src/parsdate.y.orig +++ src/parsdate.y -@@ -523,6 +523,7 @@ Convert( +@@ -522,6 +522,7 @@ Convert( static const int DaysLeap[13] = { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; @@ -9,7 +9,7 @@ Index: src/parsdate.y static const int LeapYears[] = { 1972, 1976, 1980, 1984, 1988, 1992, 1996, 2000, 2004, 2008, 2012, 2016, 2020, 2024, -@@ -550,7 +551,9 @@ Convert( +@@ -549,7 +550,9 @@ Convert( mp = DaysLeap; break; } diff --git a/news/tin/pkg/PLIST b/news/tin/pkg/PLIST index 32493f7a008..6f9ec59ced7 100644 --- a/news/tin/pkg/PLIST +++ b/news/tin/pkg/PLIST @@ -8,39 +8,19 @@ bin/rtin @man man/man1/url_handler.pl.1 @man man/man1/w2r.pl.1 @man man/man5/tin.5 -share/locale/ -share/locale/da/ -share/locale/da/LC_MESSAGES/ share/locale/da/LC_MESSAGES/tin.mo -share/locale/de/ -share/locale/de/LC_MESSAGES/ share/locale/de/LC_MESSAGES/tin.mo share/locale/en_GB/ share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/tin.mo -share/locale/es/ -share/locale/es/LC_MESSAGES/ share/locale/es/LC_MESSAGES/tin.mo -share/locale/et/ -share/locale/et/LC_MESSAGES/ share/locale/et/LC_MESSAGES/tin.mo -share/locale/fr/ -share/locale/fr/LC_MESSAGES/ share/locale/fr/LC_MESSAGES/tin.mo -share/locale/ru/ -share/locale/ru/LC_MESSAGES/ +share/locale/ro/LC_MESSAGES/tin.mo share/locale/ru/LC_MESSAGES/tin.mo -share/locale/sv/ -share/locale/sv/LC_MESSAGES/ share/locale/sv/LC_MESSAGES/tin.mo -share/locale/tr/ -share/locale/tr/LC_MESSAGES/ share/locale/tr/LC_MESSAGES/tin.mo -share/locale/zh_CN/ -share/locale/zh_CN/LC_MESSAGES/ share/locale/zh_CN/LC_MESSAGES/tin.mo -share/locale/zh_TW/ -share/locale/zh_TW/LC_MESSAGES/ share/locale/zh_TW/LC_MESSAGES/tin.mo share/tin/ share/tin/metamutt