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

(-)links/Makefile (-23 / +29 lines)
Lines 6-57 Link Here
6
#
6
#
7
7
8
PORTNAME=	links
8
PORTNAME=	links
9
PORTVERSION=	2.1.p28
9
DISTVERSION=	2.1pre33
10
PORTEPOCH=	1
10
PORTEPOCH=	1
11
CATEGORIES?=	www
11
CATEGORIES=	www
12
MASTER_SITES=	http://links.twibright.com/download/
12
MASTER_SITES=	http://links.twibright.com/download/
13
DISTNAME=	${PORTNAME}-2.1pre28
14
13
15
MAINTAINER?=	demon@FreeBSD.org
14
MAINTAINER=	demon@FreeBSD.org
16
COMMENT=	Lynx-like text WWW browser
15
COMMENT=	Lynx-like text WWW browser
17
16
18
LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
17
CONFLICTS=	links-0*
19
18
20
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=		yes
21
CONFIGURE_ARGS+=	--enable-javascript --with-ssl
20
CONFIGURE_ARGS+=	--with-ssl --without-pmshell --without-atheos --without-gpm \
22
CONFIGURE_ENV+=	CPPFLAGS='-I${LOCALBASE}/include'
21
			--without-fb
23
LDFLAGS+=	-L${LOCALBASE}/lib
22
CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
23
LDFLAGS+=		-L${LOCALBASE}/lib
24
24
25
USE_OPENSSL=	yes
25
USE_OPENSSL=	yes
26
USE_BZIP2=	yes
26
USE_BZIP2=	yes
27
27
28
OPTIONS=	SVGALIB "non-X11 graphics support" off \
28
OPTIONS=	SVGALIB "non-X11 graphics support" off \
29
		DIRECTFB "directfb driver support" off \
29
		X11 "X11 graphics support" on
30
		X11 "X11 graphics support" on
30
31
31
.include <bsd.port.pre.mk>
32
.include <bsd.port.pre.mk>
32
33
33
.if defined(WITH_SVGALIB)
34
.ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB)
34
LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib \
35
LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
35
		png.5:${PORTSDIR}/graphics/png \
36
		jpeg.9:${PORTSDIR}/graphics/jpeg \
36
		jpeg.9:${PORTSDIR}/graphics/jpeg \
37
		tiff.4:${PORTSDIR}/graphics/tiff
37
		tiff.4:${PORTSDIR}/graphics/tiff
38
CONFIGURE_ARGS+=	--enable-graphics
38
CONFIGURE_ARGS+=	--enable-graphics
39
OPTIONS_MESG=	"non-X11 graphics support enabled, "
39
.else
40
CONFIGURE_ARGS+=	--disable-graphics --without-libjpeg --without-libtiff
41
.endif
42
43
.ifdef(WITH_SVGALIB)
44
LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
45
CONFIGURE_ARGS+=	--with-svgalib
40
.else
46
.else
41
CONFIGURE_ARGS+=	--without-svgalib
47
CONFIGURE_ARGS+=	--without-svgalib
42
OPTIONS_MESG=	"non-X11 graphics support disabled, "
48
.endif
49
50
.ifdef(WITH_DIRECTFB)
51
LIB_DEPENDS+=		libdirectfb:${PORTSDIR}/devel/directfb
52
CONFIGURE_ARGS+=	--with-directfb
53
.else
54
CONFIGURE_ARGS+=	--without-directfb
43
.endif
55
.endif
44
56
45
.if !defined(WITHOUT_X11)
57
.if !defined(WITHOUT_X11)
46
LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
58
USE_XORG=	x11 xproto
47
		jpeg.9:${PORTSDIR}/graphics/jpeg \
59
CONFIGURE_ARGS+=	--with-x
48
		tiff.4:${PORTSDIR}/graphics/tiff
49
USE_XLIB=	yes
50
CONFIGURE_ARGS+=	--enable-graphics --with-x
51
OPTIONS_MESG+=	"X11 graphics support enabled."
52
.else
60
.else
53
CONFIGURE_ARGS+=	--without-x
61
CONFIGURE_ARGS+=	--without-x
54
OPTIONS_MESG+=	"X11 graphics support disabled."
55
.endif
62
.endif
56
63
57
MAN1=		links.1
64
MAN1=		links.1
Lines 61-66 Link Here
61
		@${ECHO_MSG} ${OPTIONS_MESG}
68
		@${ECHO_MSG} ${OPTIONS_MESG}
62
69
63
post-patch:
70
post-patch:
64
	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/default.c
71
	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h
