*: Clean up some things

- Fix typos
- Fix overwritten variables with focus on master/slave ports
- Remove unreferenced variables
- Sort categories
- Remove redundant option descriptions
- Clean up commented PORTREVISION
- Add missing USES

Reported by:	portscan

19 files changed, 4 insertions, 35 deletions

diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index dfa4c8f3a64b..0b286ff2a681 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -23,8 +23,6 @@ CFLAGS+=	-fcommon
 
 CONFLICTS?=	cdrtools-[0-9]* cjk-cdrtools-[0-9]* cdrtools-devel-[0-9]*
 
-SLAVEDIRS=	sysutils/genisoimage
-
 PLIST_SUB?=	CDRKIT="" GENISOIMAGE="@comment "
 
 post-patch:
diff --git a/sysutils/genisoimage/Makefile b/sysutils/genisoimage/Makefile
index e5b32ec4ea8d..57049eae8980 100644
--- a/sysutils/genisoimage/Makefile
+++ b/sysutils/genisoimage/Makefile
@@ -13,8 +13,6 @@ CONFLICTS=	# nada
 
 PLIST_SUB=	CDRKIT="@comment " GENISOIMAGE=""
 
-SLAVE_PORT=	cdrkit
-
 MASTERDIR=	${.CURDIR}/../cdrkit
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs2-cgi/Makefile b/sysutils/moosefs2-cgi/Makefile
index 630d1850a777..1f2298787584 100644
--- a/sysutils/moosefs2-cgi/Makefile
+++ b/sysutils/moosefs2-cgi/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-cgi
 
 COMMENT=	MooseFS CGI interface
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	cgi
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-cgiserv/Makefile b/sysutils/moosefs2-cgiserv/Makefile
index 0ccd3d2489cd..341974270da1 100644
--- a/sysutils/moosefs2-cgiserv/Makefile
+++ b/sysutils/moosefs2-cgiserv/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-cgiserv
 
 COMMENT=	MooseFS CGI webserver
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	cgiserv
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-chunkserver/Makefile b/sysutils/moosefs2-chunkserver/Makefile
index e09943199873..745620720804 100644
--- a/sysutils/moosefs2-chunkserver/Makefile
+++ b/sysutils/moosefs2-chunkserver/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-chunkserver
 
 COMMENT=	MooseFS data storage and synchronization component
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	chunkserver
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-cli/Makefile b/sysutils/moosefs2-cli/Makefile
index 97f1924a213e..5463f56aedc7 100644
--- a/sysutils/moosefs2-cli/Makefile
+++ b/sysutils/moosefs2-cli/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-cli
 
 COMMENT=	MooseFS command line interface
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	cli
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-client/Makefile b/sysutils/moosefs2-client/Makefile
index 5617098f4399..234c366f94ff 100644
--- a/sysutils/moosefs2-client/Makefile
+++ b/sysutils/moosefs2-client/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-client
 
 COMMENT=	MooseFS client tools
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	client
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-metalogger/Makefile b/sysutils/moosefs2-metalogger/Makefile
index 2336daa336fb..becf1e89c63b 100644
--- a/sysutils/moosefs2-metalogger/Makefile
+++ b/sysutils/moosefs2-metalogger/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-metalogger
 
 COMMENT=	MooseFS metadata backup server
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	metalogger
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs2-netdump/Makefile b/sysutils/moosefs2-netdump/Makefile
index 7df650ca451e..923c99811a58 100644
--- a/sysutils/moosefs2-netdump/Makefile
+++ b/sysutils/moosefs2-netdump/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-netdump
 
 COMMENT=	MooseFS network packet dump utility
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	netdump
 
 MASTERDIR=	${.CURDIR}/../moosefs2-master
