git: d7d7504d0bd6 - main - news/tin: Improve port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sun, 14 Jul 2024 18:03:39 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d7d7504d0bd63b96c93f9641c9718a0f7b1dcb2f

commit d7d7504d0bd63b96c93f9641c9718a0f7b1dcb2f
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-07-14 17:53:38 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
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 <bsd.port.mk>
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