diff --git a/news/tin/Makefile b/news/tin/Makefile index d886e21ee363..9697a5802b14 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -1,106 +1,105 @@ PORTNAME= tin -DISTVERSION= 2.6.3 -PORTREVISION= 1 +DISTVERSION= 2.6.4 CATEGORIES= news MASTER_SITES= https://ftp.icm.edu.pl/pub/unix/news/tin/v${DISTVERSION:R}/ \ ftp://ftp.tin.org/pub/news/clients/tin/v${DISTVERSION:R}/ MAINTAINER= kbowling@FreeBSD.org COMMENT= Easy-to-use threaded newsreader with NOV/NNTP support WWW= http://www.tin.org/ LICENSE= BSD3CLAUSE LIB_DEPENDS= libicuuc.so:devel/icu \ libpcre2-8.so:devel/pcre2 \ libuu.so:converters/uulib RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support USES= gmake iconv localbase:ldflags ncurses pkgconfig shebangfix \ tar:xz SHEBANG_FILES= tools/*.pl GNU_CONFIGURE= yes TIN_EDITOR?= /usr/bin/ee TIN_SCREEN?= ncursesw ALL_TARGET= build CFLAGS+= -DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\" MAKE_ARGS+= MAKE=${MAKE_CMD} CONFIGURE_ARGS= --with-editor=${TIN_EDITOR} \ --with-libdir=${PREFIX}/news/lib \ --with-spooldir=/var/news \ --with-screen=${TIN_SCREEN} \ --with-pcre2-config=${PREFIX}/bin/pcre2-config \ --with-nntp-default-server=news \ --enable-break-long-lines \ --with-mime-default-charset=US-ASCII \ --with-defaults-dir=${PREFIX}/etc \ --enable-ipv6 \ ${ICONV_CONFIGURE_ARG} OPTIONS_DEFINE= CANLOCK GNUPG ISPELL METAMAIL NLS NNTP_ONLY \ NNTPS SLRNFACE OPTIONS_DEFAULT= GNUPG ISPELL METAMAIL NNTPS OPTIONS_SUB= yes CANLOCK_DESC= Enable Cancel-Lock key support via libcanlock METAMAIL_DESC= Use metamail to handle MIME attachments NNTP_ONLY_DESC= Only read news via NNTP (no spool dir support) NNTPS_DESC= Enable NNTPS SLRNFACE_DESC= Use slrnface to displace sender images CANLOCK_CONFIGURE_ENABLE= cancel-locks ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell ISPELL_CONFIGURE_ON= --with-ispell=${LOCALBASE}/bin/ispell GNUPG_RUN_DEPENDS= gpg:security/gnupg GNUPG_CONFIGURE_ON= --with-gpg=${LOCALBASE}/bin/gpg \ --without-pgp \ --without-pgpk GNUPG_CONFIGURE_OFF= --disable-pgp-gpg METAMAIL_RUN_DEPENDS= metamail:mail/metamail METAMAIL_CONFIGURE_ON= --with-metamail=${LOCALBASE}/bin/metamail NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NNTP_ONLY_CONFIGURE_ENABLE= nntp-only NNTPS_USES= ssl NNTPS_CONFIGURE_ON= --with-nntps SLRNFACE_BUILD_DEPENDS= slrnface:news/slrnface SLRNFACE_RUN_DEPENDS= slrnface:news/slrnface SLRNFACE_CONFIGURE_WITH= slrnface=slrnface post-patch: ${REINPLACE_CMD} -Ee 's:5/(mmdf|mbox):5/tin_\1:g' \ ${WRKSRC}/src/Makefile.in ${REINPLACE_CMD} -e 's:/var/spool/news:/var/news:g' \ -e 's:/etc/nntpserver:${PREFIX}/etc/nntpserver:g' \ -e 's:/usr/lib/news:${PREFIX}/news/lib:g' \ -e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \ -e 's:url_handler\.pl:tinurl_handler.pl:g' \ ${WRKSRC}/doc/tin.1 ${WRKSRC}/doc/tin.5 ${REINPLACE_CMD} \ -e 's:/etc/mime\.types:${PREFIX}/etc/mime.types:g' \ ${WRKSRC}/src/mimetypes.c ${REINPLACE_CMD} \ -e 's:url_handler\.pl:tinurl_handler.pl:g' \ ${WRKSRC}/src/Makefile.in ${WRKSRC}/include/tin.h ${MV} ${WRKSRC}/tools/url_handler.pl \ ${WRKSRC}/tools/tinurl_handler.pl post-install: ${INSTALL_DATA} ${WRKSRC}/doc/tin.defaults \ ${STAGEDIR}${PREFIX}/etc/tin.defaults.sample ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tin ${RLN} tin ${STAGEDIR}${PREFIX}/bin/rtin .include diff --git a/news/tin/distinfo b/news/tin/distinfo index e97ccc9f770a..74b7011b447b 100644 --- a/news/tin/distinfo +++ b/news/tin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1720961875 -SHA256 (tin-2.6.3.tar.xz) = bf7ae8cfdc6ab6bc5aced4f08cf13687d8d6f9fa4be1690dfda5d123188d2217 -SIZE (tin-2.6.3.tar.xz) = 1639192 +TIMESTAMP = 1735122478 +SHA256 (tin-2.6.4.tar.xz) = c66a1e8db30ddabe7e3313e6870f7877fe20f0da99afb65db3d8c41012fe55f7 +SIZE (tin-2.6.4.tar.xz) = 1640064 diff --git a/news/tin/files/patch-configure b/news/tin/files/patch-configure index e9fa9640d679..f8f6b20a4cd7 100644 --- a/news/tin/files/patch-configure +++ b/news/tin/files/patch-configure @@ -1,49 +1,49 @@ ---- configure.orig 2023-12-23 23:38:33 UTC +--- configure.orig 2024-12-23 23:19:03 UTC +++ configure -@@ -14931,7 +14931,7 @@ case "$host_os" in +@@ -15326,7 +15326,7 @@ case "$host_os" in fi case "$host_os" in -freebsd*) +XXXfreebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then -@@ -17249,7 +17249,7 @@ case "$host_os" in +@@ -17644,7 +17644,7 @@ case "$host_os" in fi case "$host_os" in -freebsd*) +XXXfreebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then -@@ -18116,7 +18116,7 @@ case "$host_os" in +@@ -18511,7 +18511,7 @@ case "$host_os" in if test "$cf_result" = no ; then case "$host_os" in -freebsd*) +XXXfreebsd*) - echo "$as_me:18120: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:18515: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then -@@ -22699,13 +22699,15 @@ echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6 - echo "$as_me:22699: checking for OpenSSL" >&5 +@@ -23085,13 +23085,15 @@ echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6 + echo "$as_me:23085: checking for OpenSSL" >&5 echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6 -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "openssl"; then - test -n "$verbose" && echo " found package openssl" 1>&6 +## FreeBSD: Work around stupidity where base doesn't ship openssl pkg-config data +#if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "openssl"; then +# test -n "$verbose" && echo " found package openssl" 1>&6 +if true; then - echo "${as_me:-configure}:22705: testing found package openssl ..." 1>&5 + echo "${as_me:-configure}:23091: testing found package openssl ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags "openssl" 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs "openssl" 2>/dev/null`" + cf_pkgconfig_incs="" + cf_pkgconfig_libs="-lssl -lcrypto" test -n "$verbose" && echo " package openssl CFLAGS: $cf_pkgconfig_incs" 1>&6 - echo "${as_me:-configure}:22711: testing package openssl CFLAGS: $cf_pkgconfig_incs ..." 1>&5 + echo "${as_me:-configure}:23097: testing package openssl CFLAGS: $cf_pkgconfig_incs ..." 1>&5