From owner-svn-ports-all@FreeBSD.ORG Sun Jan 13 14:32:50 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 D9EC33FC for ; Sun, 13 Jan 2013 14:32:50 +0000 (UTC) (envelope-from ohauer@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by mx1.freebsd.org (Postfix) with ESMTP id 449F9796 for ; Sun, 13 Jan 2013 14:32:50 +0000 (UTC) Received: from mailout-de.gmx.net ([10.1.76.28]) by mrigmx.server.lan (mrigmx001) with ESMTP (Nemesis) id 0MOEAc-1Tr6pB0kI0-005bg0 for ; Sun, 13 Jan 2013 15:32:49 +0100 Received: (qmail invoked by alias); 13 Jan 2013 14:32:49 -0000 Received: from p578be941.dip0.t-ipconnect.de (EHLO [192.168.0.100]) [87.139.233.65] by mail.gmx.net (mp028) with SMTP; 13 Jan 2013 15:32:49 +0100 X-Authenticated: #1956535 X-Provags-ID: V01U2FsdGVkX1+NK2hrZFONI3VUwGGeda+bbgR8ph2xOdcInvida9 fo0YOnUJLJWkSD Message-ID: <50F2C59E.3030606@gmx.de> Date: Sun, 13 Jan 2013 15:33:02 +0100 From: olli hauer User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Ion-Mihai Tetcu Subject: Re: svn commit: r310314 - in head/ports-mgmt/tinderbox-devel: . files References: <201301131048.r0DAmVkn012514@svn.freebsd.org> In-Reply-To: <201301131048.r0DAmVkn012514@svn.freebsd.org> X-Enigmail-Version: 1.5 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: svn-ports-all@freebsd.org, Beat Gaetzi , 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: Sun, 13 Jan 2013 14:32:50 -0000 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) 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: