From 5ce2537e571423d0c0b6498de5ff164355f60aee Mon Sep 17 00:00:00 2001 From: Rainer Hurling Date: Wed, 21 Oct 2020 10:26:21 +0000 Subject: [PATCH] lang/duktape and lang/duktape-lib: Update to 2.6.0 - Use CC and CFLAGS from ports framework - Don't install debug library - Bump PORTREVISION of www/edbrowse (has lang/duktape-lib as dependency) Changelog: https://github.com/svaarala/duktape/blob/master/releases/releases.yaml PR: 250358, 250359 Submitted by: Daniel Engberg Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D26881 --- lang/duktape-lib/Makefile | 20 +++----- lang/duktape-lib/distinfo | 6 +-- .../files/patch-Makefile.sharedlibrary | 47 +++++++++++++++++++ lang/duktape/Makefile | 3 +- lang/duktape/distinfo | 6 +-- lang/duktape/files/patch-Makefile.cmdline | 12 +++++ www/edbrowse/Makefile | 2 +- 7 files changed, 74 insertions(+), 22 deletions(-) create mode 100644 lang/duktape-lib/files/patch-Makefile.sharedlibrary create mode 100644 lang/duktape/files/patch-Makefile.cmdline diff --git a/lang/duktape-lib/Makefile b/lang/duktape-lib/Makefile index 5c0884c20539..bb4a95b6d1fc 100644 --- a/lang/duktape-lib/Makefile +++ b/lang/duktape-lib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= duktape -DISTVERSION= 2.5.0 +DISTVERSION= 2.6.0 CATEGORIES= lang devel MASTER_SITES= https://duktape.org/ PKGNAMESUFFIX= -lib @@ -15,28 +15,22 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= gmake tar:xz USE_LDCONFIG= yes -MAKE_ARGS+= CC=${CC} MAKEFILE= Makefile.sharedlibrary -MAJOR= 205 -MINOR= 20500 +MAJOR= 206 +MINOR= 20600 PLIST_FILES= include/duk_config.h \ include/duktape.h \ lib/libduktape.so \ lib/libduktape.so.${MAJOR} \ - lib/libduktape.so.${MAJOR}.${MINOR} \ - lib/libduktaped.so \ - lib/libduktaped.so.${MAJOR} \ - lib/libduktaped.so.${MAJOR}.${MINOR} + lib/libduktape.so.${MAJOR}.${MINOR} do-install: ${INSTALL_DATA} ${WRKSRC}/src/duktape.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/src/duk_config.h ${STAGEDIR}${PREFIX}/include -.for l in libduktape.so libduktaped.so - ${INSTALL_LIB} ${WRKSRC}/${l}.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib - ${RLN} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/${l} - ${RLN} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/${l}.${MAJOR} -.endfor + ${INSTALL_LIB} ${WRKSRC}/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib + ${RLN} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/libduktape.so + ${RLN} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR}.${MINOR} ${STAGEDIR}${PREFIX}/lib/libduktape.so.${MAJOR} .include diff --git a/lang/duktape-lib/distinfo b/lang/duktape-lib/distinfo index c65ac4e54aaa..4b672e7583c7 100644 --- a/lang/duktape-lib/distinfo +++ b/lang/duktape-lib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575253869 -SHA256 (duktape-2.5.0.tar.xz) = 83d411560a1cd36ea132bd81d8d9885efe9285c6bc6685c4b71e69a0c4329616 -SIZE (duktape-2.5.0.tar.xz) = 1031188 +TIMESTAMP = 1602747604 +SHA256 (duktape-2.6.0.tar.xz) = 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 +SIZE (duktape-2.6.0.tar.xz) = 1035160 diff --git a/lang/duktape-lib/files/patch-Makefile.sharedlibrary b/lang/duktape-lib/files/patch-Makefile.sharedlibrary new file mode 100644 index 000000000000..66f9296e0c53 --- /dev/null +++ b/lang/duktape-lib/files/patch-Makefile.sharedlibrary @@ -0,0 +1,47 @@ +--- Makefile.sharedlibrary.orig 2020-10-12 22:23:10 UTC ++++ Makefile.sharedlibrary +@@ -52,22 +52,20 @@ INSTALL_PREFIX = /usr/local + DUKTAPE_SRCDIR = ./src + #DUKTAPE_SRCDIR = ./src-noline + +-CC = gcc +- + .PHONY: all +-all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) ++all: libduktape.$(SO_REALNAME_SUFFIX) + + # If the default duk_config.h is not suitable for the distribution, modify it + # before compiling the shared library and copy the same, edited duk_config.h + # to $INSTALL_PREFIX/include on installation. + + libduktape.$(SO_REALNAME_SUFFIX): +- $(CC) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ ++ $(CC) -shared -fPIC -Wall -Wextra ${CFLAGS} -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ + -o $@ $(DUKTAPE_SRCDIR)/duktape.c + +-libduktaped.$(SO_REALNAME_SUFFIX): +- $(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ +- -o $@ $(DUKTAPE_SRCDIR)/duktape.c ++#libduktaped.$(SO_REALNAME_SUFFIX): ++# $(CC) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ ++# -o $@ $(DUKTAPE_SRCDIR)/duktape.c + + # Symlinks depend on platform conventions. + .PHONY: install +@@ -77,12 +75,12 @@ install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped. + rm -f $(INSTALL_PREFIX)/lib/libduktape.so $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX) + ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.so + ln -s libduktape.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktape.$(SO_SONAME_SUFFIX) +- rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so +- ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) ++# rm -f $(INSTALL_PREFIX)/lib/libduktaped.so $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) ++# ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.so ++# ln -s libduktaped.$(SO_REALNAME_SUFFIX) $(INSTALL_PREFIX)/lib/libduktaped.$(SO_SONAME_SUFFIX) + mkdir -p $(INSTALL_PREFIX)/include/ + cp $(DUKTAPE_SRCDIR)/duktape.h $(DUKTAPE_SRCDIR)/duk_config.h $(INSTALL_PREFIX)/include/ + + CCOPTS = -I./examples/cmdline + duk: +- $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm ++ $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)/lib -Wall -Wextra ${CFLAGS} -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm diff --git a/lang/duktape/Makefile b/lang/duktape/Makefile index 9897719f7d90..49a3fdcc8f27 100644 --- a/lang/duktape/Makefile +++ b/lang/duktape/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= duktape -PORTVERSION= 2.5.0 +DISTVERSION= 2.6.0 CATEGORIES= lang devel MASTER_SITES= https://duktape.org/ @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= tar:xz -MAKE_ARGS+= CC=${CC} MAKEFILE= Makefile.cmdline ALL_TARGET= duk diff --git a/lang/duktape/distinfo b/lang/duktape/distinfo index 534707174a92..7d207db902cf 100644 --- a/lang/duktape/distinfo +++ b/lang/duktape/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575253657 -SHA256 (duktape-2.5.0.tar.xz) = 83d411560a1cd36ea132bd81d8d9885efe9285c6bc6685c4b71e69a0c4329616 -SIZE (duktape-2.5.0.tar.xz) = 1031188 +TIMESTAMP = 1602737106 +SHA256 (duktape-2.6.0.tar.xz) = 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 +SIZE (duktape-2.6.0.tar.xz) = 1035160 diff --git a/lang/duktape/files/patch-Makefile.cmdline b/lang/duktape/files/patch-Makefile.cmdline new file mode 100644 index 000000000000..3fcd00ca8287 --- /dev/null +++ b/lang/duktape/files/patch-Makefile.cmdline @@ -0,0 +1,12 @@ +--- Makefile.cmdline.orig 2020-10-12 22:23:10 UTC ++++ Makefile.cmdline +@@ -8,8 +8,7 @@ DUKTAPE_SOURCES = src/duktape.c + CMDLINE_SOURCES = \ + examples/cmdline/duk_cmdline.c + +-CC = gcc +-CCOPTS = -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer ++CCOPTS = ${CFLAGS} -pedantic -Wall -fstrict-aliasing -fomit-frame-pointer + CCOPTS += -I./examples/cmdline -I./src # duktape.h and duk_config.h must be in include path + CCLIBS = -lm + diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile index e1d9dfd9d224..48c48fe4f296 100644 --- a/www/edbrowse/Makefile +++ b/www/edbrowse/Makefile @@ -3,7 +3,7 @@ PORTNAME= edbrowse DISTVERSIONPREFIX= v DISTVERSION= 3.7.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www editors MAINTAINER= alfix86@gmail.com