From nobody Fri May 12 14:27:43 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHrhJ1vFnz4B52K; Fri, 12 May 2023 14:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHrhH72s1z42jR; Fri, 12 May 2023 14:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683901664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K0pe5eR+S5bw3KbprUyeRksBUkCl+W3frlEZzoV5KYU=; b=qZUBCLoLbuV9midHuOgb9NdhUARbXDxIMDurLdjjiWaonSsxIGEuWSqiOYBzx4v5fDERMj s0FL7S+fm7j3pRHf3LjJEBQXWb1NdSJKW5qIRQHiRgDgz/b8yOvoUk/eFlMuqb3Q6kyLLT YA+XmPcfHUbygenuZE3taD2yQBmLz5tlevHeUV/TXukUZSqnd7TFCMUWaiWEXv51yzxoRC jAO/4Id+DNpkXOCvhaQrY50FGVblcTYhNghA+COpipWAb0H41+nuVPXgpJjJyV7mAhtpJs EgeB/wLb+K0Bi4Waxw1TbooZw7WMkz5xEVEqVI0nfyBMaOYkIRKLIOw17xOjXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683901664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K0pe5eR+S5bw3KbprUyeRksBUkCl+W3frlEZzoV5KYU=; b=UgtVOcVI7GkgUODh4te10CHmUbPuLABaYISFIGiwRGP4d/s1OywdIQW13xFR4nH0bCs3hp 1/9yj/kKbWY84o0zMwCSQ5Pcx5t1yq42jN4hFEwYscYJR38C/E21cWWm2neIkBnvbpEmlk gVhTDzpmd8SDnJO/vqFkiToVWCCZ87gQQtvfVEGMsbth9Bd/kffnUlO+yOGUUi6MtaY/E8 5IyKOCN7jSvxzA4gcVFlmcxaKgguVObpWm572W602XrX6mbxzR6VjKs5tcTivDETAKDhd0 EYxL0kb0eyBwIXAecA6N0IAUD1w7LmLq5UYEG0jXSJFo92o/GD37fZ4TXwO3gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683901664; a=rsa-sha256; cv=none; b=VkEy5CH0O0Z0OLSBpZZsSwuMaEQfzorESpIfcmjRF4RcNrrwdOCF0jQX1zDcj93A4REZu1 c/7GsMgp9BJ8esYM4TwIvMShntKpJhewqnTpBS/IVP8blLJqCrmCCz8GdBVPu6UhNXieZn 8LwiehfPzex/9Ya0ljcMgwxYWKjXnE5L6+uAhfzhKSSuIA28znnkFVD0BY42O429wi6Wkg V+mKy0cuGYoXxEcWgdZwrdOjtnq1FAgvbn5XIYnbLym+jIY9Pejt6UDYmts2SC6GZ9L8ZF +6vtdJ7B8F7LcwdP4xNG7dNWw3dlmtHbCUtpK+kXXaKdJDxLlGhUyKYmPHZGaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHrhH5spPzfTp; Fri, 12 May 2023 14:27:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34CERhLv031604; Fri, 12 May 2023 14:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CERhmQ031603; Fri, 12 May 2023 14:27:43 GMT (envelope-from git) Date: Fri, 12 May 2023 14:27:43 GMT Message-Id: <202305121427.34CERhmQ031603@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 3eafde277e28 - main - devel/libnjs: update build target to libnjs and install njs.pc List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eafde277e28167a6727bd70e537dc8f4f4d1459 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eafde277e28167a6727bd70e537dc8f4f4d1459 commit 3eafde277e28167a6727bd70e537dc8f4f4d1459 Author: Sergey A. Osokin AuthorDate: 2023-05-12 14:26:39 +0000 Commit: Sergey A. Osokin 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 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 +