Index: head/www/links/Makefile =================================================================== --- head/www/links/Makefile (revision 458165) +++ head/www/links/Makefile (revision 458166) @@ -1,97 +1,98 @@ # Created by: Michael Vasilenko # $FreeBSD$ PORTNAME= links -DISTVERSION= 2.13 +DISTVERSION= 2.14 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://links.twibright.com/download/ MAINTAINER= portmaster@BSDforge.com COMMENT= Lynx-like text WWW browser LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING 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 +CONFIGURE_ARGS= --with-ssl --without-pmshell --without-atheos \ + --without-gpm --without-fb --without-windows -USES= cpe ssl tar:bzip2 +USES= cpe localbase:ldflags ssl gettext-runtime +USE_GNOME= librsvg2 glib20 gdkpixbuf2 cairo CPE_VENDOR= twibright -OPTIONS_DEFINE= CIPHERSTRING DIRECTFB IPV6 SVGALIB THREADS TRANS UTF8 X11 +PLIST_FILES= bin/links man/man1/links.1.gz -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_DEFINE= CIPHERSTRING DIRECTFB IPV6 NLS SVGALIB THREADS TRANS UTF8 X11 OPTIONS_DEFAULT= UTF8 X11 -PLIST_FILES= bin/links man/man1/links.1.gz +CIPHERSTRING_DESC= Select the OpenSSL ciphers used via CIPHERSTRING +DIRECTFB_DESC= DirectFB graphics support +TRANS_DESC= Hack for background transparency DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb DIRECTFB_CONFIGURE_WITH=directfb IPV6_CONFIGURE_WITH= ipv6 +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= gettext-runtime + 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_USE= xorg=x11,xproto +X11_LIB_DEPENDS= libevent.so:devel/libevent \ + libfontconfig.so:x11-fonts/fontconfig 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 .endif .include Index: head/www/links/distinfo =================================================================== --- head/www/links/distinfo (revision 458165) +++ head/www/links/distinfo (revision 458166) @@ -1,2 +1,3 @@ -SHA256 (links-2.13.tar.bz2) = c252095334a3b199fa791c6f9a9affe2839a7fbd536685ab07851cb7efaa4405 -SIZE (links-2.13.tar.bz2) = 6516087 +TIMESTAMP = 1515181008 +SHA256 (links-2.14.tar.gz) = 22fa8dcb5a60b8ffd611de31ebd4c79edce472637a3554bab401795da91d4387 +SIZE (links-2.14.tar.gz) = 7142389 Index: head/www/links/files/patch-default.c =================================================================== --- head/www/links/files/patch-default.c (revision 458165) +++ head/www/links/files/patch-default.c (revision 458166) @@ -1,11 +1,11 @@ ---- default.c.orig 2016-06-17 20:33:57 UTC +--- default.c.orig 2016-11-16 22:49:10 UTC +++ default.c -@@ -829,7 +829,7 @@ void init_home(void) +@@ -836,7 +836,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); + portable_sleep(3000); return; }