From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 4 18:50:18 2003 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 3537A37B404 for ; Mon, 4 Aug 2003 18:50:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5C6943FA3 for ; Mon, 4 Aug 2003 18:50:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h751oGUp011009 for ; Mon, 4 Aug 2003 18:50:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h751oGRV011007; Mon, 4 Aug 2003 18:50:16 -0700 (PDT) Resent-Date: Mon, 4 Aug 2003 18:50:16 -0700 (PDT) Resent-Message-Id: <200308050150.h751oGRV011007@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Laforet Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6596A37B401 for ; Mon, 4 Aug 2003 18:43:47 -0700 (PDT) Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5A5343F85 for ; Mon, 4 Aug 2003 18:43:45 -0700 (PDT) (envelope-from sheepkiller@cultdeadsheep.org) Received: (qmail 25408 invoked from network); 5 Aug 2003 01:43:44 -0000 Received: from unknown (HELO ?HOSTNAME?) (192.168.0.12) by goofy.cultdeadsheep.org with SMTP; 5 Aug 2003 01:43:44 -0000 Received: by _HOSTNAME_ (sSMTP sendmail emulation); Tue, 5 Aug 2003 03:43:46 +0200 Message-Id: <20030805014345.D5A5343F85@mx1.FreeBSD.org> Date: Tue, 5 Aug 2003 03:43:46 +0200 From: "Clement Laforet" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Clement Laforet Subject: ports/55264: database/py-MySQLdb: Add MySQL hack (now supports MySQL 3.23 and 4.0) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Clement Laforet List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Aug 2003 01:50:18 -0000 >Number: 55264 >Category: ports >Synopsis: database/py-MySQLdb: Add MySQL hack (now supports MySQL 3.23 and 4.0) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 04 18:50:16 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Clement Laforet >Release: FreeBSD 5.1-CURRENT i386 >Organization: cotds.org >Environment: System: FreeBSD chuck.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jul 31 03:00:20 CEST 2003 clement@chuck.cultdeadsheep.org:/usr/obj/usr/src/sys/CHUCK i386 >Description: * Add MySQL hack. * Clean pkg-plist >How-To-Repeat: N/A. >Fix: --- py-MySQLdb.diff begins here --- diff -Nru py-MySQLdb.old/Makefile py-MySQLdb/Makefile --- py-MySQLdb.old/Makefile Mon Aug 4 22:54:44 2003 +++ py-MySQLdb/Makefile Mon Aug 4 23:06:36 2003 @@ -15,19 +15,36 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Access a MySQL database through Python -LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client +# MySQL deps hack +MYSQL323_LIBVER=10 +MYSQL40_LIBVER= 12 -USE_PYTHON= yes +USE_PYTHON= yes USE_PYDISTUTILS= yes DOCS= MANIFEST README doc/*.html +.include + +.if defined(WITH_MYSQL_VER) +MYSQL_VER= ${WITH_MYSQL_VER} +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL_323_LIBVER}) +MYSQL_VER= 323 +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.${MYSQL40_LIBVER}) +MYSQL_VER= 40 +.else +MYSQL_VER= 323 +.endif + +LIB_DEPENDS= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client + .if !defined(NOPORTDOCS) post-install: @${MKDIR} ${DOCSDIR} -.for file in ${DOCS} - @${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} +.for FILE in ${DOCS} + @${INSTALL_MAN} ${WRKSRC}/${FILE} ${DOCSDIR} .endfor .endif -.include +.include + diff -Nru py-MySQLdb.old/pkg-plist py-MySQLdb/pkg-plist --- py-MySQLdb.old/pkg-plist Mon Aug 4 22:54:44 2003 +++ py-MySQLdb/pkg-plist Mon Aug 4 23:05:45 2003 @@ -44,17 +44,17 @@ lib/%%PYTHON_VERSION%%/site-packages/_mysql_exceptions.py lib/%%PYTHON_VERSION%%/site-packages/_mysql_exceptions.pyc lib/%%PYTHON_VERSION%%/site-packages/_mysql_exceptions.pyo -%%PORTDOCS%%share/doc/py-MySQLdb/MANIFEST -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-1.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-2.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-3.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-4.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-FAQ-1.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-FAQ-2.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-FAQ-3.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb-FAQ.html -%%PORTDOCS%%share/doc/py-MySQLdb/MySQLdb.html -%%PORTDOCS%%share/doc/py-MySQLdb/README -%%PORTDOCS%%@dirrm share/doc/py-MySQLdb +%%PORTDOCS%%%%DOCSDIR%%/MANIFEST +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-1.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-2.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-3.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-4.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-FAQ-1.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-FAQ-2.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-FAQ-3.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb-FAQ.html +%%PORTDOCS%%%%DOCSDIR%%/MySQLdb.html +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants @dirrm lib/%%PYTHON_VERSION%%/site-packages/MySQLdb --- py-MySQLdb.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: