From nobody Sun Jul 14 18:03:39 2024 X-Original-To: dev-commits-ports-main@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 4WMY9R3KWlz5R5rt; Sun, 14 Jul 2024 18:03:39 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WMY9R2PsKz4Vm9; Sun, 14 Jul 2024 18:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720980219; 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=9XlLkz18ddWN6Kkd6u8SWm3c6hsDC/MNnljkjHv6/pU=; b=wBkRLnMHrxBEuxnRG4LpyOnjUmI1JLSXmRyQ14qhREZSOL50w7EfhmpPp++49ihY8c59RA 3qArEg5xm15caMy1leOXc/8e3LhX9Fvz6BEd+xpsZVpXTbYKaA/2W8XYuPDziVC8mAoUle fxOXsAFSDVjmS+XYRZQg8J4FtrQnwMvqXdYzXJWnbtgz5bCtHPzZmmokG7HlgeidWEhNHI sZoNxr9mggxOh9lVeCn/+Seex0a8BHq0ljY4dKw8mg/jmyJyDI8iIiuFND/J1fN6KJXXVj 0IVq8Hb8U7iSnkkADgxsJWx+pIamNZGjlROrmB+Gfm2w2NxkgLzOykHJ3M9BcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720980219; a=rsa-sha256; cv=none; b=BrbKycKAdZpBbh6Texdyoyvkf93JmN4+LQ+ZsQ1TvOxKbjyIfAwGC9K1w64iN7fGKMdthv wnWKA8LN/MkkT7UWKaTWlmWom/KtFqNudKJU+3Oba4wkn5oJ7WACmRNDGUzCGEp6gf9uyd DAkMbubVLhp1Fq/1oqf0eWc0RicbFwN85R1c0tjGBHgGU7qMnXezt496us3fWz6IMLfYJO eTGmW3TqHdTJhi0YGDaaWkD0C05J120SsNL//63ag0+Pbrsz9T2cwqCjshJzFQVa/8gYZn c7t8awdbuxRlr1GQYXoRyHxOKQ+ZBklyvQrHtDFXqgd5UaFwJz+/K+cdfTeWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720980219; 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=9XlLkz18ddWN6Kkd6u8SWm3c6hsDC/MNnljkjHv6/pU=; b=geU6jTRpOwkRAIGn7XNC3zNJySXDwhmUcgJ1luAYIs2gNdHzogTZW0p9zFdObxGjtcennF 859xUURt/nVjCz+rvI3W9n+pkB+R/U67yq7zZE5oEqYUaInM2ZX4E8HyQLO3JZQDX2BnFt h4glN2REf87Wp2kYVMGHTKy4uuccc8sO7NFaVH2OwSz6X4Le3UkfTV3lTAWbwqtDcrMq/L BL1Tk3Y7rrcms9U9CM84xfw89HUj3yWP5qPiHzQlio0u+xaRdoIEA8SHRsU+Qml5vxOYSq 0Y6LRgrKrLUg1zifaccZBAurmTyXIkkjusX3iGc1NzCEr7SgALgB68xdGMBHcQ== 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 4WMY9R1yrvzJkt; Sun, 14 Jul 2024 18:03:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46EI3dAB075975; Sun, 14 Jul 2024 18:03:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46EI3dkX075972; Sun, 14 Jul 2024 18:03:39 GMT (envelope-from git) Date: Sun, 14 Jul 2024 18:03:39 GMT Message-Id: <202407141803.46EI3dkX075972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: d7d7504d0bd6 - main - news/tin: Improve port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7d7504d0bd63b96c93f9641c9718a0f7b1dcb2f Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7d7504d0bd63b96c93f9641c9718a0f7b1dcb2f commit d7d7504d0bd63b96c93f9641c9718a0f7b1dcb2f Author: Daniel Engberg AuthorDate: 2024-07-14 17:53:38 +0000 Commit: Daniel Engberg CommitDate: 2024-07-14 18:03:27 +0000 news/tin: Improve port * Switch from PORTVERSION to DISTVERSION * Clean up MASTER_SITES and use upstream main site as backup * Switch to xz release tarball * Use helpers whenever possible and USES= localbase:ldflags * Sort CONFIGURE_ARGS as they're listed when executing ./configure --help * Sort OPTIONS * Rearrange Makefile to closer match Porters Handbook PR: 280279 Reviewed by: kbowling --- news/tin/Makefile | 138 +++++++++++++++++++++++++++--------------------------- news/tin/distinfo | 6 +-- 2 files changed, 71 insertions(+), 73 deletions(-) diff --git a/news/tin/Makefile b/news/tin/Makefile index b0c1704bcda5..d886e21ee363 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -1,21 +1,11 @@ PORTNAME= tin -PORTVERSION= 2.6.3 +DISTVERSION= 2.6.3 PORTREVISION= 1 -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 +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/ @@ -26,83 +16,91 @@ LIB_DEPENDS= libicuuc.so:devel/icu \ libuu.so:converters/uulib RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support -USES= gmake iconv ncurses pkgconfig shebangfix tar:bzip2 +USES= gmake iconv localbase:ldflags ncurses pkgconfig shebangfix \ + tar:xz +SHEBANG_FILES= tools/*.pl + GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -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 +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 -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 +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 - -# --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 +SLRNFACE_CONFIGURE_WITH= slrnface=slrnface post-patch: ${REINPLACE_CMD} -Ee 's:5/(mmdf|mbox):5/tin_\1:g' \ - ${WRKSRC}/src/Makefile.in + ${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 + -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 + -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 + -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 + ${STAGEDIR}${PREFIX}/etc/tin.defaults.sample ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tin - ${LN} -sf tin ${STAGEDIR}${PREFIX}/bin/rtin + ${RLN} tin ${STAGEDIR}${PREFIX}/bin/rtin .include diff --git a/news/tin/distinfo b/news/tin/distinfo index fe4024288891..e97ccc9f770a 100644 --- a/news/tin/distinfo +++ b/news/tin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1705619907 -SHA256 (tin-2.6.3.tar.bz2) = 2dc3fcd9779f6deae455d830ed965da492f4c5f3f4176358c59625a46934cca9 -SIZE (tin-2.6.3.tar.bz2) = 2359812 +TIMESTAMP = 1720961875 +SHA256 (tin-2.6.3.tar.xz) = bf7ae8cfdc6ab6bc5aced4f08cf13687d8d6f9fa4be1690dfda5d123188d2217 +SIZE (tin-2.6.3.tar.xz) = 1639192