From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 1 01:50:04 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 11EDA16A422 for ; Wed, 1 Feb 2006 01:50:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5383C43D45 for ; Wed, 1 Feb 2006 01:50:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k111o3f3027182 for ; Wed, 1 Feb 2006 01:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k111o3tZ027177; Wed, 1 Feb 2006 01:50:03 GMT (envelope-from gnats) Resent-Date: Wed, 1 Feb 2006 01:50:03 GMT Resent-Message-Id: <200602010150.k111o3tZ027177@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, "Choe, Cheng-Dae" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E32D316A420 for ; Wed, 1 Feb 2006 01:47:34 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F60C43D45 for ; Wed, 1 Feb 2006 01:47:34 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k111lYn9010723 for ; Wed, 1 Feb 2006 01:47:34 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k111lYB0010722; Wed, 1 Feb 2006 01:47:34 GMT (envelope-from nobody) Message-Id: <200602010147.k111lYB0010722@www.freebsd.org> Date: Wed, 1 Feb 2006 01:47:34 GMT From: "Choe, Cheng-Dae" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/92656: [Maintainer] use OPTIONS knob with postgresql/ mysql dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2006 01:50:04 -0000 >Number: 92656 >Category: ports >Synopsis: [Maintainer] use OPTIONS knob with postgresql/ mysql dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 01 01:50:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: "Choe, Cheng-Dae" >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD w.comdongin.com 6.0-STABLE FreeBSD 6.0-STABLE #1: Sat Jan 21 00:34:59 KST 2006 root@w.comdongin.com:/usr/obj/data/src/sys/CDI i386 >Description: - use OPTIONS knob on database dependency selection - bsd.python.mk has problem on OPTIONS knob. To resolve this problem modify %{OPTIONS_FILE} variable at port's Makefile (comes from www/py-django ports) >How-To-Repeat: N/A >Fix: diff -ruN py-sqlobject.orig/Makefile py-sqlobject/Makefile --- py-sqlobject.orig/Makefile Fri Nov 18 02:48:26 2005 +++ py-sqlobject/Makefile Wed Feb 1 09:52:22 2006 @@ -7,7 +7,7 @@ PORTNAME= sqlobject PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python MASTER_SITES= http://cheeseshop.python.org/packages/source/S/SQLObject/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,10 +16,7 @@ MAINTAINER= whitekid@gmail.com COMMENT= A python object for manipulation with SQL table row -# Someone will add SQLite, Firebird and DBMConnection support things. -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/formencode/__init__.py:${PORTSDIR}/www/py-formencode \ - ${PYTHON_SITELIBDIR}/MySQLdb/__init__.py:${PORTSDIR}/databases/py-MySQLdb \ - ${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/formencode/__init__.py:${PORTSDIR}/www/py-formencode USE_PYTHON= yes USE_PYDISTUTILS= yes @@ -29,6 +26,22 @@ PORTDOCS= * +OPTIONS= PGSQL "PostgreSQL support" off \ + MYSQL "MySQL support" off + +# bypass infrastructure bug +OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options + +.include + +.if defined(WITH_PGSQL) +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg +.endif + +.if defined(WITH_MYSQL) +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/MySQLdb/__init__.py:${PORTSDIR}/databases/py-MySQLdb +.endif + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} @@ -36,4 +49,4 @@ ${CP} -r ${WRKSRC}/docs/* ${DOCSDIR} .endif -.include +.include >Release-Note: >Audit-Trail: >Unformatted: