Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Feb 2020 12:39:33 +1000
From:      Dima Panov <fluffy@FreeBSD.org>
To:        Matthias Fechner <mfechner@FreeBSD.org>, svn-ports-all@freebsd.org,  svn-ports-head@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r527337 - in head/www: redmine redmine4 redmine4/files
Message-ID:  <d6030a52-983e-44da-8dbb-0709c37f3fb7@Canary>
In-Reply-To: <202002281609.01SG9Gq1078192@repo.freebsd.org>
References:  <202002281609.01SG9Gq1078192@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--5e59cee6_2443a858_14d1
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Other solution is switch graphics/rubygem-mini=5Fmagick to use ImageMagic=
k6 by default instead of IM7 which is supported by port

--
Dima Panov (fluffy=40=46reeBSD.org (mailto:fluffy=40=46reeBSD.org))
(X11, KDE, Office)=40=46reeBSD team

=46acebook: http://www.facebook.com/fluffy.khv
twitter: fluffy=5Fkhv =7C skype: dima.panov =7C telegram: =40dima=5Fpanov=

IRC: fluffy=40E=46Net, fluffykhv=40=46reeNode

> On Saturday, =46eb 29, 2020 at 2:09 AM, Matthias =46echner <mfechner=40=
=46reeBSD.org (mailto:mfechner=40=46reeBSD.org)> wrote:
> Author: mfechner
> Date: =46ri =46eb 28 16:09:16 2020
> New Revision: 527337
> URL: https://svnweb.freebsd.org/changeset/ports/527337
>
> Log:
> Update to 4.0.6.
> Disable the RMAGIC option, it causes conflict with different versions o=
f imagemagick. This problem is fixed in redmine 4.1, hopefully they'll ba=
ckport the fix to the 4.0 branch.
> Use the correct redmine version when building redmine plugins.
>
> Mark www/redmine as deprecated with end of 2020Q2 to give maintainer en=
ough time to upgrade everything to redmine4.
> Redmine version 3 should not be included in 2020Q3 anymore.
>
> PR: 244288
> Submitted by: mikael=40
> Reported by: nork=40ninth-nine.com
> Reviewed by: mfechner=40
> Differential Revision: https://reviews.freebsd.org/D23682
>
> Modified:
> head/www/redmine/Makefile
> head/www/redmine4/Makefile
> head/www/redmine4/bsd.redmine.mk
> head/www/redmine4/distinfo
> head/www/redmine4/files/patch-Gemfile
>
> Modified: head/www/redmine/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/www/redmine/Makefile =46ri =46eb 28 15:10:30 2020 (r527336)
> +++ head/www/redmine/Makefile =46ri =46eb 28 16:09:16 2020 (r527337)
> =40=40 -13,6 +13,10 =40=40 COMMENT=3D =46lexible project management web=
 application
