*: Clean up some things

- Fix typos
- Remove duplicate variables
- Remove nop variables
- Sort categories
- Add missing USES

Reported by:	portscan

7 files changed, 8 insertions, 22 deletions

diff --git a/devel/rubygem-tty-config/Makefile b/devel/rubygem-tty-config/Makefile
index 5de0743412fc..823461ece850 100644
--- a/devel/rubygem-tty-config/Makefile
+++ b/devel/rubygem-tty-config/Makefile
@@ -6,7 +6,6 @@ CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Define, read and write any Ruby app configurations
 COMMENT=	Highly customisable application configuration interface for terminal tools
 
 LICENSE=	MIT
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile
index fe4d5d7a73fb..18f0e136a78a 100644
--- a/dns/dnsmasq/Makefile
+++ b/dns/dnsmasq/Makefile
@@ -8,7 +8,6 @@ PORTEPOCH=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.thekelleys.org.uk/dnsmasq/ \
 		LOCAL/mandree/
-PATCH_STRIP=	-p1
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Lightweight DNS forwarder, DHCP, and TFTP server
diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index ddb4c17a2630..94b7eea17552 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS=	libcapstone.so:devel/capstone4 \
 		libmbedtls.so:security/mbedtls \
 		libtre.so:textproc/libtre
 
-USES=		cmake pkgconfig python:3.8+ xorg
+USES=		cmake gnome pkgconfig python:3.8+ xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	x11 xcb xau xdmcp
 USE_GITHUB=	yes
diff --git a/graphics/blender-lts28/Makefile b/graphics/blender-lts28/Makefile
index 1787067f48c0..59707d181a42 100644
--- a/graphics/blender-lts28/Makefile
+++ b/graphics/blender-lts28/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYNUMPY}
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
-USES=		cmake compiler:c++14-lang gl jpeg python:3.7 shebangfix \
+USES=		cmake compiler:c++14-lang gl gnome jpeg python:3.7 shebangfix \
 		tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
@@ -57,15 +57,13 @@ OPTIONS_SUB=	yes
 ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 # note that this needs to be set to match alembics hdf5 option
-ALEMBIC_HDF5_REQUIRES=		ALEMBIC
+ALEMBIC_HDF5_IMPLIES=		ALEMBIC
 ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
 CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind
-CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64
-CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
 COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
@@ -79,8 +77,6 @@ CYCLES_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
-CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
-CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
 CYCLESOSL_IMPLIES=		CYCLES
 CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
 CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
@@ -135,8 +131,6 @@ OPENIMAGEIO_CMAKE_BOOL=		WITH_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
-OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
-OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index c5e13b539a89..238b5c713f65 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -26,7 +26,7 @@ RUN_DEPENDS=	${PYNUMPY}
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
-USES=		cmake compiler:c++14-lang gl jpeg python:3.8 shebangfix \
+USES=		cmake compiler:c++14-lang gl gnome jpeg python:3.8 shebangfix \
 		tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
@@ -57,15 +57,13 @@ OPTIONS_SUB=	yes
 ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 # note that this needs to be set to match alembics hdf5 option
-ALEMBIC_HDF5_REQUIRES=		ALEMBIC
+ALEMBIC_HDF5_IMPLIES=		ALEMBIC
 ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
 CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind
-CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64 aarch64 powerpc64 powerpc64le
-CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
 COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
@@ -79,8 +77,6 @@ CYCLES_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
-CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
-CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
 CYCLESOSL_IMPLIES=		CYCLES
 CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
 CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
@@ -138,8 +134,6 @@ OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEDN_IMPLIES=		TBB
 OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
-OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
-OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index 109c409247e9..4d989359055a 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -12,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
-USES=	pear
-NOARCH=	yes
+USES=		pear
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/Makefile b/www/Makefile
index db02f8e78f5a..d9fca5f0ef26 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -344,8 +344,8 @@
     SUBDIR += minio
     SUBDIR += minio-client
     SUBDIR += miniserve
-    SUBDIR += mitmproxy
     SUBDIR += mirrorselect
+    SUBDIR += mitmproxy
     SUBDIR += mknmz-wwwoffle
     SUBDIR += mnogosearch
     SUBDIR += mod_amazon_proxy