Fix variable substitution in pkg-message

Also, while here:
- Update licenses.
- Lint with portfmt and portclippy.
- Fix typos in pkg-message.

Approved by:	portmgr (blanket approval)

2 files changed, 14 insertions, 11 deletions

diff --git a/ports-mgmt/pkg-provides/Makefile b/ports-mgmt/pkg-provides/Makefile
index 6979cc5a0646..2983341e8b3e 100644
--- a/ports-mgmt/pkg-provides/Makefile
+++ b/ports-mgmt/pkg-provides/Makefile
@@ -3,27 +3,30 @@
 PORTNAME=	pkg-provides
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Pkg plugin for querying which package provides a particular file
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	BSD2CLAUSE BSD3CLAUSE BSD4CLAUSE
+LICENSE_COMB=	multi
 
 NOT_FOR_ARCHS=	armv6 mips mips64
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
 BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
+LIB_DEPENDS=	libpcre.so:devel/pcre
 
-USE_LDCONFIG=	yes
 USE_GITHUB=	yes
-
-SUB_LIST=	LOCALBASE=${LOCALBASE}
-
 GH_ACCOUNT=	rosorio
 GH_TAGNAME=	71b876c
+USE_LDCONFIG=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST=	LOCALBASE=${LOCALBASE}
 
-PLIST_FILES=	lib/pkg/provides.so man/man8/pkg-provides.8.gz
+PLIST_FILES=	lib/pkg/provides.so \
+		man/man8/pkg-provides.8.gz
 
 do-install:
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/pkg/
diff --git a/ports-mgmt/pkg-provides/pkg-message b/ports-mgmt/pkg-provides/files/pkg-message.in
index 0431a5d1d3a7..fcf05e2fce5d 100644
--- a/ports-mgmt/pkg-provides/pkg-message
+++ b/ports-mgmt/pkg-provides/files/pkg-message.in
@@ -3,19 +3,19 @@
   message: <<EOM
 In order to use the pkg-provides plugin you need to enable plugins in pkg.
 To do this, uncomment the following lines in %%LOCALBASE%%/etc/pkg.conf file
-and add pkg-provides to the supported plugin list
+and add pkg-provides to the supported plugin list:
 
 PKG_PLUGINS_DIR = "%%LOCALBASE%%/lib/pkg/";
 PKG_ENABLE_PLUGINS = true;
 PLUGINS [ provides ];
 
-After that run `pkg plugins' to see the plugins handled by pkg`.
+After that run `pkg plugins' to see the plugins handled by pkg.
 EOM
 }
 { type: upgrade
   maximum_version: "0.6.0"
   message: <<EOM
-To update the provides database run `pkg provides -u`
+To update the provides database run `pkg provides -u`.
 EOM
 }
 { 
@@ -24,7 +24,7 @@ EOM
   message: <<EOM
 Pkg-provides from v0.6.0 introduces a new database file format.
 
-To update the provides database run `pkg provides -uf`
+To update the provides database run `pkg provides -uf`.
 EOM
 }
 ]