git: ffbc3bd9376a - main - Clean up some things

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ffbc3bd9376a3672e16eafddf55b233b8fed1674

commit ffbc3bd9376a3672e16eafddf55b233b8fed1674
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-04-07 07:15:06 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-04-15 08:31:56 +0000

    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              | 2 +-
 biology/phyml/Makefile      | 1 -
 dns/dnsmasq/Makefile        | 2 --
 irc/irssi/Makefile          | 1 -
 java/eclipse-pydev/Makefile | 2 --
 lang/opencoarrays/Makefile  | 1 -
 net/pjsip/Makefile          | 1 -
 science/gromacs/Makefile    | 1 -
 science/hypre/Makefile      | 1 -
 sysutils/Makefile           | 2 +-
 www/netsurf/Makefile        | 3 ---
 11 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/audio/Makefile b/audio/Makefile
index 8e13ec5d82ad..477c15d2ee23 100644
--- a/audio/Makefile
+++ b/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
diff --git a/biology/phyml/Makefile b/biology/phyml/Makefile
index 8eddba28c8e2..0881c57ced44 100644
--- a/biology/phyml/Makefile
+++ b/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
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index ce494dc57133..6beea43b327b 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -12,8 +12,6 @@ MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/ \
 MAINTAINER=	mandree at FreeBSD.org
 COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
 
-CONFLICTS_INSTALL=	dnsmasq-devel-*
-
 LICENSE=	GPLv2
 
 USES=		cpe shebangfix tar:xz
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index 865a3032b453..5d939f1ba378 100644
--- a/irc/irssi/Makefile
+++ b/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
diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile
index 332e7f635c3f..46bcadddd392 100644
--- a/java/eclipse-pydev/Makefile
+++ b/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}
diff --git a/lang/opencoarrays/Makefile b/lang/opencoarrays/Makefile
index 1875526d9f19..e21d80c5da52 100644
--- a/lang/opencoarrays/Makefile
+++ b/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}
diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index e9e8f8bd6ad0..979597f98796 100644
--- a/net/pjsip/Makefile
+++ b/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
diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile
index bd29c15bd2ec..107e4ef8284a 100644
--- a/science/gromacs/Makefile
+++ b/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"
diff --git a/science/hypre/Makefile b/science/hypre/Makefile
index fd0b02dc0bf5..83f8f807bb96 100644
--- a/science/hypre/Makefile
+++ b/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 \
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 565fb8d9e2ef..b9caf5766154 100644
--- a/sysutils/Makefile
+++ b/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
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index f7bba7cacf06..cb09a03a7dbb 100644
--- a/www/netsurf/Makefile
+++ b/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