From nobody Sat Apr 23 19:36:16 2022 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 82D1C1A82949; Sat, 23 Apr 2022 19:36:16 +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 4Km1jX3Gn5z4YPF; Sat, 23 Apr 2022 19:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650742576; 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=HxvbwXyXJ0vIDAwYmoIyealhIYakIvSO8jnOPMZVrNo=; b=uUaOruf1tKka+bPogenkZMgs66UblRgT0xJPbyYD+TEiF2i/L1G3Qnvp0bFcNzbFEHKFRA iXZM9f0CneXQ1piNXYDn9OkCOjCsY9mOoKxnRsl7L6nMz+wYiSEe5oZF8Rpa372eyr4Tfo 2RypbhwYvpafw6xK2tSQvWLNIzAeubifuyYokUNT5PUmXqVnzKwEmvgtOlgsk7ULt9ABjR adRHREK0EbI2GcJpyNPp4TIpvU3ROurGtfsG+UARsC+M6fwfL6yvPmvUwRKC+2qUn2mJc6 k7Ug4Pxjkf+wh7swWMclaKN2IxC+YsO9KGFIL6dVBPfVipUiDuGj+OI8vSs9eA== 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 474B017C25; Sat, 23 Apr 2022 19:36:16 +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 23NJaGVq067091; Sat, 23 Apr 2022 19:36:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23NJaGOI067090; Sat, 23 Apr 2022 19:36:16 GMT (envelope-from git) Date: Sat, 23 Apr 2022 19:36:16 GMT Message-Id: <202204231936.23NJaGOI067090@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: dadd234a64fe - main - x11-toolkits/ocaml-labltk: drop nowadays useless (no-op) patches. 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dadd234a64fe54d7b80e3c87b6088716d9f93ade Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650742576; 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=HxvbwXyXJ0vIDAwYmoIyealhIYakIvSO8jnOPMZVrNo=; b=pSybkIyaR2y94auacFk+/2Xg+QPF49a/674dIzGdswrh+y7Cc1biAbLAdWwuj2Bk3MqSCv fEauphgGaB7WEytQZgVtj/9jHd/+XE6TXmMdfKp2nmr3LsGFDjfS7UUlgBz6BxmTLw1MDY mnJejaurbwzVMeShNWfKmHPIx+qCeoJ6nVyjB5XL4RM7+u1MdD9+kyQm+XfBH0gfbUzW0l HDWqDh0WGdzZranKRwV/DE4wRPQe8tZxQZX+Q2E6sk6g+uFA6lGCmaI9Md0obzglD4a0Ad OOk12jKHsAiSQPiCjXI41ToZskxlZPTgpgThIVFePqvBpTCHLAfL2lSjZJqQKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650742576; a=rsa-sha256; cv=none; b=JeuRfaK/TdqKqwZUTbOemSbp9yjQIUxtFEZ8LYurs0ByOChEbkXVEY72Ec+V9L0a6cLkO2 l4go9QVn6Um4iJiie07QaaVPHjtnvdKhZJJWAgU85+7gBQYvCBq30uwFAAxYcRL6rE/I6K tTNi6MckrITUuPJjQQZaz8Q5SaEGmWMIKboIoUoEss+JB+C7rJ64pJ2wl5bsOPfjhJRz9n mUhSU6HyVO6Ht4NV+b+gOq7ZRBlPlnAaF2kx9rWqDw+z/3u4NpLf7VWzcXVMQly3DBKTIQ 3H+fw/9i1mlA2IYJx5DltgCCpvYQ7NWIw5JE/yOrxLOpWR+GdWjUgSAZAfhnZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=dadd234a64fe54d7b80e3c87b6088716d9f93ade commit dadd234a64fe54d7b80e3c87b6088716d9f93ade Author: Alexey Dokuchaev AuthorDate: 2022-04-23 19:35:48 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-04-23 19:35:48 +0000 x11-toolkits/ocaml-labltk: drop nowadays useless (no-op) patches. --- x11-toolkits/ocaml-labltk/Makefile | 2 -- x11-toolkits/ocaml-labltk/files/patch-configure | 22 ---------------------- x11-toolkits/ocaml-labltk/files/patch-lib_Makefile | 18 ------------------ 3 files changed, 42 deletions(-) diff --git a/x11-toolkits/ocaml-labltk/Makefile b/x11-toolkits/ocaml-labltk/Makefile index b37267bda580..daf4a3944ae2 100644 --- a/x11-toolkits/ocaml-labltk/Makefile +++ b/x11-toolkits/ocaml-labltk/Makefile @@ -28,8 +28,6 @@ post-patch: -e 's/$$(INSTALLBINDIR)/$$(DESTDIR)$$(INSTALLBINDIR)/g' \ -e 's/$$(STUBLIBDIR)/$$(DESTDIR)$$(STUBLIBDIR)/g' \ -e 's/mkdir /& -p /g' - @${REINPLACE_CMD} -e 's|%%SCRIPTBASE%%|${PREFIX}/lib/ocaml/labltk/|g' \ - ${WRKSRC}/lib/Makefile pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml/stublibs diff --git a/x11-toolkits/ocaml-labltk/files/patch-configure b/x11-toolkits/ocaml-labltk/files/patch-configure deleted file mode 100644 index 9e7541d3a7de..000000000000 --- a/x11-toolkits/ocaml-labltk/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig 2014-09-18 04:08:33 UTC -+++ configure -@@ -44,10 +44,6 @@ exec 3>&1 - - # Parse command-line arguments - --if echo "$configure_options" | grep -q -e '--\?[a-zA-Z0-9-]\+='; then -- err "Arguments to this script look like '-libdir /foo/bar', not '-libdir=/foo/bar' (note the '=')." --fi -- - while : ; do - case "$1" in - "") break;; -@@ -222,6 +218,8 @@ if test $has_tk = true && test -z "$tk_l - esac - if test -n "$tklibdir"; then - case "$system" in -+ freebsd) tk_libs="-L$tklibdir" ;; -+ bsd_elf) tk_libs="-L$tklibdir" ;; - *bsd*) tk_libs="-R$tklibdir -L$tklibdir" ;; - *) tk_libs="-L$tklibdir" ;; - esac diff --git a/x11-toolkits/ocaml-labltk/files/patch-lib_Makefile b/x11-toolkits/ocaml-labltk/files/patch-lib_Makefile deleted file mode 100644 index bdf33aa7a2cb..000000000000 --- a/x11-toolkits/ocaml-labltk/files/patch-lib_Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/Makefile.orig 2014-09-18 04:08:33 UTC -+++ lib/Makefile -@@ -75,7 +75,7 @@ $(LIBNAME)top$(EXE) : $(LIBNAME).cma ../ - $(LIBNAME): Makefile - @echo Generate $@ - @echo "#!/bin/sh" > $@ -- @echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) "$$@"' >> $@ -+ @echo 'exec %%SCRIPTBASE%%/$(LIBNAME)top$(EXE) -I %%SCRIPTBASE%% "$$@"' >> $@ - - install-script: $(LIBNAME) - cp $(LIBNAME) $(INSTALLBINDIR) -@@ -114,4 +114,4 @@ installopt: - cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A) - chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa - chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A) --endif -\ No newline at end of file -+endif