Date: Tue, 9 Oct 2018 12:47:54 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481630 - in head/graphics/libboard: . files Message-ID: <201810091247.w99ClsvT063632@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Tue Oct 9 12:47:54 2018 New Revision: 481630 URL: https://svnweb.freebsd.org/changeset/ports/481630 Log: Switch to cmake and clang, in order to link with lld. Reported by: emaste Added: head/graphics/libboard/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/graphics/libboard/files/patch-configure Modified: head/graphics/libboard/Makefile head/graphics/libboard/pkg-plist Modified: head/graphics/libboard/Makefile ============================================================================== --- head/graphics/libboard/Makefile Tue Oct 9 12:44:06 2018 (r481629) +++ head/graphics/libboard/Makefile Tue Oct 9 12:47:54 2018 (r481630) @@ -3,7 +3,7 @@ PORTNAME= libboard DISTVERSION= 0.9.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= thierry@FreeBSD.org @@ -13,48 +13,28 @@ LICENSE= LGPL3 LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick -HAS_CONFIGURE= yes -CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 -CONFIGURE_ARGS= --prefix=${PREFIX} -CONFIGURE_ENV= CXX=${CXX} +USES= cmake compiler:c++11-lang localbase -USES= gmake -USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= c-koi GH_TAGNAME= 5b38274 +CXXFLAGS+= -D_GLIBCXX_USE_C99 -fPIC # XXX ports/193528 +USE_CXXSTD= c++11 +CMAKE_ARGS= -DMYPROJ_RAN_ONCE:BOOL=YES \ + -DEXECUTABLE_OUTPUT_PATH:PATH="${STAGEDIR}${EXAMPLESDIR}" +USE_LDCONFIG= yes + PORTDOCS= * OPTIONS_DEFINE= DOXYGEN EXAMPLES DOCS DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -.include <bsd.port.pre.mk> - -.if ${ARCH} != i386 -CXXFLAGS+= -fPIC -.endif - -pre-configure: - ${REINPLACE_CMD} -e 's|-O3|${CXXFLAGS}|;s|g++|${CXX}|' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} - post-install: ${MV} ${STAGEDIR}${PREFIX}/lib/libboard.so ${STAGEDIR}${PREFIX}/lib/libboard.so.0 ${LN} -sf libboard.so.0 ${STAGEDIR}${PREFIX}/lib/libboard.so -post-install-DOXYGEN-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ - ${RM} -r ${STAGEDIR}${DOCSDIR}/.svn - -post-install-EXAMPLES-on: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/ - cd ${WRKSRC}/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${EXAMPLESDIR}/ - ${RM} -r ${STAGEDIR}${EXAMPLESDIR}/.svn - do-test: (cd ${WRKDIR} && ${WRKSRC}/bin/arithmetic bec) .for ex in 1 2 3 @@ -62,4 +42,4 @@ do-test: .endfor ${LS} -l ${WRKDIR}/arithm* ${WRKDIR}/example* -.include <bsd.port.post.mk> +.include <bsd.port.mk> Added: head/graphics/libboard/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libboard/files/patch-CMakeLists.txt Tue Oct 9 12:47:54 2018 (r481630) @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2016-06-09 17:30:46 UTC ++++ CMakeLists.txt +@@ -149,8 +149,8 @@ install(DIRECTORY include/ DESTINATION i + install(DIRECTORY include/board/ DESTINATION include/board FILES_MATCHING PATTERN "*.h") + install(TARGETS board DESTINATION lib) + install(TARGETS board-dynamic DESTINATION lib) +-install(DIRECTORY examples/ DESTINATION share/libboard/examples FILES_MATCHING PATTERN "*.cpp") +-install(FILES README.md LICENSE AUTHORS DESTINATION share/libboard ) ++install(DIRECTORY examples/ DESTINATION share/examples/libboard FILES_MATCHING PATTERN "*.cpp") ++install(FILES README.md LICENSE AUTHORS DESTINATION share/doc/libboard ) + + FOREACH( EXAMPLE logo example1 example2 example3 example4 + arithmetic ellipse graph arrows ruler koch clipping Modified: head/graphics/libboard/pkg-plist ============================================================================== --- head/graphics/libboard/pkg-plist Tue Oct 9 12:44:06 2018 (r481629) +++ head/graphics/libboard/pkg-plist Tue Oct 9 12:47:54 2018 (r481630) @@ -1,6 +1,5 @@ include/Board.h include/BoardConfig.h -include/board/Board.ih include/board/Color.h include/board/Image.h include/board/PSFonts.h @@ -9,20 +8,14 @@ include/board/PathBoundaries.h include/board/Point.h include/board/Rect.h include/board/ShapeList.h -include/board/ShapeList.ih include/board/ShapeVisitor.h include/board/Shapes.h -include/board/Shapes.ih include/board/Tools.h -include/board/Tools.ih include/board/TransformMatrix.h -include/board/TransformMatrix.ih include/board/Transforms.h -include/board/Transforms.ih lib/libboard.a lib/libboard.so lib/libboard.so.0 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arithmetic %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arithmetic.cpp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrows
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810091247.w99ClsvT063632>