diff --git a/databases/Makefile b/databases/Makefile --- a/databases/Makefile +++ b/databases/Makefile @@ -298,6 +298,7 @@ SUBDIR += p5-DBD-XBase SUBDIR += p5-DBD-cego SUBDIR += p5-DBD-mysql + SUBDIR += p5-DBD-mysql4 SUBDIR += p5-DBI SUBDIR += p5-DBI-Shell SUBDIR += p5-DBICx-Deploy diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -24,9 +24,15 @@ CONFIGURE_ARGS= ${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}} _CONFIGURE_ARGS_gcc= --libs="-L${PREFIX}/lib/gcc${GCC_DEFAULT} `mysql_config --libs | ${SED} 's/-pthread //'`" -CONFLICTS_INSTALL= p5-DBD-mysql[45][0-9] +CONFLICTS_INSTALL= p5-DBD-mysql4 + +.include + +.if ${MYSQL_FLAVOUR} == mariadb +BROKEN= This version isn't compatible with MariaDB - use databases/p5-DBD-mysql4 instead. +.endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so -.include +.include diff --git a/databases/p5-DBD-mysql4/Makefile b/databases/p5-DBD-mysql4/Makefile new file mode 100644 --- /dev/null +++ b/databases/p5-DBD-mysql4/Makefile @@ -0,0 +1,41 @@ +PORTNAME= DBD-mysql +PORTVERSION= 4.052 +CATEGORIES= databases perl5 +MASTER_SITES= CPAN +MASTER_SITE_SUBDIR= CPAN:DVEEDEN +PKGNAMEPREFIX= p5- +PKGNAMESUFFIX= 4 + +MAINTAINER= sirdice@gmail.com +COMMENT= MySQL driver for the Perl5 Database Interface (DBI) +WWW= https://metacpan.org/release/DBD-mysql + +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${RUN_DEPENDS} \ + p5-Devel-CheckLib>=1.09:devel/p5-Devel-CheckLib +RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI +TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep + +USES= compiler:c11 mysql perl5 +USE_PERL5= configure + +CONFIGURE_ARGS= ${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}} +_CONFIGURE_ARGS_gcc= --libs="-L${PREFIX}/lib/gcc${GCC_DEFAULT} `mysql_config --libs | ${SED} 's/-pthread //'`" + +CONFLICTS_INSTALL= p5-DBD-mysql + +OPTIONS_DEFINE= SSL +OPTIONS_DEFAULT= SSL + +SSL_RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay +SSL_USES= ssl +SSL_CONFIGURE_ON= --ssl +SSL_CONFIGURE_OFF= --nossl + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so + +.include diff --git a/databases/p5-DBD-mysql4/distinfo b/databases/p5-DBD-mysql4/distinfo new file mode 100644 --- /dev/null +++ b/databases/p5-DBD-mysql4/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1711540853 +SHA256 (DBD-mysql-4.052.tar.gz) = a83f57af7817787de0ef56fb15fdfaf4f1c952c8f32ff907153b66d2da78ff5b +SIZE (DBD-mysql-4.052.tar.gz) = 162074 diff --git a/databases/p5-DBD-mysql4/pkg-descr b/databases/p5-DBD-mysql4/pkg-descr new file mode 100644 --- /dev/null +++ b/databases/p5-DBD-mysql4/pkg-descr @@ -0,0 +1,6 @@ +DBD::mysql is the Perl5 Database Interface driver for the MySQL +database. In other words: DBD::mysql is an interface between the Perl +programming language and the MySQL programming API that comes with the +MySQL relational database management system. Most functions provided by +this programming API are supported. Some rarely used functions are +missing, mainly because noone ever requested them. diff --git a/databases/p5-DBD-mysql4/pkg-plist b/databases/p5-DBD-mysql4/pkg-plist new file mode 100644 --- /dev/null +++ b/databases/p5-DBD-mysql4/pkg-plist @@ -0,0 +1,8 @@ +%%SITE_ARCH%%/Bundle/DBD/mysql.pm +%%SITE_ARCH%%/DBD/mysql.pm +%%SITE_ARCH%%/DBD/mysql/GetInfo.pm +%%SITE_ARCH%%/DBD/mysql/INSTALL.pod +%%SITE_ARCH%%/auto/DBD/mysql/mysql.so +%%PERL5_MAN3%%/Bundle::DBD::mysql.3.gz +%%PERL5_MAN3%%/DBD::mysql.3.gz +%%PERL5_MAN3%%/DBD::mysql::INSTALL.3.gz diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile --- a/mail/opendmarc/Makefile +++ b/mail/opendmarc/Makefile @@ -1,6 +1,6 @@ PORTNAME= opendmarc PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= GH @@ -13,10 +13,9 @@ RUN_DEPENDS= p5-Switch>=0:lang/p5-Switch \ p5-DBI>=0:databases/p5-DBI \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ p5-HTTP-Message>=0:www/p5-HTTP-Message -USES= cpe libtool perl5 shebangfix autoreconf +USES= cpe libtool perl5 shebangfix autoreconf mysql LICENSE_FILE_SENDMAIL= ${WRKSRC}/LICENSE.Sendmail LICENSE_GROUPS_SENDMAIL= FSF OSI LICENSE_NAME_SENDMAIL= Sendmail Open Source License @@ -52,6 +51,12 @@ .include +.if ${MYSQL_FLAVOUR} == mariadb +RUN_DEPENDS+= p5-DBD-mysql4>=0:databases/p5-DBD-mysql4 +.else +RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +.endif + .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" CONFIGURE_ARGS+= --with-milter=${MILTERBASE} diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -1,6 +1,6 @@ PORTNAME= zoneminder DISTVERSION= 1.36.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru @@ -10,7 +10,6 @@ LICENSE= GPLv2 ZM_DEPENDS= p5-DBI>=0:databases/p5-DBI \ - p5-DBD-mysql>=0:databases/p5-DBD-mysql \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-Test-LWP-UserAgent>=0:www/p5-Test-LWP-UserAgent \ p5-Sys-Mmap>=0:devel/p5-Sys-Mmap \ @@ -91,6 +90,14 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt .endif +.if ${MYSQL_FLAVOUR} == mariadb +BUILD_DEPENDS+= p5-DBD-mysql4>=0:databases/p5-DBD-mysql4 +RUN_DEPENDS+= p5-DBD-mysql4>=0:databases/p5-DBD-mysql4 +.else +BUILD_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql +.endif + RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR} PKGMESSAGE= ${WRKDIR}/pkg-message