Date: Wed, 6 Jan 2021 13:45:11 +0000 (UTC) From: Oleksii Samorukov <samm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560512 - in head/www/trac-devel: . files Message-ID: <202101061345.106DjB5A068472@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: samm Date: Wed Jan 6 13:45:11 2021 New Revision: 560512 URL: https://svnweb.freebsd.org/changeset/ports/560512 Log: www/trac-devel: re-add development version and update it to the latest release - Re-add trac-devel which was removed due to py27 dependency. Version 1.5.2 uses Py3. - Fix dependency list and add new options - Backport patch from SVN to fix --daemon mode Approved by: krion Differential Revision: https://reviews.freebsd.org/D27896 Added: head/www/trac-devel/ - copied from r549439, head/www/trac-devel/ head/www/trac-devel/files/patch-trac_util_daemon.py (contents, props changed) Deleted: head/www/trac-devel/pkg-message Modified: head/www/trac-devel/Makefile head/www/trac-devel/distinfo head/www/trac-devel/pkg-descr Modified: head/www/trac-devel/Makefile ============================================================================== --- head/www/trac-devel/Makefile Mon Sep 21 12:12:41 2020 (r549439) +++ head/www/trac-devel/Makefile Wed Jan 6 13:45:11 2021 (r560512) @@ -1,34 +1,29 @@ # $FreeBSD$ PORTNAME= trac -DISTVERSION= 1.3.3 -PORTREVISION= 1 +DISTVERSION= 1.5.2 CATEGORIES= www devel python MASTER_SITES= http://ftp.edgewall.com/pub/trac/ \ ftp://ftp.edgewall.com/pub/trac/ PKGNAMESUFFIX= -devel DISTNAME= Trac-${DISTVERSION} -MAINTAINER= joneum@FreeBSD.org +MAINTAINER= samm@FreeBSD.org COMMENT= Enhanced wiki and issue tracking system for software projects LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} +# some tests are failing with 3.8 +USES= python:3.7 + CONFLICTS_INSTALL= trac -USES= python:2.7 shebangfix -SHEBANG_FILES= trac/tests/functional/better_twill.py trac/tests/functional/tester.py \ - trac/tests/functional/testenv.py trac/tests/functional/compat.py \ - trac/tests/functional/__init__.py contrib/emailfilter.py \ - contrib/checkwiki.py contrib/htpasswd.py USE_PYTHON= distutils autoplist USE_RC_SUBR= tracd SUB_LIST= PYTHON_CMD=${PYTHON_CMD} @@ -38,20 +33,26 @@ PORTDATA= * NO_ARCH= yes -OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SVN EXAMPLES -OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SVN SQLITE +OPTIONS_DEFINE= DOCUTILS PYGMENTS TZ SVN GIT EXAMPLES TEXTILE +OPTIONS_DEFAULT= DOCUTILS PYGMENTS TZ SVN SQLITE TEXTILE OPTIONS_RADIO= DATABASE -OPTIONS_RADIO_DATABASE= PGSQL SQLITE +OPTIONS_RADIO_DATABASE= PGSQL SQLITE MYSQL DOCUTILS_DESC= Allow additional text markup PYGMENTS_DESC= Use generic syntax highlighter +TEXTILE_DESC= Support for the Textile markup TZ_DESC= Process Time Zones +SVN_DESC= Enable SVN support +GIT_DESC= Enable GIT support DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} PYGMENTS_RUN_DEPENDS= ${PY_PYGMENTS} TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR} SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion-lts>0:devel/py-subversion@${PY_FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR} +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR} +GIT_RUN_DEPENDS= git:devel/git +TEXTILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile@${PY_FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins Modified: head/www/trac-devel/distinfo ============================================================================== --- head/www/trac-devel/distinfo Mon Sep 21 12:12:41 2020 (r549439) +++ head/www/trac-devel/distinfo Wed Jan 6 13:45:11 2021 (r560512) @@ -1,3 +1,3 @@ -TIMESTAMP = 1544263946 -SHA256 (Trac-1.3.3.tar.gz) = 0ff793613de57851adbc2d45188d3263ac64b97ca39d8182e7a1ac226c396239 -SIZE (Trac-1.3.3.tar.gz) = 6466543 +TIMESTAMP = 1609593024 +SHA256 (Trac-1.5.2.tar.gz) = dac241e8018e11374cfabe68f902d815948611481f4ecb565e4f076768547e39 +SIZE (Trac-1.5.2.tar.gz) = 5416364 Added: head/www/trac-devel/files/patch-trac_util_daemon.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/trac-devel/files/patch-trac_util_daemon.py Wed Jan 6 13:45:11 2021 (r560512) @@ -0,0 +1,23 @@ +--- trac/util/daemon.py.orig 2020-12-20 02:35:50 UTC ++++ trac/util/daemon.py +@@ -68,12 +68,14 @@ def daemonize(pidfile=None, progname=None, stdin='/dev + # The process is now daemonized, redirect standard file descriptors + for stream in sys.stdout, sys.stderr: + stream.flush() +- stdin = os.open(stdin, 'rb') +- stdout = os.open(stdout, 'ab+') +- stderr = os.open(stderr, 'ab+', 0) +- os.dup2(stdin.fileno(), sys.stdin.fileno()) +- os.dup2(stdout.fileno(), sys.stdout.fileno()) +- os.dup2(stderr.fileno(), sys.stderr.fileno()) ++ stdin = os.open(stdin, os.O_RDONLY) ++ stdout = os.open(stdout, os.O_RDWR | os.O_APPEND) ++ stderr = os.open(stderr, os.O_RDWR | os.O_APPEND) ++ os.dup2(stdin, sys.stdin.fileno()) ++ os.dup2(stdout, sys.stdout.fileno()) ++ os.dup2(stderr, sys.stderr.fileno()) ++ for fd in stdin, stdout, stderr: ++ os.close(fd) + + if pidfile: + # Register signal handlers to ensure atexit hooks are called on exit Modified: head/www/trac-devel/pkg-descr ============================================================================== --- head/www/trac-devel/pkg-descr Mon Sep 21 12:12:41 2020 (r549439) +++ head/www/trac-devel/pkg-descr Wed Jan 6 13:45:11 2021 (r560512) @@ -1,5 +1,5 @@ Trac uses a minimalistic approach to web-based software project management. -Our mission; to help developers write great software while staying out of +Our mission is to help developers write great software while staying out of the way. Trac should impose as little as possible on a team's established development process and policies. @@ -12,10 +12,10 @@ What is Trac? * An integrated system for managing software projects * An enhanced wiki * A flexible web-based issue tracker - * An interface to the Subversion revision control system + * An interface to the Subversion and GIT revision control systems At the core of Trac lies an integrated wiki and issue/bug database. Using wiki markup, all objects managed by Trac can directly link to other issues/bug reports, code changesets, documentation and files. -WWW: http://trac.edgewall.org/ +WWW: https://trac.edgewall.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101061345.106DjB5A068472>