svn commit: r310314 - in head/ports-mgmt/tinderbox-devel: . files

[Ion-Mihai Tetcu]

Can you please commit the fix? It's midnight and I'm still at work,a true Monday (and I think tomorrow it will be a monday also ...)

Thanks,

Beat Gaetzi <beat at FreeBSD.org> wrote:

>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 at php5-mysql-*
>> databases/php5-pdo_mysql at php5-pdo_mysql-*" lib/db-pgsql.sh:export
>> DB_OPT_PREREQS="databases/php5-pgsql at php5-pgsql-*
>> databases/php5-pdo_pgsql at php5-pdo_pgsql-*" lib/db-sqlite.sh:export
>> DB_OPT_PREREQS="databases/php5-pdo_sqlite at 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 at FreeBSD.org | http://www.FreeBSD.org

-- 
Sent from my Android phone with K-9 Mail. Please excuse my brevity.