14 files changed, 28 insertions, 23 deletions

diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 7be0177f391c..75a679608c78 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Unique standard tape archiver with many enhancements
 
 LICENSE=	CDDL GPLv2
 LICENSE_COMB=	multi
-LICENSE_FILES=	${WRKSRC}/CDDL.Schily.txt
+LICENSE_FILE=	${WRKSRC}/CDDL.Schily.txt
 
 BUILD_DEPENDS=	smake:devel/smake
 
diff --git a/databases/py-queries/Makefile b/databases/py-queries/Makefile
index 8b0d3c01fb40..805ea369aa95 100644
--- a/databases/py-queries/Makefile
+++ b/databases/py-queries/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Simplified PostgreSQL client built upon Psycopg2
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILES=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2
 
diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile
index 431d9f134dbe..f60de36317a2 100644
--- a/devel/libcrossguid/Makefile
+++ b/devel/libcrossguid/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	mickael.maillot@gmail.com
 COMMENT=	Minimal and cross platform C++ GUID library
 
 LICENSE=	MIT
-LICENSE_FILES=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
@@ -33,13 +33,16 @@ post-patch:
 		${FILESDIR}/libcrossguid.pc.in > ${WRKDIR}/libcrossguid.pc
 
 do-build:
-	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -shared -fPIC -Wl,-soname,libcrossguid.so.0 \
-		-DGUID_LIBUUID -L${LOCALBASE}/lib guid.cpp -o libcrossguid.so.0 -luuid
+	cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -shared -fPIC \
+		-Wl,-soname,libcrossguid.so.0 \
+		-DGUID_LIBUUID -L${LOCALBASE}/lib guid.cpp \
+		-o libcrossguid.so.0 -luuid
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/guid.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_LIB} ${WRKSRC}/libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKDIR}/libcrossguid.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+	${INSTALL_DATA} ${WRKDIR}/libcrossguid.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	${LN} -sf libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib/libcrossguid.so
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-Warnings/Makefile b/devel/p5-Test-Warnings/Makefile
index dd333ae5c352..e423cf195d7e 100644
--- a/devel/p5-Test-Warnings/Makefile
+++ b/devel/p5-Test-Warnings/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Test for warnings and the lack of them
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
-LICENCE_FILE=	${WRKSRC}/LICENCE
+LICENSE_FILE=	${WRKSRC}/LICENCE
 
 TEST_DEPENDS=	p5-CPAN-Meta-Check>=0.011:devel/p5-CPAN-Meta-Check \
 		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
diff --git a/dns/dnscheckengine/Makefile b/dns/dnscheckengine/Makefile
index 679b74586587..f777a4385659 100644
--- a/dns/dnscheckengine/Makefile
+++ b/dns/dnscheckengine/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	DNS checker from the folks that run the .SE top level domain
 
 LICENSE=	BSD2CLAUSE
-LICENSE_FILES=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Crypt-OpenSSL-Random>=0:security/p5-Crypt-OpenSSL-Random \
 		p5-Digest-BubbleBabble>=0:security/p5-Digest-BubbleBabble \
diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index 1ac945bdd9a1..a74af393970c 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Library to handle OpenGL function pointer management
 
 LICENSE=	MIT
-LICENSE_FILES=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	anholt
diff --git a/japanese/font-marumoji/Makefile b/japanese/font-marumoji/Makefile
index fa0d8e8584ce..c0af569ca998 100644
--- a/japanese/font-marumoji/Makefile
+++ b/japanese/font-marumoji/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese marumoji fonts
 
 LICENSE=	MIT
-LICENSE_FILES=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	mkbold:x11-fonts/mkbold-mkitalic \
 		bdftopcf:x11-fonts/bdftopcf
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 8d7779987ffb..2496541a31f7 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -11,14 +11,15 @@ MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Portable abstraction library for DVD decryption
 
 LICENSE=	GPLv2
-LICENSE_FILES=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RESTRICTED=	CSS code may violate the DMCA
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix tar:bzip2
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOXYGEN DOCS
diff --git a/net-im/ring-gnome/Makefile b/net-im/ring-gnome/Makefile
index 22adaa216d0a..d263e05c9330 100644
--- a/net-im/ring-gnome/Makefile
+++ b/net-im/ring-gnome/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	yuri@rawbw.com
 COMMENT=	Gnome client of the Ring VoIP SIP phone and IM
 
 LICENSE=	GPLv3
-LICENSE_FILES=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libringclient.so:net-im/ring-libclient \
 		libqrencode.so:graphics/libqrencode \
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index a39fa12b9f46..e8f55c6ceed9 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -7,11 +7,11 @@ CATEGORIES=	print
 MASTER_SITES=	SF
 
 MAINTAINER=	woodsb02@FreeBSD.org
-COMMENT=	Drivers and utilities for HP Printers and All-in-One devices
+COMMENT=	Drivers and utilities for HP printers and All-in-One devices
 
 LICENSE=	GPLv2 MIT BSD3CLAUSE
 LICENSE_COMB=	multi
-LICENSE_FILES=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcupsimage.so:print/cups \
 		libdbus-1.so:devel/dbus
@@ -86,7 +86,7 @@ X11_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui \
 			${PYTHON_PKGNAMEPREFIX}qt4-dbussupport>=0:devel/py-qt4-dbussupport
 X11_CONFIGURE_ENABLE=	qt4 gui-build
 
-XSANE_DESC=		Install XSane for scanning (requires SCAN)
+XSANE_DESC=		Install XSane for scanning (implies SCAN)
 XSANE_IMPLIES=		SCAN
 XSANE_RUN_DEPENDS=	xsane:graphics/xsane
 
@@ -127,9 +127,10 @@ post-install:
 		${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample
 	${MKDIR} ${STAGEDIR}${DATADIR}/ui4/plugins
 	${MKDIR} ${STAGEDIR}/var/lib/hp
-	${MKDIR} ${STAGEDIR}/var/lib
+
 post-install-SCAN-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d
-	${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf ${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio
+	${MV} ${STAGEDIR}${PREFIX}/etc/sane.d/dll.conf \
+		${STAGEDIR}${PREFIX}/etc/sane.d/dll.d/hpaio
 
 .include <bsd.port.mk>
diff --git a/sysutils/fsearch/Makefile b/sysutils/fsearch/Makefile
index 82cd635623bc..a5b52362fe19 100644
--- a/sysutils/fsearch/Makefile
+++ b/sysutils/fsearch/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Search utility focusing on performance and advanced features
 
 LICENSE=	GPLv2+
-LICENSE_FILES=	${WRKSRC}/License
+LICENSE_FILE=	${WRKSRC}/License
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive
 LIB_DEPENDS=	libpcre.so:devel/pcre
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index e6906804b7dc..000af315a944 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -10,7 +10,7 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert LaTeX documents to HTML
 
 LICENSE=	GPLv2
-LICENSE_FILES=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/anytopnm:graphics/netpbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/x11-drivers/xf86-video-ast/Makefile b/x11-drivers/xf86-video-ast/Makefile
index f9516d2ba2a8..7b36d4e5ef37 100644
--- a/x11-drivers/xf86-video-ast/Makefile
+++ b/x11-drivers/xf86-video-ast/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org ASPEED display driver
 
 LICENSE=	MIT
-LICENSE_FILES=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 XORG_CAT=	driver
 USE_XORG=	xf86driproto glproto
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index ec4908d4dac7..4bacc62b1338 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org vmware display driver
 
 LICENSE=	MIT
-LICENSE_FILES=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 INSTALL_TARGET=	install-strip
 XORG_CAT=	driver