Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 May 2017 16:49:08 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r441791 - head/textproc/tinyxml2
Message-ID:  <201705261649.v4QGn8kS009262@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri May 26 16:49:07 2017
New Revision: 441791
URL: https://svnweb.freebsd.org/changeset/ports/441791

Log:
  Modernize Makefile
  
  - Use USES=pathfix
  - Do not hardcoded PLIST_FILES
  - Sort PORTEXAMPLES
  - Convert to options target helper
  - Use do-test: instead of check:, regression-test: and test:
  - Fix do-test:

Modified:
  head/textproc/tinyxml2/Makefile

Modified: head/textproc/tinyxml2/Makefile
==============================================================================
--- head/textproc/tinyxml2/Makefile	Fri May 26 16:01:25 2017	(r441790)
+++ head/textproc/tinyxml2/Makefile	Fri May 26 16:49:07 2017	(r441791)
@@ -11,34 +11,28 @@ COMMENT=	Small C++ XML Parser
 
 LICENSE=	ZLIB
 
-CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=ON
-USE_GITHUB=	yes
-USE_LDCONFIG=	yes
-USES=		cmake dos2unix
+OPTIONS_DEFINE=	EXAMPLES
 
-GH_ACCOUNT=	leethomason
+CMAKE_ARGS=	-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON
+USE_LDCONFIG=	yes
+USES=		cmake dos2unix pathfix
 
 PLIST_FILES=	include/tinyxml2.h \
 		lib/libtinyxml2.a \
 		lib/libtinyxml2.so \
-		lib/libtinyxml2.so.4 \
-		lib/libtinyxml2.so.4.0.1 \
+		lib/libtinyxml2.so.${PORTVERSION:R:R} \
+		lib/libtinyxml2.so.${PORTVERSION} \
 		libdata/pkgconfig/tinyxml2.pc
-PORTEXAMPLES=	xmltest.cpp resources
+PORTEXAMPLES=	resources xmltest.cpp
 
-OPTIONS_DEFINE=	EXAMPLES
+GH_ACCOUNT=	leethomason
+USE_GITHUB=	yes
+
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/ && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}/
 
-post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's@(DESTINATION )(.*)(/pkgconfig)@\1${PREFIX}/libdata\3@' \
-		${WRKSRC}/CMakeLists.txt
-
-check regression-test test: build
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test ; \
-	./test
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@cd ${WRKSRC}; ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}
+do-test:
+	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xmltest && ./xmltest
 
 .include <bsd.port.mk>



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