From nobody Fri Mar 31 12:41:01 2023 X-Original-To: dev-commits-ports-main@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 4Pp0JY2PDdz42RqC; Fri, 31 Mar 2023 12:41:01 +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 4Pp0JY1zWRz3s4H; Fri, 31 Mar 2023 12:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680266461; 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=pHA5DgYoQPf//D7KqzVVsLPZHCmNrwMHi5ntzC6KCek=; b=MfEPDjbYVsAhqfygVV8eCR9EAcRUP/jWkN7Fqs1FIIQFD/JyQY28HlW18tKYiVgVIVAyoh ugRUPqJjrk08Di1ZixywH9v+BkkufvtRqQs3srlzLSRkeWr/l6nFb8ROgXUbadbcr7/uMc cOEsx5nB6ZCZonQHiLx+cNMYkwxWxoHv99Ag5QdTMSu5yI3iWY767A25foN+6+ga2kJQK/ YR5r0MHlFHKKtp4EW9RXsN3parUsKKdQLa3SWSEgQP1J97YV1wm3RjQKWtEROvFMy3WNC7 +En9/32N/SyRRvblTdG+PpjovLrlaBu+AHtSASLqqADELSK00UdAuF/e5vWFQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680266461; 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=pHA5DgYoQPf//D7KqzVVsLPZHCmNrwMHi5ntzC6KCek=; b=WG40dRckTuO+UXiRHwHxpQ/YyXQF5xBA2o8fyrAqqYsLnlZVMqXcP5SYmq3up+TB8uCbuX zS9YMAOCYiGW25YiwKvAeyhm4STAfGWliqKfq/rVwdIw1BCqYT4m8KC1gm8HCmPounooqE kVZey+hk5UsmtClMHbZyVXJCQZ+Oay9wIHbbocc52N5hEC5Pez0SV0mlX5vPgRId9W4q4N mfkdAvc8U2igUU9pT7AZAeLMmGnuIHa9VSshLILXo21a86hSb/xWl2PL1lnXx7dNUMrgOC sDzE15VU/6u4b9UpNi/+AHjE6Z+6fUw8Dmdv7a83G1Y69bWdzIBbZgnh8Ip98A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680266461; a=rsa-sha256; cv=none; b=DGaPhJfT7xhP4VOS9WFHmgpV5V36/HNrKqkLBAeYf4AH8ZL40QdHLbRdkQ1NjCx9OJBGFt OXEdT+bVHAuXPFbiJsq9prMo/tAf3/JuYvnYMolRWH2DiLMMPraobtCQcDCpXknQWmbpI1 G1JPNKJOo89GVIe/u8VoXm6/+g+N0pkGNel9bTX7HMKCe3z+qJTYbTRHhyke1jemQsOeoH L86NeH2/3K2Re8pSRiE7qza4qZPD1SgztVhBgneGEHCam39o2lxZBgLQDCipyt8tplNzJA V/y7RFA7S0BBlVYer0F0PW9uaOltE4JatmE/XpxBmry/pp1rGmeiMnIT5/PmVw== 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 4Pp0JY12FMztgL; Fri, 31 Mar 2023 12:41:01 +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 32VCf1tC061539; Fri, 31 Mar 2023 12:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32VCf1Wi061538; Fri, 31 Mar 2023 12:41:01 GMT (envelope-from git) Date: Fri, 31 Mar 2023 12:41:01 GMT Message-Id: <202303311241.32VCf1Wi061538@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 62173bf8ab2e - main - x11-toolkits/ocaml-lablgtk2: the port had been updated and improved (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62173bf8ab2e07b8f23bb10493650a093d3b47b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=62173bf8ab2e07b8f23bb10493650a093d3b47b2 commit 62173bf8ab2e07b8f23bb10493650a093d3b47b2 Author: Alexey Dokuchaev AuthorDate: 2023-03-31 12:39:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-03-31 12:39:30 +0000 x11-toolkits/ocaml-lablgtk2: the port had been updated and improved (+) - Update to the latest version 2.18.13 - Convert that abominable `post-patch' target to static patch and leave only parts of it which matter (visible in the build log) - Fix a typo in the `src/Makefile' to prevent `sourceView2Enums.ml' from being removed as intermediate file Submitted by: naddy (typo fix for gmake 4.4 update) Reported by: portscout --- x11-toolkits/ocaml-lablgtk2/Makefile | 15 +------ x11-toolkits/ocaml-lablgtk2/distinfo | 6 +-- .../ocaml-lablgtk2/files/patch-src_Makefile | 51 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 17 deletions(-) diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile index c4bca8b9ffa9..2bf27cbb3752 100644 --- a/x11-toolkits/ocaml-lablgtk2/Makefile +++ b/x11-toolkits/ocaml-lablgtk2/Makefile @@ -1,6 +1,5 @@ PORTNAME= lablgtk2 -PORTVERSION= 2.18.12 -PORTREVISION= 1 +PORTVERSION= 2.18.13 CATEGORIES= x11-toolkits PKGNAMEPREFIX= ocaml- @@ -68,18 +67,6 @@ LIBRSVG2_CONFIGURE_WITH=rsvg LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_VARS= EXAMPLES_SUBDIRS+=rsvg -PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] - -post-patch: - @${REINPLACE_CMD} -E \ - -e 's|^(CFLAGS[[:space:]]*\+=[[:space:]]*-O)|\1 ${CFLAGS}|' \ - -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ - -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \ - -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ - -e 's,(touch)( "\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),${TRUE}\2,' \ - -e 's,(-ldconf )("\$$\(DESTDIR\)\$$\(OCAMLLDCONF\)"),\1ignore,' \ - ${WRKSRC}/src/Makefile - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} diff --git a/x11-toolkits/ocaml-lablgtk2/distinfo b/x11-toolkits/ocaml-lablgtk2/distinfo index e8100aab5c50..8e29fc84f163 100644 --- a/x11-toolkits/ocaml-lablgtk2/distinfo +++ b/x11-toolkits/ocaml-lablgtk2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640395411 -SHA256 (garrigue-lablgtk-2.18.12_GH0.tar.gz) = 43b2640b6b6d6ba352fa0c4265695d6e0b5acb8eb1da17290493e99ae6879b18 -SIZE (garrigue-lablgtk-2.18.12_GH0.tar.gz) = 1066997 +TIMESTAMP = 1665042937 +SHA256 (garrigue-lablgtk-2.18.13_GH0.tar.gz) = 7b9e680452458fd351cf8622230d62c3078db528446384268cd0dc37be82143c +SIZE (garrigue-lablgtk-2.18.13_GH0.tar.gz) = 1073083 diff --git a/x11-toolkits/ocaml-lablgtk2/files/patch-src_Makefile b/x11-toolkits/ocaml-lablgtk2/files/patch-src_Makefile new file mode 100644 index 000000000000..24b78d041ec5 --- /dev/null +++ b/x11-toolkits/ocaml-lablgtk2/files/patch-src_Makefile @@ -0,0 +1,51 @@ +--- src/Makefile.orig 2022-10-06 07:55:37 UTC ++++ src/Makefile +@@ -51,11 +51,8 @@ CUSTOM = -custom + #MLLINK += -cclib -lcamlrund + MLBYTEFLAGS = -g -dtypes + else +-CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) +-ifneq ($(TOOLCHAIN),msvc) +-CFLAGS += -O ++CFLAGS += -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS) + endif +-endif + + ifeq ($(THREADS_LIB),system) + THFLAGS = -thread +@@ -165,7 +162,7 @@ GTKSOURCEVIEW2MLOBJS = gtkSourceView2.cmo gSourceView2 + GTKSOURCEVIEW2COBJS = ml_gtksourceview2$(XO) + GTKSOURCEVIEW2MLOBJSENUM = sourceView2Enums.cmo + GTKSOURCEVIEW2PROPS = gtkSourceView2.props +-BEFORE_DEPEND += $(GTKSOURCEVIEW2PROPS:%.props=%Props.ml) $(GTKSOURCEVIEW2PROPS:%.props= o%Props.ml) $(GTKSOURCEVIEWMLOBJSENUM:%.cmo=%.ml) ++BEFORE_DEPEND += $(GTKSOURCEVIEW2PROPS:%.props=%Props.ml) $(GTKSOURCEVIEW2PROPS:%.props= o%Props.ml) $(GTKSOURCEVIEW2MLOBJSENUM:%.cmo=%.ml) + EXTRA_OBJS += $(GTKSOURCEVIEW2MLOBJSENUM) + GTKSOURCEVIEW2ALLMLOBJS = $(GTKSOURCEVIEW2MLOBJSENUM) \ + $(GTKSOURCEVIEW2PROPS:%.props=%Props.cmo) \ +@@ -406,9 +403,9 @@ findlib-install: + mkdir -p "$(DESTDIR)$(FINDLIBDIR)" + @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \ + mkdir -p "`dirname $(DESTDIR)$(OCAMLLDCONF)`"; \ +- touch "$(DESTDIR)$(OCAMLLDCONF)"; fi ++ true "$(DESTDIR)$(OCAMLLDCONF)"; fi + $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \ +- -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \ ++ -ldconf ignore \ + lablgtk2 ../META \ + build.ml \ + $(CLIBS) \ +@@ -447,11 +444,11 @@ findlib-install: + fi` + rm -f lablgtk2 + $(MAKE) lablgtk2 LABLGTKDIR="$(FINDLIBDIR)/lablgtk2" +- cp lablgtk2$(XB) "$(BINDIR)" ++ $(BSD_INSTALL_SCRIPT) lablgtk2$(XB) "$(BINDIR)" + if test -f lablgladecc$(XE); then \ +- cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ ++ $(BSD_INSTALL_SCRIPT) lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; \ + fi +- cp gdk_pixbuf_mlsource$(XE) "$(BINDIR)" ++ $(BSD_INSTALL_SCRIPT) gdk_pixbuf_mlsource$(XE) "$(BINDIR)" + $(RANLIB) $(CLIBS:%="$(FLINSTALLDIR)"/%) + @if test -f lablgtk.cmxa; then \ + echo "Execute $(RANLIB) in $(FLINSTALLDIR)"; \