On Tue, Sep 05, 2023 at 04:35:50PM +0200, Landry Breuil wrote:
[...]
> i get that for you as a maintainer it might be better/consistent, but i
> have to disagree here. What do we gain from having them split ? users
> wanting just a binary without the header/library ? disk space ? the two
> ports would build from the same tarball/distfile anyway.
>
> In addition, a @pkgpath/@conflict would be needed to handle the upgrade
> path.
>
> Landry
Alright, let's keep it as is and update the lang/njs to v0.8.0, the patch
is attached, thank you.
--
Sergey A. Osokin
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/njs/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 17 Jun 2023 03:03:18 -0000 1.2
+++ Makefile 5 Sep 2023 14:57:24 -0000
@@ -2,7 +2,7 @@ COMMENT= NGINX JavaScript command line u
GH_ACCOUNT= nginx
GH_PROJECT= njs
-GH_TAGNAME= 0.7.12
+GH_TAGNAME= 0.8.0
CATEGORIES= lang www
@@ -24,6 +24,9 @@ LIB_DEPENDS= devel/pcre2 \
CONFIGURE_STYLE=simple
ALL_TARGET= libnjs njs
+
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/auto/make
do-install:
${INSTALL_PROGRAM} ${WRKDIST}/build/njs ${PREFIX}/bin
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/njs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 25 May 2023 09:29:24 -0000 1.1.1.1
+++ distinfo 5 Sep 2023 14:57:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (njs-0.7.12.tar.gz) = enWjkCLftY2/RhBTkDoHzEjdSUL32CpGYBgZwbAHdoc=
-SIZE (njs-0.7.12.tar.gz) = 662554
+SHA256 (njs-0.8.0.tar.gz) = uYAz//aq3LuOEIuW6AwNlMbiEDvL51hGta4LVgaWCEs=
+SIZE (njs-0.8.0.tar.gz) = 715391
Index: patches/patch-auto_make
===================================================================
RCS file: /cvs/ports/lang/njs/patches/patch-auto_make,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-auto_make
--- patches/patch-auto_make 25 May 2023 09:29:24 -0000 1.1.1.1
+++ patches/patch-auto_make 5 Sep 2023 14:57:24 -0000
@@ -1,23 +1,13 @@
-should no longer be needed after
-https://github.com/nginx/njs/commit/e9d814a0a8c1857f78fdc85ed1461cb9101ebf4e
-
-Index: auto/make
---- auto/make.orig
+--- auto/make.orig 2023-07-11 23:27:41 UTC
+++ auto/make
-@@ -320,11 +320,11 @@ cat << END >> $NJS_MAKEFILE
+@@ -320,9 +320,7 @@ 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|" \\
+- 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#" \\
++ sed -e "s#@PREFIX@#${TRUEPREFIX}#" \\
+ -e "s#@VERSION@#\$(NJS_VER)#" \\
+ -e "s#@EXTRA_LIBS@#-lm $NJS_LIBS $NJS_LIB_AUX_LIBS#" \\
src/njs.pc.in > \$@
- END
-
--- /dev/null Tue Sep 5 09:58:00 2023
+++ patches/patch-src_njs.pc.in Tue Sep 5 09:44:23 2023
@@ -0,0 +1,13 @@
+--- src/njs.pc.in.orig 2023-07-11 23:13:20 UTC
++++ src/njs.pc.in
+@@ -1,8 +1,8 @@
+ prefix=@PREFIX@
+-libdir=@LIBDIR@
++libdir=${prefix}/lib
+
+ Name: njs
+ Description: library to embed njs scripting language
+ Version: @VERSION@
+ Libs: -L${libdir} -lnjs @EXTRA_LIBS@
+-Cflags: @CFLAGS@
++Cflags: -I${prefix}/include
