Clean up some things

- Remove duplicate variables
- Remove nop variables
- Sort categories
- Remove redundant option descriptions that match the default ones

Reported by:	portscan

audio/Makefile

@@ -60,9 +60,9 @@
     SUBDIR += blop
     SUBDIR += boops-lv2
     SUBDIR += bristol
+    SUBDIR += bschaffl-lv2
     SUBDIR += bsequencer-lv2
     SUBDIR += bshapr-lv2
-    SUBDIR += bschaffl-lv2
     SUBDIR += bslizr-lv2
     SUBDIR += cadence
     SUBDIR += calf-lv2

biology/phyml/Makefile

@@ -28,7 +28,6 @@ OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 
-MPICH_DESC=		Parallel processing support via MPICH
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 MPICH_MAKE_ARGS=	CC="${LOCALBASE}/bin/mpicc"
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi

dns/dnsmasq/Makefile

@@ -12,8 +12,6 @@ MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/ \
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
 
-CONFLICTS_INSTALL=	dnsmasq-devel-*
-
 LICENSE=	GPLv2
 
 USES=		cpe shebangfix tar:xz

irc/irssi/Makefile

@@ -39,7 +39,6 @@ PERL_USES=			perl5
 PERL_CONFIGURE_ON=		--with-perl-lib=site
 PERL_CONFIGURE_OFF=		--with-perl=no
 PROXY_CONFIGURE_WITH=		proxy
-SOCKS_DESC=			Socks proxy support
 SOCKS_CONFIGURE_WITH=		socks
 TRUECOLOR_DESC=			True color support
 TRUECOLOR_CONFIGURE_ENABLE=	true-color

java/eclipse-pydev/Makefile

@@ -27,8 +27,6 @@ JAVA_VERSION=	1.8+
 NO_BUILD=	YES
 NO_WRKSUBDIR=	YES
 
-PLUGINDIR=	share/eclipse/dropins/${PORTNAME}/eclipse/plugins
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJYTHON}

lang/opencoarrays/Makefile

@@ -30,7 +30,6 @@ OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
-MPICH_DESC=		Parallel processing support via MPICH
 MPICH_BUILD_DEPENDS=	mpif90:net/mpich
 MPICH_RUN_DEPENDS=	mpif90:net/mpich
 MPICH_CONFIGURE_ENV=	MPI_HOME=${LOCALBASE}

net/pjsip/Makefile

@@ -41,7 +41,6 @@ RESAMPLE_DESC=	Enable resampling implementations
 RESAMPLEDLL_DESC=	Build libresample as shared library
 SHARED_DESC=	Build shared libraries (other ports may depend on this)
 SPEEXAEC_DESC=	Speex Acoustic Echo Canceller/AEC
-V4L_DESC=	Video4Linux2 support
 WEBRTC_DESC=	Build libwebrtc
 
 OPTIONS_SUB=	yes

science/gromacs/Makefile

@@ -68,7 +68,6 @@ MP_DESC=		Multiprocessing
 NOMP_DESC=		No multiprocessing support
 NOMP_PLIST_SUB=		SUFFIX_MPI=""
 
-MPICH_DESC=		Parallel processing support via MPICH
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 MPICH_CMAKE_ON=		-DGMX_MPI:BOOL=ON \
 			-DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/bin/mpicc"

science/hypre/Makefile

@@ -35,7 +35,6 @@ OPTIONS_DEFAULT=	MPICH
 NOMPI_DESC=		Build without parallel processing support
 NOMPI_CONFIGURE_ON=	--without-MPI
 
-MPICH_DESC=		Parallel processing support via MPICH
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 MPICH_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx
 MPICH_CONFIGURE_WITH=	MPI-include=${LOCALBASE}/include \

sysutils/Makefile

@@ -1119,7 +1119,6 @@
     SUBDIR += rubygem-capistrano-ext
     SUBDIR += rubygem-capistrano-harrow
     SUBDIR += rubygem-chef
-    SUBDIR += rubygem-chef15
     SUBDIR += rubygem-chef-api
     SUBDIR += rubygem-chef-bin
     SUBDIR += rubygem-chef-config
@@ -1130,6 +1129,7 @@
     SUBDIR += rubygem-chef-utils15
     SUBDIR += rubygem-chef-vault
     SUBDIR += rubygem-chef-zero
+    SUBDIR += rubygem-chef15
     SUBDIR += rubygem-choria-mcorpc-support
     SUBDIR += rubygem-facter
     SUBDIR += rubygem-fluent-mixin-plaintextformatter

www/netsurf/Makefile

@@ -57,9 +57,6 @@ CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB} -lssl -lcrypto
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
-
 post-patch:
 	@${REINPLACE_CMD} '/CFLAGS/d' \
 		${WRKSRC}//Makefile.defaults