Index: head/x11-toolkits/pango/Makefile
===================================================================
--- head/x11-toolkits/pango/Makefile	(revision 442177)
+++ head/x11-toolkits/pango/Makefile	(revision 442178)
@@ -1,65 +1,57 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pango
-PORTVERSION=	1.40.4
+PORTVERSION=	1.40.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Open-source framework for the layout and rendering of i18n text
 
 LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	fontconfig>=2.10.91:x11-fonts/fontconfig \
-		cairo>=1.12.10,2:graphics/cairo
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:x11-fonts/encodings
 
 PORTSCOUT=	limitw:1,even
 
 USES+=		gettext gmake gnome libtool localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	cairo glib20 introspection:build referencehack
 INSTALL_TARGET=	install-strip
 
 VERSION=	1.8.0
-LIBVERSION=	0.4000.4
+LIBVERSION=	0.4000.6
 PLIST_SUB+=     VERSION=${VERSION} LIBVERSION=${LIBVERSION}
 
 FONTSCALE=	${LOCALBASE}/share/fonts/TTF/luximb.ttf
 FONTENCOD=	${LOCALBASE}/share/fonts/encodings/encodings.dir
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_XORG+=	xft xrender
-#CONFIGURE_ARGS+=--with-xft
-PLIST_SUB+=	X11=""
-.else
-CONFIGURE_ARGS+=--without-xft
-PLIST_SUB+=	X11="@comment "
-.endif
+X11_CONFIGURE_WITH=	xft
+X11_USE=	XORG=x11,xft,xrender
 
 pre-configure:
 # .if !exists() evaluates too early before cairo has a chance to be installed
 	@if ! pkg-config --exists cairo-gobject; then \
 		${ECHO_MSG} "${PKGNAME}: Needs cairo with GLIB (GObject) support enabled."; \
 		${FALSE}; \
 	fi
 
 .include <bsd.port.mk>
 
 .endif
Index: head/x11-toolkits/pango/distinfo
===================================================================
--- head/x11-toolkits/pango/distinfo	(revision 442177)
+++ head/x11-toolkits/pango/distinfo	(revision 442178)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491220406
-SHA256 (gnome2/pango-1.40.4.tar.xz) = f8fdc5fc66356dc4edf915048cceeee065a0e0cb70b3b2598f62bda320129a3e
-SIZE (gnome2/pango-1.40.4.tar.xz) = 1062600
+TIMESTAMP = 1495618340
+SHA256 (gnome2/pango-1.40.6.tar.xz) = ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573
+SIZE (gnome2/pango-1.40.6.tar.xz) = 832040