From owner-svn-ports-all@FreeBSD.ORG Sat Jun 21 13:04:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9C88CAB; Sat, 21 Jun 2014 13:04:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7CD7E2109; Sat, 21 Jun 2014 13:04:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5LD4kYD073657; Sat, 21 Jun 2014 13:04:46 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5LD4kN9073656; Sat, 21 Jun 2014 13:04:46 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201406211304.s5LD4kN9073656@svn.freebsd.org> From: Antoine Brodin Date: Sat, 21 Jun 2014 13:04:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358691 - head/www/links X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2014 13:04:46 -0000 Author: antoine Date: Sat Jun 21 13:04:45 2014 New Revision: 358691 URL: http://svnweb.freebsd.org/changeset/ports/358691 QAT: https://qat.redports.org/buildarchive/r358691/ Log: Unbreak Modified: head/www/links/Makefile Modified: head/www/links/Makefile ============================================================================== --- head/www/links/Makefile Sat Jun 21 11:35:33 2014 (r358690) +++ head/www/links/Makefile Sat Jun 21 13:04:45 2014 (r358691) @@ -36,20 +36,6 @@ OPTIONS_DEFAULT= IPV6 UTF8 X11 PLIST_FILES= bin/links man/man1/links.1.gz -.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:${PORTSDIR}/graphics/png \ - libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libtiff.so:${PORTSDIR}/graphics/tiff -CONFIGURE_ARGS+= --enable-graphics -.else -CONFIGURE_ARGS+= --disable-graphics --without-libjpeg --without-libtiff -.endif - DIRECTFB_LIB_DEPENDS= libdirectfb.so:${PORTSDIR}/devel/directfb DIRECTFB_CONFIGURE_WITH=directfb @@ -63,11 +49,26 @@ THREADS_LDFLAGS=-pthread TRANS_EXTRA_PATCHES= ${FILESDIR}/extra-terminal.c.diff -UTF8_CONFIGURE_WITH= utf8 +UTF8_CONFIGURE_ENABLE= utf8 -X11_USE= xorg=x11,proto +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:${PORTSDIR}/graphics/png \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libtiff.so:${PORTSDIR}/graphics/tiff +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" \