diff --git a/sysutils/moosefs3-cgi/Makefile b/sysutils/moosefs3-cgi/Makefile
index 7f84203e3fe8..33598d679ef4 100644
--- a/sysutils/moosefs3-cgi/Makefile
+++ b/sysutils/moosefs3-cgi/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-cgi
 
 COMMENT=	MooseFS CGI interface
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	cgi
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-cgiserv/Makefile b/sysutils/moosefs3-cgiserv/Makefile
index 79692f7ed4a8..dcfca328869a 100644
--- a/sysutils/moosefs3-cgiserv/Makefile
+++ b/sysutils/moosefs3-cgiserv/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-cgiserv
 
 COMMENT=	MooseFS CGI webserver
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	cgiserv
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-chunkserver/Makefile b/sysutils/moosefs3-chunkserver/Makefile
index 9d00bda211c3..618486153678 100644
--- a/sysutils/moosefs3-chunkserver/Makefile
+++ b/sysutils/moosefs3-chunkserver/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-chunkserver
 
 COMMENT=	MooseFS data storage and synchronization component
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	chunkserver
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-cli/Makefile b/sysutils/moosefs3-cli/Makefile
index 356cf37a2cf0..b6a7a9a928f2 100644
--- a/sysutils/moosefs3-cli/Makefile
+++ b/sysutils/moosefs3-cli/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-cli
 
 COMMENT=	MooseFS command line interface
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	cli
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-client/Makefile b/sysutils/moosefs3-client/Makefile
index 23e44ad3da61..0d8386aa62c0 100644
--- a/sysutils/moosefs3-client/Makefile
+++ b/sysutils/moosefs3-client/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-client
 
 COMMENT=	MooseFS client tools
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	client
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-metalogger/Makefile b/sysutils/moosefs3-metalogger/Makefile
index ad426ce678e4..3bc3fbedc889 100644
--- a/sysutils/moosefs3-metalogger/Makefile
+++ b/sysutils/moosefs3-metalogger/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-metalogger
 
 COMMENT=	MooseFS metadata backup server
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	metalogger
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
diff --git a/sysutils/moosefs3-netdump/Makefile b/sysutils/moosefs3-netdump/Makefile
index 3789a6875abb..0fedd8ca6ca4 100644
--- a/sysutils/moosefs3-netdump/Makefile
+++ b/sysutils/moosefs3-netdump/Makefile
@@ -4,8 +4,6 @@ PKGNAMESUFFIX=	-netdump
 
 COMMENT=	MooseFS network packet dump utility
 
-LICENSE=	GPLv2
-
 MFS_COMPONENT=	netdump
 
 MASTERDIR=	${.CURDIR}/../moosefs3-master
diff --git a/sysutils/mstflint/Makefile b/sysutils/mstflint/Makefile
index 196b63f1e3b3..10af903636e2 100644
--- a/sysutils/mstflint/Makefile
+++ b/sysutils/mstflint/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	4.16.0-1
 CATEGORIES=	sysutils
 
 MAINTAINER=	hselasky@FreeBSD.org
-COMMENT=	Firmware Burning and Diagnostics Tools for Mellanox devices
+COMMENT?=	Firmware Burning and Diagnostics Tools for Mellanox devices
 
 LICENSE=	BSD2CLAUSE GPLv2
 LICENSE_COMB=	dual
diff --git a/sysutils/passwordsafe/Makefile b/sysutils/passwordsafe/Makefile
index 901160657179..2405072f2f75 100644
--- a/sysutils/passwordsafe/Makefile
+++ b/sysutils/passwordsafe/Makefile
@@ -37,7 +37,7 @@ MAKE_ENV=	NO_QR=yes
 GH_ACCOUNT=	pwsafe
 GH_PROJECT=	${GH_ACCOUNT}
 
-WX_COMP=	wx
+WX_COMPS=	wx
 WANT_WX_VER=	3.0
 
 LDFLAGS=	-L${PREFIX}/lib -lqrencode
diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile
index e61679e14b53..d3afc071d4b0 100644
--- a/sysutils/pdsh/Makefile
+++ b/sysutils/pdsh/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	pdsh
 PORTVERSION=	2.34
 DISTVERSIONPREFIX=	${PORTNAME}-
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	i@levsha.me
@@ -12,7 +13,7 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 # :keepla because port uses lt_dlopen
-USES=		autoreconf gmake libtool:keepla shebangfix
+USES=		autoreconf gmake libtool:keepla perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	chaos
 USE_PERL5=	run