Bug 222787 - graphics/aseprite: Fix conflict with textproc/cmark
Summary: graphics/aseprite: Fix conflict with textproc/cmark
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: Tobias Kortkamp
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2017-10-04 22:26 UTC by Tobias Kortkamp
Modified: 2017-10-05 13:49 UTC (History)
1 user (show)

See Also:

Attachments
aseprite.diff (4.60 KB, patch)
2017-10-04 22:26 UTC, Tobias Kortkamp 		yuri: maintainer-approval+
Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tobias Kortkamp freebsd_committer freebsd_triage 2017-10-04 22:26:39 UTC 
Created attachment 186912 [details]
aseprite.diff

graphics/aseprite installs it's embedded cmark version for some reason which
conflicts with the files textproc/cmark installs.

Before we add CONFLICTS in either port, let's switch aseprite over to using the
version from textproc/cmark instead.

Newer versions of aseprite have a USE_SHARED_CMARK option which would fix this
as well, but updating the port appears to be non-trivial.
Comment 1 Yuri Victorovich freebsd_committer freebsd_triage 2017-10-05 05:03:13 UTC 
Tobias,

Thank you for your patch.

Does it pass poudriere?

Yuri
Comment 2 Tobias Kortkamp freebsd_committer freebsd_triage 2017-10-05 10:19:12 UTC 
(In reply to Yuri Victorovich from comment #1)
Yes, of course.
Comment 3 Yuri Victorovich freebsd_committer freebsd_triage 2017-10-05 13:03:34 UTC 
Comment on attachment 186912 [details]
aseprite.diff

Thanks!
Comment 4 commit-hook freebsd_committer freebsd_triage 2017-10-05 13:10:21 UTC 
A commit references this bug:

Author: tobik
Date: Thu Oct  5 13:09:18 UTC 2017
New revision: 451309
URL: https://svnweb.freebsd.org/changeset/ports/451309

Log:
  graphics/aseprite: Fix conflict with textproc/cmark

  Link with libcmark from textproc/cmark instead of using the embedded
  cmark version and stop installing files that textproc/cmark already
  provides.

  PR:		222787
  Reported by:	rodrigo
  Approved by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)
  MFH:		2017Q4

Changes:
  head/graphics/aseprite/Makefile
  head/graphics/aseprite/distinfo
  head/graphics/aseprite/files/patch-third__party_CMakeLists.txt
  head/graphics/aseprite/pkg-plist
Comment 5 commit-hook freebsd_committer freebsd_triage 2017-10-05 13:48:52 UTC 
A commit references this bug:

Author: tobik
Date: Thu Oct  5 13:48:16 UTC 2017
New revision: 451311
URL: https://svnweb.freebsd.org/changeset/ports/451311

Log:
  MFH: r451309

  graphics/aseprite: Fix conflict with textproc/cmark

  Link with libcmark from textproc/cmark instead of using the embedded
  cmark version and stop installing files that textproc/cmark already
  provides.

  PR:		222787
  Reported by:	rodrigo
  Approved by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)

  Approved by:	ports-secteam blanket

Changes:
_U  branches/2017Q4/
  branches/2017Q4/graphics/aseprite/Makefile
  branches/2017Q4/graphics/aseprite/distinfo
  branches/2017Q4/graphics/aseprite/files/patch-third__party_CMakeLists.txt
  branches/2017Q4/graphics/aseprite/pkg-plist
Comment 6 Tobias Kortkamp freebsd_committer freebsd_triage 2017-10-05 13:49:35 UTC 
Committed, thanks!