Attachment #209210 for bug #242036

View | Details | Raw Unified | Return to bug 242036
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	links
DISTVERSION=	2.20.2
PORTREVISION=	2
PORTEPOCH=	1
CATEGORIES=	www
MASTER_SITES=	http://links.twibright.com/download/

X11_USES=		xorg
X11_USE=		xorg=x11,xorgproto
X11_LIB_DEPENDS=	libevent.so:devel/libevent \
			libfontconfig.so:x11-fonts/fontconfig \
			libfreetype.so:print/freetype2

X11_CONFIGURE_WITH=	x
X11_PLIST_FILES=	share/pixmaps/links.xpm


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535040129	1	TIMESTAMP = 1574015007
2	SHA256 (links-2.16.tar.gz) = 83ab4557d9b121570384d1bd27adf16f962b9b007bac5780ae094e6fff6b3d62	2	SHA256 (links-2.20.2.tar.gz) = f0ec13b019e5501ef29858bf61a3bf89cece0b0f065b5064be242bce84e675bd
3	SIZE (links-2.16.tar.gz) = 7365133	3	SIZE (links-2.20.2.tar.gz) = 7063295




--- types.c.orig	2019-11-17 18:26:27 UTC
+++ types.c
@@ -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 || 
+	    (extl == 3 && !casecmp(ext, cast_uchar "htm", 3)) ||
 	    (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) {

Return to bug 242036

Lines 2-9 Link Here

(-)Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= links	4	PORTNAME= links
5	DISTVERSION= 2.16	5	DISTVERSION= 2.20.2
6	PORTREVISION= 2
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= www	7	CATEGORIES= www
9	MASTER_SITES= http://links.twibright.com/download/	8	MASTER_SITES= http://links.twibright.com/download/
Lines 62-68 Link Here
62	X11_USES= xorg	61	X11_USES= xorg
63	X11_USE= xorg=x11,xorgproto	62	X11_USE= xorg=x11,xorgproto
64	X11_LIB_DEPENDS= libevent.so:devel/libevent \	63	X11_LIB_DEPENDS= libevent.so:devel/libevent \
65	libfontconfig.so:x11-fonts/fontconfig	64	libfontconfig.so:x11-fonts/fontconfig \
		65	libfreetype.so:print/freetype2
		66
66	X11_CONFIGURE_WITH= x	67	X11_CONFIGURE_WITH= x
67	X11_PLIST_FILES= share/pixmaps/links.xpm	68	X11_PLIST_FILES= share/pixmaps/links.xpm
68		69

Lines 1-12 Link Here

(-)files/patch-types.c (-6 / +6 lines)
1	--- types.c.orig 2016-06-17 20:33:57 UTC	1	--- types.c.orig 2019-11-17 18:26:27 UTC
2	+++ types.c	2	+++ types.c
3	@@ -849,7 +849,8 @@ unsigned char *get_content_type_by_exten	3	@@ -872,7 +872,8 @@ unsigned char *get_content_type_by_extension(unsigned
4	ext = NULL;	4	ext = NULL;
5	}	5	}
6	if (ext) while (ext[extl] && ext[extl] != '.' && !dir_sep(ext[extl]) && !end_of_dir(url, ext[extl])) extl++;	6	if (ext) while (ext[extl] && ext[extl] != '.' && !dir_sep(ext[extl]) && !end_of_dir(url, ext[extl])) extl++;
7	- if ((extl == 3 && !casecmp(ext, cast_uchar "htm", 3)) \|\|	7	- if ((extl == 3 && !casecmp(ext, cast_uchar "htm", 3)) \|\|
8	+ if (force_html \|\|	8	+ if (force_html \|\|
9	+ (extl == 3 && !casecmp(ext, cast_uchar "htm", 3)) \|\|	9	+ (extl == 3 && !casecmp(ext, cast_uchar "htm", 3)) \|\|
10	(extl == 4 && !casecmp(ext, cast_uchar "html", 4))) return stracpy(cast_uchar "text/html");	10	(extl == 4 && !casecmp(ext, cast_uchar "html", 4)) \|\|
11	foreach(e, extensions) {	11	(extl == 5 && !casecmp(ext, cast_uchar "xhtml", 5))) return stracpy(cast_uchar "text/html");
12	unsigned char *fname = NULL;	12	foreach(struct list, l, ll, extensions.list_entry) {