- Remove unused USE_* knobs:

databases/mysql57-server
   games/kajongg
   textproc/ruby-htree

- Fix typos in USE_* knobs:
   graphics/fortytwo
   math/hexcalc
   misc/gnustep-examples
   www/h2o

- Remove unused BROKEN_alpha knob:
   devel/directfb

- Remove user-settable knob:
   multimedia/tovid

Approved by:	portmgr blanket

databases/mysql57-server/Makefile

@@ -116,8 +116,6 @@ OPENSSL_CMAKE_ON=	-DWITH_SSL=system
 OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
 .endif
 
-USE_CLANG=	3.3+
-
 post-extract:
 	${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 

devel/directfb/Makefile

@@ -49,8 +49,6 @@ CONFIGURE_ARGS=	--disable-osx --disable-extra-warnings --disable-profiling \
 		--with-inputdrivers=all --with-smooth-scaling \
 		--with-dither-rgb16=advanced
 
-BROKEN_alpha=	Does not compile on alpha
-
 DOCS_BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	freetype

games/kajongg/Makefile

@@ -13,7 +13,6 @@ COMMENT=	${${PORTNAME}_DESC}
 USES=		cmake:outsource python tar:xz twisted:run sqlite
 USE_KDE4=	kdelibs kdeprefix pykde4 automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_TWISTED_RUN=	yes
 CMAKE_ARGS=	-DINSTALL_KAJONGG:BOOL=TRUE
 
 .include <${.CURDIR}/../kdegames4/Makefile.common>

graphics/fortytwo/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	fortytwo
 PORTVERSION=	0.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics gnustep
 MASTER_SITES=	SF/${PORTNAME}/FT%20%2842%29/${PORTVERSION}
 DISTFILES=	FT-${PORTVERSION}-src.tgz \
@@ -19,7 +19,7 @@ USE_GNUSTEP=	back build
 LIB_DEPENDS=	libEncore.so:${PORTSDIR}/devel/fortytwo-encore \
 		libBDB.so:${PORTSDIR}/databases/fortytwo-bdb
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
+USE_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 USE_BDB=	43+
 
 WRKSRC=		${WRKDIR}/FT-${PORTVERSION}

math/hexcalc/Makefile

@@ -13,7 +13,7 @@ MAINTAINER=	jhs@berklix.com
 COMMENT=	Multi-radix calculator for x11
 
 # XORG_CAT=	app
-# USE_IMAKE=	yes
+# USES= imake
 #	Maybe later.
 #	It would move from distfiles/hexcalc..tar.Z
 #	to distfiles/xorg/app/hexcalc..tar.Z & require change in distinfo

misc/gnustep-examples/Makefile

@@ -11,14 +11,14 @@ MAINTAINER=	ports@FreeBSD.org
 USES=		gnustep
 USE_GNUSTEP=	back build
 
-USE_GNUSTEP_MAKE_DIRS+=	. gui/Finger gui/GFractal gui/HostAddress gui/MyGL
+l_GNUSTEP_MAKE_DIRS=	. gui/Finger gui/GFractal gui/HostAddress gui/MyGL
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^//|#|' \
 		${WRKSRC}/gui/GFractal/GNUmakefile
 
 do-build:
-.for i in ${USE_GNUSTEP_MAKE_DIRS}
+.for i in ${l_GNUSTEP_MAKE_DIRS}
 	@(cd ${BUILD_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 	   ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 .endfor
@@ -27,7 +27,7 @@ do-build:
 # source GNUstep.sh
 #
 do-install:
-.for i in ${USE_GNUSTEP_MAKE_DIRS}
+.for i in ${l_GNUSTEP_MAKE_DIRS}
 	@(cd ${INSTALL_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 .endfor

multimedia/tovid/Makefile

@@ -28,7 +28,6 @@ RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer \
 
 USES=		python
 USE_PYTHON=	autoplist distutils
-USE_PACKAGE_DEPENDS=	yes
 
 PYDISTUTILS_INSTALLNOSINGLE=	yes
 

textproc/ruby-htree/Makefile

@@ -14,7 +14,6 @@ COMMENT=	Ruby library to manipulate HTML/XML tree data structure
 OPTIONS_DEFINE=	DOCS
 
 USE_RUBY=	yes
-USE_RUBY_RD2=		yes
 USE_RUBY_RDOC=		yes
 
 LIB_FILES=	htree.rb htree

www/h2o/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	h2o
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -45,10 +46,10 @@ CMAKE_ARGS+=	-DEXTRA_LIBRARIES=OFF -DWITHOUT_LIBS=ON
 
 .if ${PORT_OPTIONS:MLIBRESSL}
 CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=ON
-USE_OPENSSL_PORT=	no
+WITH_OPENSSL_PORT=	no
 .else
 CMAKE_ARGS+=	-DWITH_BUNDLED_SSL=OFF
-USE_OPENSSL_PORT=	yes
+WITH_OPENSSL_PORT=	yes
 .endif
 
 post-patch: