aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql60-server
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql60-server')
-rw-r--r--databases/mysql60-server/Makefile237
-rw-r--r--databases/mysql60-server/distinfo2
-rw-r--r--databases/mysql60-server/files/mysql-client.sh15
-rw-r--r--databases/mysql60-server/files/mysql-server.sh.in64
-rw-r--r--databases/mysql60-server/files/patch-Docs::Makefile.in11
-rw-r--r--databases/mysql60-server/files/patch-Makefile.in16
-rw-r--r--databases/mysql60-server/files/patch-configure22
-rw-r--r--databases/mysql60-server/files/patch-man::Makefile.in13
-rw-r--r--databases/mysql60-server/files/patch-mysys_default.c22
-rw-r--r--databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp11
-rw-r--r--databases/mysql60-server/files/patch-scripts::Makefile.in37
-rw-r--r--databases/mysql60-server/files/patch-sql::mysqld.cc11
-rw-r--r--databases/mysql60-server/files/patch-sql::mytcpd.h147
-rw-r--r--databases/mysql60-server/pkg-descr7
-rw-r--r--databases/mysql60-server/pkg-install36
-rw-r--r--databases/mysql60-server/pkg-plist167
-rw-r--r--databases/mysql60-server/pkg-plist.client55
-rw-r--r--databases/mysql60-server/pkg-plist.scripts13
18 files changed, 0 insertions, 886 deletions
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
deleted file mode 100644
index 3ef94d6ca7c3..000000000000
--- a/databases/mysql60-server/Makefile
+++ /dev/null
@@ -1,237 +0,0 @@
-# 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= 5.0.9
-PORTREVISION?= 1
-CATEGORIES= databases
-MASTER_SITES= ${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR= MySQL-5.0
-PKGNAMESUFFIX?= -server
-DISTNAME= ${PORTNAME}-${PORTVERSION}-beta
-
-MAINTAINER= ale@FreeBSD.org
-COMMENT?= Multithreaded SQL database (server)
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-beta
-SLAVEDIRS= databases/mysql50-client
-USE_LIBTOOL_VER=15
-USE_REINPLACE= yes
-
-.if ${PKGNAMESUFFIX} == "-server"
-USE_RC_SUBR= mysql-server.sh
-.endif
-
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
- --without-debug \
- --without-readline \
- --without-libedit \
- --without-bench \
- --without-extra-tools \
- --with-libwrap \
- --with-mysqlfs \
- --with-low-memory \
- --with-comment='FreeBSD port: ${PKGNAME}' \
- --enable-thread-safe-client
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.if defined(WITH_CHARSET) && ${WITH_CHARSET} != ""
-CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
-.endif
-.if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
-CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
-.endif
-.if defined(WITH_OPENSSL)
-USE_OPENSSL= yes
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-.endif
-.if defined(BUILD_STATIC)
-CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
-.endif
-.if defined(WITHOUT_INNODB)
-CONFIGURE_ARGS+=--without-innodb
-.endif
-.if defined(WITH_NDB)
-CONFIGURE_ARGS+=--with-ndbcluster
-.endif
-.if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
-CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
-.endif
-.if defined(WITH_LINUXTHREADS)
-CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
-CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
-CFLAGS+= -D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
-CFLAGS+= -I${LOCALBASE}/include/pthread/linuxthreads
-.if ${OSVERSION} > 500000
-LIB_DEPENDS+= lthread.[35]:${PORTSDIR}/devel/linuxthreads
-CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
-.else
-LIB_DEPENDS+= lthread.[24]:${PORTSDIR}/devel/linuxthreads
-CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
-.endif
-.else
-CONFIGURE_ARGS+=--with-named-thread-libs=${PTHREAD_LIBS}
-CFLAGS+= ${PTHREAD_CFLAGS}
-.endif
-
-.if ${OSVERSION} < 500000
-LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CXX= ${CC}
-.endif
-.if defined(BUILD_OPTIMIZED)
-CFLAGS+= -O3 -fno-omit-frame-pointer
-.if ${OSVERSION} > 500000 || (defined(USE_GCC) && (${USE_GCC} == 3.0 || ${USE_GCC} == 3.1 || ${USE_GCC} == 3.2 || ${USE_GCC} == 3.3))
-CFLAGS+= -fno-gcse
-.endif
-.endif
-CXXFLAGS+= ${CFLAGS} -felide-constructors -fno-rtti
-.if ${OSVERSION} >= 400002
-CXXFLAGS+= -fno-exceptions
-.endif
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
-USE_MYSQL= yes
-WANT_MYSQL_VER= 50
-
-LATEST_LINK= mysql50-server
-
-CONFLICTS= mysql-server-3.* mysql-server-4.*
-
-PLIST_SUB= VER=${PORTVERSION}-beta
-.if defined(WITH_NDB)
-PLIST_SUB+= NDB=""
-.else
-PLIST_SUB+= NDB="@comment "
-.endif
-
-MAN1= mysqld.1 \
- mysqld_safe.1 perror.1 replace.1
-
-INFO= mysql
-
-pre-fetch:
- @${ECHO} ""
- @${ECHO} "You may use the following build options:"
- @${ECHO} ""
- @${ECHO} " WITH_CHARSET=charset Define the primary built-in charset (latin1)."
- @${ECHO} " WITH_XCHARSET=list Define other built-in charsets (may be 'all')."
- @${ECHO} " WITH_COLLATION=collate Define default collation (latin1_swedish_ci)."
- @${ECHO} " WITH_OPENSSL=yes Enable secure connections."
- @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library."
- @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads"
- @${ECHO} " (try it if you use libpthread)."
- @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations"
- @${ECHO} " (use it if you need speed)."
- @${ECHO} " BUILD_STATIC=yes Build a static version of mysqld."
- @${ECHO} " (use it if you need even more speed)."
- @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler."
- @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster."
- @${ECHO} ""
-
-post-patch:
- @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
- @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
- @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
- @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
-.if defined(WITH_PROC_SCOPE_PTH)
- @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
-.endif
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
-.else
-# MySQL-Client part
-.if defined(CLIENT_ONLY)
-LATEST_LINK= mysql50-client
-
-CONFLICTS= mysql-client-3.* mysql-client-4.*
-
-MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
-
-INSTALLS_SHLIB= yes
-LDCONFIG_DIRS= %%PREFIX%%/lib/mysql
-
-CONFIGURE_ARGS+=--without-server
-
-post-patch:
- @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include strings mysys dbug extra regex libmysql_r libmysql client scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in
- @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
- @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
- @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
-.if defined(WITH_PROC_SCOPE_PTH)
- @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
-.endif
-
-post-install:
- @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
- @${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mysql-client.sh
-
-.else
-# MySQL-Scripts part
-USE_MYSQL= yes
-WANT_MYSQL_VER= 50
-USE_PERL5= yes
-
-RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql50
-.if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-
-LATEST_LINK= mysql50-scripts
-
-CONFLICTS= mysql-scripts-3.* mysql-scripts-4.*
-
-MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1
-
-SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \
- mysql_secure_installation mysql_zap mysqlaccess \
- mysql_convert_table_format mysql_find_rows mysqlhotcopy \
- mysqldumpslow mysql_explain_log mysql_tableinfo mysqld_multi
-
-post-patch:
- @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|install-exec-am install-data-am|install-exec-am|g" ${WRKSRC}/scripts/Makefile.in
- @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
-.endif
-.endif
-# Common part
-post-extract:
- @${CP} /usr/include/tcpd.h ${WRKSRC}/sql/mytcpd.h
-
-.if defined(WITH_OPENSSL) && defined(BUILD_STATIC)
-pre-configure:
- @${ECHO} "You can't use the BUILD_STATIC option when using OpenSSL."
- @${FALSE}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
deleted file mode 100644
index 4989cc739f3e..000000000000
--- a/databases/mysql60-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c
-SIZE (mysql-5.0.9-beta.tar.gz) = 18615183
diff --git a/databases/mysql60-server/files/mysql-client.sh b/databases/mysql60-server/files/mysql-client.sh
deleted file mode 100644
index bef414c12ed2..000000000000
--- a/databases/mysql60-server/files/mysql-client.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- start)
- /sbin/ldconfig -m %%PREFIX%%/lib/mysql
- ;;
- stop)
- ;;
- *)
- echo ""
- echo "Usage: `basename $0` { start | stop }"
- echo ""
- exit 64
- ;;
-esac
diff --git a/databases/mysql60-server/files/mysql-server.sh.in b/databases/mysql60-server/files/mysql-server.sh.in
deleted file mode 100644
index 93bd177f98b3..000000000000
--- a/databases/mysql60-server/files/mysql-server.sh.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: mysql
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_limits (bool): Set to "NO" by default.
-# Set it to yes to run `limits -e -U mysql`
-# just before mysql starts.
-# mysql_dbdir (str): Default to "/var/db/mysql"
-# Base database directory.
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. %%RC_SUBR%%
-
-name="mysql"
-rcvar=`set_rcvar`
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_args=""}
-
-mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
-pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
-command="%%PREFIX%%/bin/mysqld_safe"
-command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null &"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--ldata=${mysql_dbdir}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args >/dev/null
- [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- if checkyesno mysql_limits; then
- eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
- else
- return 0
- fi
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql60-server/files/patch-Docs::Makefile.in b/databases/mysql60-server/files/patch-Docs::Makefile.in
deleted file mode 100644
index 3a4f448240cf..000000000000
--- a/databases/mysql60-server/files/patch-Docs::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Docs/Makefile.in.orig Fri Jun 3 14:54:01 2005
-+++ Docs/Makefile.in Fri Jun 3 14:55:32 2005
-@@ -494,7 +494,7 @@
- uninstall-info-am
-
-
--all: txt_files
-+all:
-
- txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
- INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in
deleted file mode 100644
index 3d79a8146f37..000000000000
--- a/databases/mysql60-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig Thu May 26 15:27:53 2005
-+++ Makefile.in Fri Jun 3 15:05:48 2005
-@@ -355,12 +355,7 @@
-
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
--SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
-- @readline_topdir@ sql-common \
-- @thread_dirs@ pstack \
-- @sql_union_dirs@ scripts @man_dirs@ tests \
-- netware @libmysqld_dirs@ \
-- @bench_dirs@ support-files @tools_dirs@
-+SUBDIRS =
-
- DIST_SUBDIRS = . include @docs_dirs@ zlib \
- @readline_topdir@ sql-common \
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
deleted file mode 100644
index fbbdc8efd9d1..000000000000
--- a/databases/mysql60-server/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig Sun Dec 21 19:03:09 2003
-+++ configure Wed Dec 24 10:40:53 2003
-@@ -8128,8 +8128,6 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"; $ac_aux_dir/ltconfig $LIBTOOL_DEPS;
-
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
- # Prevent multiple expansion
-
-@@ -12678,8 +12644,8 @@
- # Some system specific hacks
- #
-
--MAX_C_OPTIMIZE="-O3"
--MAX_CXX_OPTIMIZE="-O3"
-+MAX_C_OPTIMIZE=""
-+MAX_CXX_OPTIMIZE=""
-
- case $SYSTEM_TYPE in
- *solaris2.7*)
diff --git a/databases/mysql60-server/files/patch-man::Makefile.in b/databases/mysql60-server/files/patch-man::Makefile.in
deleted file mode 100644
index 0f83c2ae8cad..000000000000
--- a/databases/mysql60-server/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005
-+++ man/Makefile.in Wed Apr 6 13:10:42 2005
-@@ -333,9 +333,7 @@
- tools_dirs = @tools_dirs@
- uname_prog = @uname_prog@
- zlib_dir = @zlib_dir@
--man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \
-- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
-- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
-+man_MANS =
-
- EXTRA_DIST = mysql.1.in mysql_zap.1.in \
- mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql60-server/files/patch-mysys_default.c b/databases/mysql60-server/files/patch-mysys_default.c
deleted file mode 100644
index 7c1dbe23aa9a..000000000000
--- a/databases/mysql60-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- mysys/default.c.orig Thu May 26 15:26:56 2005
-+++ mysys/default.c Fri Jun 3 17:16:59 2005
-@@ -517,7 +517,7 @@
- {
- MY_STAT stat_info;
- if (!my_stat(name,&stat_info,MYF(0)))
-- return 1;
-+ return 0;
- /*
- Ignore world-writable regular files.
- This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
- *ptr++= env;
- #endif
- *ptr++= "/etc/";
-+ *ptr++= "%%PREFIX%%/etc/";
- #endif
-- if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
-- *ptr++= env;
- *ptr++= ""; /* Place for defaults_extra_file */
- #if !defined(__WIN__) && !defined(__NETWARE__)
- *ptr++= "~/";;
diff --git a/databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp b/databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp
deleted file mode 100644
index ef1f6711f469..000000000000
--- a/databases/mysql60-server/files/patch-ndb::src::mgmclient::main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ndb/src/mgmclient/main.cpp.orig Mon Jan 10 15:36:57 2005
-+++ ndb/src/mgmclient/main.cpp Mon Jan 10 15:37:26 2005
-@@ -122,7 +122,7 @@
- }
- #ifdef HAVE_READLINE
- /* Get a line from the user. */
-- line_read = readline (prompt);
-+ line_read = readline ((char *)prompt);
- /* If the line has any text in it, save it on the history. */
- if (line_read && *line_read)
- add_history (line_read);
diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in
deleted file mode 100644
index 5e2d4e697ea6..000000000000
--- a/databases/mysql60-server/files/patch-scripts::Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
---- scripts/Makefile.in.orig Sat Jun 11 03:32:05 2005
-+++ scripts/Makefile.in Thu Jun 16 23:09:08 2005
-@@ -333,24 +333,7 @@
- uname_prog = @uname_prog@
- yassl_dir = @yassl_dir@
- zlib_dir = @zlib_dir@
--bin_SCRIPTS = @server_scripts@ \
-- msql2mysql \
-- mysql_config \
-- mysql_fix_privilege_tables \
-- mysql_fix_extensions \
-- mysql_setpermission \
-- mysql_secure_installation \
-- mysql_zap \
-- mysqlaccess \
-- mysqlbug \
-- mysql_convert_table_format \
-- mysql_find_rows \
-- mysqlhotcopy \
-- mysqldumpslow \
-- mysql_explain_log \
-- mysql_tableinfo \
-- mysqld_multi \
-- mysql_create_system_tables
-+bin_SCRIPTS =
-
- EXTRA_SCRIPTS = make_binary_distribution.sh \
- make_sharedlib_distribution.sh \
-@@ -380,7 +363,7 @@
- mysqlaccess.conf \
- mysqlbug
-
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
-+dist_pkgdata_DATA =
-
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
diff --git a/databases/mysql60-server/files/patch-sql::mysqld.cc b/databases/mysql60-server/files/patch-sql::mysqld.cc
deleted file mode 100644
index e79f985fcb69..000000000000
--- a/databases/mysql60-server/files/patch-sql::mysqld.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004
-+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005
-@@ -128,7 +128,7 @@
- #endif /* __WIN__ */
-
- #ifdef HAVE_LIBWRAP
--#include <tcpd.h>
-+#include "mytcpd.h"
- #include <syslog.h>
- #ifdef NEED_SYS_SYSLOG_H
- #include <sys/syslog.h>
diff --git a/databases/mysql60-server/files/patch-sql::mytcpd.h b/databases/mysql60-server/files/patch-sql::mytcpd.h
deleted file mode 100644
index 43afdf1cf96e..000000000000
--- a/databases/mysql60-server/files/patch-sql::mytcpd.h
+++ /dev/null
@@ -1,147 +0,0 @@
---- sql/mytcpd.h.orig Sun Jan 9 13:33:51 2005
-+++ sql/mytcpd.h Sun Jan 9 13:41:42 2005
-@@ -6,6 +6,25 @@
- * $FreeBSD: /tmp/pcvs/ports/databases/mysql60-server/files/Attic/patch-sql::mytcpd.h,v 1.1 2005-01-10 13:17:30 ale Exp $
- */
-
-+#ifndef _TCPWRAPPERS_TCPD_H
-+#define _TCPWRAPPERS_TCPD_H
-+
-+/* someone else may have defined this */
-+#undef __P
-+
-+/* use prototypes if we have an ANSI C compiler or are using C++ */
-+#if defined(__STDC__) || defined(__cplusplus)
-+#define __P(args) args
-+#else
-+#define __P(args) ()
-+#endif
-+
-+/* Need definitions of struct sockaddr_in and FILE. */
-+#include <netinet/in.h>
-+#include <stdio.h>
-+
-+__BEGIN_DECLS
-+
- /* Structure to describe one communications endpoint. */
-
- #define STRING_LENGTH 128 /* hosts, users, processes */
-@@ -31,10 +50,10 @@
- char pid[10]; /* access via eval_pid(request) */
- struct host_info client[1]; /* client endpoint info */
- struct host_info server[1]; /* server endpoint info */
-- void (*sink) (); /* datagram sink function or 0 */
-- void (*hostname) (); /* address to printable hostname */
-- void (*hostaddr) (); /* address to printable address */
-- void (*cleanup) (); /* cleanup function or 0 */
-+ void (*sink) __P((int)); /* datagram sink function or 0 */
-+ void (*hostname) __P((struct host_info *)); /* address to printable hostname */
-+ void (*hostaddr) __P((struct host_info *)); /* address to printable address */
-+ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */
- struct netconfig *config; /* netdir handle */
- };
-
-@@ -67,20 +86,23 @@
- /* Global functions. */
-
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void fromhost(); /* get/validate client host info */
-+extern void fromhost __P((struct request_info *)); /* get/validate client host info */
- #else
- #define fromhost sock_host /* no TLI support needed */
- #endif
-
--extern int hosts_access(); /* access control */
--extern void shell_cmd(); /* execute shell command */
--extern char *percent_x(); /* do %<char> expansion */
--extern void rfc931(); /* client name from RFC 931 daemon */
--extern void clean_exit(); /* clean up and exit */
--extern void refuse(); /* clean up and exit */
--extern char *xgets(); /* fgets() on steroids */
--extern char *split_at(); /* strchr() and split */
--extern unsigned long dot_quad_addr(); /* restricted inet_addr() */
-+extern void shell_cmd __P((char *)); /* execute shell command */
-+extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */
-+#ifdef INET6
-+extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */
-+#else
-+extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */
-+#endif
-+extern void clean_exit __P((struct request_info *)); /* clean up and exit */
-+extern void refuse __P((struct request_info *)); /* clean up and exit */
-+extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */
-+extern char *split_at __P((char *, int)); /* strchr() and split */
-+extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
-
- /* Global variables. */
-
-@@ -98,9 +120,14 @@
- */
-
- #ifdef __STDC__
-+extern int hosts_access(struct request_info *request);
-+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr,
-+ char *client_user);
- extern struct request_info *request_init(struct request_info *,...);
- extern struct request_info *request_set(struct request_info *,...);
- #else
-+extern int hosts_access();
-+extern int hosts_ctl();
- extern struct request_info *request_init(); /* initialize request */
- extern struct request_info *request_set(); /* update request structure */
- #endif
-@@ -123,27 +150,27 @@
- * host_info structures serve as caches for the lookup results.
- */
-
--extern char *eval_user(); /* client user */
--extern char *eval_hostname(); /* printable hostname */
--extern char *eval_hostaddr(); /* printable host address */
--extern char *eval_hostinfo(); /* host name or address */
--extern char *eval_client(); /* whatever is available */
--extern char *eval_server(); /* whatever is available */
-+extern char *eval_user __P((struct request_info *)); /* client user */
-+extern char *eval_hostname __P((struct host_info *)); /* printable hostname */
-+extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */
-+extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */
-+extern char *eval_client __P((struct request_info *)); /* whatever is available */
-+extern char *eval_server __P((struct request_info *)); /* whatever is available */
- #define eval_daemon(r) ((r)->daemon) /* daemon process name */
- #define eval_pid(r) ((r)->pid) /* process id */
-
- /* Socket-specific methods, including DNS hostname lookups. */
-
--extern void sock_host(); /* look up endpoint addresses */
--extern void sock_hostname(); /* translate address to hostname */
--extern void sock_hostaddr(); /* address to printable address */
-+extern void sock_host __P((struct request_info *));
-+extern void sock_hostname __P((struct host_info *));
-+extern void sock_hostaddr __P((struct host_info *));
- #define sock_methods(r) \
- { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
-
- /* The System V Transport-Level Interface (TLI) interface. */
-
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
--extern void tli_host(); /* look up endpoint addresses etc. */
-+extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */
- #endif
-
- /*
-@@ -184,7 +211,7 @@
- * behavior.
- */
-
--extern void process_options(); /* execute options */
-+extern void process_options __P((char *, struct request_info *)); /* execute options */
- extern int dry_run; /* verification flag */
-
- /* Bug workarounds. */
-@@ -223,3 +250,7 @@
- #define strtok my_strtok
- extern char *my_strtok();
- #endif
-+
-+__END_DECLS
-+
-+#endif /* tcpd.h */
diff --git a/databases/mysql60-server/pkg-descr b/databases/mysql60-server/pkg-descr
deleted file mode 100644
index 4ddefbb70546..000000000000
--- a/databases/mysql60-server/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
-WWW: http://www.mysql.com/
-
-- Alex Dupre
-ale@FreeBSD.org
diff --git a/databases/mysql60-server/pkg-install b/databases/mysql60-server/pkg-install
deleted file mode 100644
index 586f846c5031..000000000000
--- a/databases/mysql60-server/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-case $2 in
-POST-INSTALL)
- USER=mysql
- GROUP=${USER}
- UID=88
- GID=${UID}
-
- if pw group show "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- exit 1
- fi
- fi
-
- if pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
- fi
- ;;
-esac
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
deleted file mode 100644
index 9f12dd17a3fb..000000000000
--- a/databases/mysql60-server/pkg-plist
+++ /dev/null
@@ -1,167 +0,0 @@
-@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
-bin/comp_err
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_create_system_tables
-bin/mysql_install_db
-bin/mysql_tzinfo_to_sql
-bin/mysql_waitpid
-bin/mysqld_safe
-%%NDB%%bin/ndb_delete_all
-%%NDB%%bin/ndb_desc
-%%NDB%%bin/ndb_drop_index
-%%NDB%%bin/ndb_drop_table
-%%NDB%%bin/ndb_mgm
-%%NDB%%bin/ndb_restore
-%%NDB%%bin/ndb_select_all
-%%NDB%%bin/ndb_select_count
-%%NDB%%bin/ndb_show_tables
-%%NDB%%bin/ndb_test_platform
-%%NDB%%bin/ndb_waiter
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters_debug.h
-%%NDB%%include/mysql/ndb/mgmapi/mgmapi_debug.h
-%%NDB%%include/mysql/ndb/mgmapi/ndb_logevent.h
-%%NDB%%include/mysql/ndb/ndb_constants.h
-%%NDB%%include/mysql/ndb/ndb_init.h
-%%NDB%%include/mysql/ndb/ndb_types.h
-%%NDB%%include/mysql/ndb/ndb_version.h
-%%NDB%%include/mysql/ndb/ndbapi/Ndb.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbApi.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbBlob.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbDictionary.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbError.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbEventOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbIndexOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbIndexScanOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbPool.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbRecAttr.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbReceiver.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbScanFilter.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbScanOperation.hpp
-%%NDB%%include/mysql/ndb/ndbapi/NdbTransaction.hpp
-%%NDB%%include/mysql/ndb/ndbapi/ndbapi_limits.h
-%%NDB%%include/mysql/ndb/ndbapi/ndb_cluster_connection.hpp
-%%NDB%%include/mysql/ndb/ndbapi/ndb_opt_defaults.h
-%%NDB%%include/mysql/ndb/ndbapi/ndberror.h
-lib/mysql/libdbug.a
-lib/mysql/libheap.a
-lib/mysql/libmyisam.a
-lib/mysql/libmyisammrg.a
-lib/mysql/libmystrings.a
-lib/mysql/libmysys.a
-%%NDB%%lib/mysql/libndbclient.a
-%%NDB%%lib/mysql/libndbclient.so
-%%NDB%%lib/mysql/libndbclient.so.0
-lib/mysql/libvio.a
-libexec/mysqld
-%%NDB%%libexec/ndb_cpcd
-%%NDB%%libexec/ndb_mgmd
-%%NDB%%libexec/ndbd
-%%DATADIR%%/Description.plist
-%%DATADIR%%/Info.plist
-%%DATADIR%%/MySQL-shared-compat.spec
-%%DATADIR%%/StartupParameters.plist
-%%DATADIR%%/postinstall
-%%DATADIR%%/preinstall
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/mi_test_all
-%%DATADIR%%/mi_test_all.res
-%%DATADIR%%/my-huge.cnf
-%%DATADIR%%/my-innodb-heavy-4G.cnf
-%%DATADIR%%/my-large.cnf
-%%DATADIR%%/my-medium.cnf
-%%DATADIR%%/my-small.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql-%%VER%%.spec
-%%DATADIR%%/mysql.server
-%%DATADIR%%/ndb-config-2-node.ini
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%NDB%%@dirrm include/mysql/ndb/mgmapi
-%%NDB%%@dirrm include/mysql/ndb/ndbapi
-%%NDB%%@dirrm include/mysql/ndb
-@unexec rmdir %D/include/mysql 2> /dev/null || true
-@unexec rmdir %D/lib/mysql 2> /dev/null || true
-@dirrm %%DATADIR%%/charsets
-@dirrm %%DATADIR%%/czech
-@dirrm %%DATADIR%%/danish
-@dirrm %%DATADIR%%/dutch
-@dirrm %%DATADIR%%/english
-@dirrm %%DATADIR%%/estonian
-@dirrm %%DATADIR%%/french
-@dirrm %%DATADIR%%/german
-@dirrm %%DATADIR%%/greek
-@dirrm %%DATADIR%%/hungarian
-@dirrm %%DATADIR%%/italian
-@dirrm %%DATADIR%%/japanese
-@dirrm %%DATADIR%%/korean
-@dirrm %%DATADIR%%/norwegian
-@dirrm %%DATADIR%%/norwegian-ny
-@dirrm %%DATADIR%%/polish
-@dirrm %%DATADIR%%/portuguese
-@dirrm %%DATADIR%%/romanian
-@dirrm %%DATADIR%%/russian
-@dirrm %%DATADIR%%/serbian
-@dirrm %%DATADIR%%/slovak
-@dirrm %%DATADIR%%/spanish
-@dirrm %%DATADIR%%/swedish
-@dirrm %%DATADIR%%/ukrainian
-@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
deleted file mode 100644
index acc408a80967..000000000000
--- a/databases/mysql60-server/pkg-plist.client
+++ /dev/null
@@ -1,55 +0,0 @@
-bin/mysql
-bin/mysql_config
-bin/mysql_fix_privilege_tables
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlbug
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqltest
-bin/mysqltestmanager-pwgen
-bin/mysqltestmanagerc
-etc/rc.d/000.mysql-client.sh
-include/mysql/errmsg.h
-include/mysql/keycache.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
-include/mysql/my_list.h
-include/mysql/my_net.h
-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
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/raid.h
-include/mysql/sql_common.h
-include/mysql/sql_state.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.14
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.14
-%%DATADIR%%/mysql_fix_privilege_tables.sql
-@dirrm include/mysql
-@dirrm lib/mysql
-@dirrm %%DATADIR%%
diff --git a/databases/mysql60-server/pkg-plist.scripts b/databases/mysql60-server/pkg-plist.scripts
deleted file mode 100644
index f77f27a1839c..000000000000
--- a/databases/mysql60-server/pkg-plist.scripts
+++ /dev/null
@@ -1,13 +0,0 @@
-bin/msql2mysql
-bin/mysql_convert_table_format
-bin/mysql_explain_log
-bin/mysql_find_rows
-bin/mysql_fix_extensions
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tableinfo
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqld_multi
-bin/mysqldumpslow
-bin/mysqlhotcopy