Attachment 237242 Details for Bug 266996 – Git-formatted patch

[patch] Git-formatted patch

websvn-2.8.0.patch (text/plain), 3.54 KB, created by Michael Osipov on 2022-10-12 18:31:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2022-10-12 18:31:48 UTC

Size: 3.54 KB

patch

obsolete

>commit aa590fdd66ba998f0e246e98c4e64fc2c71bbe63
>Author: Michael Osipov <michael.osipov@siemens.com>
>Date:   2022-10-12 20:26:45 +0200
>
>    devel/websvn: update to 2.8.0
>
>diff --git a/UPDATING b/UPDATING
>index 9087d5dac2b6..a2e595577d6a 100644
>--- a/UPDATING
>+++ b/UPDATING
>@@ -5,6 +5,16 @@ they are unavoidable.
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20221012:
>+  AFFECTS: devel/websvn
>+  AUTHOR: michael.osipov@siemens.com
>+
>+  WebSVN 2.8.0 includes full PHP 8.x support which requires a change from PEAR
>+  to Composer 2. You must manually install dependencies through it, the ports
>+  system will not handle it anymore for you since */horde* (PR 266552) has been
>+  marked as incompatible with PHP 8.x for the time being. See pkg-message for
>+  detailed instructions.
>+
> 20221011:
>   AFFECTS: users of security/acme.sh
>   AUTHOR: dvl@FreeBSD.org
>diff --git a/devel/websvn/Makefile b/devel/websvn/Makefile
>index 4d396fb11414..97bc21386d30 100644
>--- a/devel/websvn/Makefile
>+++ b/devel/websvn/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	websvn
>-PORTVERSION=	2.7.0
>+PORTVERSION=	2.8.0
> CATEGORIES=	devel www
> PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
> 
>@@ -11,16 +11,13 @@ LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/license.txt
> 
> RUN_DEPENDS=	${LOCALBASE}/bin/svn:devel/subversion \
>-		${PEARDIR}/Archive/Tar.php:devel/pear@${PHP_FLAVOR} \
>-		${PEARDIR}/geshi.php:devel/pear-geshi@${PHP_FLAVOR} \
>-		${PEARDIR}/Text/Diff.php:devel/pear-Text_Diff@${PHP_FLAVOR}
>+		${LOCALBASE}/bin/composer:devel/php-composer2@${PHP_FLAVOR}
> 
>-USES=		php:flavors cpe
>-IGNORE_WITH_PHP=	82
>+USES=		php:web,flavors cpe
> USE_GITHUB=	yes
> GH_ACCOUNT=	${PORTNAME}php
> 
>-USE_PHP=	iconv pcre xml mbstring
>+USE_PHP=	iconv pcre xml mbstring zlib dom
> 
> NO_BUILD=	yes
> NO_ARCH=	yes
>diff --git a/devel/websvn/distinfo b/devel/websvn/distinfo
>index fe01a72df50a..25c13ba8fc41 100644
>--- a/devel/websvn/distinfo
>+++ b/devel/websvn/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1647254076
>-SHA256 (websvnphp-websvn-2.7.0_GH0.tar.gz) = 1cb23254f19e37f37620048711a55a0c439c38f6329475fea40a8be9c2df4e69
>-SIZE (websvnphp-websvn-2.7.0_GH0.tar.gz) = 253551
>+TIMESTAMP = 1665562275
>+SHA256 (websvnphp-websvn-2.8.0_GH0.tar.gz) = 3376f2d3710a2c4faaa332295b9f655f6bb7b2c2b792bb5e4a26eb84f5264760
>+SIZE (websvnphp-websvn-2.8.0_GH0.tar.gz) = 253612
>diff --git a/devel/websvn/files/pkg-message.in b/devel/websvn/files/pkg-message.in
>index 4d41e1f4878d..01bea7d98ae1 100644
>--- a/devel/websvn/files/pkg-message.in
>+++ b/devel/websvn/files/pkg-message.in
>@@ -1,16 +1,23 @@
> [
> { type: install
>   message: <<EOM
>-To setup WebSVN, please edit the configuration file:
>-%%WWWDIR%%/include/config.php
>+Make sure to install dependencies with:
>+  cd %%WWWDIR%% && composer i
> 
>-and modify your web server's configuration to serve
>-WebSVN actually!
>+Make sure you modify %%WWWDIR%%/include/config.php to your needs and your web
>+server configuration to serve WebSVN!
>+EOM
>+},
>+{ type: upgrade
>+  message: <<EOM
>+Make sure to update dependencies with:
>+  cd %%WWWDIR%% && composer u
> EOM
> },
> { type: remove
>   message: <<EOM
>-Consider deleting %%ETCDIR%%!
>+You would like to delete:
>+  rm -R %%WWWDIR%% %%ETCDIR%%
> EOM
> }
> ]
>diff --git a/devel/websvn/pkg-plist b/devel/websvn/pkg-plist
>index 08ed8a82b493..63f39e1c8424 100644
>--- a/devel/websvn/pkg-plist
>+++ b/devel/websvn/pkg-plist
>@@ -3,7 +3,7 @@
> %%WWWDIR%%/browse.php
> %%WWWDIR%%/cache/tmp
> %%WWWDIR%%/comp.php
>-@comment %%WWWDIR%%/composer.json
>+%%WWWDIR%%/composer.json
> %%WWWDIR%%/diff.php
> %%WWWDIR%%/dl.php
> %%WWWDIR%%/filedetails.php

Flags:

michael.osipov: maintainer-approval+

Actions: View | Diff

Attachments on bug 266996: 237242