git: 395f14f433d3 - main - */*njs: remove needless patch
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 Dec 2024 01:07:43 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=395f14f433d38f518bea770462ea324e058428f9
commit 395f14f433d38f518bea770462ea324e058428f9
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2024-12-20 01:06:29 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
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