From nobody Fri Dec 20 01:07:43 2024 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 4YDq5q47P4z5h2GJ; Fri, 20 Dec 2024 01:07:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YDq5q29RJz4vYb; Fri, 20 Dec 2024 01:07:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734656863; 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=9r9MiCxBcrDXFMiZxgzm3HM5Q4eziCNDCYs69PKM3Ik=; b=BNu9ZuBjtDzyXxvmgR3X2y96KpH/97Lf/IU9Rom243YQQGmfdniPj/695SQ5ikgyynnWBV cKgsURqsGBdnUKshnowqypU6twYiA8nQ6lsHeZl7q27/mrAntP6a0Ajvxjf3ll3RGfZbtB pShPL0FAvsDQM5v15VtyclqMtsEueJ0zhHBZ9Sss9XrLtdb1jWl7vizbCjTZJUmQEVh20a OiymRUzDw+8+TXaNV4Twnsmn02W6MhK7T2j0dAvHtLM0hMpcKvjkSKdaR6HfLBJAi6LVfg +FB3fYju/rCD0WHSUpO47T6MgQOeLZtM/pBdMlStEHnzssKmq+8hWZ1claEj4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734656863; 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=9r9MiCxBcrDXFMiZxgzm3HM5Q4eziCNDCYs69PKM3Ik=; b=gz6TnldaIlV6CXDPg14VhilbdMcwt4u1lWR15GsXuw/5wHiZNlcVTvcUe89w0u4qZnDiV9 gzTLAv4jCTPEZ3/NkZft16S42ZakukaQTJrZ26tSq3zh+sET7k55DZDrC88GMK3IX+NTxN tF2ZQ4Yw43EVGhlDRPawwMoU2/lerAtw0aDVpx4JvKGax0GCX/Ho0i3HXVImcsTFCFG/jF 9h/raY3Ribf/cJ8uqGEM/ArpQSGhh9RFbW1acAuRI1yMzvYm26GvQwNJ7IdoKuZ1vXQmxo ARRsaS0TQkBS5JRuR7+UV7Mf1sjCO2BNqgGafPE58n5AtuS9X/W5sXqOGH7SsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734656863; a=rsa-sha256; cv=none; b=io4SSEorjuoeci0GFxvVAeCfdxw0MR8v/StZJoWohP8XlWHaEuEv4anyiSehVIhBEOwE91 HeOvhSX5W1QzfW9b802BChco/HBEykdKmthj69r3yLBDHbEtEFOKFqYHdLgk60Nv44g1qk xXaVmd2Z5+k7zlCztz9onEwLaE35+2KbjubafWuIB0+JmQBjOl/KPv8zUSbIGIIZJHpfui slIxT5E3grlNb1qFXdYYOVmSi2lrPX9hX+GhmAA+RZZfuemQgIdRm8SBYxe/ZSVMkGMuyi TlODLbl1LGYlUQ5WmI+PD1HA8pAQfHv6ODMhexk+LSRXAJGUn7AD8LdITPPAaA== 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 4YDq5q1TzWzHNP; Fri, 20 Dec 2024 01:07:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BK17hnY079704; Fri, 20 Dec 2024 01:07:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BK17hWc079701; Fri, 20 Dec 2024 01:07:43 GMT (envelope-from git) Date: Fri, 20 Dec 2024 01:07:43 GMT Message-Id: <202412200107.4BK17hWc079701@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: 395f14f433d3 - main - */*njs: remove needless patch 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 395f14f433d38f518bea770462ea324e058428f9 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=395f14f433d38f518bea770462ea324e058428f9 commit 395f14f433d38f518bea770462ea324e058428f9 Author: Sergey A. Osokin AuthorDate: 2024-12-20 01:06:29 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-20 01:06:29 +0000 */*njs: remove needless patch Let's use a set of arguments for configure script instead. Bump PORTREVISION. --- devel/libnjs/Makefile | 5 ++++- devel/libnjs/files/patch-auto_quickjs | 15 --------------- lang/njs/Makefile | 15 ++++++++------- lang/njs/files/patch-auto_quickjs | 15 --------------- 4 files changed, 12 insertions(+), 38 deletions(-) diff --git a/devel/libnjs/Makefile b/devel/libnjs/Makefile index fbf89b45ed97..dddb6970ddaf 100644 --- a/devel/libnjs/Makefile +++ b/devel/libnjs/Makefile @@ -1,5 +1,6 @@ PORTNAME= libnjs DISTVERSION= 0.8.8 +PORTREVISION= 1 CATEGORIES= devel www MAINTAINER= osa@FreeBSD.org @@ -19,10 +20,12 @@ CPE_VENDOR= f5 USE_GITHUB= yes GH_TUPLE= nginx:njs:${DISTVERSION} HAS_CONFIGURE= yes +CONFIGURE_ARGS= --cc-opt="-I${LOCALBASE}/include/quickjs" \ + --ld-opt="-L${LOCALBASE}/lib" \ + --with-quickjs post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/auto/quickjs \ ${WRKSRC}/src/njs.pc.in do-build: diff --git a/devel/libnjs/files/patch-auto_quickjs b/devel/libnjs/files/patch-auto_quickjs deleted file mode 100644 index 8312bac9b456..000000000000 --- a/devel/libnjs/files/patch-auto_quickjs +++ /dev/null @@ -1,15 +0,0 @@ ---- auto/quickjs.orig 2024-12-15 17:49:15 UTC -+++ auto/quickjs -@@ -46,9 +46,9 @@ if [ $NJS_TRY_QUICKJS = YES ]; then - fi - - if [ $njs_found = no ]; then -- njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs" -- njs_feature_incs="/usr/include/quickjs/" -- njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread" -+ njs_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs" -+ njs_feature_incs="%%LOCALBASE%%/include/quickjs/" -+ njs_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread" - - . auto/feature - fi diff --git a/lang/njs/Makefile b/lang/njs/Makefile index f52d0541a5ed..36a0d40d1da8 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -1,5 +1,6 @@ PORTNAME= njs DISTVERSION= 0.8.8 +PORTREVISION= 1 CATEGORIES= lang www MAINTAINER= osa@FreeBSD.org @@ -9,23 +10,23 @@ WWW= https://nginx.org/en/docs/njs/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ + libquickjs.so:lang/quickjs + USES= cpe ssl CPE_VENDOR= f5 USE_GITHUB= yes GH_TUPLE= nginx:njs:${DISTVERSION} -HAS_CONFIGURE= yes -LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ - libquickjs.so:lang/quickjs +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --cc-opt="-I${LOCALBASE}/include/quickjs" \ + --ld-opt="-L${LOCALBASE}/lib" \ + --with-quickjs PLIST_FILES= bin/njs -post-patch: - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/auto/quickjs - do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} njs diff --git a/lang/njs/files/patch-auto_quickjs b/lang/njs/files/patch-auto_quickjs deleted file mode 100644 index 8312bac9b456..000000000000 --- a/lang/njs/files/patch-auto_quickjs +++ /dev/null @@ -1,15 +0,0 @@ ---- auto/quickjs.orig 2024-12-15 17:49:15 UTC -+++ auto/quickjs -@@ -46,9 +46,9 @@ if [ $NJS_TRY_QUICKJS = YES ]; then - fi - - if [ $njs_found = no ]; then -- njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs" -- njs_feature_incs="/usr/include/quickjs/" -- njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread" -+ njs_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs" -+ njs_feature_incs="%%LOCALBASE%%/include/quickjs/" -+ njs_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread" - - . auto/feature - fi