Attachment 233986 Details for Bug 262082 – [PATCH] update lang/urweb with latest version (20200209), build on poudriere, fix build on FreeBSD 12,13, update LIB_DEPENDS, address portlint warnings

[patch] [PATCH] update lang/urweb with latest version (20200209), build on poudriere, fix build on FreeBSD 12,13, update LIB_DEPENDS, address portlint warnings

lang_urweb.diff (text/plain), 5.04 KB, created by Timothy Beyer on 2022-05-17 04:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Beyer

Created: 2022-05-17 04:50:55 UTC

Size: 5.04 KB

patch

obsolete

>From 0a475b7b83b0d205e2795594b4bb7f7e8e1e5c46 Mon Sep 17 00:00:00 2001
>From: Timothy Beyer <beyert_freebsd@fastmail.net>
>Date: Mon, 16 May 2022 20:53:46 -0700
>Subject: [PATCH] fix build of lang/urweb in poudriere
>
>---
> lang/{urweb.orig => urweb}/Makefile                | 28 +++++++++++++---------
> lang/{urweb.orig => urweb}/distinfo                |  5 ++--
> .../files/patch-src__c__urweb.c => /dev/null       | 11 ---------
> lang/{urweb.orig => urweb}/pkg-plist               | 24 +++++++++++--------
> 4 files changed, 34 insertions(+), 34 deletions(-)
> delete mode 100644 lang/urweb.orig/files/patch-src__c__urweb.c
>
>diff --git a/lang/urweb.orig/Makefile b/lang/urweb/Makefile
>index 7db2261..110a75b 100644
>--- a/lang/urweb.orig/Makefile
>+++ b/lang/urweb/Makefile
>@@ -1,10 +1,8 @@
> # Created by: Timothy Beyer <beyert@cs.ucr.edu>
> 
> PORTNAME=	urweb
>-PORTVERSION=	20150520
>-PORTREVISION=	3
>+PORTVERSION=	20200209
> CATEGORIES=	lang www
>-MASTER_SITES=	http://www.impredicative.com/ur/
> 
> MAINTAINER=	beyert@cs.ucr.edu
> COMMENT=	Ultimate host for embedded domain-specific languages
>@@ -12,18 +10,19 @@ COMMENT=	Ultimate host for embedded domain-specific languages
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN=		fails to build
>-BROKEN_FreeBSD_12=	invalid target: self
>-BROKEN_FreeBSD_13=	invalid target: self
>+ONLY_FOR_ARCHS=	amd64 i386
> 
> BUILD_DEPENDS=	mlton:lang/mlton
>+LIB_DEPENDS=	libgmp.so:math/gmp \
>+	libicudata.so:devel/icu
> 
>-CONFIGURE_ENV=	CCARGS="-I${LOCALBASE}/include"
>+USES=		gmake libtool tar:tgz ssl autoreconf
> 
>+CONFIGURE_ENV=	CCARGS="-I${LOCALBASE}/include"
> GNU_CONFIGURE=	yes
>-USES=		gmake libtool tar:tgz ssl
>+
>+USE_GITHUB=	yes
> USE_LDCONFIG=	yes
>-ONLY_FOR_ARCHS=	i386 amd64
> CFLAGS+=	-pthread
> 
> OPTIONS_DEFINE=	ELISP PGSQL SQLITE MYSQL
>@@ -63,7 +62,14 @@ CONFIGURE_ENV+=	MSHEADER="no"
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -e "s|postgresql/libpq-fe.h|libpq-fe.h|g" \
>-	${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e "s|postgresql/libpq-fe.h|libpq-fe.h|g" \
>+		${WRKSRC}/configure.ac
>+	@${REINPLACE_CMD} -e "s|uw_Basis_int true|uw_Basis_int utrue|" \
>+		-e "s|uw_Basis_int false|uw_Basis_int ufalse|" \
>+		-e "s|uw_Basis_bool true|uw_Basis_bool utrue|" \
>+		-e "s|uw_Basis_bool false|uw_Basis_bool ufalse|" \
>+		-e "s|\&true|\&utrue|g" -e "s|\&false|\&ufalse|g" \
>+		-e "s|abs(ret)|llabs(ret)|" \
>+		${WRKSRC}/src/c/urweb.c
> 
> .include <bsd.port.mk>
>diff --git a/lang/urweb.orig/distinfo b/lang/urweb/distinfo
>index 7c43b77..de7df73 100644
>--- a/lang/urweb.orig/distinfo
>+++ b/lang/urweb/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (urweb-20150520.tgz) = 35f31c9b39093dc50be72731ae7288245befc1b98bfcdcc481db15a8c937f41a
>-SIZE (urweb-20150520.tgz) = 4349365
>+TIMESTAMP = 1645398698
>+SHA256 (urweb-urweb-20200209_GH0.tar.gz) = 56062e4b2485c73e2b912e6c7631ce47e885774dd0ac4e9acbb21594165fac01
>+SIZE (urweb-urweb-20200209_GH0.tar.gz) = 804989
>diff --git a/lang/urweb.orig/files/patch-src__c__urweb.c b/lang/urweb.orig/files/patch-src__c__urweb.c
>deleted file mode 100644
>index b1c9568..0000000
>--- a/lang/urweb.orig/files/patch-src__c__urweb.c
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- src/c/urweb.c.orig	2014-07-04 15:32:47.000000000 +0200
>-+++ src/c/urweb.c	2014-12-19 01:22:02.000000000 +0100
>-@@ -4204,7 +4204,7 @@ uw_Basis_int uw_Basis_rand(uw_context ct
>-   pthread_mutex_unlock(&rand_mutex);
>- 
>-   if (r)
>--    return abs(ret);
>-+    return llabs(ret);
>-   else
>-     uw_error(ctx, FATAL, "Random number generation failed");
>- }
>diff --git a/lang/urweb.orig/pkg-plist b/lang/urweb/pkg-plist
>index 6e0f109..56dccd4 100644
>--- a/lang/urweb.orig/pkg-plist
>+++ b/lang/urweb/pkg-plist
>@@ -6,32 +6,35 @@ include/urweb/types.h
> include/urweb/types_cpp.h
> include/urweb/urweb.h
> include/urweb/urweb_cpp.h
>+include/urweb/uthash.h
> lib/liburweb.a
> lib/liburweb.so
>-lib/liburweb.so.0
>-lib/liburweb.so.0.0.0
>+lib/liburweb.so.1
>+lib/liburweb.so.1.0.0
> lib/liburweb_cgi.a
> lib/liburweb_cgi.so
>-lib/liburweb_cgi.so.0
>-lib/liburweb_cgi.so.0.0.0
>+lib/liburweb_cgi.so.1
>+lib/liburweb_cgi.so.1.0.0
> lib/liburweb_fastcgi.a
> lib/liburweb_fastcgi.so
>-lib/liburweb_fastcgi.so.0
>-lib/liburweb_fastcgi.so.0.0.0
>+lib/liburweb_fastcgi.so.1
>+lib/liburweb_fastcgi.so.1.0.0
> lib/liburweb_http.a
> lib/liburweb_http.so
>-lib/liburweb_http.so.0
>-lib/liburweb_http.so.0.0.0
>+lib/liburweb_http.so.1
>+lib/liburweb_http.so.1.0.0
> lib/liburweb_static.a
> lib/liburweb_static.so
>-lib/liburweb_static.so.0
>-lib/liburweb_static.so.0.0.0
>+lib/liburweb_static.so.1
>+lib/liburweb_static.so.1.0.0
> lib/urweb/js/urweb.js
> lib/urweb/ur/basis.urs
> lib/urweb/ur/char.ur
> lib/urweb/ur/char.urs
> lib/urweb/ur/datetime.ur
> lib/urweb/ur/datetime.urs
>+lib/urweb/ur/json.ur
>+lib/urweb/ur/json.urs
> lib/urweb/ur/list.ur
> lib/urweb/ur/list.urs
> lib/urweb/ur/listPair.ur
>@@ -46,6 +49,7 @@ lib/urweb/ur/top.ur
> lib/urweb/ur/top.urs
> %%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-compat.el
> %%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-defs.el
>+%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-flycheck.el
> %%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-mode-startup.el
> %%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-mode.el
> %%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-move.el

Flags:

beyert: maintainer-approval+

Actions: View | Diff

Attachments on bug 262082: 231977 | 233981 | 233986