Date: Fri, 28 Dec 2012 19:03:02 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309577 - in head: . databases/innotop multimedia/zoneminder net-mgmt/netdot ports-mgmt/tinderbox ports-mgmt/tinderbox-devel sysutils/watchmen www/MT Message-ID: <201212281903.qBSJ32Vn083629@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Fri Dec 28 19:03:02 2012 New Revision: 309577 URL: http://svnweb.freebsd.org/changeset/ports/309577 Log: Convert the remaining ports that depend on databases/p5-DBD-mysql${MYSQL_VER} to just depend on databases/p5-DBD-mysql as that will handle the MYSQL_VER magic. This is required as only databases/p5-DBD-mysql supports mariadb-client and the upcomming perconaXX-client. Approved by: portmgr (bapt) Initial patches by: pgollucci Modified: head/UPDATING head/databases/innotop/Makefile (contents, props changed) head/multimedia/zoneminder/Makefile (contents, props changed) head/net-mgmt/netdot/Makefile (contents, props changed) head/ports-mgmt/tinderbox-devel/Makefile (contents, props changed) head/ports-mgmt/tinderbox/Makefile (contents, props changed) head/sysutils/watchmen/Makefile (contents, props changed) head/www/MT/Makefile (contents, props changed) Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Dec 28 18:17:22 2012 (r309576) +++ head/UPDATING Fri Dec 28 19:03:02 2012 (r309577) @@ -5,6 +5,26 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20121228: + AFFECTS: users of databases/innotop, multimedia/zoneminder + net-mgmt/netdot, ports-mgmt/tinderbox, ports-mgmt/tinderbox-devel + sysutils/watchmen, www/MT + + The above mentioned ports were converted to depend on + databases/p5-DBD-mysql. That will cause messages like + + ===> p5-DBD-mysql-4.021 conflicts with installed package(s): + p5-DBD-mysql55-4.021 + + To prevent this run one of the following commands to fix the + dependencies. + + # portmaster -o databases/p5-DBD-mysql databases/p5-DBD-mysql55 + or + # portupgrade -fo databases/p5-DBD-mysql databases/p5-DBD-mysql55 + or + # pkg set -o databases/p5-DBD-mysql55:databases/p5-DBD-mysql + 20121220: AFFECTS: users of lang/ghc AUTHOR: haskell@FreeBSD.org Modified: head/databases/innotop/Makefile ============================================================================== --- head/databases/innotop/Makefile Fri Dec 28 18:17:22 2012 (r309576) +++ head/databases/innotop/Makefile Fri Dec 28 19:03:02 2012 (r309577) @@ -16,10 +16,10 @@ COMMENT= A MySQL and InnoDB monitoring p LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \ +BUILD_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \ p5-DBI>=1.46:${PORTSDIR}/databases/p5-DBI \ p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey -RUN_DEPENDS= p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \ +RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \ p5-DBI>=1.46:${PORTSDIR}/databases/p5-DBI \ p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Fri Dec 28 18:17:22 2012 (r309576) +++ head/multimedia/zoneminder/Makefile Fri Dec 28 19:03:02 2012 (r309577) @@ -25,7 +25,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphic avutil.1:${PORTSDIR}/multimedia/ffmpeg BUILD_DEPENDS= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5-extensions \ p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ - p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \ + p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \ p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \ Modified: head/net-mgmt/netdot/Makefile ============================================================================== --- head/net-mgmt/netdot/Makefile Fri Dec 28 18:17:22 2012 (r309576) +++ head/net-mgmt/netdot/Makefile Fri Dec 28 19:03:02 2012 (r309577) @@ -20,7 +20,7 @@ RUN_DEPENDS= p5-libapreq2>=0:${PORTSDIR} p5-Apache-AuthCookie>=0:${PORTSDIR}/www/p5-Apache-AuthCookie \ p5-Apache2-SiteControl>=1.0:${PORTSDIR}/www/p5-Apache2-SiteControl \ p5-URI>=0:${PORTSDIR}/net/p5-URI \ - p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} \ + p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \ p5-SQL-Translator>=0.07:${PORTSDIR}/databases/p5-SQL-Translator \ p5-Class-DBI>=3.0.17:${PORTSDIR}/databases/p5-Class-DBI \ p5-Class-DBI-AbstractSearch>=0:${PORTSDIR}/databases/p5-Class-DBI-AbstractSearch \ Modified: head/ports-mgmt/tinderbox-devel/Makefile ============================================================================== --- head/ports-mgmt/tinderbox-devel/Makefile Fri Dec 28 18:17:22 2012 (r309576) +++ head/ports-mgmt/tinderbox-devel/Makefile Fri Dec 28 19:03:02 2012 (r309577) @@ -68,7 +68,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/pear/MD USE_PHP+= mysql .endif USE_MYSQL= yes -RUN_DEPENDS+= p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} +RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql .endif .if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI) Modified: head/ports-mgmt/tinderbox/Makefile ============================================================================== --- head/ports-mgmt/tinderbox/Makefile Fri Dec 28 18:17:22 2012 (r309576) +++ head/ports-mgmt/tinderbox/Makefile Fri Dec 28 19:03:02 2012 (r309577) @@ -6,7 +6,7 @@ PORTNAME= tinderbox PORTVERSION= 3.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt MASTER_SITES= http://tinderbox.marcuscom.com/ \ http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/ @@ -66,7 +66,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/pear/MD USE_PHP+= mysql .endif USE_MYSQL= yes -RUN_DEPENDS+= p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} +RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql .endif .if defined(WITH_CVSUP) Modified: head/sysutils/watchmen/Makefile ============================================================================== --- head/sysutils/watchmen/Makefile Fri Dec 28 18:17:22 2012 (r309576) +++ head/sysutils/watchmen/Makefile Fri Dec 28 19:03:02 2012 (r309577) @@ -7,6 +7,7 @@ PORTNAME= watchmen PORTVERSION= 0.07 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= GOOGLE_CODE @@ -43,7 +44,7 @@ RUN_DEPENDS+= p5-Time-HiRes>=0:${PORTSDI .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes -RUN_DEPENDS+= p5-DBD-mysql${MYSQL_VER}>=0:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} +RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql .endif .if ${PORT_OPTIONS:MPGSQL} Modified: head/www/MT/Makefile ============================================================================== --- head/www/MT/Makefile Fri Dec 28 18:17:22 2012 (r309576) +++ head/www/MT/Makefile Fri Dec 28 19:03:02 2012 (r309577) @@ -7,6 +7,7 @@ PORTNAME= MT PORTVERSION= 5.14 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES?= http://www.movabletype.org/downloads/stable/ DISTNAME?= MTOS-${PORTVERSION}-en @@ -42,7 +43,7 @@ CGIDIR= www/cgi-bin/mt .if defined(WITH_MYSQL) DB_DIR?= ${BASEDIR}/var/db/mysql/blog -RUN_DEPENDS+= p5-DBD-mysql${MYSQL_VER}>=1:${PORTSDIR}/databases/p5-DBD-mysql${MYSQL_VER} +RUN_DEPENDS+= p5-DBD-mysql>=1:${PORTSDIR}/databases/p5-DBD-mysql USE_MYSQL= yes .else DB_DIR?= ${PREFIX}/${CGIDIR}/db
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212281903.qBSJ32Vn083629>