From owner-svn-ports-head@FreeBSD.ORG Sun Feb 9 14:15:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B7C5C7E; Sun, 9 Feb 2014 14:15:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 13F1518DA; Sun, 9 Feb 2014 14:15:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19EFTl6052483; Sun, 9 Feb 2014 14:15:29 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19EFTZn052479; Sun, 9 Feb 2014 14:15:29 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201402091415.s19EFTZn052479@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Sun, 9 Feb 2014 14:15:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343503 - in head/databases: py-MySQLdb py-MySQLdb51 py-MySQLdb55 py-MySQLdb56 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 14:15:30 -0000 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 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 .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 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 # $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"