Attachment 119287 Details for Bug 161788 – file.diff

[patch] file.diff

file.diff (text/plain), 4.44 KB, created by Brendan Fabeny on 2011-10-19 00:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Fabeny

Created: 2011-10-19 00:00:20 UTC

Size: 4.44 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/links/Makefile,v
>retrieving revision 1.70
>diff -u -r1.70 Makefile
>--- Makefile	23 Sep 2011 22:26:02 -0000	1.70
>+++ Makefile	18 Oct 2011 21:11:25 -0000
>@@ -6,17 +6,11 @@
> #
> 
> PORTNAME=	links
>-DISTVERSION=	2.2
>-PORTREVISION=	7
>+DISTVERSION=	2.3pre2
> PORTEPOCH=	1
> CATEGORIES?=	www
> MASTER_SITES=	http://links.twibright.com/download/
> 
>-PATCH_SITES=	ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/ \
>-		ftp://ftp.osuosl.org/pub/blfs/conglomeration/links/ \
>-		ftp://ftp.ntua.gr/pub/linux/gentoo/distfiles/
>-PATCH_DIST_STRIP=-p1
>-
> MAINTAINER?=	demon@FreeBSD.org
> COMMENT=	Lynx-like text WWW browser
> 
>@@ -35,7 +29,7 @@
> 		DIRECTFB "directfb driver support" off \
> 		IPV6 "IPv6 support" off \
> 		X11 "X11 graphics support" on \
>-		UTF8 "With gentoo utf-8 patch" on \
>+		UTF8 "With UTF-8 support" on \
> 		TRANS "Hack for background transparency" off
> 
> .include <bsd.port.options.mk>
>@@ -65,8 +59,9 @@
> 
> .if defined(WITH_IPV6)
> USE_AUTOTOOLS+=	autoconf
>-PATCH_SITES+=	http://xpisar.wz.cz/links-ipv6/:ipv6
>-PATCHFILES+=	links-2.2-ipv6-2.diff:ipv6
>+MASTER_SITES+=	http://xpisar.wz.cz/links-ipv6/:ipv6
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} links-2.2-ipv6-2.diff:ipv6
>+EXTRA_PATCHES+= ${WRKDIR}/links-2.2-ipv6-2.diff
> .endif
> 
> .if !defined(WITHOUT_X11)
>@@ -83,10 +78,8 @@
> CONFIGURE_ARGS+=	--without-x
> .endif
> 
>-.if defined(WITH_UTF8)
>-PATCHFILES+=	links-2.1pre33-utf8.diff.bz2
>-pre-configure:
>-		pwd && cd ${WRKSRC}/intl && ./gen-intl && ./synclang && cd ..
>+.if defined(WITHOUT_UTF8)
>+CONFIGURE_ARGS+=	--disable-utf8
> .endif
> 
> .if defined(WITH_TRANS)
>@@ -96,8 +89,18 @@
> MAN1=		links.1
> PLIST_FILES+=	bin/links
> 
>+.ifdef(WITH_IPV6)
>+post-extract:
>+#adjust the ipv6 patch for links 2.3*
>+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/links-2.2-ipv6-2.diff ${WRKDIR}
>+	@${REINPLACE_CMD} -E -e 's!void (lookup_fn|end_real_lookup)!static &!' \
>+		-e 's!^(\+\+\+|---) (a|b)/!\1 !' ${WRKDIR}/links-2.2-ipv6-2.diff
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h
>+#replace a deprecated indirect selection with png_jumpbuf()
>+	@${REINPLACE_CMD} -e 's!png_ptr->jmpbuf!png_jmpbuf(png_ptr)!' ${WRKSRC}/png.c
> 
> .if !defined(WITHOUT_X11)
> post-install:
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/www/links/distinfo,v
>retrieving revision 1.29
>diff -u -r1.29 distinfo
>--- distinfo	19 Mar 2011 12:34:27 -0000	1.29
>+++ distinfo	18 Oct 2011 06:53:41 -0000
>@@ -1,6 +1,4 @@
>-SHA256 (links-2.2.tar.bz2) = d3c60ff425bec5aacd1b15578a643c03090ad73fbb404f6ce8ee8c6219bdbc6d
>-SIZE (links-2.2.tar.bz2) = 3832115
>+SHA256 (links-2.3pre2.tar.bz2) = fba7a7742973437b92834af12dc8bf4eee998dc0fbc57caaad8690b9ad3ba0c7
>+SIZE (links-2.3pre2.tar.bz2) = 3832710
> SHA256 (links-2.2-ipv6-2.diff) = d6d6745796f07ab8949ceec6592e82c32a170739027f99488ffd5f1d93a5e63c
> SIZE (links-2.2-ipv6-2.diff) = 12524
>-SHA256 (links-2.1pre33-utf8.diff.bz2) = a34de30b787e6bab984cd5000c7a576f157437f622e9fe3a076808769a56db75
>-SIZE (links-2.1pre33-utf8.diff.bz2) = 4793
>Index: files/patch-configure
>===================================================================
>RCS file: files/patch-configure
>diff -N files/patch-configure
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-configure	18 Oct 2011 17:48:35 -0000
>@@ -0,0 +1,11 @@
>+--- configure.orig	2011-04-19 11:36:37.000000000 -0400
>++++ configure	2011-10-18 13:48:27.000000000 -0400
>+@@ -1762,6 +1762,8 @@
>+   cat > conftest.$ac_ext <<EOF
>+ #line 1764 "configure"
>+ #include "confdefs.h"
>++#include <sys/types.h>
>++#include <netinet/in.h>
>+ #include <$ac_hdr>
>+ EOF
>+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>Index: files/patch-configure.in
>===================================================================
>RCS file: files/patch-configure.in
>diff -N files/patch-configure.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-configure.in	18 Oct 2011 17:18:42 -0000
>@@ -0,0 +1,16 @@
>+--- 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 @@
>+ AC_CHECK_HEADERS(sigaction.h)
>+ AC_CHECK_HEADERS(netinet/in_systm.h)
>+ AC_CHECK_HEADERS(netinet/in_system.h)
>+-AC_CHECK_HEADERS(netinet/ip.h)
>++AC_CHECK_HEADERS([netinet/ip.h],[],[],[
>++#ifdef HAVE_SYS_TYPES_H
>++# include <sys/types.h>
>++#endif
>++#include <netinet/in.h>
>++])
>+ AC_CHECK_HEADERS(netinet/dhcp.h)
>+ AC_CHECK_HEADERS(sys/select.h)
>+ AC_CHECK_HEADERS(sys/resource.h)

Actions: View | Diff

Attachments on bug 161788: 119287