Index: head/www/links/Makefile =================================================================== --- head/www/links/Makefile (revision 283904) +++ head/www/links/Makefile (revision 283905) @@ -1,107 +1,110 @@ # New ports collection makefile for: links # Date created: 21 January 2000 # Whom: Michael Vasilenko # # $FreeBSD$ # 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 CONFLICTS= links-0* GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ssl --without-pmshell --without-atheos \ --without-gpm --without-fb CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_OPENSSL= yes USE_BZIP2= yes OPTIONS= SVGALIB "non-X11 graphics support" off \ 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 .ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB) LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --enable-graphics .else CONFIGURE_ARGS+= --disable-graphics --without-libjpeg --without-libtiff .endif .ifdef(WITH_SVGALIB) LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib CONFIGURE_ARGS+= --with-svgalib .else CONFIGURE_ARGS+= --without-svgalib .endif .ifdef(WITH_DIRECTFB) LIB_DEPENDS+= directfb-1.4.5:${PORTSDIR}/devel/directfb CONFIGURE_ARGS+= --with-directfb .else CONFIGURE_ARGS+= --without-directfb .endif .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) USE_XORG= x11 xproto CONFIGURE_ARGS+= --with-x DESKTOP_ENTRIES="links" \ "Lynx-like text WWW browser" \ "links" \ "links -g" \ "Application;Network;WebBrowser;" \ false PLIST_FILES+= share/pixmaps/links.xpm .else 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) EXTRA_PATCHES+= ${FILESDIR}/extra-terminal.c.diff .endif 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: @${INSTALL_DATA} ${WRKSRC}/graphics/links.xpm ${PREFIX}/share/pixmaps/links.xpm .endif .include Property changes on: head/www/links/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.70 \ No newline at end of property +1.71 \ No newline at end of property Index: head/www/links/distinfo =================================================================== --- head/www/links/distinfo (revision 283904) +++ head/www/links/distinfo (revision 283905) @@ -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 Property changes on: head/www/links/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/www/links/files/patch-configure =================================================================== --- head/www/links/files/patch-configure (nonexistent) +++ head/www/links/files/patch-configure (revision 283905) @@ -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 < ++#include + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" Property changes on: head/www/links/files/patch-configure ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/links/files/patch-configure.in =================================================================== --- head/www/links/files/patch-configure.in (nonexistent) +++ head/www/links/files/patch-configure.in (revision 283905) @@ -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 ++#endif ++#include ++]) + AC_CHECK_HEADERS(netinet/dhcp.h) + AC_CHECK_HEADERS(sys/select.h) + AC_CHECK_HEADERS(sys/resource.h) Property changes on: head/www/links/files/patch-configure.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property