65
66
.include <bsd.port.post.mk>
72
.include <bsd.port.post.mk>
(-)links/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (links-2.1pre28.tar.bz2) = 815afe558dd548258eeb03b01cce01ce
1
MD5 (links-2.1pre33.tar.bz2) = 99cdbd1194579eea6d857168a57e0d74
2
SHA256 (links-2.1pre28.tar.bz2) = 203531be7c84ebe3a5d53c6d6cda4f4a27626dec620ec5aa8926414d0bee5995
2
SHA256 (links-2.1pre33.tar.bz2) = 1f6be6db54eb5fb2947926b5214879c260030da9909c1d189d053d8dc3357f98
3
SIZE (links-2.1pre28.tar.bz2) = 3915943
3
SIZE (links-2.1pre33.tar.bz2) = 3817630
(-)links/files/patch-ab (-14 lines)
Lines 1-14 Link Here
1
--- kbd.c.orig	Sat Oct 12 19:47:58 2002
2
+++ kbd.c	Sat Mar  1 16:03:31 2003
3
@@ -746,9 +746,9 @@
4
 				case 'B': ev.x = KBD_DOWN; break;
5
 				case 'C': ev.x = KBD_RIGHT; break;
6
 				case 'D': ev.x = KBD_LEFT; break;
7
-				case 'F':
8
+				case 'F': ev.x = KBD_END; break;
9
 				case 'e': ev.x = KBD_END; break;
10
-				case 'H':
11
+				case 'H': ev.x = KBD_HOME; break;
12
 				case 0: ev.x = KBD_HOME; break;
13
 				case 'I': ev.x = KBD_PAGE_UP; break;
14
 				case 'G': ev.x = KBD_PAGE_DOWN; break;
(-)links/files/patch-default.c (-4 / +4 lines)
Lines 1-11 Link Here
1
--- default.c.orig	Tue Feb 11 21:54:38 2003
1
--- default.c.orig	2008-03-06 22:43:25.117856165 -0500
2
+++ default.c	Sat Mar  1 16:03:31 2003
2
+++ default.c	2008-03-06 22:44:12.412560939 -0500
3
@@ -300,7 +300,7 @@
3
@@ -400,7 +400,7 @@
4
 	get_system_name();
4
 	get_system_name();
5
 	links_home = get_home(&first_use);
5
 	links_home = get_home(&first_use);
6
 	if (!links_home) {
6
 	if (!links_home) {
7
-		fprintf(stderr, "Unable to find or create links config directory. Please check, that you have $HOME variable set correctly and that you have write permission to your home directory.\n\007");
7
-		fprintf(stderr, "Unable to find or create links config directory. Please check, that you have $HOME variable set correctly and that you have write permission to your home directory.\n\007");
8
+		fprintf(stderr, "Unable to find or create links config directory. Please check, that you have set the $HOME variable correctly and that you have write permission to your home directory.\n");
8
+		fprintf(stderr, "Unable to find or create links config directory. Please check, that you have $HOME variable set correctly and that you have write permission to your home directory.\n");
9
 		sleep(3);
9
 		sleep(3);
10
 		return;
10
 		return;
11
 	}
11
 	}
(-)links/files/patch-regexp.c (-19 lines)
Lines 1-19 Link Here
1
--- regexp.c~	Fri Nov 25 02:38:35 2005
2
+++ regexp.c	Tue Jan 24 12:39:04 2006
3
@@ -148,6 +148,7 @@
4
 #ifdef HAVE_PCRE
5
 	const char *er_ptr;
6
 	int erroffset;
7
+	pcre *ppat;
8
 #else
9
 	regmatch_t pmat[MAXCAPTURE/3];
10
 	regex_t ppat_data;
11
@@ -197,7 +198,7 @@
12
 #endif /* REGEX_DEBUG */
13
 	
14
 #ifdef HAVE_PCRE
15
-	pcre *ppat = pcre_compile(pom, 0/*PCRE_ANCHORED*/, &er_ptr, &erroffset, NULL);
16
+	ppat = pcre_compile(pom, 0/*PCRE_ANCHORED*/, &er_ptr, &erroffset, NULL);
17
 	pcre_free(pom);
18
 #else /* HAVE_PCRE */
19
 	ppat = &ppat_data;
(-)links/files/patch-types.c (-4 / +4 lines)
Lines 1-11 Link Here
1
--- types.c.orig	Thu Jul  5 13:10:37 2007
1
--- types.c.orig	2008-03-19 18:18:18.614955994 -0400
2
+++ types.c	Thu Jul  5 13:12:07 2007
2
+++ types.c	2008-03-19 18:21:18.345245179 -0400
3
@@ -807,7 +807,8 @@
3
@@ -820,7 +820,8 @@
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, "htm", 3)) ||
7
-	if ((extl == 3 && !casecmp(ext, "htm", 3)) ||
8
+	if (force_html ||
8
+	if (force_html || 
9
+	    (extl == 3 && !casecmp(ext, "htm", 3)) ||
9
+	    (extl == 3 && !casecmp(ext, "htm", 3)) ||
10
 	    (extl == 4 && !casecmp(ext, "html", 4))) return stracpy("text/html");
10
 	    (extl == 4 && !casecmp(ext, "html", 4))) return stracpy("text/html");
11
 	foreach(e, extensions) {
11
 	foreach(e, extensions) {

Return to bug 121886