mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

Convert the remaining ports that depend on databases/p5-DBD-mysql${MYSQL_VER}

Browse Source 
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
This commit is contained in:
Florian Smeets 2012-12-28 19:03:02 +00:00
parent 084838b8d4
commit 303e871aaa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=309577
8 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
UPDATING
View File

@ -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

4
databases/innotop/Makefile
View File

@ -16,10 +16,10 @@ COMMENT= A MySQL and InnoDB monitoring program
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

2
multimedia/zoneminder/Makefile
View File

@ -25,7 +25,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
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 \

2
net-mgmt/netdot/Makefile
View File

@ -20,7 +20,7 @@ RUN_DEPENDS= p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
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 \

2
ports-mgmt/tinderbox-devel/Makefile
View File

@ -68,7 +68,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/database
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)

4
ports-mgmt/tinderbox/Makefile
View File

@ -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/MDB2/Driver/mysql.php:${PORTSDIR}/database
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)

3
sysutils/watchmen/Makefile
View File

@ -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:${PORTSDIR}/devel/p5-Time-HiRes
.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}

3
www/MT/Makefile
View File

@ -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