svn commit: r358691 - head/www/links

[Antoine Brodin]

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 <bsd.port.options.mk>
-
-#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 <bsd.port.options.mk>
+
+#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" \