git: 1ed2eb42e5c7 - main - www/trac: update to 1.6 version

The branch main has been updated by samm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1ed2eb42e5c7dcdd88b2f46714e241c010ccbfbe

commit 1ed2eb42e5c7dcdd88b2f46714e241c010ccbfbe
Author:     Oleksii Samorukov <samm@FreeBSD.org>
AuthorDate: 2024-01-02 20:33:53 +0000
Commit:     Oleksii Samorukov <samm@FreeBSD.org>
CommitDate: 2024-01-02 20:33:53 +0000

    www/trac: update to 1.6 version
    
    - update to the latest release
    - move www/trac-devel to www/trac as changes are now released
    
    ChangeLog: https://trac.edgewall.org/wiki/TracDev/ReleaseNotes/1.6
---
 MOVED                                   | 1 +
 www/trac-devel/distinfo                 | 3 ---
 www/{trac-devel => trac}/Makefile       | 5 +----
 www/trac/distinfo                       | 3 +++
 www/{trac-devel => trac}/files/tracd.in | 0
 www/{trac-devel => trac}/pkg-descr      | 0
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/MOVED b/MOVED
index 20e8f67d4702..f53946dbf678 100644
--- a/MOVED
+++ b/MOVED
@@ -23,6 +23,7 @@
 # This file can be linted with Tools/scripts/MOVEDlint.awk
 #
 # Port|Moved to|Date|Why
+www/trac-devel|www/trac|2024-01-02|Trac released stable version with py3 support, so removing -devel port
 devel/rubygem-rainbow2|devel/rubygem-rainbow|2018-10-01|Has expired: Obsolete by gitlab-ce 11.3.x update, please use devel/rubygem-rainbow instead
 net/rubygem-fog-google13|net/rubygem-fog-google|2018-10-01|Has expired: Obsolete by gitlab-ce 11.3.x update, please use net/rubygem-fog-google instead
 devel/rubygem-gemnasium-gitlab-service||2018-10-01|Has expired: Not required by gitlab-ce 11.3.x update anymore
diff --git a/www/trac-devel/distinfo b/www/trac-devel/distinfo
deleted file mode 100644
index 5db5fff8eb92..000000000000
--- a/www/trac-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1686028534
-SHA256 (Trac-1.5.4.tar.gz) = 59fc453b4f6700f7e79917f1990aa20634d3cf85db2d3888111433725b9796e8
-SIZE (Trac-1.5.4.tar.gz) = 6161372
diff --git a/www/trac-devel/Makefile b/www/trac/Makefile
similarity index 97%
rename from www/trac-devel/Makefile
rename to www/trac/Makefile
index 4edf32efbd92..83032b3af224 100644
--- a/www/trac-devel/Makefile
+++ b/www/trac/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	trac
-DISTVERSION=	1.5.4
+DISTVERSION=	1.6
 CATEGORIES=	www devel python
 MASTER_SITES=	http://ftp.edgewall.com/pub/trac/ \
 		ftp://ftp.edgewall.com/pub/trac/
-PKGNAMESUFFIX=	-devel
 DISTNAME=	Trac-${DISTVERSION}
 
 MAINTAINER=	samm@FreeBSD.org
@@ -22,8 +21,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 USES=		cpe python
 CPE_VENDOR=	edgewall
 
-CONFLICTS_INSTALL=	trac
-
 USE_PYTHON=	distutils autoplist
 USE_RC_SUBR=	tracd
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
diff --git a/www/trac/distinfo b/www/trac/distinfo
new file mode 100644
index 000000000000..d5712d442da5
--- /dev/null
+++ b/www/trac/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704225806
+SHA256 (Trac-1.6.tar.gz) = 61d73c61f670d68ffc346829d24b2f1d2050aa561aa71cb98e2fb43992c27304
+SIZE (Trac-1.6.tar.gz) = 6383061
diff --git a/www/trac-devel/files/tracd.in b/www/trac/files/tracd.in
similarity index 100%
rename from www/trac-devel/files/tracd.in
rename to www/trac/files/tracd.in
diff --git a/www/trac-devel/pkg-descr b/www/trac/pkg-descr
similarity index 100%
rename from www/trac-devel/pkg-descr
rename to www/trac/pkg-descr