Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 May 2018 08:34:15 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r470689 - head/devel/shiboken
Message-ID:  <201805230834.w4N8YFVb093725@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed May 23 08:34:14 2018
New Revision: 470689
URL: https://svnweb.freebsd.org/changeset/ports/470689

Log:
  - Switch to new test framework
  - Switch to options helpers
  - Fix build for WITHOUT=MANPAGES case
  
  Approved by:	portmgr blanket

Modified:
  head/devel/shiboken/Makefile

Modified: head/devel/shiboken/Makefile
==============================================================================
--- head/devel/shiboken/Makefile	Wed May 23 08:28:55 2018	(r470688)
+++ head/devel/shiboken/Makefile	Wed May 23 08:34:14 2018	(r470689)
@@ -26,34 +26,23 @@ 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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805230834.w4N8YFVb093725>