diff --git a/devel/libnjs/Makefile b/devel/libnjs/Makefile index 0a23904e5cb7..938ee47a3e26 100644 --- a/devel/libnjs/Makefile +++ b/devel/libnjs/Makefile @@ -1,35 +1,36 @@ PORTNAME= libnjs DISTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= devel www MAINTAINER= osa@FreeBSD.org COMMENT= NGINX JavaScript static library 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 USE_GITHUB= yes GH_TUPLE= nginx:njs:${DISTVERSION} HAS_CONFIGURE= yes post-patch: @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/auto/make do-build: @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 index 5a7b66d1ad47..e3b74fc7b1cc 100644 --- a/devel/libnjs/files/patch-auto_make +++ b/devel/libnjs/files/patch-auto_make @@ -1,13 +1,24 @@ ---- auto/make.orig 2023-07-11 23:27:41 UTC +--- auto/make.orig 2023-10-24 04:42:29 UTC +++ auto/make -@@ -320,9 +320,7 @@ cat << END >> $NJS_MAKEFILE +@@ -85,8 +85,9 @@ do + cat << END >> $NJS_MAKEFILE + + $NJS_BUILD_DIR/$njs_obj: $njs_src +- \$(NJS_CC) -c \$(NJS_CFLAGS) $NJS_LIB_AUX_CFLAGS \\ ++ \$(NJS_CC) -c \$(NJS_CFLAGS) \\ + \$(NJS_LIB_INCS) -Injs \\ ++ $NJS_LIB_AUX_CFLAGS \\ + -o $NJS_BUILD_DIR/$njs_obj \\ + $njs_dep_flags \\ + $njs_src +@@ -320,9 +321,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#" \\ + sed -e "s#@PREFIX@#%%LOCALBASE%%#" \\ -e "s#@VERSION@#\$(NJS_VER)#" \\ -e "s#@EXTRA_LIBS@#-lm $NJS_LIBS $NJS_LIB_AUX_LIBS#" \\ src/njs.pc.in > \$@