diff options
-rw-r--r-- | databases/p5-DBD-mysql/Makefile | 6 | ||||
-rw-r--r-- | databases/p5-DBD-mysql/distinfo | 4 | ||||
-rw-r--r-- | databases/p5-DBD-mysql/files/patch-dbdimp.c | 12 | ||||
-rw-r--r-- | databases/p5-DBD-mysql40/Makefile | 2 | ||||
-rw-r--r-- | databases/p5-DBD-mysql41/Makefile | 2 | ||||
-rw-r--r-- | databases/p5-DBD-mysql50/Makefile | 4 |
6 files changed, 8 insertions, 22 deletions
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index 92145f2fda10..31e5bf74190a 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -6,8 +6,8 @@ # PORTNAME= DBD-mysql -PORTVERSION= 3.0001 -PORTREVISION= 1 +PORTVERSION= 3.0002 +PORTREVISION= 0 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DBD @@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= skv@FreeBSD.org COMMENT?= MySQL driver for the Perl5 Database Interface (DBI) -CONFLICTS?= p5-Mysql-modules-* p5-DBD-mysql4[0-9]-* p5-DBD-mysql5[0-9]-* +CONFLICTS?= p5-Mysql-modules-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]* USE_MYSQL= yes diff --git a/databases/p5-DBD-mysql/distinfo b/databases/p5-DBD-mysql/distinfo index 8b58cd2f03cb..0641f8450b3e 100644 --- a/databases/p5-DBD-mysql/distinfo +++ b/databases/p5-DBD-mysql/distinfo @@ -1,2 +1,2 @@ -MD5 (DBD-mysql-3.0001.tar.gz) = 70d1d33e906e896194a747fc23c22f1f -SIZE (DBD-mysql-3.0001.tar.gz) = 129946 +MD5 (DBD-mysql-3.0002.tar.gz) = df70ba084c97f5f7c2a997c3de2f0ad0 +SIZE (DBD-mysql-3.0002.tar.gz) = 130077 diff --git a/databases/p5-DBD-mysql/files/patch-dbdimp.c b/databases/p5-DBD-mysql/files/patch-dbdimp.c deleted file mode 100644 index bbeb09f9a7a4..000000000000 --- a/databases/p5-DBD-mysql/files/patch-dbdimp.c +++ /dev/null @@ -1,12 +0,0 @@ ---- dbdimp.c.orig Mon Jul 11 11:37:03 2005 -+++ dbdimp.c Mon Jul 11 11:37:30 2005 -@@ -2772,7 +2772,9 @@ - unsigned long *lengths; - int rc; - imp_sth_fbh_t *fbh; -+#if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION - MYSQL_BIND *bind; -+#endif - D_imp_dbh_from_sth; - - #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION diff --git a/databases/p5-DBD-mysql40/Makefile b/databases/p5-DBD-mysql40/Makefile index 9e4a3e17f7b1..031f2f6cea6f 100644 --- a/databases/p5-DBD-mysql40/Makefile +++ b/databases/p5-DBD-mysql40/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= 40 COMMENT= MySQL 4.0 driver for the Perl5 Database Interface (DBI) -CONFLICTS= p5-Mysql-modules-* p5-DBD-mysql-* p5-DBD-mysql4[1-9]-* p5-DBD-mysql5[0-9]-* +CONFLICTS= p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[1-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]* WANT_MYSQL_VER= 40 diff --git a/databases/p5-DBD-mysql41/Makefile b/databases/p5-DBD-mysql41/Makefile index 8306cecfd76c..70fde263fb7c 100644 --- a/databases/p5-DBD-mysql41/Makefile +++ b/databases/p5-DBD-mysql41/Makefile @@ -9,7 +9,7 @@ PKGNAMESUFFIX= 41 COMMENT= MySQL 4.1 driver for the Perl5 Database Interface (DBI) -CONFLICTS= p5-Mysql-modules-* p5-DBD-mysql-* p5-DBD-mysql4[02-9]-* p5-DBD-mysql5[0-9]-* +CONFLICTS= p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[02-9]-[0-9]* p5-DBD-mysql5[0-9]-[0-9]* WANT_MYSQL_VER= 41 diff --git a/databases/p5-DBD-mysql50/Makefile b/databases/p5-DBD-mysql50/Makefile index 7e8467391b6d..25aed50f6a68 100644 --- a/databases/p5-DBD-mysql50/Makefile +++ b/databases/p5-DBD-mysql50/Makefile @@ -9,9 +9,7 @@ PKGNAMESUFFIX= 50 COMMENT= MySQL 5.0 driver for the Perl5 Database Interface (DBI) -BROKEN= Does not compile - -CONFLICTS= p5-Mysql-modules-* p5-DBD-mysql-* p5-DBD-mysql4[0-9]-* +CONFLICTS= p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* WANT_MYSQL_VER= 50 |