Bug 205297 - audio/beets: Update to 1.3.15
Summary: audio/beets: Update to 1.3.15
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Martin Wilke
URL:
Keywords: easy, needs-qa, patch
Depends on:
Blocks:
 
Reported: 2015-12-13 20:10 UTC by Stig Inge Lea Bjørnsen
Modified: 2015-12-21 15:18 UTC (History)
2 users (show)

See Also:
miwi: maintainer-feedback? (silb)


Attachments
SVN diff for upgrading audio/beets from 1.3.11 to 1.3.15 (4.20 KB, patch)
2015-12-13 20:10 UTC, Stig Inge Lea Bjørnsen
koobs: maintainer-approval+
Details | Diff
SVN diff for upgrading audio/beets from 1.3.11 to 1.3.15 without -nox11 (4.50 KB, patch)
2015-12-17 20:51 UTC, Stig Inge Lea Bjørnsen
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Stig Inge Lea Bjørnsen 2015-12-13 20:10:10 UTC
Created attachment 164203 [details]
SVN diff for upgrading audio/beets from 1.3.11 to 1.3.15

See the changelog [1].

  - New options BADFILES, IPFS, METASYNC_DBUS

Dependency changes:

- Increase the minimum version of devel/py-enum34
  - declared in setup.py [2]
- New required dependency devel/py-jellyfish
- Upstream changed the optional dependency from audio/py-mpd to audio/py-mpd2
- New optional dependencies audio/flac, audio/mp3val, sysutils/ipfs-go, devel/py-dbus
- Remove an unneeded dependency to audio/py-mpd from The BPD plugin
- Correct the package name prefix for beautifulsoup

[1] http://beets.readthedocs.org/en/v1.3.15/changelog.html
[2] https://github.com/sampsyo/beets/blob/v1.3.15/setup.py
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2015-12-15 11:29:29 UTC
Hi,

Looking at:

.if ! ${PORT_OPTIONS:MX11}
IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
.endif

there is no option for it, also can we convert it to the new options helper :)?

Thanks in advance.
Comment 2 Stig Inge Lea Bjørnsen 2015-12-15 17:34:02 UTC
The option MX11 is a test for "OPTIONS_UNSET=X11" in '/etc/make.conf'. Lots of other ports use it as well:

  grep -R --include=*/Makefile MX11 /usr/ports

What is the new options helper?
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2015-12-16 04:18:01 UTC
Hi

Sorry to say it makes no sense.

do this

run make config disable all options:
run  make all-depends-list

safe the output,

redo make config and enable Imagemagick only
run  make all-depends-list and look what it shows;

it use 
graphics/ImageMagick-nox11
instant of 
graphics/ImageMagick

my /etc/make.conf have no UNSET flags set.

Soon as I have set all options except Imagemagik and run all-depends-list again
it still links to x11 releated ports because your dependency don't have nox11 related knobs. 

.if ! ${PORT_OPTIONS:MX11}
IMAGEMAGICK_RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick-nox11
.endif

should be removed because it does not what it is suppose to be.
Comment 4 Stig Inge Lea Bjørnsen 2015-12-16 20:14:12 UTC
Thanks for clarifying,

I have reproduced the situation that you describe.

The current approach of selecting the -nox11 variant of ImageMagick is broken.

What do you recommend between:

* removing the 'MX11' check and let the IMAGEMAGICK option install the convert 
  command from graphics/ImageMagick
* defining a new option X11 in audio/beets similar to how www/piwigo does it?
Comment 5 Martin Wilke freebsd_committer freebsd_triage 2015-12-16 23:12:09 UTC
As i have said MX11 knob should be removed.
Comment 6 Stig Inge Lea Bjørnsen 2015-12-17 20:51:20 UTC
Created attachment 164325 [details]
SVN diff for upgrading audio/beets from 1.3.11 to 1.3.15 without -nox11

Here is a new patch which also removes the -nox11 variant selection of the ImageMagick dependency.
Comment 7 commit-hook freebsd_committer freebsd_triage 2015-12-21 15:18:29 UTC
A commit references this bug:

Author: miwi
Date: Mon Dec 21 15:18:20 UTC 2015
New revision: 404116
URL: https://svnweb.freebsd.org/changeset/ports/404116

Log:
  - Update to 1.3.15
  - Remove unused X11 options

  PR:		205297
  Submitted by:	maintainer
  Approved by:	mat (mentor)
  Differential Revision:	D4569

Changes:
  head/audio/beets/Makefile
  head/audio/beets/distinfo