diff options
| author | nork <nork@FreeBSD.org> | 2003-04-19 00:17:47 +0800 |
|---|---|---|
| committer | nork <nork@FreeBSD.org> | 2003-04-19 00:17:47 +0800 |
| commit | 31f739d8eb1f8468989ab86457f9d6ce47a0542c (patch) | |
| tree | 5a30efb25f9307c8e0e65d425e3815a8c1b89f3d | |
| parent | b2c9db345f76be5705874f7075b84997ee53ef4a (diff) | |
| download | freebsd-ports-gnome-31f739d8eb1f8468989ab86457f9d6ce47a0542c.tar.gz freebsd-ports-gnome-31f739d8eb1f8468989ab86457f9d6ce47a0542c.tar.zst freebsd-ports-gnome-31f739d8eb1f8468989ab86457f9d6ce47a0542c.zip | |
Repo copy & update to MySQL 4.1.0 aka mysql41-server/mysql41-client.
Submitted by: Alex Dupre <sysadmin@alexdupre.com> (maintainer)
Repo copied by: joe (cvs)
Approved by: portmgr (no objections)
43 files changed, 450 insertions, 420 deletions
diff --git a/databases/Makefile b/databases/Makefile index f577a689af23..278b959a4e6a 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -67,6 +67,8 @@ SUBDIR += mysql323-server SUBDIR += mysql40-client SUBDIR += mysql40-server + SUBDIR += mysql41-client + SUBDIR += mysql41-server SUBDIR += mysqlman SUBDIR += mysqltcl SUBDIR += mytop diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile index 99cc26f7f145..cfd9e1b04604 100644 --- a/databases/mysql41-client/Makefile +++ b/databases/mysql41-client/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: MySQL-client -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-client +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql40-server +MASTERDIR= ${.CURDIR}/../mysql41-server COMMENT= Multithreaded SQL database (client) PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index 2c9dcc3717e3..145b1ac72405 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -1,33 +1,34 @@ -# New ports collection makefile for: MySQL-server -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-server +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.0.12 -PORTREVISION?= 1 +PORTVERSION= 4.1.0 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ - http://mysql.tzone.it/Downloads/MySQL-4.0/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.mysql.cz/Downloads/MySQL-4.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ - http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ + http://mysql.tzone.it/Downloads/MySQL-4.1/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.mysql.cz/Downloads/MySQL-4.1/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= sysadmin@alexdupre.com COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql40-client +SLAVEDIRS= databases/mysql41-client DB_DIR?= /var/db/mysql USE_LIBTOOL= yes USE_REINPLACE= yes @@ -37,6 +38,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ + --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ @@ -95,10 +97,10 @@ CXX= ${CC} .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha ONLY_FOR_ARCHS= i386 alpha sparc64 diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo index c4d84965c754..14aad1713e59 100644 --- a/databases/mysql41-server/distinfo +++ b/databases/mysql41-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f +MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in index ba5973587226..d78a89dcc9a1 100644 --- a/databases/mysql41-server/files/patch-Makefile.in +++ b/databases/mysql41-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu Feb 20 20:58:01 2003 -+++ Makefile.in Thu Feb 27 12:27:18 2003 +--- Makefile.in.orig Fri Apr 11 10:50:40 2003 ++++ Makefile.in Fri Apr 11 10:51:55 2003 @@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ \ +- @readline_topdir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = + # Relink after clean - linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist index e77a5fa4d0f5..927a0cc79c6a 100644 --- a/databases/mysql41-server/pkg-plist +++ b/databases/mysql41-server/pkg-plist @@ -99,33 +99,33 @@ libexec/mysqld share/mysql/Description.plist share/mysql/Info.plist share/mysql/StartupParameters.plist -share/mysql/binary-configure share/mysql/postinstall share/mysql/preinstall -share/mysql/charsets/Index +share/mysql/charsets/Index.xml share/mysql/charsets/README -share/mysql/charsets/cp1251.conf -share/mysql/charsets/cp1257.conf -share/mysql/charsets/croat.conf -share/mysql/charsets/danish.conf -share/mysql/charsets/dec8.conf -share/mysql/charsets/dos.conf -share/mysql/charsets/estonia.conf -share/mysql/charsets/german1.conf -share/mysql/charsets/greek.conf -share/mysql/charsets/hebrew.conf -share/mysql/charsets/hp8.conf -share/mysql/charsets/hungarian.conf -share/mysql/charsets/koi8_ru.conf -share/mysql/charsets/koi8_ukr.conf -share/mysql/charsets/latin1.conf -share/mysql/charsets/latin2.conf -share/mysql/charsets/latin5.conf -share/mysql/charsets/swe7.conf -share/mysql/charsets/usa7.conf -share/mysql/charsets/win1250.conf -share/mysql/charsets/win1251.conf -share/mysql/charsets/win1251ukr.conf +share/mysql/charsets/armscii8.xml +share/mysql/charsets/ascii.xml +share/mysql/charsets/cp1250.xml +share/mysql/charsets/cp1251.xml +share/mysql/charsets/cp1256.xml +share/mysql/charsets/cp1257.xml +share/mysql/charsets/cp850.xml +share/mysql/charsets/cp852.xml +share/mysql/charsets/cp866.xml +share/mysql/charsets/dec8.xml +share/mysql/charsets/greek.xml +share/mysql/charsets/hebrew.xml +share/mysql/charsets/hp8.xml +share/mysql/charsets/keybcs2.xml +share/mysql/charsets/koi8r.xml +share/mysql/charsets/koi8u.xml +share/mysql/charsets/latin1.xml +share/mysql/charsets/latin2.xml +share/mysql/charsets/latin5.xml +share/mysql/charsets/latin7.xml +share/mysql/charsets/macce.xml +share/mysql/charsets/macroman.xml +share/mysql/charsets/swe7.xml share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -136,6 +136,7 @@ share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt share/mysql/estonian/errmsg.sys share/mysql/estonian/errmsg.txt +share/mysql/fill_help_tables.sql share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys @@ -150,7 +151,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client index 42c5460fc13e..55d2632aff04 100644 --- a/databases/mysql41-server/pkg-plist.client +++ b/databases/mysql41-server/pkg-plist.client @@ -9,12 +9,12 @@ bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh -include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h @@ -24,6 +24,7 @@ include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_semaphore.h include/mysql/my_sys.h +include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h @@ -33,11 +34,12 @@ include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.12 +lib/mysql/libmysqlclient_r.so.14 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile index 99cc26f7f145..cfd9e1b04604 100644 --- a/databases/mysql50-client/Makefile +++ b/databases/mysql50-client/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: MySQL-client -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-client +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql40-server +MASTERDIR= ${.CURDIR}/../mysql41-server COMMENT= Multithreaded SQL database (client) PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 2c9dcc3717e3..145b1ac72405 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -1,33 +1,34 @@ -# New ports collection makefile for: MySQL-server -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-server +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.0.12 -PORTREVISION?= 1 +PORTVERSION= 4.1.0 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ - http://mysql.tzone.it/Downloads/MySQL-4.0/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.mysql.cz/Downloads/MySQL-4.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ - http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ + http://mysql.tzone.it/Downloads/MySQL-4.1/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.mysql.cz/Downloads/MySQL-4.1/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= sysadmin@alexdupre.com COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql40-client +SLAVEDIRS= databases/mysql41-client DB_DIR?= /var/db/mysql USE_LIBTOOL= yes USE_REINPLACE= yes @@ -37,6 +38,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ + --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ @@ -95,10 +97,10 @@ CXX= ${CC} .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha ONLY_FOR_ARCHS= i386 alpha sparc64 diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index c4d84965c754..14aad1713e59 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f +MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in index ba5973587226..d78a89dcc9a1 100644 --- a/databases/mysql50-server/files/patch-Makefile.in +++ b/databases/mysql50-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu Feb 20 20:58:01 2003 -+++ Makefile.in Thu Feb 27 12:27:18 2003 +--- Makefile.in.orig Fri Apr 11 10:50:40 2003 ++++ Makefile.in Fri Apr 11 10:51:55 2003 @@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ \ +- @readline_topdir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = + # Relink after clean - linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index e77a5fa4d0f5..927a0cc79c6a 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -99,33 +99,33 @@ libexec/mysqld share/mysql/Description.plist share/mysql/Info.plist share/mysql/StartupParameters.plist -share/mysql/binary-configure share/mysql/postinstall share/mysql/preinstall -share/mysql/charsets/Index +share/mysql/charsets/Index.xml share/mysql/charsets/README -share/mysql/charsets/cp1251.conf -share/mysql/charsets/cp1257.conf -share/mysql/charsets/croat.conf -share/mysql/charsets/danish.conf -share/mysql/charsets/dec8.conf -share/mysql/charsets/dos.conf -share/mysql/charsets/estonia.conf -share/mysql/charsets/german1.conf -share/mysql/charsets/greek.conf -share/mysql/charsets/hebrew.conf -share/mysql/charsets/hp8.conf -share/mysql/charsets/hungarian.conf -share/mysql/charsets/koi8_ru.conf -share/mysql/charsets/koi8_ukr.conf -share/mysql/charsets/latin1.conf -share/mysql/charsets/latin2.conf -share/mysql/charsets/latin5.conf -share/mysql/charsets/swe7.conf -share/mysql/charsets/usa7.conf -share/mysql/charsets/win1250.conf -share/mysql/charsets/win1251.conf -share/mysql/charsets/win1251ukr.conf +share/mysql/charsets/armscii8.xml +share/mysql/charsets/ascii.xml +share/mysql/charsets/cp1250.xml +share/mysql/charsets/cp1251.xml +share/mysql/charsets/cp1256.xml +share/mysql/charsets/cp1257.xml +share/mysql/charsets/cp850.xml +share/mysql/charsets/cp852.xml +share/mysql/charsets/cp866.xml +share/mysql/charsets/dec8.xml +share/mysql/charsets/greek.xml +share/mysql/charsets/hebrew.xml +share/mysql/charsets/hp8.xml +share/mysql/charsets/keybcs2.xml +share/mysql/charsets/koi8r.xml +share/mysql/charsets/koi8u.xml +share/mysql/charsets/latin1.xml +share/mysql/charsets/latin2.xml +share/mysql/charsets/latin5.xml +share/mysql/charsets/latin7.xml +share/mysql/charsets/macce.xml +share/mysql/charsets/macroman.xml +share/mysql/charsets/swe7.xml share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -136,6 +136,7 @@ share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt share/mysql/estonian/errmsg.sys share/mysql/estonian/errmsg.txt +share/mysql/fill_help_tables.sql share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys @@ -150,7 +151,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client index 42c5460fc13e..55d2632aff04 100644 --- a/databases/mysql50-server/pkg-plist.client +++ b/databases/mysql50-server/pkg-plist.client @@ -9,12 +9,12 @@ bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh -include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h @@ -24,6 +24,7 @@ include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_semaphore.h include/mysql/my_sys.h +include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h @@ -33,11 +34,12 @@ include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.12 +lib/mysql/libmysqlclient_r.so.14 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile index 99cc26f7f145..cfd9e1b04604 100644 --- a/databases/mysql51-client/Makefile +++ b/databases/mysql51-client/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: MySQL-client -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-client +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql40-server +MASTERDIR= ${.CURDIR}/../mysql41-server COMMENT= Multithreaded SQL database (client) PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 2c9dcc3717e3..145b1ac72405 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -1,33 +1,34 @@ -# New ports collection makefile for: MySQL-server -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-server +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.0.12 -PORTREVISION?= 1 +PORTVERSION= 4.1.0 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ - http://mysql.tzone.it/Downloads/MySQL-4.0/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.mysql.cz/Downloads/MySQL-4.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ - http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ + http://mysql.tzone.it/Downloads/MySQL-4.1/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.mysql.cz/Downloads/MySQL-4.1/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= sysadmin@alexdupre.com COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql40-client +SLAVEDIRS= databases/mysql41-client DB_DIR?= /var/db/mysql USE_LIBTOOL= yes USE_REINPLACE= yes @@ -37,6 +38,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ + --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ @@ -95,10 +97,10 @@ CXX= ${CC} .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha ONLY_FOR_ARCHS= i386 alpha sparc64 diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index c4d84965c754..14aad1713e59 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f +MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in index ba5973587226..d78a89dcc9a1 100644 --- a/databases/mysql51-server/files/patch-Makefile.in +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu Feb 20 20:58:01 2003 -+++ Makefile.in Thu Feb 27 12:27:18 2003 +--- Makefile.in.orig Fri Apr 11 10:50:40 2003 ++++ Makefile.in Fri Apr 11 10:51:55 2003 @@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ \ +- @readline_topdir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = + # Relink after clean - linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index e77a5fa4d0f5..927a0cc79c6a 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -99,33 +99,33 @@ libexec/mysqld share/mysql/Description.plist share/mysql/Info.plist share/mysql/StartupParameters.plist -share/mysql/binary-configure share/mysql/postinstall share/mysql/preinstall -share/mysql/charsets/Index +share/mysql/charsets/Index.xml share/mysql/charsets/README -share/mysql/charsets/cp1251.conf -share/mysql/charsets/cp1257.conf -share/mysql/charsets/croat.conf -share/mysql/charsets/danish.conf -share/mysql/charsets/dec8.conf -share/mysql/charsets/dos.conf -share/mysql/charsets/estonia.conf -share/mysql/charsets/german1.conf -share/mysql/charsets/greek.conf -share/mysql/charsets/hebrew.conf -share/mysql/charsets/hp8.conf -share/mysql/charsets/hungarian.conf -share/mysql/charsets/koi8_ru.conf -share/mysql/charsets/koi8_ukr.conf -share/mysql/charsets/latin1.conf -share/mysql/charsets/latin2.conf -share/mysql/charsets/latin5.conf -share/mysql/charsets/swe7.conf -share/mysql/charsets/usa7.conf -share/mysql/charsets/win1250.conf -share/mysql/charsets/win1251.conf -share/mysql/charsets/win1251ukr.conf +share/mysql/charsets/armscii8.xml +share/mysql/charsets/ascii.xml +share/mysql/charsets/cp1250.xml +share/mysql/charsets/cp1251.xml +share/mysql/charsets/cp1256.xml +share/mysql/charsets/cp1257.xml +share/mysql/charsets/cp850.xml +share/mysql/charsets/cp852.xml +share/mysql/charsets/cp866.xml +share/mysql/charsets/dec8.xml +share/mysql/charsets/greek.xml +share/mysql/charsets/hebrew.xml +share/mysql/charsets/hp8.xml +share/mysql/charsets/keybcs2.xml +share/mysql/charsets/koi8r.xml +share/mysql/charsets/koi8u.xml +share/mysql/charsets/latin1.xml +share/mysql/charsets/latin2.xml +share/mysql/charsets/latin5.xml +share/mysql/charsets/latin7.xml +share/mysql/charsets/macce.xml +share/mysql/charsets/macroman.xml +share/mysql/charsets/swe7.xml share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -136,6 +136,7 @@ share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt share/mysql/estonian/errmsg.sys share/mysql/estonian/errmsg.txt +share/mysql/fill_help_tables.sql share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys @@ -150,7 +151,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client index 42c5460fc13e..55d2632aff04 100644 --- a/databases/mysql51-server/pkg-plist.client +++ b/databases/mysql51-server/pkg-plist.client @@ -9,12 +9,12 @@ bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh -include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h @@ -24,6 +24,7 @@ include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_semaphore.h include/mysql/my_sys.h +include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h @@ -33,11 +34,12 @@ include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.12 +lib/mysql/libmysqlclient_r.so.14 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile index 99cc26f7f145..cfd9e1b04604 100644 --- a/databases/mysql54-client/Makefile +++ b/databases/mysql54-client/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: MySQL-client -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-client +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql40-server +MASTERDIR= ${.CURDIR}/../mysql41-server COMMENT= Multithreaded SQL database (client) PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 2c9dcc3717e3..145b1ac72405 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -1,33 +1,34 @@ -# New ports collection makefile for: MySQL-server -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-server +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.0.12 -PORTREVISION?= 1 +PORTVERSION= 4.1.0 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ - http://mysql.tzone.it/Downloads/MySQL-4.0/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.mysql.cz/Downloads/MySQL-4.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ - http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ + http://mysql.tzone.it/Downloads/MySQL-4.1/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.mysql.cz/Downloads/MySQL-4.1/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= sysadmin@alexdupre.com COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql40-client +SLAVEDIRS= databases/mysql41-client DB_DIR?= /var/db/mysql USE_LIBTOOL= yes USE_REINPLACE= yes @@ -37,6 +38,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ + --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ @@ -95,10 +97,10 @@ CXX= ${CC} .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha ONLY_FOR_ARCHS= i386 alpha sparc64 diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index c4d84965c754..14aad1713e59 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f +MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in index ba5973587226..d78a89dcc9a1 100644 --- a/databases/mysql54-server/files/patch-Makefile.in +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu Feb 20 20:58:01 2003 -+++ Makefile.in Thu Feb 27 12:27:18 2003 +--- Makefile.in.orig Fri Apr 11 10:50:40 2003 ++++ Makefile.in Fri Apr 11 10:51:55 2003 @@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ \ +- @readline_topdir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = + # Relink after clean - linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index e77a5fa4d0f5..927a0cc79c6a 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -99,33 +99,33 @@ libexec/mysqld share/mysql/Description.plist share/mysql/Info.plist share/mysql/StartupParameters.plist -share/mysql/binary-configure share/mysql/postinstall share/mysql/preinstall -share/mysql/charsets/Index +share/mysql/charsets/Index.xml share/mysql/charsets/README -share/mysql/charsets/cp1251.conf -share/mysql/charsets/cp1257.conf -share/mysql/charsets/croat.conf -share/mysql/charsets/danish.conf -share/mysql/charsets/dec8.conf -share/mysql/charsets/dos.conf -share/mysql/charsets/estonia.conf -share/mysql/charsets/german1.conf -share/mysql/charsets/greek.conf -share/mysql/charsets/hebrew.conf -share/mysql/charsets/hp8.conf -share/mysql/charsets/hungarian.conf -share/mysql/charsets/koi8_ru.conf -share/mysql/charsets/koi8_ukr.conf -share/mysql/charsets/latin1.conf -share/mysql/charsets/latin2.conf -share/mysql/charsets/latin5.conf -share/mysql/charsets/swe7.conf -share/mysql/charsets/usa7.conf -share/mysql/charsets/win1250.conf -share/mysql/charsets/win1251.conf -share/mysql/charsets/win1251ukr.conf +share/mysql/charsets/armscii8.xml +share/mysql/charsets/ascii.xml +share/mysql/charsets/cp1250.xml +share/mysql/charsets/cp1251.xml +share/mysql/charsets/cp1256.xml +share/mysql/charsets/cp1257.xml +share/mysql/charsets/cp850.xml +share/mysql/charsets/cp852.xml +share/mysql/charsets/cp866.xml +share/mysql/charsets/dec8.xml +share/mysql/charsets/greek.xml +share/mysql/charsets/hebrew.xml +share/mysql/charsets/hp8.xml +share/mysql/charsets/keybcs2.xml +share/mysql/charsets/koi8r.xml +share/mysql/charsets/koi8u.xml +share/mysql/charsets/latin1.xml +share/mysql/charsets/latin2.xml +share/mysql/charsets/latin5.xml +share/mysql/charsets/latin7.xml +share/mysql/charsets/macce.xml +share/mysql/charsets/macroman.xml +share/mysql/charsets/swe7.xml share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -136,6 +136,7 @@ share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt share/mysql/estonian/errmsg.sys share/mysql/estonian/errmsg.txt +share/mysql/fill_help_tables.sql share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys @@ -150,7 +151,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client index 42c5460fc13e..55d2632aff04 100644 --- a/databases/mysql54-server/pkg-plist.client +++ b/databases/mysql54-server/pkg-plist.client @@ -9,12 +9,12 @@ bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh -include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h @@ -24,6 +24,7 @@ include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_semaphore.h include/mysql/my_sys.h +include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h @@ -33,11 +34,12 @@ include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.12 +lib/mysql/libmysqlclient_r.so.14 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile index 99cc26f7f145..cfd9e1b04604 100644 --- a/databases/mysql55-client/Makefile +++ b/databases/mysql55-client/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: MySQL-client -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-client +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql40-server +MASTERDIR= ${.CURDIR}/../mysql41-server COMMENT= Multithreaded SQL database (client) PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 2c9dcc3717e3..145b1ac72405 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -1,33 +1,34 @@ -# New ports collection makefile for: MySQL-server -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-server +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.0.12 -PORTREVISION?= 1 +PORTVERSION= 4.1.0 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ - http://mysql.tzone.it/Downloads/MySQL-4.0/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.mysql.cz/Downloads/MySQL-4.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ - http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ + http://mysql.tzone.it/Downloads/MySQL-4.1/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.mysql.cz/Downloads/MySQL-4.1/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= sysadmin@alexdupre.com COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql40-client +SLAVEDIRS= databases/mysql41-client DB_DIR?= /var/db/mysql USE_LIBTOOL= yes USE_REINPLACE= yes @@ -37,6 +38,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ + --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ @@ -95,10 +97,10 @@ CXX= ${CC} .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha ONLY_FOR_ARCHS= i386 alpha sparc64 diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index c4d84965c754..14aad1713e59 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f +MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in index ba5973587226..d78a89dcc9a1 100644 --- a/databases/mysql55-server/files/patch-Makefile.in +++ b/databases/mysql55-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu Feb 20 20:58:01 2003 -+++ Makefile.in Thu Feb 27 12:27:18 2003 +--- Makefile.in.orig Fri Apr 11 10:50:40 2003 ++++ Makefile.in Fri Apr 11 10:51:55 2003 @@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ \ +- @readline_topdir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = + # Relink after clean - linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index e77a5fa4d0f5..927a0cc79c6a 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -99,33 +99,33 @@ libexec/mysqld share/mysql/Description.plist share/mysql/Info.plist share/mysql/StartupParameters.plist -share/mysql/binary-configure share/mysql/postinstall share/mysql/preinstall -share/mysql/charsets/Index +share/mysql/charsets/Index.xml share/mysql/charsets/README -share/mysql/charsets/cp1251.conf -share/mysql/charsets/cp1257.conf -share/mysql/charsets/croat.conf -share/mysql/charsets/danish.conf -share/mysql/charsets/dec8.conf -share/mysql/charsets/dos.conf -share/mysql/charsets/estonia.conf -share/mysql/charsets/german1.conf -share/mysql/charsets/greek.conf -share/mysql/charsets/hebrew.conf -share/mysql/charsets/hp8.conf -share/mysql/charsets/hungarian.conf -share/mysql/charsets/koi8_ru.conf -share/mysql/charsets/koi8_ukr.conf -share/mysql/charsets/latin1.conf -share/mysql/charsets/latin2.conf -share/mysql/charsets/latin5.conf -share/mysql/charsets/swe7.conf -share/mysql/charsets/usa7.conf -share/mysql/charsets/win1250.conf -share/mysql/charsets/win1251.conf -share/mysql/charsets/win1251ukr.conf +share/mysql/charsets/armscii8.xml +share/mysql/charsets/ascii.xml +share/mysql/charsets/cp1250.xml +share/mysql/charsets/cp1251.xml +share/mysql/charsets/cp1256.xml +share/mysql/charsets/cp1257.xml +share/mysql/charsets/cp850.xml +share/mysql/charsets/cp852.xml +share/mysql/charsets/cp866.xml +share/mysql/charsets/dec8.xml +share/mysql/charsets/greek.xml +share/mysql/charsets/hebrew.xml +share/mysql/charsets/hp8.xml +share/mysql/charsets/keybcs2.xml +share/mysql/charsets/koi8r.xml +share/mysql/charsets/koi8u.xml +share/mysql/charsets/latin1.xml +share/mysql/charsets/latin2.xml +share/mysql/charsets/latin5.xml +share/mysql/charsets/latin7.xml +share/mysql/charsets/macce.xml +share/mysql/charsets/macroman.xml +share/mysql/charsets/swe7.xml share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -136,6 +136,7 @@ share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt share/mysql/estonian/errmsg.sys share/mysql/estonian/errmsg.txt +share/mysql/fill_help_tables.sql share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys @@ -150,7 +151,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client index 42c5460fc13e..55d2632aff04 100644 --- a/databases/mysql55-server/pkg-plist.client +++ b/databases/mysql55-server/pkg-plist.client @@ -9,12 +9,12 @@ bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh -include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h @@ -24,6 +24,7 @@ include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_semaphore.h include/mysql/my_sys.h +include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h @@ -33,11 +34,12 @@ include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.12 +lib/mysql/libmysqlclient_r.so.14 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile index 99cc26f7f145..cfd9e1b04604 100644 --- a/databases/mysql60-client/Makefile +++ b/databases/mysql60-client/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: MySQL-client -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-client +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql40-server +MASTERDIR= ${.CURDIR}/../mysql41-server COMMENT= Multithreaded SQL database (client) PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 2c9dcc3717e3..145b1ac72405 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -1,33 +1,34 @@ -# New ports collection makefile for: MySQL-server -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-server +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.0.12 -PORTREVISION?= 1 +PORTVERSION= 4.1.0 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ - http://mysql.tzone.it/Downloads/MySQL-4.0/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.mysql.cz/Downloads/MySQL-4.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ - http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ + http://mysql.tzone.it/Downloads/MySQL-4.1/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.mysql.cz/Downloads/MySQL-4.1/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= sysadmin@alexdupre.com COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql40-client +SLAVEDIRS= databases/mysql41-client DB_DIR?= /var/db/mysql USE_LIBTOOL= yes USE_REINPLACE= yes @@ -37,6 +38,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ + --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ @@ -95,10 +97,10 @@ CXX= ${CC} .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha ONLY_FOR_ARCHS= i386 alpha sparc64 diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index c4d84965c754..14aad1713e59 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f +MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index ba5973587226..d78a89dcc9a1 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu Feb 20 20:58:01 2003 -+++ Makefile.in Thu Feb 27 12:27:18 2003 +--- Makefile.in.orig Fri Apr 11 10:50:40 2003 ++++ Makefile.in Fri Apr 11 10:51:55 2003 @@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ \ +- @readline_topdir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = + # Relink after clean - linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index e77a5fa4d0f5..927a0cc79c6a 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -99,33 +99,33 @@ libexec/mysqld share/mysql/Description.plist share/mysql/Info.plist share/mysql/StartupParameters.plist -share/mysql/binary-configure share/mysql/postinstall share/mysql/preinstall -share/mysql/charsets/Index +share/mysql/charsets/Index.xml share/mysql/charsets/README -share/mysql/charsets/cp1251.conf -share/mysql/charsets/cp1257.conf -share/mysql/charsets/croat.conf -share/mysql/charsets/danish.conf -share/mysql/charsets/dec8.conf -share/mysql/charsets/dos.conf -share/mysql/charsets/estonia.conf -share/mysql/charsets/german1.conf -share/mysql/charsets/greek.conf -share/mysql/charsets/hebrew.conf -share/mysql/charsets/hp8.conf -share/mysql/charsets/hungarian.conf -share/mysql/charsets/koi8_ru.conf -share/mysql/charsets/koi8_ukr.conf -share/mysql/charsets/latin1.conf -share/mysql/charsets/latin2.conf -share/mysql/charsets/latin5.conf -share/mysql/charsets/swe7.conf -share/mysql/charsets/usa7.conf -share/mysql/charsets/win1250.conf -share/mysql/charsets/win1251.conf -share/mysql/charsets/win1251ukr.conf +share/mysql/charsets/armscii8.xml +share/mysql/charsets/ascii.xml +share/mysql/charsets/cp1250.xml +share/mysql/charsets/cp1251.xml +share/mysql/charsets/cp1256.xml +share/mysql/charsets/cp1257.xml +share/mysql/charsets/cp850.xml +share/mysql/charsets/cp852.xml +share/mysql/charsets/cp866.xml +share/mysql/charsets/dec8.xml +share/mysql/charsets/greek.xml +share/mysql/charsets/hebrew.xml +share/mysql/charsets/hp8.xml +share/mysql/charsets/keybcs2.xml +share/mysql/charsets/koi8r.xml +share/mysql/charsets/koi8u.xml +share/mysql/charsets/latin1.xml +share/mysql/charsets/latin2.xml +share/mysql/charsets/latin5.xml +share/mysql/charsets/latin7.xml +share/mysql/charsets/macce.xml +share/mysql/charsets/macroman.xml +share/mysql/charsets/swe7.xml share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -136,6 +136,7 @@ share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt share/mysql/estonian/errmsg.sys share/mysql/estonian/errmsg.txt +share/mysql/fill_help_tables.sql share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys @@ -150,7 +151,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client index 42c5460fc13e..55d2632aff04 100644 --- a/databases/mysql60-server/pkg-plist.client +++ b/databases/mysql60-server/pkg-plist.client @@ -9,12 +9,12 @@ bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh -include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h @@ -24,6 +24,7 @@ include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_semaphore.h include/mysql/my_sys.h +include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h @@ -33,11 +34,12 @@ include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.12 +lib/mysql/libmysqlclient_r.so.14 @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile index 99cc26f7f145..cfd9e1b04604 100644 --- a/databases/percona55-client/Makefile +++ b/databases/percona55-client/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: MySQL-client -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-client +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME= mysql -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -client -MASTERDIR= ${.CURDIR}/../mysql40-server +MASTERDIR= ${.CURDIR}/../mysql41-server COMMENT= Multithreaded SQL database (client) PKGINSTALL= mustnotexist PLIST= ${PKGDIR}/pkg-plist.client diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 2c9dcc3717e3..145b1ac72405 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -1,33 +1,34 @@ -# New ports collection makefile for: MySQL-server -# Date created: Sun Mar 3 12:20:35 CET 2002 -# Whom: Alex Dupre <sysadmin@alexdupre.com> +# New ports collection makefile for: MySQL-server +# Date created: Fri Apr 11 10:06:26 CET 2003 +# Whom: Alex Dupre <sysadmin@alexdupre.com> # # $FreeBSD$ # PORTNAME?= mysql -PORTVERSION= 4.0.12 -PORTREVISION?= 1 +PORTVERSION= 4.1.0 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ - http://mysql.tzone.it/Downloads/MySQL-4.0/ \ - ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-4.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.0/ \ - http://www.mysql.cz/Downloads/MySQL-4.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.0/ \ - http://mysql.oms-net.nl/Downloads/MySQL-4.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/ +MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.1/ \ + http://mysql.tzone.it/Downloads/MySQL-4.1/ \ + ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.1/ \ + http://mysql.mediatraffic.fi/Downloads/MySQL-4.1/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-4.1/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-4.1/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-4.1/ \ + http://www.mysql.cz/Downloads/MySQL-4.1/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-4.1/ \ + http://mysql.oms-net.nl/Downloads/MySQL-4.1/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/ PKGNAMESUFFIX?= -server +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha MAINTAINER= sysadmin@alexdupre.com COMMENT?= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql40-client +SLAVEDIRS= databases/mysql41-client DB_DIR?= /var/db/mysql USE_LIBTOOL= yes USE_REINPLACE= yes @@ -37,6 +38,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --without-debug \ --without-readline \ + --without-libedit \ --without-bench \ --without-extra-tools \ --with-libwrap \ @@ -95,10 +97,10 @@ CXX= ${CC} .if !defined(CLIENT_ONLY) USE_PERL5_RUN= yes -RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql40-client \ +RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql41-client \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql -PLIST_SUB= MYSQL_VERSION=${PORTVERSION} +PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-alpha ONLY_FOR_ARCHS= i386 alpha sparc64 diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index c4d84965c754..14aad1713e59 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.12.tar.gz) = 7d7696ecad5018939735049c0e87132f +MD5 (mysql-4.1.0-alpha.tar.gz) = a3e9be29f98a3e8c81e996d3f4248afb diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in index ba5973587226..d78a89dcc9a1 100644 --- a/databases/percona55-server/files/patch-Makefile.in +++ b/databases/percona55-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Thu Feb 20 20:58:01 2003 -+++ Makefile.in Thu Feb 27 12:27:18 2003 +--- Makefile.in.orig Fri Apr 11 10:50:40 2003 ++++ Makefile.in Fri Apr 11 10:51:55 2003 @@ -212,12 +212,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ COPYING COPYING.LIB --SUBDIRS = . include @docs_dirs@ @readline_dir@ \ +-SUBDIRS = . include @docs_dirs@ \ +- @readline_topdir@ \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests \ - BUILD @netware_dir@ os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ -- +SUBDIRS = + # Relink after clean - linked_sources = linked_client_sources linked_server_sources \ diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index e77a5fa4d0f5..927a0cc79c6a 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -99,33 +99,33 @@ libexec/mysqld share/mysql/Description.plist share/mysql/Info.plist share/mysql/StartupParameters.plist -share/mysql/binary-configure share/mysql/postinstall share/mysql/preinstall -share/mysql/charsets/Index +share/mysql/charsets/Index.xml share/mysql/charsets/README -share/mysql/charsets/cp1251.conf -share/mysql/charsets/cp1257.conf -share/mysql/charsets/croat.conf -share/mysql/charsets/danish.conf -share/mysql/charsets/dec8.conf -share/mysql/charsets/dos.conf -share/mysql/charsets/estonia.conf -share/mysql/charsets/german1.conf -share/mysql/charsets/greek.conf -share/mysql/charsets/hebrew.conf -share/mysql/charsets/hp8.conf -share/mysql/charsets/hungarian.conf -share/mysql/charsets/koi8_ru.conf -share/mysql/charsets/koi8_ukr.conf -share/mysql/charsets/latin1.conf -share/mysql/charsets/latin2.conf -share/mysql/charsets/latin5.conf -share/mysql/charsets/swe7.conf -share/mysql/charsets/usa7.conf -share/mysql/charsets/win1250.conf -share/mysql/charsets/win1251.conf -share/mysql/charsets/win1251ukr.conf +share/mysql/charsets/armscii8.xml +share/mysql/charsets/ascii.xml +share/mysql/charsets/cp1250.xml +share/mysql/charsets/cp1251.xml +share/mysql/charsets/cp1256.xml +share/mysql/charsets/cp1257.xml +share/mysql/charsets/cp850.xml +share/mysql/charsets/cp852.xml +share/mysql/charsets/cp866.xml +share/mysql/charsets/dec8.xml +share/mysql/charsets/greek.xml +share/mysql/charsets/hebrew.xml +share/mysql/charsets/hp8.xml +share/mysql/charsets/keybcs2.xml +share/mysql/charsets/koi8r.xml +share/mysql/charsets/koi8u.xml +share/mysql/charsets/latin1.xml +share/mysql/charsets/latin2.xml +share/mysql/charsets/latin5.xml +share/mysql/charsets/latin7.xml +share/mysql/charsets/macce.xml +share/mysql/charsets/macroman.xml +share/mysql/charsets/swe7.xml share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -136,6 +136,7 @@ share/mysql/english/errmsg.sys share/mysql/english/errmsg.txt share/mysql/estonian/errmsg.sys share/mysql/estonian/errmsg.txt +share/mysql/fill_help_tables.sql share/mysql/french/errmsg.sys share/mysql/french/errmsg.txt share/mysql/german/errmsg.sys @@ -150,7 +151,6 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt -share/mysql/make_binary_distribution share/mysql/mi_test_all share/mysql/mi_test_all.res share/mysql/my-huge.cnf diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client index 42c5460fc13e..55d2632aff04 100644 --- a/databases/percona55-server/pkg-plist.client +++ b/databases/percona55-server/pkg-plist.client @@ -9,12 +9,12 @@ bin/mysqlmanagerc bin/mysqlshow bin/mysqltest etc/rc.d/000.mysql-client.sh -include/mysql/dbug.h include/mysql/errmsg.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_config.h +include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h @@ -24,6 +24,7 @@ include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_semaphore.h include/mysql/my_sys.h +include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h @@ -33,11 +34,12 @@ include/mysql/raid.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h +include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.12 +lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.12 +lib/mysql/libmysqlclient_r.so.14 @dirrm include/mysql @dirrm lib/mysql |