Index: head/devel/shiboken/Makefile
===================================================================
--- head/devel/shiboken/Makefile	(revision 470688)
+++ head/devel/shiboken/Makefile	(revision 470689)
@@ -1,59 +1,48 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	shiboken
 PORTVERSION=	1.2.2
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://download.qt-project.org/official_releases/pyside/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ code generator for CPython extensions
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libxslt.so:textproc/libxslt
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 
 USE_QT4=	corelib qmake_build qtestlib moc_build network \
 		uic_build rcc_build xml xmlpatterns
 
 USES=		cmake python:2.7 tar:bzip2
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	all
+TEST_TARGET=	test
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+MANPAGES_PLIST_FILES=	man/man1/shiboken.1.gz
+MANPAGES_CMAKE_OFF=	-DNO_INSTALL_MANPAGES:BOOL="ON"
 
-.if ${PORT_OPTIONS:MMANPAGES}
-PLIST_FILES+=	man/man1/shiboken.1.gz
-.else
-CMAKE_ARGS=	-DNO_INSTALL_MANPAGES:BOOL="ON"
-.endif
+DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+DOCS_ALL_TARGET=	doc
 
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	sphinx-build:textproc/py-sphinx
-ALL_TARGET+=	doc
-post-install:
-	if [ -d ${WRKSRC}/doc/html ]; then \
-		${MKDIR} ${STAGEDIR}${DOCSDIR} && \
-		cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}; \
-	fi
-.endif
+post-install-DOCS-on:
+	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 post-patch:
 	@cd ${WRKSRC}/generator && \
-	${MV} ${PORTNAME} ${PORTNAME}.dir
-
-regression-test: build
-	@${ECHO_MSG} "===> Running shiboken regression tests"
-	@cd ${WRKSRC} && ${MAKE} test
+		${MV} ${PORTNAME} ${PORTNAME}.dir
 
 .include <bsd.port.mk>