Replace cgit-patched with cgit-causal-agency

7 files changed, 15 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index b80e429..d3bcbc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PORTSDIR = /usr/ports
 
-PORTS += devel/cgit-patched
+PORTS += devel/cgit-causal-agency
 PORTS += irc/catgirl
 PORTS += irc/litterbox
 PORTS += irc/pounce
diff --git a/devel/cgit-patched/Makefile b/devel/cgit-causal-agency/Makefile
index 670897e..bc112ea 100644
--- a/devel/cgit-patched/Makefile
+++ b/devel/cgit-causal-agency/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD: head/devel/cgit/Makefile 523699 2020-01-21 01:37:59Z meta $
 
-PORTNAME=	cgit-patched
-PORTVERSION=	1.2.3p3
+PORTNAME=	cgit-causal-agency
+PORTVERSION=	1.2.3
 CONFLICTS_INSTALL=	cgit
 CATEGORIES=	devel www
-MASTER_SITES=	https://git.causal.agency/cgit/snapshot/:cgit \
+MASTER_SITES=	https://git.causal.agency/src/snapshot/:src \
 		KERNEL_ORG/software/scm/git:git
-DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
+DISTFILES=	src-${SRC_VERSION}${EXTRACT_SUFX}:src \
 		git-${GIT_VERSION}${EXTRACT_SUFX}:git
-DISTNAME=	cgit-${DISTVERSION}
+DISTNAME=	src-${SRC_VERSION}
 
 MAINTAINER=	june@causal.agency
 COMMENT=	Fast, lightweight web frontend for Git repositories
@@ -18,7 +18,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	msgfmt:devel/gettext-tools
 
-GIT_VERSION=	2.25.0
+SRC_VERSION=	db652695744cc54584296b54289166b4b21ac407
+GIT_VERSION=	2.25.1
+WRKSRC_SUBDIR=	www/git.causal.agency/cgit
+
 USES=		cpe gmake iconv perl5 python:3.2+,env shebangfix ssl
 CPE_VENDOR=	lars_hjemli
 USE_PERL5=	test
@@ -45,7 +48,6 @@ ASCIIDOC_DESC=	Use asciidoc to preprocess man page
 ASCIIDOC_BUILD_DEPENDS=	a2x:textproc/asciidoc
 
 post-extract:
-	@${RMDIR} ${WRKSRC}/git
 	@${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git
 
 post-patch:
diff --git a/devel/cgit-causal-agency/distinfo b/devel/cgit-causal-agency/distinfo
new file mode 100644
index 0000000..f0c91aa
--- /dev/null
+++ b/devel/cgit-causal-agency/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1609119689
+SHA256 (src-db652695744cc54584296b54289166b4b21ac407.tar.gz) = 73778c2a6d544fea181c976aa392d90df735cb5c9cbd916c4b03aa60fa9c6fdc
+SIZE (src-db652695744cc54584296b54289166b4b21ac407.tar.gz) = 757713
+SHA256 (git-2.25.1.tar.gz) = 4999ae0ee6cc7dfb280d7051e39a82a5630b00c1d8cd54890f07b4b7193d25aa
+SIZE (git-2.25.1.tar.gz) = 9026631
diff --git a/devel/cgit-patched/files/pkg-message.in b/devel/cgit-causal-agency/files/pkg-message.in
index 0190639..0190639 100644
--- a/devel/cgit-patched/files/pkg-message.in
+++ b/devel/cgit-causal-agency/files/pkg-message.in
diff --git a/devel/cgit-patched/pkg-descr b/devel/cgit-causal-agency/pkg-descr
index 1a9d828..1a9d828 100644
--- a/devel/cgit-patched/pkg-descr
+++ b/devel/cgit-causal-agency/pkg-descr
diff --git a/devel/cgit-patched/pkg-plist b/devel/cgit-causal-agency/pkg-plist
index 765565f..765565f 100644
--- a/devel/cgit-patched/pkg-plist
+++ b/devel/cgit-causal-agency/pkg-plist
diff --git a/devel/cgit-patched/distinfo b/devel/cgit-patched/distinfo
deleted file mode 100644
index 0a951b5..0000000
--- a/devel/cgit-patched/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1595538673
-SHA256 (cgit-1.2.3p3.tar.gz) = ef8859b47c150ceeff27d577a3ff1d2dc5644468f532bc4e660d47feae26a646
-SIZE (cgit-1.2.3p3.tar.gz) = 111767
-SHA256 (git-2.25.0.tar.gz) = a98c9b96d91544b130f13bf846ff080dda2867e77fe08700b793ab14ba5346f6
-SIZE (git-2.25.0.tar.gz) = 9023390