Index: head/devel/libdbusmenu/Makefile
===================================================================
--- head/devel/libdbusmenu/Makefile	(revision 437358)
+++ head/devel/libdbusmenu/Makefile	(revision 437359)
@@ -1,42 +1,43 @@
 # Created by: Olivier Duchateau
 # $FreeBSD$
 
 PORTNAME=	libdbusmenu
 PORTVERSION=	16.04.0
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/243440794/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GLib and Gtk Implementation of the DBusMenu protocol
 
 LICENSE=	GPLv3 LGPL21 LGPL3
 LICENSE_COMB=	multi
-LICENSE_DISTFILES=	${WRKSRC}/COPYING-GPL3 ${WRKSRC}/COPYING.2.1 \
-	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING-GPL3
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.2.1
 
 BUILD_DEPENDS=	vapigen:lang/vala \
 		gtkdoc-check:textproc/gtk-doc
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomedocutils:build glib20 intltool intlhack libxslt \
 		introspection:build gtk30
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	VERSION="0.4"
 
 CONFIGURE_ARGS=	--disable-static \
 	--disable-static \
 	--disable-dumper \
 	--disable-tests \
 	--disable-massivedebugging \
 	--enable-introspection=yes \
 	--disable-nls \
 	--enable-vala \
 	--with-gtk=3
 
 .include <bsd.port.mk>
Index: head/x11/libexo/Makefile
===================================================================
--- head/x11/libexo/Makefile	(revision 437358)
+++ head/x11/libexo/Makefile	(revision 437359)
@@ -1,45 +1,45 @@
 # Created by: Matt Lancereau
 # $FreeBSD$
 
 PORTNAME=	libexo
 PORTVERSION=	0.10.7
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME:C/lib//}/${PORTVERSION:R}
 DISTNAME=	exo-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Application library for the Xfce desktop environment
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
-LICENSE_DISTFILES=	${WRKSRC}/COPYING \
-	${WRKSRC}/COPYING.LIB
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
 BUILD_DEPENDS=	p5-URI>=1.60:net/p5-URI
 RUN_DEPENDS=	p5-URI>=1.60:net/p5-URI
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 USES=		desktop-file-utils gmake libtool pathfix perl5 \
 		pkgconfig gettext-tools xfce tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_XFCE=	libmenu
 USE_XORG=	x11
 
 CONFIGURE_ARGS=--without-html-dir
 
 OPTIONS_DEFINE=	NLS
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 OPTIONS_SUB=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \
 		${WRKSRC}/exo-open/exo-mail-reader.desktop.in
 
 .include <bsd.port.mk>
Index: head/x11-wm/xfce4-panel/Makefile
===================================================================
--- head/x11-wm/xfce4-panel/Makefile	(revision 437358)
+++ head/x11-wm/xfce4-panel/Makefile	(revision 437359)
@@ -1,45 +1,45 @@
 # Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.12.1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's panel
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
-LICENSE_DISTFILES=	${WRKSRC}/COPYING \
-	${WRKSRC}/COPYING.LIB
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 	libdbus-glib-1.so:devel/dbus-glib \
 	libfontconfig.so:x11-fonts/fontconfig \
 	libfreetype.so:print/freetype2
 
 USES=		desktop-file-utils gmake libtool pathfix gettext-tools perl5 \
 		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack libwnck cairo
 USE_LDCONFIG=	yes
 USE_XFCE=	garcon libexo
 USE_XORG=	ice sm x11 xext
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=--enable-gio-unix --without-html-dir
 
 OPTIONS_DEFINE=		GTK3 NLS
 OPTIONS_DEFAULT=	GTK3
 GTK3_USES=	xfce:gtk3
 GTK3_USE=	gnome=gtk30
 GTK3_CONFIGURE_ENABLE=	gtk3
 GTK3_USES_OFF=	xfce
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>