diff --git a/news/tin/Makefile b/news/tin/Makefile index 8ba345e9678e..5a1a312c8efd 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -1,106 +1,106 @@ PORTNAME= tin PORTVERSION= 2.6.2 CATEGORIES+= news MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \ ftp://sunsite.icm.edu.pl/pub/unix/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.ka.nu/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.tau.ac.il/pub/unix/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.funet.fi/pub/unix/news/tin-unoff/ \ ftp://ftp.lip6.fr/pub/unix/news/readers/tin-unoff/ \ ftp://ftp.karlsruhe.org/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/v${PORTVERSION:R}/ \ ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/v${PORTVERSION:R}/ \ ftp://ftp.informatik.uni-hamburg.de/pub/soft/news/tin/v${PORTVERSION:R}/ -MAINTAINER= kbowling@FreeBSD.org +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 ncurses pkgconfig shebangfix tar:bzip2 GNU_CONFIGURE= yes SHEBANG_FILES= tools/opt-case.pl tools/tinews.pl tools/url_handler.pl \ tools/w2r.pl TIN_EDITOR?= /usr/bin/ee TIN_SCREEN?= ncursesw OPTIONS_DEFINE= CANLOCK GNUPG ISPELL METAMAIL NLS NNTP_ONLY \ NNTPS SLRNFACE OPTIONS_DEFAULT= GNUPG ISPELL METAMAIL NNTPS OPTIONS_SUB= yes NNTP_ONLY_DESC= Only read news via NNTP (no spool dir support) NNTP_ONLY_CONFIGURE_ENABLE= nntp-only NNTPS_DESC= Enable NNTPS NNTPS_USES= ssl NNTPS_CONFIGURE_ON= --with-nntps GNUPG_RUN_DEPENDS= gpg:security/gnupg GNUPG_CONFIGURE_ON= --with-gpg=${LOCALBASE}/bin/gpg \ --without-pgp \ --without-pgpk GNUPG_CONFIGURE_OFF= --disable-pgp-gpg ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell ISPELL_CONFIGURE_ON= --with-ispell=${LOCALBASE}/bin/ispell METAMAIL_DESC?= Use metamail to handle MIME attachments METAMAIL_RUN_DEPENDS= metamail:mail/metamail METAMAIL_CONFIGURE_ON= --with-metamail=${LOCALBASE}/bin/metamail CANLOCK_DESC= Enable Cancel-Lock key support via libcanlock CANLOCK_CONFIGURE_ENABLE= cancel-locks NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SLRNFACE_DESC?= Use slrnface to displace sender images SLRNFACE_CONFIGURE_WITH= slrnface=slrnface SLRNFACE_BUILD_DEPENDS= slrnface:news/slrnface SLRNFACE_RUN_DEPENDS= slrnface:news/slrnface # --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii # national environment. CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} \ --enable-break-long-lines \ --enable-ipv6 \ --with-defaults-dir=${PREFIX}/etc \ --with-editor=${TIN_EDITOR} \ --with-libdir=${PREFIX}/news/lib \ --with-mime-default-charset=US-ASCII \ --with-nntp-default-server=news \ --with-pcre2-config=${PREFIX}/bin/pcre2-config \ --with-screen=${TIN_SCREEN} \ --with-spooldir=/var/news MAKE_ARGS+= MAKE=${MAKE_CMD} CFLAGS+= -DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ALL_TARGET= build 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 ${LN} -sf tin ${STAGEDIR}${PREFIX}/bin/rtin .include diff --git a/news/tin/files/patch-configure b/news/tin/files/patch-configure index d2a70f20232f..9ffb404a5c78 100644 --- a/news/tin/files/patch-configure +++ b/news/tin/files/patch-configure @@ -1,29 +1,49 @@ ---- configure.orig 2023-01-26 00:10:06 UTC +--- configure.orig 2022-12-24 23:00:29 UTC +++ configure @@ -13804,7 +13804,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 @@ -16120,7 +16120,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 @@ -16983,7 +16983,7 @@ case "$host_os" in if test "$cf_result" = no ; then case "$host_os" in -freebsd*) +XXXfreebsd*) echo "$as_me:16987: 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 +@@ -21363,13 +21363,15 @@ fi + + if test "$enable_nntps" = "yes" && test "$have_libtls" = "no" || test "$enable_nntps" = "openssl"; then + +-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}:21369: 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}:21375: testing package openssl CFLAGS: $cf_pkgconfig_incs ..." 1>&5 diff --git a/news/tin/files/patch-include_autoconf.hin b/news/tin/files/patch-include_autoconf.hin index c5b87df17956..efea776aee4b 100644 --- a/news/tin/files/patch-include_autoconf.hin +++ b/news/tin/files/patch-include_autoconf.hin @@ -1,10 +1,10 @@ ---- include/autoconf.hin.orig 2015-11-22 01:15:52.000000000 +0100 -+++ include/autoconf.hin 2016-01-16 18:09:27.785884000 +0100 -@@ -46,7 +46,6 @@ +--- include/autoconf.hin.orig 2022-12-09 09:03:48 UTC ++++ include/autoconf.hin +@@ -49,7 +49,6 @@ /* compiler, compilerflags, ... */ # undef TIN_CC -# undef TIN_CFLAGS # undef TIN_CPP # undef TIN_CPPFLAGS # undef TIN_LD