On Thu, Mar 08, 2018 at 11:23:52AM +0100, Sebastian Reitenbach wrote:
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/sogo/Makefile,v
> retrieving revision 1.74
> diff -u -r1.74 Makefile
> --- Makefile 11 Jan 2018 19:27:12 -0000 1.74
> +++ Makefile 8 Mar 2018 09:46:46 -0000
> @@ -2,15 +2,15 @@
>
> COMMENT = web based groupware server
>
> -VERSION = 3.2.10
> +VERSION = 4.0.0
> DISTNAME = SOGo-${VERSION}
> PKGNAME = sogo-${VERSION}
> REVISION = 1
Zap REVISION.
> SHARED_LIBS += GDLContentStore 3.0
> -SHARED_LIBS += NGCards 3.0
> -SHARED_LIBS += SOGo 4.1
> -SHARED_LIBS += SOGoUI 2.1
> +SHARED_LIBS += NGCards 3.1
> +SHARED_LIBS += SOGo 5.0
> +SHARED_LIBS += SOGoUI 2.2
>
> CATEGORIES = www
> HOMEPAGE = http://www.sogo.nu/
https://sogo.nu works.
> @@ -72,8 +72,14 @@
> ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0.sh \
> ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
> ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> + ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0.sh \
> + ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh
> + ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh \
> ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
> + ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> + ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh \
> + ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
> ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> ${WRKSRC}/Scripts/sql-update-3.0.0-to-combined.sh \
> ${PREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh
I'd really simplify these into a loop to shorten the target and ease
reading:
.for _s in ...
${INSTALL_SCRIPT} ... \
${WRKSRC}/Scripts/..${_s}.. \
${PREFIX}/share/doc/sogo/..${_s}..
.endfor
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/sogo/distinfo,v
> retrieving revision 1.40
> diff -u -r1.40 distinfo
> --- distinfo 7 Jul 2017 10:41:05 -0000 1.40
> +++ distinfo 8 Mar 2018 09:46:46 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (SOGo-3.2.10.tar.gz) = Y4KKk9FcMMhKeVXUSWI3PUKGl3cOh1zlqaU2c3jK8E4=
> -SIZE (SOGo-3.2.10.tar.gz) = 32644083
> +SHA256 (SOGo-4.0.0.tar.gz) = t/P8diJZ9j8Fs9n8/j7KUSbcChGDE1/Xwp3ezV3Z4lw=
> +SIZE (SOGo-4.0.0.tar.gz) = 34458610
> Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> ===================================================================
> RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh 8 Mar 2018
> 09:46:46 -0000
> @@ -0,0 +1,68 @@
> +$OpenBSD$
> +
> +Index: Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> +--- Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh.orig
> ++++ Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> +@@ -1,4 +1,4 @@
> +-#!/bin/bash
> ++#!/bin/sh
Does the script work with our ksh?
> Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> ===================================================================
> RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh 8 Mar 2018
> 09:46:46 -0000
> @@ -0,0 +1,59 @@
> +$OpenBSD$
> +
> +Index: Scripts/sql-update-3.2.10_to_4.0.0.sh
> +--- Scripts/sql-update-3.2.10_to_4.0.0.sh.orig
> ++++ Scripts/sql-update-3.2.10_to_4.0.0.sh
> +@@ -1,4 +1,4 @@
> +-#!/bin/bash
> ++#!/bin/sh
Same as above.
> Index: pkg/README
> ===================================================================
> RCS file: /cvs/ports/www/sogo/pkg/README,v
> retrieving revision 1.21
> diff -u -r1.21 README
> --- pkg/README 5 Jul 2017 21:11:50 -0000 1.21
> +++ pkg/README 8 Mar 2018 09:46:46 -0000
> @@ -286,3 +286,14 @@
>
> # su _sogo "${TRUEPREFIX}/bin/bash
> ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh"
> # su _sogo "${TRUEPREFIX}/bin/bash
> ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh"
bash is already missing from RUN_DEPENDS, I wonder if users tried to run
that instruction but failed.
> +
> +Upgrade SOGo from < 4.0.0
> +=========================
> +Updating SOGo from version 3.X to 4.X requires an update of the database
> schema.
> +
> +Run one of the following scripts as the SOGo system user _sogo. Depending on
> +the database you use, choose the postgres or mysql variant. The scripts
> +will ask you for the database credentials.
> +
> +# su _sogo "${TRUEPREFIX}/bin/bash
> ${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh"
> +# su _sogo "${TRUEPREFIX}/bin/bash
> ${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh"
Same here. We either have to add the dependency or ensure that ksh
suffices and adjust the instructions accordingly.
