From 30ca82a7b6fd78434ba755192ebda2d356664756 Mon Sep 17 00:00:00 2001 From: Jimmy Olgeni Date: Thu, 28 May 2020 08:01:47 +0000 Subject: [PATCH] Update www/links to version 2.20.2. PR: 242036 Submitted by: olgeni Approved by: maintainer --- www/links/Makefile | 7 ++++--- www/links/distinfo | 6 +++--- www/links/files/patch-types.c | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/www/links/Makefile b/www/links/Makefile index 73145e027b65..f426ec9c1af3 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= links -DISTVERSION= 2.16 -PORTREVISION= 2 +DISTVERSION= 2.20.2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://links.twibright.com/download/ @@ -62,7 +61,9 @@ UTF8_CONFIGURE_ENABLE= utf8 X11_USES= xorg X11_USE= xorg=x11,xorgproto X11_LIB_DEPENDS= libevent.so:devel/libevent \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + X11_CONFIGURE_WITH= x X11_PLIST_FILES= share/pixmaps/links.xpm diff --git a/www/links/distinfo b/www/links/distinfo index e9b5f5164ae1..e725e0f6a3b2 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535040129 -SHA256 (links-2.16.tar.gz) = 83ab4557d9b121570384d1bd27adf16f962b9b007bac5780ae094e6fff6b3d62 -SIZE (links-2.16.tar.gz) = 7365133 +TIMESTAMP = 1574015007 +SHA256 (links-2.20.2.tar.gz) = f0ec13b019e5501ef29858bf61a3bf89cece0b0f065b5064be242bce84e675bd +SIZE (links-2.20.2.tar.gz) = 7063295 diff --git a/www/links/files/patch-types.c b/www/links/files/patch-types.c index 96810352f3ee..757cc10bbde6 100644 --- a/www/links/files/patch-types.c +++ b/www/links/files/patch-types.c @@ -1,12 +1,12 @@ ---- types.c.orig 2016-06-17 20:33:57 UTC +--- types.c.orig 2019-11-17 18:26:27 UTC +++ types.c -@@ -849,7 +849,8 @@ unsigned char *get_content_type_by_exten +@@ -872,7 +872,8 @@ unsigned char *get_content_type_by_extension(unsigned ext = NULL; } if (ext) while (ext[extl] && ext[extl] != '.' && !dir_sep(ext[extl]) && !end_of_dir(url, ext[extl])) extl++; - if ((extl == 3 && !casecmp(ext, cast_uchar "htm", 3)) || -+ if (force_html || ++ if (force_html || + (extl == 3 && !casecmp(ext, cast_uchar "htm", 3)) || - (extl == 4 && !casecmp(ext, cast_uchar "html", 4))) return stracpy(cast_uchar "text/html"); - foreach(e, extensions) { - unsigned char *fname = NULL; + (extl == 4 && !casecmp(ext, cast_uchar "html", 4)) || + (extl == 5 && !casecmp(ext, cast_uchar "xhtml", 5))) return stracpy(cast_uchar "text/html"); + foreach(struct list, l, ll, extensions.list_entry) {