> LICENSE=3D GPLv2
> LICENSE=5F=46ILE=3D =24=7BWRKSRC=7D/doc/COPYING
>
> +DEPRECATED=3D EOLed upstream
> +=23 Remove the port before 2020Q3
> +EXPIRATION=5FDATE=3D 2020-06-25
> +
> RUN=5FDEPENDS=3D rubygem-bundler>=3D1.5.0:sysutils/rubygem-bundler =5C
> rubygem-rails4>=3D4.2.11.1:www/rubygem-rails4 =5C
> rubygem-jquery-rails>=3D3.1.4:www/rubygem-jquery-rails =5C
>
> Modified: head/www/redmine4/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/www/redmine4/Makefile =46ri =46eb 28 15:10:30 2020 (r527336)
> +++ head/www/redmine4/Makefile =46ri =46eb 28 16:09:16 2020 (r527337)
> =40=40 -2,8 +2,7 =40=40
> =23 =24=46reeBSD=24
>
> PORTNAME=3D redmine
> -PORTVERSION=3D 4.0.5
> -PORTREVISION=3D 4
> +PORTVERSION=3D 4.0.6
> CATEGORIES=3D www
> MASTER=5FSITES=3D https://www.redmine.org/releases/
> PKGNAMESU=46=46IX=3D 4
> =40=40 -37,8 +36,6 =40=40 RUN=5FDEPENDS=3D rubygem-bundler>=3D1.5.0:sys=
utils/rubygem-b
> USES=3D cpe
> USE=5FRUBY=3D yes
>
> -CON=46LICTS=5FINSTALL=3D redmine
> -
> NO=5FARCH=3D yes
> NO=5FBUILD=3D yes
>
> =40=40 -48,7 +45,7 =40=40 PLIST=5FSUB=3D WWWOWN=3D=24=7BWWWOWN=7D WWWGR=
P=3D=24=7BWWWGRP=7D
> SUB=5FLIST=3D RUBY=5FNAME=3D=24=7BRUBY=5FNAME=7D
>
> OPTIONS=5FDE=46INE=3D MYSQL POSTGRESQL MARKDOWN RMAGIC THIN
> -OPTIONS=5FDE=46AULT=3DMYSQL MARKDOWN RMAGIC THIN
> +OPTIONS=5FDE=46AULT=3DMYSQL MARKDOWN THIN
> OPTIONS=5FSUB=3D yes
> POSTGRESQL=5FDESC=3DEnable PostgreSQL support
> MARKDOWN=5FDESC=3D Enable Markdown support
> =40=40 -64,6 +61,16 =40=40 RMAGIC=5FRUN=5FDEPENDS=3D rubygem-rmagick>=3D=
2.16.0:graphics/r
> THIN=5FRUN=5FDEPENDS=3D rubygem-thin>=3D1.6.2:www/rubygem-thin
> THIN=5FSUB=5FLIST=3D WWWOWN=3D=24=7BWWWOWN=7D WWWGRP=3D=24=7BWWWGRP=7D
> THIN=5FVARS=3D USE=5FRC=5FSUBR=3Dredmine
> +
> +.include <bsd.port.options.mk>
> +
> +.if =24=7BPORT=5FOPTIONS:MRMAGIC=7D
> +=23 rubygem-mini=5Fmagick-4.10.1 wants imagemagick7
> +=23 and rubygem-rmagick-2.16.0=5F6 wants imagemagick6
> +=23 fixed in 4.1.0: https://www.redmine.org/projects/redmine/repositor=
y/revisions/18366
> +=23 but not in 4.0-stable as of 2020/02/13
> +BROKEN=3D conflicting dependencies
> +.endif
>
> post-extract:
> =40=24=7BRM=7D -r =24=7BWRKSRC=7D/.hgignore =24=7BWRKSRC=7D/.gitignore =
=24=7BWRKSRC=7D/.github =5C
>
> Modified: head/www/redmine4/bsd.redmine.mk
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/www/redmine4/bsd.redmine.mk =46ri =46eb 28 15:10:30 2020 (r527=
336)
> +++ head/www/redmine4/bsd.redmine.mk =46ri =46eb 28 16:09:16 2020 (r527=
337)
> =40=40 -43,9 +43,9 =40=40
> =23 .include =22=24=7B.CURDIR=7D/../../www/redmine/bsd.redmine.mk=22
> =23 =7D=7D=7D
>
> -PKGNAMEPRE=46IX=3F=3D redmine-
> +PKGNAMEPRE=46IX=3F=3D redmine4-
>
> -RUN=5FDEPENDS+=3D redmine>=3D2.0:www/redmine
> +RUN=5FDEPENDS+=3D redmine4>=3D4.0:www/redmine4
>
> USE=5FRUBY=3D yes
> .if =21defined(PLIST)
>
> Modified: head/www/redmine4/distinfo
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/www/redmine4/distinfo =46ri =46eb 28 15:10:30 2020 (r527336)
> +++ head/www/redmine4/distinfo =46ri =46eb 28 16:09:16 2020 (r527337)
> =40=40 -1,3 +1,3 =40=40
> -TIMESTAMP =3D 1573401952
> -SHA256 (redmine-4.0.5.tar.gz) =3D 64eabe6867fd5d14d1b4c584417b9b71fbb9=
b68a019400eeb03e1f2147c369e8
> -SIZE (redmine-4.0.5.tar.gz) =3D 2519900
> +TIMESTAMP =3D 1582635822
> +SHA256 (redmine-4.0.6.tar.gz) =3D 173c4de0ce0a8b2b1e340b6f50d88dfc4ec3=
a3a7aae11acde201a15613aec8c4
> +SIZE (redmine-4.0.6.tar.gz) =3D 2520461
>
> Modified: head/www/redmine4/files/patch-Gemfile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/www/redmine4/files/patch-Gemfile =46ri =46eb 28 15:10:30 2020 =
(r527336)
> +++ head/www/redmine4/files/patch-Gemfile =46ri =46eb 28 16:09:16 2020 =
(r527337)
> =40=40 -1,13 +1,11 =40=40
> ---- Gemfile.orig 2019-10-19 09:33:33 UTC
> +--- Gemfile.orig 2020-02-25 14:28:07 UTC
> +++ Gemfile
> -=40=40 -2,9 +2,9 =40=40 source 'https://rubygems.org'
> -
> +=40=40 -3,8 +3,8 =40=40 source 'https://rubygems.org'
> gem =22bundler=22, =22>=3D 1.5.0=22
>
> --gem =22rails=22, =225.2.3=22
> + gem =22rails=22, =225.2.4.1=22
> -gem =22rouge=22, =22=7E> 3.3.0=22
> -gem =22request=5Fstore=22, =221.0.5=22
> -+gem =22rails=22, =225.2.4.1=22
> +gem =22rouge=22, =22=7E> 3.12.0=22
> +gem =22request=5Fstore=22, =22>=3D 1.0.5=22
> gem =22mini=5Fmime=22, =22=7E> 1.0.1=22
> =40=40 -84,7 +82,7 =40=40
> -
> -group :test do
> - gem =22rails-dom-testing=22
> -- gem =22mocha=22
> +- gem 'mocha', '>=3D 1.4.0'
> - gem =22simplecov=22, =22=7E> 0.14.1=22, :require =3D> false
> - =23 =46or running system tests
> - gem 'puma', '=7E> 3.7'

--5e59cee6_2443a858_14d1
Content-Type: application/pgp-signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: Canary
Comment: https://www.canarymail.io
Charset: UTF-8

wkYEABEKAAYFAl5ZzuYACgkQpiZ27ZPjsBge4wCg04TwvSq0TaDTxuIgXPAxxsWf/y0AnjXFWPpD
ZELjuKuHX+N22b274TfW
=U7oP
-----END PGP SIGNATURE-----

--5e59cee6_2443a858_14d1--




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d6030a52-983e-44da-8dbb-0709c37f3fb7>