git: 19b09a4fbf4b - main - www/links: update the port to version 2.29, adjust conflicts

The branch main has been updated by danfe:

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

commit 19b09a4fbf4b15639f1a2e96ef19638c905aebc6
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-04-12 08:04:16 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-04-12 08:04:16 +0000

    www/links: update the port to version 2.29, adjust conflicts
    
    Some notable changes in this version:
    
      - Implemented strike formatting
      - Bugfix: image was sometimes displayed with too small size
      - Bugfix: WEBP images from local disk could not be displayed
      - Added support for AVIF images
      - Updated Polish translation
    
    Approved by:    maintainer timeout
---
 www/links/Makefile | 13 +++++++------
 www/links/distinfo |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/www/links/Makefile b/www/links/Makefile
index a71522999d1a..40147695e7a2 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	links
-PORTVERSION=	2.28
+PORTVERSION=	2.29
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://links.twibright.com/download/
@@ -11,7 +11,7 @@ WWW=		http://links.twibright.com/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	links-0* links-hacked links1
+CONFLICTS_INSTALL=	links1
 
 LIB_DEPENDS=	libzstd.so:archivers/zstd
 
@@ -70,7 +70,8 @@ X11_PLIST_FILES=	share/pixmaps/links.xpm
 CIPHERSTRING?=	HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH
 
 .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libpng.so:graphics/png \
+LIB_DEPENDS+=	libavif.so:graphics/libavif \
+		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp
 USES+=		jpeg pkgconfig
@@ -79,9 +80,9 @@ CONFIGURE_ARGS+=	--enable-graphics
 .if ${PORT_OPTIONS:MSVG}
 IGNORE=	option SVG requires one of DIRECTFB, SVGALIB, or X11
 .endif
-CONFIGURE_ARGS+=	--disable-graphics --without-libjpeg \
-			--without-librsvg --without-libtiff \
-			--without-libwebp
+CONFIGURE_ARGS+=	--disable-graphics --without-libavif \
+			--without-libjpeg --without-librsvg \
+			--without-libtiff --without-libwebp
 .endif
 
 .if ${PORT_OPTIONS:MX11}
diff --git a/www/links/distinfo b/www/links/distinfo
index 882bc8ac7d7c..44ebb90f38e1 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664624497
-SHA256 (links-2.28.tar.bz2) = 2fd5499b13dee59457c132c167b8495c40deda75389489c6cccb683193f454b4
-SIZE (links-2.28.tar.bz2) = 6512800
+TIMESTAMP = 1679424666
+SHA256 (links-2.29.tar.bz2) = 22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998
+SIZE (links-2.29.tar.bz2) = 6521024