On Mon, Jun 10, 2019 at 10:34:21PM +0200, Klemens Nanni wrote:
> On Mon, Jun 10, 2019 at 08:10:58PM +0100, Stuart Henderson wrote:
> > Removing execinfo from WANTLIB nullifies the devel/libexecinfo LIB_DEPENDS
> > ..
> That... is a valid point. I'll leave it in and double check tooling's
> output before cooking diffs, thanks.
I don't see why you are removing libcurses and libz from wantlib
$ ldd /usr/local/bin/include-what-you-use
/usr/local/bin/include-what-you-use:
Start End Type Open Ref GrpRef Name
0000050a920fd000 0000050a9352b000 exe 2 0 0
/usr/local/bin/include-what-you-use
0000050d4ff04000 0000050d4ff11000 rlib 0 2 0
/usr/lib/libpthread.so.26.1
0000050d8fd16000 0000050d939de000 rlib 0 1 0
/usr/local/lib/libLLVM-7.so
0000050d0ced0000 0000050d0cfc2000 rlib 0 2 0
/usr/lib/libc++.so.2.2
0000050d17810000 0000050d17853000 rlib 0 3 0
/usr/lib/libc++abi.so.0.1
0000050d68782000 0000050d687b1000 rlib 0 2 0
/usr/lib/libm.so.10.1
0000050d1e240000 0000050d1e336000 rlib 0 1 0
/usr/lib/libc.so.95.1
0000050d45d6c000 0000050d45da9000 rlib 0 1 0
/usr/lib/libedit.so.5.2
0000050d1cbec000 0000050d1cc07000 rlib 0 1 0
/usr/lib/libz.so.5.0
0000050d62d77000 0000050d62dd9000 rlib 0 1 0
/usr/lib/libcurses.so.14.0
0000050d1a310000 0000050d1a310000 ld.so 0 1 0
/usr/libexec/ld.so
Is there a push to move everything to python3 now?
Changing MODPY_ADJ_FILES to a glob seems a bit pointless.
Should do-test explictly use ${MODPY_BIN} ?
>
> 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 10 Jun 2019 20:33:34 -0000
> @@ -3,28 +3,40 @@
> 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 execinfo 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}/docs/* ${DOCDIR}/
> + ${INSTALL_DATA} ${WRKSRC}/README.md
> ${PREFIX}/share/include-what-you-use/
>
> .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 10 Jun 2019 15:48:02 -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/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/README.md
> +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
>
