Bug 177620 - databases/py-MySQLdb*: Inconsistent CONFLICTS
Summary: databases/py-MySQLdb*: Inconsistent CONFLICTS
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ruslan Makhmatkhanov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-03 23:10 UTC by leres
Modified: 2014-02-09 14:20 UTC (History)
1 user (show)

See Also:


Attachments
patch.txt (1.79 KB, text/plain)
2013-04-03 23:10 UTC, leres
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description leres 2013-04-03 23:10:01 UTC
	It's possible to install both py-MySQLdb and py-MySQLdb55
	(or any one of the other satellite ports) even though they
	install files in the same locations.

Fix: Currently the CONFLICTS are:

	    % cd /usr/ports/databases && grep CONFLICTS py-MySQLdb*/Makefile
	    py-MySQLdb/Makefile:CONFLICTS=  py*-MySQLdb-devel-[0-9]*
	    py-MySQLdb41/Makefile:CONFLICTS=        py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
	    py-MySQLdb50/Makefile:CONFLICTS=        py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
	    py-MySQLdb51/Makefile:CONFLICTS=        py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
	    py-MySQLdb55/Makefile:CONFLICTS=        py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*

	Change py-MySQLdb's CONFLICTS to:

	    CONFLICTS= py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*

	Remove CONFLICTS from the py-MySQLdb[45][0-9] ports and use
	CONFLICTS from the master port.

	Note that this eliminates the "py*-MySQLdb-devel-[0-9]*"
	pattern from CONFLICTS in the satellite ports which doesn't
	match any current ports.

	See attached patch.
How-To-Repeat: 	cd /usr/ports/databases/py-MySQLdb && make install
	cd /usr/ports/databases/py-MySQLdb55 && make install
	pkg_info -g pkg_info -g py27-MySQLdb-1.2.3_2
	(notice tons of bad checksums)
Comment 1 Edwin Groothuis freebsd_committer 2013-04-03 23:10:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->tj

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter freebsd_committer 2014-02-09 14:16:05 UTC
Author: rm
Date: Sun Feb  9 14:15:28 2014
New Revision: 343503
URL: http://svnweb.freebsd.org/changeset/ports/343503
QAT: https://qat.redports.org/buildarchive/r343503/

Log:
  - make py*-MySQLdb ports actually conflict with each other [1]
  
  while here:
  - do not use easy_install and add stage support
  - convert to auto-generated packing list
  - bump PORTREVISION
  - add py-MySQLdb56 port as a slave to py-MySQLdb
  
  PR:		177620 [1] (based on)
  Submitted by:	Craig Leres <leres@ee.lbl.gov>
  Approved by:	maintainer timeout (10 months)

Added:
  head/databases/py-MySQLdb56/
     - copied from r341154, head/databases/py-MySQLdb55/
Deleted:
  head/databases/py-MySQLdb/pkg-plist
Modified:
  head/databases/py-MySQLdb/Makefile
  head/databases/py-MySQLdb51/Makefile
  head/databases/py-MySQLdb55/Makefile
  head/databases/py-MySQLdb56/Makefile

Modified: head/databases/py-MySQLdb/Makefile
==============================================================================
--- head/databases/py-MySQLdb/Makefile	Sun Feb  9 14:00:38 2014	(r343502)
+++ head/databases/py-MySQLdb/Makefile	Sun Feb  9 14:15:28 2014	(r343503)
@@ -3,7 +3,7 @@
 
 PORTNAME=	MySQLdb
 DISTVERSION=	1.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases python
 MASTER_SITES=	SF/mysql-python/mysql-python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,23 +13,20 @@ MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
 USE_PYTHON=		2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USE_MYSQL=		yes
-PYDISTUTILS_INSTALLARGS=	-O 1 -N -Z -S ${PYTHON_SITELIBDIR} -d ${PYEASYINSTALL_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG}
-PYDISTUTILS_PKGNAME=	MySQL-python
-PYEASYINSTALL_ARCHDEP=	yes
 
-CONFLICTS=	py*-MySQLdb-devel-[0-9]*
+CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]*
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
-OPTIONS_DEFINE=	DOCS MYSQLCLIENT_R
+OPTIONS_DEFINE=		DOCS MYSQLCLIENT_R
 OPTIONS_DEFAULT=	DOCS MYSQLCLIENT_R
 MYSQLCLIENT_R_DESC=	Use libmysqlclient_r (thread safe)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQLCLIENT_R}
@@ -39,10 +36,8 @@ pre-configure:
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/databases/py-MySQLdb51/Makefile
==============================================================================
--- head/databases/py-MySQLdb51/Makefile	Sun Feb  9 14:00:38 2014	(r343502)
+++ head/databases/py-MySQLdb51/Makefile	Sun Feb  9 14:15:28 2014	(r343503)
@@ -5,11 +5,7 @@ PKGNAMESUFFIX=	51
 
 COMMENT=	Access a MySQL database through Python (Using MySQL 5.1 Client)
 
-CONFLICTS=	py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
-
 WANT_MYSQL_VER=	51
-
 MASTERDIR=	${.CURDIR}/../py-MySQLdb
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/databases/py-MySQLdb55/Makefile
==============================================================================
--- head/databases/py-MySQLdb55/Makefile	Sun Feb  9 14:00:38 2014	(r343502)
+++ head/databases/py-MySQLdb55/Makefile	Sun Feb  9 14:15:28 2014	(r343503)
@@ -5,11 +5,7 @@ PKGNAMESUFFIX=	55
 
 COMMENT=	Access a MySQL database through Python (Using MySQL 5.5 Client)
 
-CONFLICTS=	py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
-
 WANT_MYSQL_VER=	55
-
 MASTERDIR=	${.CURDIR}/../py-MySQLdb
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"

Modified: head/databases/py-MySQLdb56/Makefile
==============================================================================
--- head/databases/py-MySQLdb55/Makefile	Sun Jan 26 03:20:55 2014	(r341154)
+++ head/databases/py-MySQLdb56/Makefile	Sun Feb  9 14:15:28 2014	(r343503)
@@ -1,15 +1,10 @@
-# Created by: Tom Judge <tom@tomjudge.com>
 # $FreeBSD$
 
-PKGNAMESUFFIX=	55
+PKGNAMESUFFIX=	56
 
 COMMENT=	Access a MySQL database through Python (Using MySQL 5.5 Client)
 
-CONFLICTS=	py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
-
-WANT_MYSQL_VER=	55
-
+WANT_MYSQL_VER=	56
 MASTERDIR=	${.CURDIR}/../py-MySQLdb
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Ruslan Makhmatkhanov freebsd_committer 2014-02-09 14:17:22 UTC
Responsible Changed
From-To: tj->rm

I will take it.
Comment 4 Ruslan Makhmatkhanov freebsd_committer 2014-02-09 14:17:31 UTC
State Changed
From-To: open->closed

Committed, thank you!