From owner-svn-ports-all@FreeBSD.ORG Mon Jan 14 19:51:06 2013 Return-Path: Delivered-To: svn-ports-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 07F31EB3; Mon, 14 Jan 2013 19:51:06 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id 7618C6F0; Mon, 14 Jan 2013 19:51:05 +0000 (UTC) Received: from zeus.network.lan (dynamic-94-247-222-039.catv.glattnet.ch [94.247.222.39]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r0EJowXR055169 (version=TLSv1/SSLv3 cipher=DHE-DSS-CAMELLIA256-SHA bits=256 verify=NO); Mon, 14 Jan 2013 19:50:58 GMT (envelope-from beat@FreeBSD.org) Message-ID: <50F461A1.1080300@FreeBSD.org> Date: Mon, 14 Jan 2013 20:50:57 +0100 From: Beat Gaetzi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: olli hauer Subject: Re: svn commit: r310314 - in head/ports-mgmt/tinderbox-devel: . files References: <201301131048.r0DAmVkn012514@svn.freebsd.org> <50F2C59E.3030606@gmx.de> In-Reply-To: <50F2C59E.3030606@gmx.de> X-Enigmail-Version: 1.4.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: svn-ports-all@FreeBSD.org, Ion-Mihai Tetcu , ports-committers@FreeBSD.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 19:51:06 -0000 On 01/13/13 15:33, olli hauer wrote: > On 2013-01-13 11:48, Ion-Mihai Tetcu wrote: >> Author: itetcu Date: Sun Jan 13 10:48:31 2013 New Revision: >> 310314 URL: http://svnweb.freebsd.org/changeset/ports/310314 >> >> Log: - update to 4.0.0.b2 - convert to OPTIONSng - drop local >> patches incorporated upstream >> >> Submitted by: beat@ > > > I thought tinderbox use now pdo instead pear (maybe README should > also adjusted) Yes, my fault. Sorry! It turns out that my development still has MDB2 installed that's why the testing was successful. Beat > lib/db-mysql.sh:export > DB_OPT_PREREQS="databases/php5-mysql@php5-mysql-* > databases/php5-pdo_mysql@php5-pdo_mysql-*" lib/db-pgsql.sh:export > DB_OPT_PREREQS="databases/php5-pgsql@php5-pgsql-* > databases/php5-pdo_pgsql@php5-pdo_pgsql-*" lib/db-sqlite.sh:export > DB_OPT_PREREQS="databases/php5-pdo_sqlite@php5-pdo_sqlite-*" > > I'm running tinderbox for over a year now with the following > changes (pear -> pdo_...) > > Index: Makefile > =================================================================== > > --- Makefile (revision 310320) > +++ Makefile (working copy) @@ -62,16 +62,14 @@ .if > ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes .if defined(WEBUI) > -RUN_DEPENDS+= > ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql > > -USE_PHP+= pgsql > +USE_PHP+= pgsql pdo_pgsql .endif RUN_DEPENDS+= > p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg .endif > > .if ${PORT_OPTIONS:MMYSQL} .if defined(WEBUI) -RUN_DEPENDS+= > ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql > > -USE_PHP+= mysql > +USE_PHP+= mysql pdo_mysql .endif USE_MYSQL= yes RUN_DEPENDS+= > p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql @@ -79,8 +77,7 > @@ > > .if ${PORT_OPTIONS:MSQLITE} .if defined(WEBUI) -RUN_DEPENDS+= > ${LOCALBASE}/share/pear/MDB2/Driver/sqlite.php:${PORTSDIR}/databases/pear-MDB2_Driver_sqlite > > -USE_PHP+= sqlite > +USE_PHP+= sqlite pdo_sqlite .endif RUN_DEPENDS+= > p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite .endif @@ > -123,8 +120,6 @@ ${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; > then/if false; then/' \ ${WRKSRC}/tc .endif - ${REINPLACE_CMD} -e > 's/.set_rcvar./tinderd_enable/' \ - > ${WRKSRC}/etc/rc.d/tinderd @cd ${WRKSRC} && ${FIND} -E . -regex > '.*(orig|bak)' -exec ${RM} {} \; > > do-install: > -- Beat Gätzi | FreeBSD Committer beat@FreeBSD.org | http://www.FreeBSD.org