Bug 194824 - [PATCH] databases/mariadb-server -client and -scripts update CONFLICTS
Summary: [PATCH] databases/mariadb-server -client and -scripts update CONFLICTS
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: John Marino
URL:
Keywords: patch-ready
Depends on:
Blocks:
 
Reported: 2014-11-04 20:25 UTC by Bernard Spil
Modified: 2014-11-28 11:34 UTC (History)
2 users (show)

See Also:
dgeo: maintainer-feedback+

Attachments
Patch for mariab-server, -client and -scripts (2.38 KB, patch)
2014-11-04 20:25 UTC, Bernard Spil 		no flags 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 Bernard Spil freebsd_committer freebsd_triage 2014-11-04 20:25:55 UTC 
Created attachment 149048 [details]
Patch for mariab-server, -client and -scripts

1. Add conflicts for new MariaDB-10.0 port
2. Fix conflict with self mysql[0-46-9][0-9] matches mysql56
3. Clean up/simplify existing conflicts
3a. mysql <= 5.0 have been removed from ports more than a year ago (as per MOVED)
3b. Development for mysql6 has stopped (as per MOVED)
4. port-names with periods can't be found

See also 
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194809
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194810
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194819
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2014-11-04 20:25:55 UTC 
Maintainer CC'd
Comment 2 John Marino freebsd_committer freebsd_triage 2014-11-24 15:49:36 UTC 
feedback timeout, maintainer approval no longer required.  I am promoting the PR.
Comment 3 John Marino freebsd_committer freebsd_triage 2014-11-28 11:24:39 UTC 
replacing mariadb-scripts/Makefile instead of using diff is not kosher.  Taking this pending that is not a big problem.
Comment 4 John Marino freebsd_committer freebsd_triage 2014-11-28 11:31:27 UTC 
the mariadb-scripts/Makefile is identical to what is already in the repo, so this seems like a mistake creating the diff (besides the fact it was created from an empty file)
Comment 5 commit-hook freebsd_committer freebsd_triage 2014-11-28 11:33:32 UTC 
A commit references this bug:

Author: marino
Date: Fri Nov 28 11:33:15 UTC 2014
New revision: 373557
URL: https://svnweb.freebsd.org/changeset/ports/373557

Log:
  databases/mariadb-(server,client): Update conflicts

  PR:		194824
  Submitted by:	Bernard Spil
  Approved by:	maintainer timeout

Changes:
  head/databases/mariadb-client/Makefile
  head/databases/mariadb-server/Makefile
Comment 6 John Marino freebsd_committer freebsd_triage 2014-11-28 11:34:50 UTC 
I did what I could, which was to update the conflicts lines on mariadb.