Bug 207004 - [patch] misc/ossp-uuid: Fix e2fsprogs-libuuid conflict
Summary: [patch] misc/ossp-uuid: Fix e2fsprogs-libuuid conflict
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Kurt Jaeger
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2016-02-07 16:48 UTC by Ultima
Modified: 2016-03-06 11:49 UTC (History)
3 users (show)

See Also:
vd: maintainer-feedback+
vd: maintainer-feedback+


Attachments
Patch.diff (5.64 KB, patch)
2016-02-07 16:48 UTC, Ultima
Ultima1252: maintainer-approval? (vd)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ultima 2016-02-07 16:48:56 UTC
Created attachment 166712 [details]
Patch.diff

Currently when requiring both ossp-uuid and e2fspogs-libuuid is an impossibility without the use of a jail. This patch was created to fix this conflict. The patch includes updating revisions for removal of CONFLICTS, and change LIBDEPEND change for all affected ports.

 The changes on ossp-uuid port includes renaming of the shared/static libs created, C/C++ manpage, and rename of pkgconfig file. I have built all the affected ports and after testing them I see no problems currently.

  net/guacamole-server
* Modified libdepend
* Added port revision

  misc/e2fsprogs-libuuid
* Removed ossp-uuid conflict
* Added port revision

  misc/p5-OSSP-uuid
* Modified build depend

  misc/ossp-uuid
* Updated revision from 7 to 8
* Removed conflicts with e2fsprogs-libuuid
* Added pre-patch to change shared/static lib names
* Added patchfile to change C/C++ manpages and rename pkgconfig file
* Updated pkg-plist
Comment 1 Vasil Dimov freebsd_committer freebsd_triage 2016-02-08 07:18:49 UTC
The misc/ossp-uuid changes look good to me.
Comment 2 Bernard Spil freebsd_committer freebsd_triage 2016-02-27 22:04:03 UTC
Hi Vasil,

Can you please set the maintainer-feedback flag accordingly?
Comment 3 Kurt Jaeger freebsd_committer freebsd_triage 2016-03-06 10:26:07 UTC
Testbuilds@work
Comment 4 commit-hook freebsd_committer freebsd_triage 2016-03-06 11:49:07 UTC
A commit references this bug:

Author: pi
Date: Sun Mar  6 11:48:11 UTC 2016
New revision: 410454
URL: https://svnweb.freebsd.org/changeset/ports/410454

Log:
  net/guacamole-server, misc/e2fsprogs-libuuid, misc/p5-OSSP-uuid, misc/ossp-uuid

  Currently when requiring both ossp-uuid and e2fspogs-libuuid is an
  impossibility without the use of a jail. This patch was created to
  fix this conflict. The patch includes updating revisions for removal
  of CONFLICTS, and change LIBDEPEND change for all affected ports.

  The changes on ossp-uuid port includes renaming of the shared/static
  libs created, C/C++ manpage, and rename of pkgconfig file.

  PR:		207004
  Submitted by:	Ultima1252@gmail.com
  Approved by:	vd

Changes:
  head/misc/e2fsprogs-libuuid/Makefile
  head/misc/ossp-uuid/Makefile
  head/misc/ossp-uuid/files/patch-Makefile.in
  head/misc/ossp-uuid/files/patch-uuid.pc.in
  head/misc/ossp-uuid/pkg-plist
  head/misc/p5-OSSP-uuid/Makefile
  head/net/guacamole-server/Makefile
Comment 5 Kurt Jaeger freebsd_committer freebsd_triage 2016-03-06 11:49:46 UTC
Committed, thanks!