From nobody Thu Jan 26 00:47:52 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P2MWD3sLCz3byc9; Thu, 26 Jan 2023 00:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2MWD32rtz4XQ6; Thu, 26 Jan 2023 00:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674694072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIRRWaFz0vMDpHwLNIW64hfJo4oSBinuTcSUUtocWCQ=; b=TwYSFaPuURYyjz37q59r7L0TQb7dt9PafZpWclig0Ag5jkLA5uPE+bNLsfEFJbQsdSG0kb 58Q5gK1SOzgQWxYjrsqJgOSWezbz1oarr+xWFnX4gcZPmv9Rej11q8HdlfmOPX/DSXOxi3 4X7LswwRNgEe45v51r/z74J97BKI2uiJil5eQzTe8z17qETtVe1Sca82u9jQqeQXEDBrRW Lai7FLpBUaMuU6nN2B8Ytpw17aMtdjvD3VMkkmZ5ZXUxGgWRmH3pyQwEBf9v4CPFV0zfmB gcSJaIjCHZxo3+krvZiuUSP3gzE9uN6oC7otjf1nXE/F1/7XWNZivqylXd0SYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674694072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KIRRWaFz0vMDpHwLNIW64hfJo4oSBinuTcSUUtocWCQ=; b=JYFk3OyrMWVAaqA4eHTlxblAPSNIB9I+/BHDpcL9lzDg+XcN2+uAq/fCMIFRvJUNUt5eTI nk3UosvsRnIrRa1VTlPof+bxDT9J1O8Bp/ZyY2/3VYPVj5eyyGE3/HFARRiB386u4uXbw8 YegXYOAgG24XWXJuU21vG/H2+bNqb4j63lgWaicmhVEjOs2cx89H3sb4mGoImv9zvNPWzD LQHj65lI6ym+FUt46XjJZfG6+K0u8grpVYQx9894LSaNvQPGXUh/pRt1wojrrRaeAi/H/1 axAExeB8JTl0toCNvTIXtAWYpem5nGLLcYp0rPsO+MtaSjb4oTlJgWct+InhNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674694072; a=rsa-sha256; cv=none; b=skpHnc1kU8jBHHhDUHin3fVFoxxLmGf/Ud1VzYSH+r2RgIstrk8CsaMf1XgZZz+TUTwXvW vp8O36noxQ6zqRr7dT71BokAdnZVUPABIJN5WkjFJs1+DKJlYJMcHrZSPEv5SS2+k8emqc ZtImE1OMAZmaTPiy6LmNuNGkkqwqef+WCmAQmcKL8PoyTLa4g2U8b10G602jkYwRCAjvw6 eDf+SYuj/YH1qRj7mlfimywetCWH1kSRs4G69f2QBSJoGX/f6Zz6DzfgQbnFiTmFPz4RMJ HskTkMFR1LC+PC/CUQ3WDxwKzg8lNRj4Fvkk3oYFBwRlJsf9NQPtGKIBKNGGOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P2MWD1qYDz18cr; Thu, 26 Jan 2023 00:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30Q0lqCm079470; Thu, 26 Jan 2023 00:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30Q0lqLk079469; Thu, 26 Jan 2023 00:47:52 GMT (envelope-from git) Date: Thu, 26 Jan 2023 00:47:52 GMT Message-Id: <202301260047.30Q0lqLk079469@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 1afdf85df7a5 - main - news/tin: Upgrade to 2.6.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1afdf85df7a5d159615c7b2b0ef33e805b10b7f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=1afdf85df7a5d159615c7b2b0ef33e805b10b7f7 commit 1afdf85df7a5d159615c7b2b0ef33e805b10b7f7 Author: Kevin Bowling AuthorDate: 2023-01-26 00:46:48 +0000 Commit: Kevin Bowling CommitDate: 2023-01-26 00:46:48 +0000 news/tin: Upgrade to 2.6.2 Switch to PCRE2. Enable NNTPS support. Changes: http://bzr.tin.org/doc/CHANGES --- news/tin/Makefile | 94 ++++++++++++++++++++++-------------------- news/tin/distinfo | 6 +-- news/tin/files/patch-configure | 10 ++--- 3 files changed, 57 insertions(+), 53 deletions(-) diff --git a/news/tin/Makefile b/news/tin/Makefile index 80b29c1b17fd..8ba345e9678e 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -1,6 +1,5 @@ PORTNAME= tin -PORTVERSION= 2.6.1 -PORTREVISION= 2 +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}/ \ @@ -15,65 +14,70 @@ MASTER_SITES= ftp://ftp.tin.org/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= libuu.so:converters/uulib \ - libicuuc.so:devel/icu \ - libpcre.so:devel/pcre +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 shebangfix tar:bzip2 +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= GNUPG ISPELL METAMAIL CANLOCK NNTP_ONLY SLRNFACE NLS -OPTIONS_DEFAULT= GNUPG ISPELL METAMAIL -OPTIONS_SUB= yes -NNTP_ONLY_DESC= Only read news via NNTP (no spool dir support) -NNTP_ONLY_CONFIGURE_ENABLE=nntp-only -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 +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 +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+=--with-nntp-default-server=news \ - --with-spooldir=/var/news \ - --with-libdir=${PREFIX}/news/lib \ - --with-defaults-dir=${PREFIX}/etc \ - --with-editor=${TIN_EDITOR} \ - --with-pcre=${PREFIX}/lib \ - --with-screen=${TIN_SCREEN} \ - --enable-break-long-lines \ - ${ICONV_CONFIGURE_ARG} \ - --with-mime-default-charset=US-ASCII \ - --enable-ipv6 -MAKE_ARGS+= MAKE=${MAKE_CMD} -CFLAGS+= -DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -ALL_TARGET= build +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' \ @@ -97,6 +101,6 @@ 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 + ${LN} -sf tin ${STAGEDIR}${PREFIX}/bin/rtin .include diff --git a/news/tin/distinfo b/news/tin/distinfo index e958487b6d5b..576f03e07925 100644 --- a/news/tin/distinfo +++ b/news/tin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649023260 -SHA256 (tin-2.6.1.tar.bz2) = fd9f5ec962b1cbd7e48c57064a0ecd9c0de0eb7cf3e8e1ccdaacb3210dbacc8a -SIZE (tin-2.6.1.tar.bz2) = 2233970 +TIMESTAMP = 1674691088 +SHA256 (tin-2.6.2.tar.bz2) = f2a161c026c78f91536c33bd5fdf83f6fc140fbedd972fba353f2b9fa94c182a +SIZE (tin-2.6.2.tar.bz2) = 2280375 diff --git a/news/tin/files/patch-configure b/news/tin/files/patch-configure index a0abb1cf558d..d2a70f20232f 100644 --- a/news/tin/files/patch-configure +++ b/news/tin/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2022-04-03 22:04:44 UTC +--- configure.orig 2023-01-26 00:10:06 UTC +++ configure -@@ -13695,7 +13695,7 @@ case "$host_os" in +@@ -13804,7 +13804,7 @@ case "$host_os" in fi case "$host_os" in @@ -9,7 +9,7 @@ # 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 -@@ -16011,7 +16011,7 @@ case "$host_os" in +@@ -16120,7 +16120,7 @@ case "$host_os" in fi case "$host_os" in @@ -18,12 +18,12 @@ # 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 -@@ -16874,7 +16874,7 @@ case "$host_os" in +@@ -16983,7 +16983,7 @@ case "$host_os" in if test "$cf_result" = no ; then case "$host_os" in -freebsd*) +XXXfreebsd*) - echo "$as_me:16878: checking for tgoto in -lmytinfo" >&5 + 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