From 9b4a46dbc27a945dcda0a25668eafbbb24a270b6 Mon Sep 17 00:00:00 2001
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Tue, 20 Dec 2011 11:24:25 +0000
Subject: [PATCH] Update to version 2.4.

Submitted by:	bf
---
 www/links/Makefile                    |  6 ++----
 www/links/distinfo                    |  8 ++++----
 www/links/files/extra-terminal.c.diff | 20 ++++++++++----------
 www/links/files/patch-configure.in    | 10 +++++-----
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/www/links/Makefile b/www/links/Makefile
index e82cc6bf0910..6318a18a3830 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	links
-DISTVERSION=	2.3
-PORTEPOCH=	1
-PORTREVISION=	2
+DISTVERSION=	2.4
 CATEGORIES?=	www
 MASTER_SITES=	http://links.twibright.com/download/
 
@@ -61,7 +59,7 @@ CONFIGURE_ARGS+=	--without-directfb
 .if defined(WITH_IPV6)
 USE_AUTOTOOLS+=	autoconf
 PATCH_SITES+=	http://xpisar.wz.cz/links-ipv6/:ipv6
-PATCHFILES+=	links-2.3-ipv6-2.diff.gz:ipv6
+PATCHFILES+=	links-2.4-ipv6.patch.gz:ipv6
 PATCH_DIST_STRIP=	-p1
 .endif
 
diff --git a/www/links/distinfo b/www/links/distinfo
index 4a5f98b08fbb..9af1bc1135c2 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1,4 +1,4 @@
-SHA256 (links-2.3.tar.bz2) = 73751f5e11679cee62d8de7c6d72ee5b34b33af8adfe7c2763a16f40c872c96e
-SIZE (links-2.3.tar.bz2) = 3831706
-SHA256 (links-2.3-ipv6-2.diff.gz) = ddadd120ca0ab92fe37205dd14914779ca1eb26480867e8cdd5cd752c946ab29
-SIZE (links-2.3-ipv6-2.diff.gz) = 7693
+SHA256 (links-2.4.tar.bz2) = bebb6ccafaaabf1d251ccd79ff5cda07078a11bf7d15e775d6f3a0a89d4dd125
+SIZE (links-2.4.tar.bz2) = 3843247
+SHA256 (links-2.4-ipv6.patch.gz) = ab7d6d2c31e1714e64c33fbfadea4364bd07180c7b69d1f9d4e33dc08857da2f
+SIZE (links-2.4-ipv6.patch.gz) = 8658
diff --git a/www/links/files/extra-terminal.c.diff b/www/links/files/extra-terminal.c.diff
index d1e4ad95ee59..c180255767e5 100644
--- a/www/links/files/extra-terminal.c.diff
+++ b/www/links/files/extra-terminal.c.diff
@@ -1,10 +1,10 @@
---- terminal.c.orig	2008-05-01 21:02:39.000000000 +0400
-+++ terminal.c	2008-05-01 21:03:50.000000000 +0400
-@@ -819,6 +819,7 @@
- 			add_to_str(&a, &l, m);						\
- 			m[1] = '4';							\
- 			m[2] = ((attrib >> 3) & 7) + '0';				\
-+			if (m[2]!='0')							\
- 			add_to_str(&a, &l, m);						\
- 		} else if (getcompcode(attrib & 7) < getcompcode(attrib >> 3 & 7))	\
- 			add_to_str(&a, &l, ";7");					\
+--- terminal.c.orig	2011-11-20 22:10:01.000000000 -0500
++++ terminal.c	2011-12-19 05:33:15.000000000 -0500
+@@ -891,6 +891,7 @@
+ 			add_to_str(&a, &l, m);				\
+ 			m[1] = '4';					\
+ 			m[2] = ((attrib >> 3) & 7) + '0';		\
++			if (m[2] != '0')				\
+ 			add_to_str(&a, &l, m);				\
+ 		} else if (getcompcode(attrib & 7) < getcompcode(attrib >> 3 & 7))\
+ 			add_to_str(&a, &l, ";7");			\
diff --git a/www/links/files/patch-configure.in b/www/links/files/patch-configure.in
index 55cbcbd17548..ae60328793c5 100644
--- a/www/links/files/patch-configure.in
+++ b/www/links/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2011-10-18 13:14:56.000000000 -0400
-+++ configure.in	2011-10-18 13:18:27.000000000 -0400
-@@ -59,7 +59,12 @@
+--- configure.in.orig	2011-11-21 12:07:21.000000000 -0500
++++ configure.in	2011-12-19 05:54:11.000000000 -0500
+@@ -126,7 +126,12 @@
  AC_CHECK_HEADERS(sigaction.h)
  AC_CHECK_HEADERS(netinet/in_systm.h)
  AC_CHECK_HEADERS(netinet/in_system.h)
@@ -11,6 +11,6 @@
 +#endif
 +#include <netinet/in.h>
 +])
+ AC_CHECK_HEADERS(arpa/inet.h)
  AC_CHECK_HEADERS(netinet/dhcp.h)
- AC_CHECK_HEADERS(sys/select.h)
- AC_CHECK_HEADERS(sys/resource.h)
+ AC_CHECK_HEADERS(net/socket.h)