Index: head/www/links/Makefile =================================================================== --- head/www/links/Makefile (revision 417906) +++ head/www/links/Makefile (revision 417907) @@ -1,98 +1,97 @@ # Created by: Michael Vasilenko # $FreeBSD$ PORTNAME= links -DISTVERSION= 2.9 +DISTVERSION= 2.13 PORTEPOCH= 1 CATEGORIES= www ipv6 -MASTER_SITES= http://links.twibright.com/download/ LOCAL/bf +MASTER_SITES= http://links.twibright.com/download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Lynx-like text WWW browser LICENSE= GPLv2 -CONFLICTS= links-0* links-hacked-[0-9]* links1-* +CONFLICTS= links-0* links-hacked-[0-9]* links1-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ssl --without-pmshell --without-atheos \ --without-gpm --without-fb --without-windows CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_OPENSSL= yes -USES= cpe tar:bzip2 +USES= cpe ssl tar:bzip2 CPE_VENDOR= twibright OPTIONS_DEFINE= CIPHERSTRING DIRECTFB IPV6 SVGALIB THREADS TRANS UTF8 X11 CIPHERSTRING_DESC= Select the OpenSSL ciphers used via CIPHERSTRING DIRECTFB_DESC= DirectFB graphics support SVGALIB_DESC= SVGALib graphics support TRANS_DESC= Hack for background transparency UTF8_DESC= UTF-8 support X11_DESC= X11 graphics support OPTIONS_DEFAULT= UTF8 X11 PLIST_FILES= bin/links man/man1/links.1.gz DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb DIRECTFB_CONFIGURE_WITH=directfb IPV6_CONFIGURE_WITH= ipv6 SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib SVGALIB_CONFIGURE_WITH= svgalib THREADS_CFLAGS= -DHAVE_PTHREADS THREADS_LDFLAGS=-pthread TRANS_EXTRA_PATCHES= ${FILESDIR}/extra-terminal.c.diff UTF8_CONFIGURE_ENABLE= utf8 X11_USE= xorg=x11,xproto X11_CONFIGURE_WITH= x X11_PLIST_FILES= share/pixmaps/links.xpm .include #CIPHERSTRING must be a valid OpenSSL cipher string(see ciphers(1)): CIPHERSTRING?= HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libpng.so:graphics/png \ libtiff.so:graphics/tiff USES+= jpeg CONFIGURE_ARGS+= --enable-graphics .else CONFIGURE_ARGS+= --disable-graphics --without-libjpeg --without-libtiff .endif .if ${PORT_OPTIONS:MX11} DESKTOP_ENTRIES="links" \ "Lynx-like text WWW browser" \ "${PREFIX}/share/pixmaps/links.xpm" \ "links -g" \ "Network;WebBrowser;" \ false .endif post-patch: @${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h @${REINPLACE_CMD} -e "/LIBS=/{s/-lpthread/-pthread/;s/-ldl//;}" \ ${WRKSRC}/configure .if ${PORT_OPTIONS:MCIPHERSTRING} @${REINPLACE_CMD} -e '/SSL_CTX_set_options/ \ s/;/; SSL_CTX_set_cipher_list(context, "${CIPHERSTRING}");/' \ ${WRKSRC}/https.c .endif .if ${PORT_OPTIONS:MX11} post-install: - @${INSTALL_DATA} ${WRKSRC}/graphics/links.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/links.xpm + ${INSTALL_DATA} ${WRKSRC}/graphics/links.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/links.xpm .endif .include Index: head/www/links/distinfo =================================================================== --- head/www/links/distinfo (revision 417906) +++ head/www/links/distinfo (revision 417907) @@ -1,2 +1,2 @@ -SHA256 (links-2.9.tar.bz2) = 4360ead54d5f41da16b2f4c0033317ca775f40c1e658a29e9e7f8ce4bc23878f -SIZE (links-2.9.tar.bz2) = 4111393 +SHA256 (links-2.13.tar.bz2) = c252095334a3b199fa791c6f9a9affe2839a7fbd536685ab07851cb7efaa4405 +SIZE (links-2.13.tar.bz2) = 6516087 Index: head/www/links/files/patch-configure =================================================================== --- head/www/links/files/patch-configure (revision 417906) +++ head/www/links/files/patch-configure (revision 417907) @@ -1,11 +1,83 @@ ---- configure.orig 2011-04-19 11:36:37.000000000 -0400 -+++ configure 2011-10-18 13:48:27.000000000 -0400 -@@ -1762,6 +1762,8 @@ +--- configure.orig 2016-06-26 22:49:47 UTC ++++ configure +@@ -1913,6 +1913,8 @@ else cat > conftest.$ac_ext < +#include #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +@@ -6031,7 +6033,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat > conftest.$ac_ext <&6 +@@ -7586,7 +7588,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpthread $LIBS" ++LIBS="-pthread $LIBS" + cat > conftest.$ac_ext <&6 +@@ -7633,7 +7635,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-ldl $LIBS" ++LIBS=" $LIBS" + cat > conftest.$ac_ext <&6 +@@ -9837,7 +9839,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpthread $LIBS" ++LIBS="-pthread $LIBS" + cat > conftest.$ac_ext <&6 Index: head/www/links/files/patch-default.c =================================================================== --- head/www/links/files/patch-default.c (revision 417906) +++ head/www/links/files/patch-default.c (revision 417907) @@ -1,11 +1,11 @@ ---- default.c.orig 2008-03-06 22:43:25.117856165 -0500 -+++ default.c 2008-03-06 22:44:12.412560939 -0500 -@@ -400,7 +400,7 @@ - get_system_name(); +--- default.c.orig 2016-06-17 20:33:57 UTC ++++ default.c +@@ -829,7 +829,7 @@ void init_home(void) + get_compiler_name(); links_home = get_home(&first_use); if (!links_home) { - 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"); + 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"); sleep(3); return; } Index: head/www/links/files/patch-types.c =================================================================== --- head/www/links/files/patch-types.c (revision 417906) +++ head/www/links/files/patch-types.c (revision 417907) @@ -1,12 +1,12 @@ ---- types.c.orig 2012-06-06 15:49:37.000000000 -0400 -+++ types.c 2012-06-27 02:28:56.000000000 -0400 -@@ -841,7 +841,8 @@ +--- types.c.orig 2016-06-17 20:33:57 UTC ++++ types.c +@@ -849,7 +849,8 @@ unsigned char *get_content_type_by_exten 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))) return stracpy(cast_uchar "text/html"); foreach(e, extensions) { unsigned char *fname = NULL;