From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 16:00:23 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 33F0316A4CE for ; Tue, 17 May 2005 16:00:23 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 025EC43DA9 for ; Tue, 17 May 2005 16:00:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4HG0MCT006169 for ; Tue, 17 May 2005 16:00:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4HG0LK8006168; Tue, 17 May 2005 16:00:21 GMT (envelope-from gnats) Date: Tue, 17 May 2005 16:00:21 GMT Message-Id: <200505171600.j4HG0LK8006168@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Marcus Grando Subject: Re: ports/81155: REPOCOPY: databases/py-PySQLite11 -> databases/py-PySQLite2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2005 16:00:23 -0000 The following reply was made to PR ports/81155; it has been noted by GNATS. From: Marcus Grando To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/81155: REPOCOPY: databases/py-PySQLite11 -> databases/py-PySQLite2 Date: Tue, 17 May 2005 12:51:33 -0300 This is a multi-part message in MIME format. --------------030408020500050502000700 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit REPOCOPY: databases/py-PySQLite11 -> databases/py-pysqlite2 - Update py-pysqlite2 to 2.0.0 - Fix pkg-plist - Don't install docs if NOPORTDOCS is set - Update CONFLICTS in database/(PySQLite10|PySQLite11|pysqlite2) Patches attached. -- Marcus Grando Grupos Internet S/A marcus(at)corp.grupos.com.br --------------030408020500050502000700 Content-Type: text/plain; name="py-PySQLite10.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="py-PySQLite10.patch" diff -ruN py-PySQLite10.orig/Makefile py-PySQLite10/Makefile --- py-PySQLite10.orig/Makefile Sun Mar 13 21:49:16 2005 +++ py-PySQLite10/Makefile Tue May 17 12:43:54 2005 @@ -18,7 +18,7 @@ LIB_DEPENDS= sqlite.2:${PORTSDIR}/databases/sqlite2 -CONFLICTS= py*-PySQLite-1.1* +CONFLICTS= py*-PySQLite-1.1* py*-pysqlite-2.* WRKSRC= ${WRKDIR}/pysqlite USE_PYTHON= yes --------------030408020500050502000700 Content-Type: text/plain; name="py-PySQLite11.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="py-PySQLite11.patch" diff -ruN py-PySQLite11.orig/Makefile py-PySQLite11/Makefile --- py-PySQLite11.orig/Makefile Sun Apr 10 14:10:20 2005 +++ py-PySQLite11/Makefile Tue May 17 12:44:12 2005 @@ -20,7 +20,7 @@ LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}11 -CONFLICTS= py*-PySQLite-1.0* +CONFLICTS= py*-PySQLite-1.0* py*-pysqlite-2.* WRKSRC= ${WRKDIR}/pysqlite USE_PYTHON= yes --------------030408020500050502000700 Content-Type: text/plain; name="py-pysqlite2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="py-pysqlite2.patch" diff -ruN py-pysqlite2.orig/Makefile py-pysqlite2/Makefile --- py-pysqlite2.orig/Makefile Sun Apr 10 14:10:20 2005 +++ py-pysqlite2/Makefile Tue May 17 12:33:41 2005 @@ -5,38 +5,45 @@ # $FreeBSD: ports/databases/py-PySQLite11/Makefile,v 1.10 2005/04/10 09:48:07 pav Exp $ # -PORTNAME= PySQLite -PORTVERSION= 1.1.6 +PORTNAME= pysqlite +PORTVERSION= 2.0.0 CATEGORIES= databases python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= pysqlite +MASTER_SITES= http://initd.org/pub/software/pysqlite/releases/2.0/2.0.0/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pysqlite-${PORTVERSION} MAINTAINER= marcus@corp.grupos.com.br COMMENT= A DB-API v2 Python library for the SQLite 3 embedded SQL engine LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 -LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}11 +LATEST_LINK= ${PYTHON_PKGNAMEPREFIX}${PORTNAME}2 -CONFLICTS= py*-PySQLite-1.0* +CONFLICTS= py*-PySQLite-1.0* py*-PySQLite-1.1* -WRKSRC= ${WRKDIR}/pysqlite -USE_PYTHON= yes +USE_REINPLACE= yes +USE_PYTHON= 2.3+ USE_PYDISTUTILS= yes +PYDISTUTILS_BUILDARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib +DOCSBASE= share/doc/py-${PORTNAME}2 +DOCSDIR= ${PREFIX}/${DOCSBASE} .if !defined(NOPORTDOCS) PORTDOCS= * .endif +pre-configure: + @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" ${WRKSRC}/setup.cfg +.if !defined(NOPORTDOCS) + @${REINPLACE_CMD} -e "s|pysqlite2-doc|${DOCSBASE}|" ${WRKSRC}/setup.py +.else + @${REINPLACE_CMD} -e "s|data_files = data_files,||" ${WRKSRC}/setup.py +.endif + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/rest/manual.txt ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR} + @${MKDIR} ${DOCSDIR}/code + @${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} .endif .include diff -ruN py-pysqlite2.orig/distinfo py-pysqlite2/distinfo --- py-pysqlite2.orig/distinfo Sun Mar 13 21:49:16 2005 +++ py-pysqlite2/distinfo Tue May 17 11:23:41 2005 @@ -1,2 +1,2 @@ -MD5 (pysqlite-1.1.6.tar.gz) = cc936312beff1bd7ab6e4f46d745237c -SIZE (pysqlite-1.1.6.tar.gz) = 42479 +MD5 (pysqlite-2.0.0.tar.gz) = 8cf906cd82ef2e383a804a318c49bb21 +SIZE (pysqlite-2.0.0.tar.gz) = 56874 diff -ruN py-pysqlite2.orig/pkg-plist py-pysqlite2/pkg-plist --- py-pysqlite2.orig/pkg-plist Sun Oct 17 03:24:11 2004 +++ py-pysqlite2/pkg-plist Tue May 17 11:58:50 2005 @@ -1,12 +1,29 @@ -%%PYTHON_SITELIBDIR%%/sqlite/__init__.py -%%PYTHON_SITELIBDIR%%/sqlite/__init__.pyc -%%PYTHON_SITELIBDIR%%/sqlite/__init__.pyo -%%PYTHON_SITELIBDIR%%/sqlite/main.py -%%PYTHON_SITELIBDIR%%/sqlite/main.pyc -%%PYTHON_SITELIBDIR%%/sqlite/main.pyo -%%PYTHON_SITELIBDIR%%/_sqlite.so -@dirrm %%PYTHON_SITELIBDIR%%/sqlite -%%PORTDOCS%%%%EXAMPLESDIR%%/converters.py -%%PORTDOCS%%%%EXAMPLESDIR%%/dbapi_transactions.py -%%PORTDOCS%%%%EXAMPLESDIR%%/manual_transactions.py -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +bin/test-pysqlite +%%PYTHON_SITELIBDIR%%/pysqlite2/__init__.py +%%PYTHON_SITELIBDIR%%/pysqlite2/__init__.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/__init__.pyo +%%PYTHON_SITELIBDIR%%/pysqlite2/_sqlite.so +%%PYTHON_SITELIBDIR%%/pysqlite2/dbapi2.py +%%PYTHON_SITELIBDIR%%/pysqlite2/dbapi2.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/dbapi2.pyo +%%PYTHON_SITELIBDIR%%/pysqlite2/test/__init__.py +%%PYTHON_SITELIBDIR%%/pysqlite2/test/__init__.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/test/__init__.pyo +%%PYTHON_SITELIBDIR%%/pysqlite2/test/dbapi.py +%%PYTHON_SITELIBDIR%%/pysqlite2/test/dbapi.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/test/dbapi.pyo +%%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.py +%%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/test/factory.pyo +%%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.py +%%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/test/transactions.pyo +%%PYTHON_SITELIBDIR%%/pysqlite2/test/types.py +%%PYTHON_SITELIBDIR%%/pysqlite2/test/types.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/test/types.pyo +%%PYTHON_SITELIBDIR%%/pysqlite2/test/userfunctions.py +%%PYTHON_SITELIBDIR%%/pysqlite2/test/userfunctions.pyc +%%PYTHON_SITELIBDIR%%/pysqlite2/test/userfunctions.pyo +@dirrm %%PYTHON_SITELIBDIR%%/pysqlite2/test +@dirrm %%PYTHON_SITELIBDIR%%/pysqlite2 + --------------030408020500050502000700--