From nobody Tue Mar 21 06:20:04 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PghKc4Tp0z40rL0; Tue, 21 Mar 2023 06:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PghKc32xWz3hmB; Tue, 21 Mar 2023 06:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679379604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFCP4xEMMD5Tz9nTcIEvdiwUWRPcNJhs3I8XbSM7kME=; b=oG61ayMcF8r8KdswJM3ahR4LyNiNFShvZzomGT1sblOKhlMBz2x8iROx3dGWib7ScPNGko f4MFGVCN5V0M3Xgmvx+QcNzU45IP27wL7DJhE5UutDAE8gm/wlOdBk42lW6WiLya6mmlG4 etss172STAOJuCxRXP5dC4K8o366HXyorfMOZW13qOsD9kEKsX2XQLNPT8rTBkUrhpALTN FnUD+bDUNTYdz052bBjL0/qeCbu4jARh46rVYGPSKYl1QIHK2swXYGgpSQatF03VRbex6T Xr9qZQMZVNYc626AeSg2Kh+toERCXl7arc3Ctv2wphggsEaoBP8saGsJ9mOVjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679379604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFCP4xEMMD5Tz9nTcIEvdiwUWRPcNJhs3I8XbSM7kME=; b=A8LTLSnRdC6PPpXtSrAmPZdaTJ4Opnz7Jnon47cs/f7gnNE2ItI3RbK368mqPRftkJm0Ni SD0LPsj96ZGhisFOwWFQ+0xPsKIcr+hUAseuV4v74J1RxEaReHyfEe2ecBvpZW/138xkMH 022vPbW0QY0YY5er42jfckbbna/54cDGL0Hty8fepxQIU2BZ5QTqVcFA2OaVc/6VBuwJOn 04gV7LOhny2TW/mMaT+dWBtB7FtqvRzWBRiEuEuPJUfVovN86utVF0jn/CCSeBkmCnPr58 sCz0SkoNnY/J8rg69XyH2nZXqUcpmVDL+4kc2fEPTFj1/hLKZY16DXi3pS8GuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679379604; a=rsa-sha256; cv=none; b=pR8lEstVXm869EBn7E2nJh5ieLcCd+ZNTmYGR3KKT1rSgaauALzpJcvVOdI2jmj9zveIC4 puUrl/EmNAOl5bJtT3T732hU3AUNF6b9/WjTpk/xmA3caEvphvcUTwjvfbupSSYYQrhv35 SrPmm9Fo/o2XnTr41+ZIcfV2KPKp3M9aXUBf3smaXRmUnGhrTeoOJm/grwYdFGaPM+wFCZ 7MSbW5PNVZfpYwmWU+77ezLLVEZa/6WEWechzxY3E3Yx2pGH7Kzl95khMGyO1bCsjueQZq /B4tkqU+AboE8y1eLzETEqlJDd9VJ8AcojM/qjWBwXzE5zTntpmlUIDoyR8jPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PghKc26zqz11ky; Tue, 21 Mar 2023 06:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32L6K4Nt022545; Tue, 21 Mar 2023 06:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32L6K4Lr022542; Tue, 21 Mar 2023 06:20:04 GMT (envelope-from git) Date: Tue, 21 Mar 2023 06:20:04 GMT Message-Id: <202303210620.32L6K4Lr022542@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: ecae8fdb1f74 - main - lang/urweb: Update version 20150520=>20200209 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecae8fdb1f74efed8659989b9203961da8c3f1c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecae8fdb1f74efed8659989b9203961da8c3f1c1 commit ecae8fdb1f74efed8659989b9203961da8c3f1c1 Author: Timothy Beyer AuthorDate: 2023-03-21 06:14:14 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-03-21 06:19:54 +0000 lang/urweb: Update version 20150520=>20200209 - Unbreak port for modern FreeBSD versions, such as FreeBSD 12 and 13, and likely 14 - Update LIB_DEPENDS with new dependencies - Pet portlint - While I(bofh) am here pet portclippy/portfmt - Utilize OPTIONSNG PR: 262082 --- lang/urweb/Makefile | 78 ++++++++++++++-------------------- lang/urweb/distinfo | 5 ++- lang/urweb/files/patch-src__c__urweb.c | 11 ----- lang/urweb/pkg-plist | 24 ++++++----- 4 files changed, 49 insertions(+), 69 deletions(-) diff --git a/lang/urweb/Makefile b/lang/urweb/Makefile index 96e26571c80f..5471904e9169 100644 --- a/lang/urweb/Makefile +++ b/lang/urweb/Makefile @@ -1,8 +1,6 @@ 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 @@ -11,60 +9,48 @@ WWW= http://www.impredicative.com/ur/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build -BROKEN_FreeBSD_12= invalid target: self -BROKEN_FreeBSD_13= invalid target: self -DEPRECATED= Broken since 2020 -EXPIRATION_DATE= 2023-03-20 +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" - -GNU_CONFIGURE= yes -USES= gmake libtool tar:tgz ssl +USES= autoreconf gmake libtool ssl tar:tgz +USE_GITHUB= yes USE_LDCONFIG= yes -ONLY_FOR_ARCHS= i386 amd64 -CFLAGS+= -pthread - -OPTIONS_DEFINE= ELISP PGSQL SQLITE MYSQL -OPTIONS_DEFAULT= ELISP PGSQL -OPTIONS_EXCLUDE= NLS DOCS -ELISP_DESC= Install contributed Emacs Lisp - -.include +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +CONFIGURE_ENV= CCARGS="-I${LOCALBASE}/include" -.if ${PORT_OPTIONS:MELISP} -PLIST_SUB+= ELISP="" -CONFIGURE_ARGS+= with_emacs=yes -.else -PLIST_SUB+= ELISP="@comment " -CONFIGURE_ARGS+= with_emacs=no -.endif +CFLAGS+= -pthread -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -WANT_PGSQL= server -.else -CONFIGURE_ENV+= PGHEADER="no" -.endif +OPTIONS_DEFINE= ELISP MYSQL PGSQL SQLITE +OPTIONS_DEFAULT= ELISP PGSQL +OPTIONS_EXCLUDE= DOCS NLS +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MSQLITE} -USES+= sqlite -.else -CONFIGURE_ENV+= SQHEADER="no" -.endif +ELISP_DESC= Install contributed Emacs Lisp -.if ${PORT_OPTIONS:MMYSQL} -USES+= mysql -.else -CONFIGURE_ENV+= MSHEADER="no" -.endif +ELISP_CONFIGURE_ON= with_emacs=yes +ELISP_CONFIGURE_OFF= with_emacs=no +MYSQL_USES= mysql +MYSQL_CONFIGURE_ENV_OFF= MSHEADER="no" +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ENV_OFF= PGHEADER="no" +PGSQL_VARS= WANT_PGSQL=server +SQLITE_USES= sqlite +SQLITE_CONFIGURE_ENV_OFF= SQHEADER="no" 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 diff --git a/lang/urweb/distinfo b/lang/urweb/distinfo index 7c43b7790291..926b9f7c9e42 100644 --- a/lang/urweb/distinfo +++ b/lang/urweb/distinfo @@ -1,2 +1,3 @@ -SHA256 (urweb-20150520.tgz) = 35f31c9b39093dc50be72731ae7288245befc1b98bfcdcc481db15a8c937f41a -SIZE (urweb-20150520.tgz) = 4349365 +TIMESTAMP = 1679330544 +SHA256 (urweb-urweb-20200209_GH0.tar.gz) = 56062e4b2485c73e2b912e6c7631ce47e885774dd0ac4e9acbb21594165fac01 +SIZE (urweb-urweb-20200209_GH0.tar.gz) = 804989 diff --git a/lang/urweb/files/patch-src__c__urweb.c b/lang/urweb/files/patch-src__c__urweb.c deleted file mode 100644 index b1c95689dc75..000000000000 --- a/lang/urweb/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/pkg-plist b/lang/urweb/pkg-plist index 6e0f109299c8..56dccd4daad9 100644 --- a/lang/urweb/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