From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 20 16:10:13 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 8182616A41F for ; Fri, 20 Jan 2006 16:10:13 +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 301DC43D48 for ; Fri, 20 Jan 2006 16:10:11 +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 k0KGA8Is019391 for ; Fri, 20 Jan 2006 16:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0KGA8GE019390; Fri, 20 Jan 2006 16:10:08 GMT (envelope-from gnats) Resent-Date: Fri, 20 Jan 2006 16:10:08 GMT Resent-Message-Id: <200601201610.k0KGA8GE019390@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, vd@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED93B16A41F; Fri, 20 Jan 2006 16:00:32 +0000 (GMT) (envelope-from vd@datamax.bg) Received: from jengal.datamax.bg (jengal.datamax.bg [82.103.104.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B9C143D45; Fri, 20 Jan 2006 16:00:32 +0000 (GMT) (envelope-from vd@datamax.bg) Received: from qlovarnika.bg.datamax (qlovarnika.bg.datamax [192.168.10.2]) by jengal.datamax.bg (Postfix) with SMTP id 31358B857; Fri, 20 Jan 2006 18:00:31 +0200 (EET) Received: (nullmailer pid 70847 invoked by uid 1002); Fri, 20 Jan 2006 16:00:31 -0000 Message-Id: <20060120160030.GA70809@qlovarnika.bg.datamax> Date: Fri, 20 Jan 2006 18:00:31 +0200 From: Vasil Dimov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/92065: [patch] misc/tinderbox does not install php4-pgsql (or mysql) extension X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: vd@FreeBSD.org List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jan 2006 16:10:13 -0000 >Number: 92065 >Category: ports >Synopsis: [patch] misc/tinderbox does not install php4-pgsql (or mysql) extension >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jan 20 16:10:07 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Vasil Dimov >Release: FreeBSD 6.0-STABLE amd64 >Organization: DataMax >Environment: >Description: misc/tinderbox does not install the php extension for the selected database, because the extension is added to USE_PHP after bsd.port.pre.mk inclusion. >How-To-Repeat: >Fix: The exact solution was suggested by flz. --- tinderbox_dep.diff begins here --- Index: Makefile =================================================================== RCS file: /usr/local/cvsupdroot/ports/misc/tinderbox/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 19 Jan 2006 06:35:35 -0000 1.7 +++ Makefile 20 Jan 2006 15:54:22 -0000 @@ -23,7 +23,6 @@ NO_BUILD= yes USE_APACHE= yes -USE_PHP= session SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -33,6 +32,8 @@ IGNORE= is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL .endif +USE_PHP= session + .if defined(WITH_PGSQL) USE_PGSQL= yes USE_PHP+= pgsql @@ -45,6 +46,8 @@ RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql .endif +.include "${PORTSDIR}/Mk/bsd.php.mk" + post-extract: .for f in inc_ds.php inc_tinderbox.php ${MV} ${WRKSRC}/www-exp/${f} ${WRKSRC}/www-exp/${f}-dist --- tinderbox_dep.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: