CVS commit: pkgsrc/devel

["Sergey A. Osokin" <osa%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   osa
Date:           Wed May 17 16:44:52 UTC 2023

Modified Files:
        pkgsrc/devel: Makefile
Added Files:
        pkgsrc/devel/libnjs: DESCR Makefile PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/devel/libnjs/patches: patch-auto_make

Log Message:
devel/libnjs: add NGINX JavaScript static library


To generate a diff of this commit:
cvs rdiff -u -r1.3991 -r1.3992 pkgsrc/devel/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libnjs/DESCR pkgsrc/devel/libnjs/Makefile \
    pkgsrc/devel/libnjs/PLIST pkgsrc/devel/libnjs/buildlink3.mk \
    pkgsrc/devel/libnjs/distinfo pkgsrc/devel/libnjs/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libnjs/patches/patch-auto_make

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.3991 pkgsrc/devel/Makefile:1.3992
--- pkgsrc/devel/Makefile:1.3991        Thu May 11 05:23:30 2023
+++ pkgsrc/devel/Makefile       Wed May 17 16:44:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3991 2023/05/11 05:23:30 adam Exp $
+# $NetBSD: Makefile,v 1.3992 2023/05/17 16:44:51 osa Exp $
 #
 
 COMMENT=       Development utilities
@@ -944,6 +944,7 @@ SUBDIR+=    libnet10
 SUBDIR+=       libnet11
 SUBDIR+=       libnfc
 SUBDIR+=       libnjb
+SUBDIR+=       libnjs
 SUBDIR+=       libntlm
 SUBDIR+=       liboil
 SUBDIR+=       liboop

Added files:

Index: pkgsrc/devel/libnjs/DESCR
diff -u /dev/null pkgsrc/devel/libnjs/DESCR:1.1
--- /dev/null   Wed May 17 16:44:52 2023
+++ pkgsrc/devel/libnjs/DESCR   Wed May 17 16:44:51 2023
@@ -0,0 +1,4 @@
+The library of the njs scripting language.  njs, is a subset of the JavaScript
+language that allows extending nginx functionality.  njs is created in
+compliance with ECMAScript 5.1 (strict mode) with some ECMAScript 6 and later
+extensions.  The compliance is still evolving.
Index: pkgsrc/devel/libnjs/Makefile
diff -u /dev/null pkgsrc/devel/libnjs/Makefile:1.1
--- /dev/null   Wed May 17 16:44:52 2023
+++ pkgsrc/devel/libnjs/Makefile        Wed May 17 16:44:51 2023
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1 2023/05/17 16:44:51 osa Exp $
+
+PKGNAME=       libnjs-${VERSION}
+VERSION=       0.7.12
+DISTNAME=      njs-${VERSION}
+CATEGORIES=    devel www
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=nginx/}
+
+MAINTAINER=    osa%NetBSD.org@localhost
+HOMEPAGE=      https://nginx.org/en/docs/njs/
+COMMENT=       NGINX JavaScript static library
+LICENSE=       2-clause-bsd
+
+HAS_CONFIGURE= yes
+USE_LANGUAGES+=        c
+
+INSTALLATION_DIRS=     include lib/pkgconfig
+
+do-build:
+       ${RUN} cd ${WRKSRC} && ${BUILD_MAKE_CMD} libnjs
+
+do-install:
+       ${INSTALL_DATA} ${WRKSRC}/src/*.h ${DESTDIR}${PREFIX}/include
+       ${INSTALL_DATA} ${WRKSRC}/build/njs_auto_config.h ${DESTDIR}${PREFIX}/include
+       ${INSTALL_DATA} ${WRKSRC}/build/libnjs.a ${DESTDIR}${PREFIX}/lib
+       ${INSTALL_DATA} ${WRKSRC}/build/njs.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "options.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/libnjs/PLIST
diff -u /dev/null pkgsrc/devel/libnjs/PLIST:1.1
--- /dev/null   Wed May 17 16:44:52 2023
+++ pkgsrc/devel/libnjs/PLIST   Wed May 17 16:44:51 2023
@@ -0,0 +1,75 @@
+@comment $NetBSD: PLIST,v 1.1 2023/05/17 16:44:51 osa Exp $
+include/njs.h
+include/njs_addr2line.h
+include/njs_arr.h
+include/njs_array.h
+include/njs_array_buffer.h
+include/njs_assert.h
+include/njs_async.h
+include/njs_auto_config.h
+include/njs_boolean.h
+include/njs_buffer.h
+include/njs_chb.h
+include/njs_clang.h
+include/njs_date.h
+include/njs_diyfp.h
+include/njs_djb_hash.h
+include/njs_dtoa.h
+include/njs_dtoa_fixed.h
+include/njs_encoding.h
+include/njs_error.h
+include/njs_event.h
+include/njs_file.h
+include/njs_function.h
+include/njs_generator.h
+include/njs_iterator.h
+include/njs_json.h
+include/njs_lexer.h
+include/njs_lexer_tables.h
+include/njs_lvlhsh.h
+include/njs_main.h
+include/njs_malloc.h
+include/njs_math.h
+include/njs_md5.h
+include/njs_module.h
+include/njs_mp.h
+include/njs_murmur_hash.h
+include/njs_number.h
+include/njs_object.h
+include/njs_object_hash.h
+include/njs_object_prop_declare.h
+include/njs_parser.h
+include/njs_promise.h
+include/njs_queue.h
+include/njs_random.h
+include/njs_rbtree.h
+include/njs_regex.h
+include/njs_regexp.h
+include/njs_regexp_pattern.h
+include/njs_scope.h
+include/njs_sha1.h
+include/njs_sha2.h
+include/njs_sprintf.h
+include/njs_str.h
+include/njs_string.h
+include/njs_strtod.h
+include/njs_symbol.h
+include/njs_time.h
+include/njs_timer.h
+include/njs_trace.h
+include/njs_typed_array.h
+include/njs_types.h
+include/njs_unicode.h
+include/njs_unicode_lower_case.h
+include/njs_unicode_upper_case.h
+include/njs_unix.h
+include/njs_utf16.h
+include/njs_utf8.h
+include/njs_utils.h
+include/njs_value.h
+include/njs_value_conversion.h
+include/njs_variable.h
+include/njs_vm.h
+include/njs_vmcode.h
+lib/libnjs.a
+lib/pkgconfig/njs.pc
Index: pkgsrc/devel/libnjs/buildlink3.mk
diff -u /dev/null pkgsrc/devel/libnjs/buildlink3.mk:1.1
--- /dev/null   Wed May 17 16:44:52 2023
+++ pkgsrc/devel/libnjs/buildlink3.mk   Wed May 17 16:44:51 2023
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2023/05/17 16:44:51 osa Exp $
+
+BUILDLINK_TREE+=       libnjs
+
+.if !defined(LIBNJS_BUILDLINK3_MK)
+LIBNJS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libnjs+= libnjs>=0.7.12
+BUILDLINK_PKGSRCDIR.libnjs?=   ../../devel/libnjs
+
+.endif # LIBNJS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -libnjs
Index: pkgsrc/devel/libnjs/distinfo
diff -u /dev/null pkgsrc/devel/libnjs/distinfo:1.1
--- /dev/null   Wed May 17 16:44:52 2023
+++ pkgsrc/devel/libnjs/distinfo        Wed May 17 16:44:51 2023
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2023/05/17 16:44:51 osa Exp $
+
+BLAKE2s (njs-0.7.12.tar.gz) = a4c69c83bcc81ecd593f63f6d3e2d5d9cff8185ad56e8fd4846660c132976133
+SHA512 (njs-0.7.12.tar.gz) = a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
+Size (njs-0.7.12.tar.gz) = 662554 bytes
+SHA1 (patch-auto_make) = dc784639fa8c4b7fb1437c16575555b38a1d85af
Index: pkgsrc/devel/libnjs/options.mk
diff -u /dev/null pkgsrc/devel/libnjs/options.mk:1.1
--- /dev/null   Wed May 17 16:44:52 2023
+++ pkgsrc/devel/libnjs/options.mk      Wed May 17 16:44:51 2023
@@ -0,0 +1,31 @@
+# $NetBSD: options.mk,v 1.1 2023/05/17 16:44:51 osa Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libnjs
+PKG_SUPPORTED_OPTIONS= ssl pcre2 xml
+PKG_SUGGESTED_OPTIONS= ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpcre2)
+.include "../../devel/pcre2/buildlink3.mk"
+SUBST_CLASSES+=                fix-pcre2
+SUBST_STAGE.fix-pcre2= pre-configure
+SUBST_FILES.fix-pcre2= auto/pcre
+SUBST_SED.fix-pcre2=   -e 's,/usr/pkg,${BUILDLINK_PREFIX.pcre2},g'
+SUBST_NOOP_OK.fix-pcre2=yes
+.else
+CONFIGURE_ARGS+=       --no-pcre
+CONFIGURE_ARGS+=       --no-pcre2
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --no-openssl
+.endif
+
+.if !empty(PKG_OPTIONS:Mxml)
+.include "../../textproc/libxml2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --no-libxml2
+.endif

Index: pkgsrc/devel/libnjs/patches/patch-auto_make
diff -u /dev/null pkgsrc/devel/libnjs/patches/patch-auto_make:1.1
--- /dev/null   Wed May 17 16:44:52 2023
+++ pkgsrc/devel/libnjs/patches/patch-auto_make Wed May 17 16:44:51 2023
@@ -0,0 +1,27 @@
+$NetBSD: patch-auto_make,v 1.1 2023/05/17 16:44:51 osa Exp $
+
+Use pipe as a delimiter for sed(1) to fix build for libnjs target.
+
+sed(1) command line utility may fail with the following error:
+sed: 1: "s, at EXTRA_LIBS@,-lm   -L ...": bad in substitute command: '-'
+when a replacement for @EXTRA_LIBS@ contains a comma symbol.
+
+--- 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
+