Attachment #231977 for bug #262082




# Created by: Timothy Beyer <beyert@cs.ucr.edu>

PORTNAME=	urweb
PORTVERSION=	20200209
PORTREVISION=	3
CATEGORIES=	lang www
MASTER_SITES=	http://www.impredicative.com/ur/

MAINTAINER=	beyert@cs.ucr.edu
COMMENT=	Ultimate host for embedded domain-specific languages

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENSE

ONLY_FOR_ARCHS=	amd64 i386
BROKEN_FreeBSD_12=	invalid target: self
BROKEN_FreeBSD_13=	invalid target: self

BUILD_DEPENDS=	mlton:lang/mlton
LIB_DEPENDS=	libgmp.so:math/gmp \
	libicudata.so:devel/icu

USES=		gmake libtool tar:tgz ssl autoreconf

CONFIGURE_ENV=	CCARGS="-I${LOCALBASE}/include"
GNU_CONFIGURE=	yes

USE_GITHUB=	yes
USE_LDCONFIG=	yes
ONLY_FOR_ARCHS=	i386 amd64
CFLAGS+=	-pthread

OPTIONS_DEFINE=	ELISP PGSQL SQLITE MYSQL

.endif

post-patch:
	@${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>

Lines 1-2 Link Here

(-)b/lang/urweb/distinfo (-2 / +3 lines)
1	SHA256 (urweb-20150520.tgz) = 35f31c9b39093dc50be72731ae7288245befc1b98bfcdcc481db15a8c937f41a	1	TIMESTAMP = 1645398698
2	SIZE (urweb-20150520.tgz) = 4349365	2	SHA256 (urweb-urweb-20200209_GH0.tar.gz) = 56062e4b2485c73e2b912e6c7631ce47e885774dd0ac4e9acbb21594165fac01
		3	SIZE (urweb-urweb-20200209_GH0.tar.gz) = 804989

Removed Link Here

(-)a/lang/urweb.orig/files/patch-src__c__urweb.c (-11 lines)
1	--- src/c/urweb.c.orig 2014-07-04 15:32:47.000000000 +0200
2	+++ src/c/urweb.c 2014-12-19 01:22:02.000000000 +0100
3	@@ -4204,7 +4204,7 @@ uw_Basis_int uw_Basis_rand(uw_context ct
4	pthread_mutex_unlock(&rand_mutex);
5
6	if (r)
7	- return abs(ret);
8	+ return llabs(ret);
9	else
10	uw_error(ctx, FATAL, "Random number generation failed");
11	}




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.1
lib/liburweb.so.1.0.0
lib/liburweb_cgi.a
lib/liburweb_cgi.so
lib/liburweb_cgi.so.1
lib/liburweb_cgi.so.1.0.0
lib/liburweb_fastcgi.a
lib/liburweb_fastcgi.so
lib/liburweb_fastcgi.so.1
lib/liburweb_fastcgi.so.1.0.0
lib/liburweb_http.a
lib/liburweb_http.so
lib/liburweb_http.so.1
lib/liburweb_http.so.1.0.0
lib/liburweb_static.a
lib/liburweb_static.so
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

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

Return to bug 262082

Lines 1-10 Link Here

(-)b/lang/urweb/Makefile (-11 / +17 lines)
1	# Created by: Timothy Beyer <beyert@cs.ucr.edu>	1	# Created by: Timothy Beyer <beyert@cs.ucr.edu>
2		2
3	PORTNAME= urweb	3	PORTNAME= urweb
4	PORTVERSION= 20150520	4	PORTVERSION= 20200209
5	PORTREVISION= 3
6	CATEGORIES= lang www	5	CATEGORIES= lang www
7	MASTER_SITES= http://www.impredicative.com/ur/
8		6
9	MAINTAINER= beyert@cs.ucr.edu	7	MAINTAINER= beyert@cs.ucr.edu
10	COMMENT= Ultimate host for embedded domain-specific languages	8	COMMENT= Ultimate host for embedded domain-specific languages
Lines 12-29 COMMENT= Ultimate host for embedded domain-specific languages Link Here
12	LICENSE= BSD3CLAUSE	10	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
14		12
15	BROKEN= fails to build	13	ONLY_FOR_ARCHS= amd64 i386
16	BROKEN_FreeBSD_12= invalid target: self
17	BROKEN_FreeBSD_13= invalid target: self
18		14
19	BUILD_DEPENDS= mlton:lang/mlton	15	BUILD_DEPENDS= mlton:lang/mlton
		16	LIB_DEPENDS= libgmp.so:math/gmp \
		17	libicudata.so:devel/icu
20		18
21	CONFIGURE_ENV= CCARGS="-I${LOCALBASE}/include"	19	USES= gmake libtool tar:tgz ssl autoreconf
22		20
		21	CONFIGURE_ENV= CCARGS="-I${LOCALBASE}/include"
23	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
24	USES= gmake libtool tar:tgz ssl	23
		24	USE_GITHUB= yes
25	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
26	ONLY_FOR_ARCHS= i386 amd64
27	CFLAGS+= -pthread	26	CFLAGS+= -pthread
28		27
29	OPTIONS_DEFINE= ELISP PGSQL SQLITE MYSQL	28	OPTIONS_DEFINE= ELISP PGSQL SQLITE MYSQL
Lines 63-69 CONFIGURE_ENV+= MSHEADER="no" Link Here
63	.endif	62	.endif
64		63
65	post-patch:	64	post-patch:
66	${REINPLACE_CMD} -e "s\|postgresql/libpq-fe.h\|libpq-fe.h\|g" \	65	@${REINPLACE_CMD} -e "s\|postgresql/libpq-fe.h\|libpq-fe.h\|g" \
67	${WRKSRC}/configure	66	${WRKSRC}/configure.ac
		67	@${REINPLACE_CMD} -e "s\|uw_Basis_int true\|uw_Basis_int utrue\|" \
		68	-e "s\|uw_Basis_int false\|uw_Basis_int ufalse\|" \
		69	-e "s\|uw_Basis_bool true\|uw_Basis_bool utrue\|" \
		70	-e "s\|uw_Basis_bool false\|uw_Basis_bool ufalse\|" \
		71	-e "s\|\&true\|\&utrue\|g" -e "s\|\&false\|\&ufalse\|g" \
		72	-e "s\|abs(ret)\|llabs(ret)\|" \
		73	${WRKSRC}/src/c/urweb.c
68		74
69	.include <bsd.port.mk>	75	.include <bsd.port.mk>

Lines 6-37 include/urweb/types.h Link Here

(-)b/lang/urweb/pkg-plist (-10 / +14 lines)
6	include/urweb/types_cpp.h	6	include/urweb/types_cpp.h
7	include/urweb/urweb.h	7	include/urweb/urweb.h
8	include/urweb/urweb_cpp.h	8	include/urweb/urweb_cpp.h
		9	include/urweb/uthash.h
9	lib/liburweb.a	10	lib/liburweb.a
10	lib/liburweb.so	11	lib/liburweb.so
11	lib/liburweb.so.0	12	lib/liburweb.so.1
12	lib/liburweb.so.0.0.0	13	lib/liburweb.so.1.0.0
13	lib/liburweb_cgi.a	14	lib/liburweb_cgi.a
14	lib/liburweb_cgi.so	15	lib/liburweb_cgi.so
15	lib/liburweb_cgi.so.0	16	lib/liburweb_cgi.so.1
16	lib/liburweb_cgi.so.0.0.0	17	lib/liburweb_cgi.so.1.0.0
17	lib/liburweb_fastcgi.a	18	lib/liburweb_fastcgi.a
18	lib/liburweb_fastcgi.so	19	lib/liburweb_fastcgi.so
19	lib/liburweb_fastcgi.so.0	20	lib/liburweb_fastcgi.so.1
20	lib/liburweb_fastcgi.so.0.0.0	21	lib/liburweb_fastcgi.so.1.0.0
21	lib/liburweb_http.a	22	lib/liburweb_http.a
22	lib/liburweb_http.so	23	lib/liburweb_http.so
23	lib/liburweb_http.so.0	24	lib/liburweb_http.so.1
24	lib/liburweb_http.so.0.0.0	25	lib/liburweb_http.so.1.0.0
25	lib/liburweb_static.a	26	lib/liburweb_static.a
26	lib/liburweb_static.so	27	lib/liburweb_static.so
27	lib/liburweb_static.so.0	28	lib/liburweb_static.so.1
28	lib/liburweb_static.so.0.0.0	29	lib/liburweb_static.so.1.0.0
29	lib/urweb/js/urweb.js	30	lib/urweb/js/urweb.js
30	lib/urweb/ur/basis.urs	31	lib/urweb/ur/basis.urs
31	lib/urweb/ur/char.ur	32	lib/urweb/ur/char.ur
32	lib/urweb/ur/char.urs	33	lib/urweb/ur/char.urs
33	lib/urweb/ur/datetime.ur	34	lib/urweb/ur/datetime.ur
34	lib/urweb/ur/datetime.urs	35	lib/urweb/ur/datetime.urs
		36	lib/urweb/ur/json.ur
		37	lib/urweb/ur/json.urs
35	lib/urweb/ur/list.ur	38	lib/urweb/ur/list.ur
36	lib/urweb/ur/list.urs	39	lib/urweb/ur/list.urs
37	lib/urweb/ur/listPair.ur	40	lib/urweb/ur/listPair.ur
Lines 46-51 lib/urweb/ur/top.ur Link Here
46	lib/urweb/ur/top.urs	49	lib/urweb/ur/top.urs
47	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-compat.el	50	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-compat.el
48	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-defs.el	51	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-defs.el
		52	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-flycheck.el
49	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-mode-startup.el	53	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-mode-startup.el
50	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-mode.el	54	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-mode.el
51	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-move.el	55	%%ELISP%%share/emacs/site-lisp/urweb-mode/urweb-move.el