git: 3eafde277e28 - main - devel/libnjs: update build target to libnjs and install njs.pc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 12 May 2023 14:27:43 UTC
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eafde277e28167a6727bd70e537dc8f4f4d1459 commit 3eafde277e28167a6727bd70e537dc8f4f4d1459 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2023-05-12 14:26:39 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2023-05-12 14:26:39 +0000 devel/libnjs: update build target to libnjs and install njs.pc Make portlint(1) happy by moving LIB_DEPENDS up. Bump PORTREVISION. --- devel/libnjs/Makefile | 11 +++++++---- devel/libnjs/files/patch-auto_make | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/devel/libnjs/Makefile b/devel/libnjs/Makefile index 7af4bebf82a1..39a1a022976a 100644 --- a/devel/libnjs/Makefile +++ b/devel/libnjs/Makefile @@ -1,5 +1,6 @@ PORTNAME= libnjs DISTVERSION= 0.7.12 +PORTREVISION= 1 CATEGORIES= devel www MAINTAINER= osa@FreeBSD.org @@ -9,6 +10,8 @@ WWW= https://nginx.org/en/docs/njs/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 + USES= cpe ssl CPE_VENDOR= f5 @@ -17,8 +20,6 @@ USE_GITHUB= yes GH_TUPLE= nginx:njs:${DISTVERSION} HAS_CONFIGURE= yes -LIB_DEPENDS= libpcre2-8.so:devel/pcre2 - PLIST_FILES= include/njs_addr2line.h \ include/njs_arr.h \ include/njs_array_buffer.h \ @@ -91,14 +92,16 @@ PLIST_FILES= include/njs_addr2line.h \ include/njs_vm.h \ include/njs_vmcode.h \ include/njs.h \ - lib/libnjs.a + lib/libnjs.a \ + libdata/pkgconfig/njs.pc do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build/libnjs.a + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libnjs do-install: ${INSTALL_DATA} ${WRKSRC}/src/*.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/build/njs_auto_config.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/build/libnjs.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/build/njs.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include <bsd.port.mk> diff --git a/devel/libnjs/files/patch-auto_make b/devel/libnjs/files/patch-auto_make new file mode 100644 index 000000000000..bcc24076ba99 --- /dev/null +++ b/devel/libnjs/files/patch-auto_make @@ -0,0 +1,19 @@ +--- auto/make.orig 2023-05-11 23:24:57 UTC ++++ auto/make +@@ -320,11 +320,11 @@ cat << END >> $NJS_MAKEFILE + pc: $NJS_BUILD_DIR/njs.pc + + $NJS_BUILD_DIR/njs.pc: $NJS_BUILD_DIR/njs_auto_config.h +- sed -e "s,@PREFIX@,$(pwd)/$NJS_BUILD_DIR," \\ +- -e "s,@LIBDIR@,$(pwd)/$NJS_BUILD_DIR," \\ +- -e "s,@CFLAGS@,-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src," \\ +- -e "s,@VERSION@,\$(NJS_VER)," \\ +- -e "s,@EXTRA_LIBS@,-lm $NJS_LIBS $NJS_LIB_AUX_LIBS," \\ ++ sed -e "s|@PREFIX@|$(pwd)/$NJS_BUILD_DIR|" \\ ++ -e "s|@LIBDIR@|$(pwd)/$NJS_BUILD_DIR|" \\ ++ -e "s|@CFLAGS@|-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src|" \\ ++ -e "s|@VERSION@|\$(NJS_VER)|" \\ ++ -e "s|@EXTRA_LIBS@|-lm $NJS_LIBS $NJS_LIB_AUX_LIBS|" \\ + src/njs.pc.in > \$@ + END +