On Wed, Jun 12, 2019 at 06:28:13PM +0100, Stuart Henderson wrote:
> I think it's correct to remove those extras.
>
> libexecinfo is an extra specially annoying case because many ports are only
> prepared to deal with Linux (execinfo.h header but the backtrace functions are
> in libc). I'm not sure where it originally came from in the i-w-y-u port but
> reviewing the source/build infrastructure there is nothing that uses it, so
> we are ok to remove this from the port too (LIB_DEPENDS as well as the
> WANTLIB).
Thanks for working this out.
Updated diff below stripping WANTLIB and LIB_DEPENDS, the README is now
installed besides the rest of the documentation.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/include-what-you-use/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 16 Feb 2019 12:06:23 -0000 1.15
+++ Makefile 17 Jun 2019 20:56:03 -0000
@@ -3,28 +3,38 @@
COMMENT= tool to analyse \#includes in C and C++ source files
CATEGORIES= devel
DISTNAME= include-what-you-use-0.11.src
-PKGNAME= include-what-you-use-0.11
-REVISION= 0
+PKGNAME= ${DISTNAME:.src=}
+REVISION= 1
-HOMEPAGE= http://include-what-you-use.org
+HOMEPAGE= https://include-what-you-use.org
MASTER_SITES= ${HOMEPAGE}/downloads/
WRKDIST= ${WRKDIR}/include-what-you-use
MAINTAINER= Jonathan Gray <j...@openbsd.org>
# BSD
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE= Yes
-WANTLIB= c curses execinfo form m pthread z
+WANTLIB= ${COMPILER_LIBCXX} c m pthread
LLVM_V= 7.0.1
BUILD_DEPENDS= devel/llvm>=${LLVM_V}
RUN_DEPENDS= devel/llvm>=${LLVM_V}
-LIB_DEPENDS= devel/libexecinfo
MODULES= devel/cmake lang/python
+MODPY_BUILDDEP= No
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+MODPY_ADJ_FILES= *.py
+
COMPILER= base-clang ports-gcc
COMPILER_LANGS= c++
-MODPY_ADJ_FILES = fix_includes.py iwyu_tool.py
+DOCDIR= ${PREFIX}/share/doc/include-what-you-use
+
+do-test:
+ cd ${WRKSRC} && ./run_iwyu_tests.py
+
+post-install:
+ ${INSTALL_DATA_DIR} ${DOCDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/docs/* ${DOCDIR}/
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/include-what-you-use/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 1 Jan 2017 06:58:37 -0000 1.2
+++ pkg/PLIST 13 Jun 2019 23:21:13 -0000
@@ -2,9 +2,20 @@
bin/fix_includes.py
@bin bin/include-what-you-use
bin/iwyu_tool.py
+share/doc/include-what-you-use/
+share/doc/include-what-you-use/IWYUMappings.md
+share/doc/include-what-you-use/IWYUPragmas.md
+share/doc/include-what-you-use/README.md
+share/doc/include-what-you-use/WhatIsAUse.md
+share/doc/include-what-you-use/WhyIWYU.md
+share/doc/include-what-you-use/WhyIWYUIsDifficult.md
share/include-what-you-use/
+share/include-what-you-use/boost-1.64-all-private.imp
+share/include-what-you-use/boost-1.64-all.imp
share/include-what-you-use/boost-all-private.imp
share/include-what-you-use/boost-all.imp
+share/include-what-you-use/clang-6.intrinsics.imp
+share/include-what-you-use/gcc-8.intrinsics.imp
share/include-what-you-use/gcc.libc.imp
share/include-what-you-use/gcc.stl.headers.imp
share/include-what-you-use/gcc.symbols.imp
