From nobody Fri Jun 30 11:46:11 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 4QstnH5Jz7z4kqnp; Fri, 30 Jun 2023 11:46:11 +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 4QstnH4V0Mz459X; Fri, 30 Jun 2023 11:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688125571; 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=HoBwes42Hj/TZAFiDZe82VNiaZhnMUYPmLI6cHMc5Rs=; b=TvW+/bliOXn0RsVghfJG1uVXcouFNPGO7DMOInhMqq1iU+Vyjco+JVP7v4GQXatccl9Z1X 4rD1oqPpQRMpdaaX4ukcwZqZ1f7OfastJVaJyrcZX36B/myfq0bexJRILi18Tv+fXpRt3Q zoTy14GxI30/CX/Fv93yfdFvCy+lncZd9NZ5OjcDbIDt+tiA6ab0mw2wvTPVugppjsTj0W TZcCig276vVJSq+ow5rgsIjakrAwVHWvMIi+NVhFhw1zIf4/9bInDHRuLm+myPw6HDOejp ttPz+M6ayW7i7lOYBOiNFoZqSFVDE8E5sXjLJ0ibo0pAVUoZ+b8Wxjlp07U8UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688125571; 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=HoBwes42Hj/TZAFiDZe82VNiaZhnMUYPmLI6cHMc5Rs=; b=hjtO0mXbgNeg+F2UW4QWAUVfGl3zmNpanYT0vrFVGDspGoBkASlk1ETJrPbcASdYgwgplU 0TPWnGmnL7Py62QPimb1cu3gPn79oPrfV5vs2ykwywKCDTNuaUOjZC8NCgE9ERrI/pB31c D9WcQ8gRbm5t+spN71ksp1Hyt9iukQjPdtJ2lgfYbR9varL9+Fzc0dASeYB5PDyR/IBQRZ xOu6854H/re4rVxzFpjqG42mYv7YwbGW7KqpcP4XBq1TrQJrOyWlEXyoaAMS0SiuTGDgB3 8FhRIE7ABBVNsnEezBe9xYMbJKj+hC9pvNP6Fih0qTxhUACUqLSZ4h/uF7uN3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688125571; a=rsa-sha256; cv=none; b=YvSz50NI8g8mESvVk/8cLeZIVTDYP2+cpaP4I/YP7SAcr701TUlmDCXfFP8UwW8Gu/Oede MfoUifHFAiFel291vAnQmdI0deq0n4UBpy4YnZlIpcowzyzX6fWu6z3qpPJEwFM1iviZ29 rLRgi8sx3gVtSjDwM05Ioowi2INNddqQZ3q+S1Ph5ahiX2kgorDi6DHxEd0I6xP+bIzFqb FyefzfPWdV7RGbrkByJz5tsW0VSAVoQtXg1RCfCMBkOqE8mmHqTL4fHGFt6GuryBGTwTof 7KPp5SJ8iSlbwCyxENM4xCJaqAv8rhzlmSgvHp+wHjKtLGu9+NXdXfzhL255wg== 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 4QstnH384jzxvL; Fri, 30 Jun 2023 11:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35UBkBE6016618; Fri, 30 Jun 2023 11:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35UBkBUQ016617; Fri, 30 Jun 2023 11:46:11 GMT (envelope-from git) Date: Fri, 30 Jun 2023 11:46:11 GMT Message-Id: <202306301146.35UBkBUQ016617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 211b01d0758a - main - devel/delta: fetch from GitHub 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 211b01d0758aa5f8597db757992022ee6c77ff20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=211b01d0758aa5f8597db757992022ee6c77ff20 commit 211b01d0758aa5f8597db757992022ee6c77ff20 Author: Stefan Eßer AuthorDate: 2023-06-30 11:38:50 +0000 Commit: Stefan Eßer CommitDate: 2023-06-30 11:45:43 +0000 devel/delta: fetch from GitHub Make port more compliant with style, fetch from GitHub instead of a local copy, respect port system CFLAGS, support installation of README files depending on DOCS, support testing of the compiled port, take maintainership from ports@. The installed programs are identical to those of the previous port version, except for CFLAGS from the ports system that are no longer ignored. --- devel/delta/Makefile | 21 +++++++++++++-------- devel/delta/distinfo | 5 +++-- devel/delta/files/patch-Build.mk | 11 +++++++---- devel/delta/files/patch-test0__delta_hello.test | 10 ++++++++++ devel/delta/pkg-plist | 5 +++++ 5 files changed, 38 insertions(+), 14 deletions(-) diff --git a/devel/delta/Makefile b/devel/delta/Makefile index 3efb81100e8e..858e65ff729f 100644 --- a/devel/delta/Makefile +++ b/devel/delta/Makefile @@ -1,26 +1,31 @@ PORTNAME= delta -PORTVERSION= 2006.08.03 -PORTREVISION= 1 +DISTVERSIONPREFIX= release- +DISTVERSION= 2020-06-22 CATEGORIES= devel -MASTER_SITES= LOCAL/eadler/delta -MAINTAINER= ports@FreeBSD.org +MAINTAINER= se@FreeBSD.org COMMENT= Heuristically minimizes interesting files -WWW= http://delta.tigris.org/ +WWW= https://github.com/dsw/delta/ LICENSE= BSD2CLAUSE -PLIST_FILES= bin/delta bin/multidelta bin/topformflat - USES= gmake perl5 shebangfix +USE_GITHUB= yes +GH_ACCOUNT= dsw USE_PERL5= run -SHEBANG_FILES= delta multidelta +SHEBANG_FILES= delta multidelta test0_delta/hello.test test*_multidelta/testit + +TEST_TARGET= check CONFLICTS_INSTALL= git-delta +OPTIONS_DEFINE= DOCS + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/delta ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/multidelta ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/topformflat ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/delta/distinfo b/devel/delta/distinfo index 85450391bc93..7eaa92910480 100644 --- a/devel/delta/distinfo +++ b/devel/delta/distinfo @@ -1,2 +1,3 @@ -SHA256 (delta-2006.08.03.tar.gz) = 38184847a92b01b099bf927dbe66ef88fcfbe7d346a7304eeaad0977cb809ca0 -SIZE (delta-2006.08.03.tar.gz) = 32804 +TIMESTAMP = 1688123061 +SHA256 (dsw-delta-release-2020-06-22_GH0.tar.gz) = ea8a1dc3a97e21ff09f8c70f6b1f544b17674cc85000d5d79a91e73a662c2e7a +SIZE (dsw-delta-release-2020-06-22_GH0.tar.gz) = 19929 diff --git a/devel/delta/files/patch-Build.mk b/devel/delta/files/patch-Build.mk index 302bfabae5de..44c1680ae121 100644 --- a/devel/delta/files/patch-Build.mk +++ b/devel/delta/files/patch-Build.mk @@ -1,9 +1,12 @@ ---- ./Build.mk.orig 2013-09-19 09:41:07.282741683 -0400 -+++ ./Build.mk 2013-09-19 09:41:14.007747039 -0400 -@@ -1,6 +1,5 @@ +--- Build.mk.orig 2020-06-23 01:34:49 UTC ++++ Build.mk +@@ -1,7 +1,7 @@ # see License.txt for copyright and terms of use -CC := gcc - CFLAGS := -Wall +-CFLAGS := -Wall ++# CC := gcc ++# CFLAGS := -Wall # CFLAGS += -g FLEX := flex + diff --git a/devel/delta/files/patch-test0__delta_hello.test b/devel/delta/files/patch-test0__delta_hello.test new file mode 100644 index 000000000000..a1c0514fcb0d --- /dev/null +++ b/devel/delta/files/patch-test0__delta_hello.test @@ -0,0 +1,10 @@ +--- test0_delta/hello.test.orig 2023-06-30 11:16:27 UTC ++++ test0_delta/hello.test +@@ -1,6 +1,6 @@ + #!/usr/local/bin/bash + # -*-sh-*- +-if gcc -o a.out $1 &> cmp_out; then ++if cc -o a.out $1 &> cmp_out; then + if ! ./a.out &> run_out; then + exit 0; # Success. + fi diff --git a/devel/delta/pkg-plist b/devel/delta/pkg-plist new file mode 100644 index 000000000000..825b30857cbd --- /dev/null +++ b/devel/delta/pkg-plist @@ -0,0 +1,5 @@ +bin/delta +bin/multidelta +bin/topformflat +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTDOCS%%%%DOCSDIR%%/README_using_delta.md