git: 211b01d0758a - main - devel/delta: fetch from GitHub

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Fri, 30 Jun 2023 11:46:11 UTC
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=211b01d0758aa5f8597db757992022ee6c77ff20

commit 211b01d0758aa5f8597db757992022ee6c77ff20
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2023-06-30 11:38:50 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
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 <bsd.port.mk>
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