databases/ateam_mysql57_ldap_auth: Remove expired port

Depends on upstream EOL MySQL 5.7

11 files changed, 2 insertions, 655 deletions

diff --git a/MOVED b/MOVED
index 7104993521f9..8f00a1697094 100644
--- a/MOVED
+++ b/MOVED
@@ -8186,3 +8186,5 @@ www/py-yt-dlp-devel|www/py-yt-dlp|2023-12-22|Remove the -devel suffix
 math/octave-forge-statistics-bootstrap|math/octave-forge-statistics-resampling|2023-12-24|Name change upstream
 comms/openzwave-devel||2023-12-28|Has expired: Upstream no longer maintained, indicates to move to openzwave JS instead
 net/net/dpdk-22.11|net/dpdk|2023-12-30|Instead of expiring dpdk move dpdk-22.11 to dpdk
+databases/ateam_mysql57_ldap_auth||2023-12-31|Depends on upstream EOL MySQL 5.7
+databases/mysql-udf||2023-12-31|Has expired: Upstream last update was in 2007
diff --git a/databases/Makefile b/databases/Makefile
index 8448c85817c7..51abc4af5317 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -15,7 +15,6 @@
     SUBDIR += apache-commons-dbutils
     SUBDIR += arrow
     SUBDIR += arrow-glib
-    SUBDIR += ateam_mysql57_ldap_auth
     SUBDIR += autobackupmysql
     SUBDIR += automysqlbackup
     SUBDIR += bbdb
@@ -193,7 +192,6 @@
     SUBDIR += mysql-connector-j
     SUBDIR += mysql-connector-java51
     SUBDIR += mysql-connector-odbc-80
-    SUBDIR += mysql-udf
     SUBDIR += mysql2pgsql
     SUBDIR += mysql57-client
     SUBDIR += mysql57-server
diff --git a/databases/ateam_mysql57_ldap_auth/Makefile b/databases/ateam_mysql57_ldap_auth/Makefile
deleted file mode 100644
index 97c739df0ed3..000000000000
--- a/databases/ateam_mysql57_ldap_auth/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-PORTNAME=	ateam_mysql57_ldap_auth
-PORTVERSION=	1.0
-PORTREVISION=	2
-CATEGORIES=	databases
-
-MAINTAINER=	ganbold@FreeBSD.org
-COMMENT=	A-Team MySQL LDAP authentication plugin
-WWW=		https://github.com/ateamsystems/ateam_mysql_ldap_auth
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-IGNORE_WITH_MYSQL=	80
-
-LIB_DEPENDS=	libconfig.so:devel/libconfig
-
-USES=		compiler:c++11-lang gmake ldap mysql:57,client,server
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	ateamsystems
-GH_TAGNAME=	f6d79fb
-
-PLIST_FILES=	lib/mysql/plugin/auth_ldap.so \
-		"@sample etc/ateam_mysql_ldap_auth.conf.sample"
-PORTDOCS=	README INSTALL
-
-OPTIONS_DEFINE=	DOCS
-
-SUB_FILES=	pkg-message
-
-MAKE_ARGS=	CC="${CC}"
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mysql/plugin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/auth_ldap.so \
-		${STAGEDIR}${PREFIX}/lib/mysql/plugin
-	${INSTALL_DATA} ${WRKSRC}/ateam_mysql_ldap_auth.conf \
-		${STAGEDIR}${PREFIX}/etc/ateam_mysql_ldap_auth.conf.sample
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/databases/ateam_mysql57_ldap_auth/distinfo b/databases/ateam_mysql57_ldap_auth/distinfo
deleted file mode 100644
index b8dce6744fad..000000000000
--- a/databases/ateam_mysql57_ldap_auth/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1593015605
-SHA256 (ateamsystems-ateam_mysql57_ldap_auth-1.0-f6d79fb_GH0.tar.gz) = 0f175183472d89bc8dde450b2fc3d5f6562900a912898898ef9dcd32498bb875
-SIZE (ateamsystems-ateam_mysql57_ldap_auth-1.0-f6d79fb_GH0.tar.gz) = 18081
diff --git a/databases/ateam_mysql57_ldap_auth/files/pkg-message.in b/databases/ateam_mysql57_ldap_auth/files/pkg-message.in
deleted file mode 100644
index fd841b038634..000000000000
--- a/databases/ateam_mysql57_ldap_auth/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
----------------------------------------------------------------------
-Please see %%DOCSDIR%%/INSTALL
-for install notes.
----------------------------------------------------------------------
diff --git a/databases/ateam_mysql57_ldap_auth/pkg-descr b/databases/ateam_mysql57_ldap_auth/pkg-descr
deleted file mode 100644
index 32e67a0e56b0..000000000000
--- a/databases/ateam_mysql57_ldap_auth/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-A-Team MySQL LDAP Authenticator
----------------------------------------------------------------------------- -
-A-Team MySQL LDAP Authenticator (ateam_mysql_ldap_auth) is an authentication
-plugin for MySQL 5.5.7 and up, and has been tested with 5.6 under FreeBSD.
-This module allows you to create MySQL users that are then authenticated
-against an LDAP server. This reduces administrative overhead and eliminates
-your users having to remember a seperate username and password for MySQL.
-Just like MySQL Enterprise's PAM module, for client side authentication
-this plugin uses the clear_text password module as the LDAP server must
-perform the password hashing and comparison.  For command line clients this
-is done by setting the following environment variable:
-
-  export LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN=1
-
-In MySQL Workbench this is acheived by going to go to the "Advanced" tab and
-checking "Enable Cleartext Authentication Plugin" when editing a connction.
-
-!!! IMPORTANT:
-!!! ------------------------------------------------------------------------
-!!! ENSURE THE COMMUNICATIONS PATH BETWEEN THE CLIENT AND SERVER IS SECURE!
-!!! ------------------------------------------------------------------------
-!!! By default MySQL does not use SSL so additional steps and network design
-!!! are needed to ensure you're not exposing your credetials.
diff --git a/databases/mysql-udf/Makefile b/databases/mysql-udf/Makefile
deleted file mode 100644
index 47b93958b828..000000000000
--- a/databases/mysql-udf/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-PORTNAME=	mysql-udf
-PORTVERSION=	0.3
-PORTREVISION=	3
-CATEGORIES=	databases
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Set of user-defined functions for the MySQL server
-WWW=		https://mysql-udf.sourceforge.net/
-
-LICENSE=	BSD2CLAUSE
-
-DEPRECATED=	Upstream last update was in 2007
-EXPIRATION_DATE=	2023-12-31
-
-USES=		mysql
-IGNORE_WITH_MYSQL=	105m 106m 1011m 80 81
-
-CFLAGS+=	-fPIC
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-MODULES=	colwidth confidence_higher confidence_lower correlation \
-		faculty geomean intercept kurtosis longest median noverm \
-		skewness slope stdnorm_density stdnorm_dist weightedavg
-
-.for MODULE in ${MODULES}
-PLIST_FILES+=	lib/mysql/plugin/udf_${MODULE}.so
-.endfor
-
-do-build:
-.for MODULE in ${MODULES}
-	cd ${WRKSRC} && \
-	${CC} ${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -c -o udf_${MODULE}.o udf_${MODULE}.cc && \
-	${CC} -shared -o udf_${MODULE}.so udf_${MODULE}.o
-.endfor
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/mysql/plugin
-.for MODULE in ${MODULES}
-	${INSTALL_PROGRAM} ${WRKSRC}/udf_${MODULE}.so ${STAGEDIR}${PREFIX}/lib/mysql/plugin/udf_${MODULE}.so
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/mysql-udf/distinfo b/databases/mysql-udf/distinfo
deleted file mode 100644
index d1afcfd8f0c5..000000000000
--- a/databases/mysql-udf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1467549429
-SHA256 (mysql-udf-0.3.tar.gz) = d9115aeecccfc06ccdc209a761a6a4d0dba70f15c9319ab76d173b04737beaf2
-SIZE (mysql-udf-0.3.tar.gz) = 6714
diff --git a/databases/mysql-udf/files/patch-mysql_4.1 b/databases/mysql-udf/files/patch-mysql_4.1
deleted file mode 100644
index 992f6a4d1554..000000000000
--- a/databases/mysql-udf/files/patch-mysql_4.1
+++ /dev/null
@@ -1,490 +0,0 @@
-diff -C3 -r mysql-udf-orig/udf_colwidth.cc udf_colwidth.cc
-*** mysql-udf-orig/udf_colwidth.cc	2004-07-16 00:35:05.000000000 +0200
---- udf_colwidth.cc	2005-10-05 14:37:55.000000000 +0200
-***************
-*** 42,47 ****
---- 42,48 ----
-  my_bool colwidth_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void colwidth_deinit( UDF_INIT* initid );
-  void colwidth_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void colwidth_clear( UDF_INIT* initid, char* is_null, char *error );
-  void colwidth_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  long long colwidth( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* error );
-  
-***************
-*** 93,102 ****
-  
-  void colwidth_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
-  {
-    struct colwidth_data* data = (struct colwidth_data*)initid->ptr;
-    
-    data->maxlength=(long long) 0;
--   colwidth_add( initid, args, is_null, message );
-  }
-  
-  
---- 94,110 ----
-  
-  void colwidth_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
-  {
-+ 
-+   colwidth_clear( initid, is_null, message );
-+   colwidth_add( initid, args, is_null, message );
-+ }
-+ 
-+ 
-+ void colwidth_clear( UDF_INIT* initid, char* is_null, char* message )
-+ {
-    struct colwidth_data* data = (struct colwidth_data*)initid->ptr;
-    
-    data->maxlength=(long long) 0;
-  }
-  
-  
-diff -C3 -r mysql-udf-orig/udf_confidence_higher.cc udf_confidence_higher.cc
-*** mysql-udf-orig/udf_confidence_higher.cc	2004-07-15 23:39:09.000000000 +0200
---- udf_confidence_higher.cc	2005-06-01 10:19:48.000000000 +0200
-***************
-*** 38,43 ****
---- 38,44 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-diff -C3 -r mysql-udf-orig/udf_confidence_lower.cc udf_confidence_lower.cc
-*** mysql-udf-orig/udf_confidence_lower.cc	2004-07-15 23:38:17.000000000 +0200
---- udf_confidence_lower.cc	2005-06-01 10:20:17.000000000 +0200
-***************
-*** 38,43 ****
---- 38,44 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-diff -C3 -r mysql-udf-orig/udf_correlation.cc udf_correlation.cc
-*** mysql-udf-orig/udf_correlation.cc	2004-07-16 00:31:41.000000000 +0200
---- udf_correlation.cc	2005-10-05 14:14:22.000000000 +0200
-***************
-*** 36,41 ****
---- 36,42 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 49,54 ****
---- 50,56 ----
-  my_bool correlation_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void correlation_deinit( UDF_INIT* initid );
-  void correlation_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void correlation_clear( UDF_INIT* initid, char* is_null, char *error );
-  void correlation_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double correlation( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  
-***************
-*** 134,139 ****
---- 136,147 ----
-  
-  void correlation_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   correlation_clear( initid, is_null, is_error );
-+   correlation_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void correlation_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    regression_data *buffer = (regression_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 156,162 ****
-    buffer->valuesx=(double *) malloc(BUFFERSIZE*sizeof(double));
-    buffer->valuesy=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   correlation_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 164,169 ----
-diff -C3 -r mysql-udf-orig/udf_geomean.cc udf_geomean.cc
-*** mysql-udf-orig/udf_geomean.cc	2004-07-16 00:10:42.000000000 +0200
---- udf_geomean.cc	2005-10-05 15:06:05.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 43,48 ****
---- 44,50 ----
-  my_bool geomean_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void geomean_deinit( UDF_INIT* initid );
-  void geomean_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void geomean_clear( UDF_INIT* initid, char* is_null, char *error );
-  void geomean_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double geomean( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 104,109 ****
---- 106,117 ----
-  
-  void geomean_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   geomean_clear( initid, is_null, is_error );
-+   geomean_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void geomean_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    geomean_data *buffer = (geomean_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->value=0;
-***************
-*** 111,117 ****
-    *is_null = 0;
-    *is_error = 0;
-  
--   geomean_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 119,124 ----
-diff -C3 -r mysql-udf-orig/udf_intercept.cc udf_intercept.cc
-*** mysql-udf-orig/udf_intercept.cc	2004-07-16 00:29:17.000000000 +0200
---- udf_intercept.cc	2005-10-05 14:45:26.000000000 +0200
-***************
-*** 48,53 ****
---- 48,54 ----
-  my_bool intercept_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void intercept_deinit( UDF_INIT* initid );
-  void intercept_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void intercept_clear( UDF_INIT* initid, char* is_null, char *error );
-  void intercept_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double intercept( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  
-***************
-*** 133,138 ****
---- 134,145 ----
-  
-  void intercept_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   intercept_clear( initid, is_null, is_error );
-+   intercept_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void intercept_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    regression_data *buffer = (regression_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 155,165 ****
-    buffer->valuesx=(double *) malloc(BUFFERSIZE*sizeof(double));
-    buffer->valuesy=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   intercept_add( initid, args, is_null, is_error );
-  }
-  
-  
-- 
-  void intercept_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-    if (args->args[0]!=NULL && args->args[1]!=NULL)
---- 162,170 ----
-diff -C3 -r mysql-udf-orig/udf_kurtosis.cc udf_kurtosis.cc
-*** mysql-udf-orig/udf_kurtosis.cc	2004-07-15 23:55:53.000000000 +0200
---- udf_kurtosis.cc	2005-10-05 14:47:25.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 46,51 ****
---- 47,53 ----
-  my_bool kurtosis_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void kurtosis_deinit( UDF_INIT* initid );
-  void kurtosis_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void kurtosis_clear( UDF_INIT* initid, char* is_null, char *error );
-  void kurtosis_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double kurtosis( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 116,121 ****
---- 118,130 ----
-  
-  void kurtosis_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   kurtosis_clear( initid, is_null, is_error );
-+   kurtosis_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ 
-+ void kurtosis_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    kurtosis_data *buffer = (kurtosis_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 131,137 ****
-  
-    buffer->values=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   kurtosis_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 140,145 ----
-diff -C3 -r mysql-udf-orig/udf_longest.cc udf_longest.cc
-*** mysql-udf-orig/udf_longest.cc	2004-07-16 00:34:09.000000000 +0200
---- udf_longest.cc	2005-10-05 14:48:58.000000000 +0200
-***************
-*** 41,46 ****
---- 41,47 ----
-  my_bool longest_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void longest_deinit( UDF_INIT* initid );
-  void longest_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void longest_clear( UDF_INIT* initid, char* is_null, char *error );
-  void longest_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  char *longest(UDF_INIT * initid, UDF_ARGS *args, char *result, unsigned long *length, char *is_null, char * /*error*/ );
-  }
-***************
-*** 97,102 ****
---- 98,109 ----
-  
-  void longest_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
-  {
-+   longest_clear( initid, is_null, message );
-+   longest_add( initid, args, is_null, message );
-+ }
-+ 
-+ void longest_clear( UDF_INIT* initid, char* is_null, char* message )
-+ {
-    struct longest_data* data = (struct longest_data*) initid->ptr;
-    if (data->result_string != NULL)
-    {
-***************
-*** 105,111 ****
-    }
-    data->length = 0;
-    *is_null = 0;
--   longest_add( initid, args, is_null, message );
-  }
-  
-  
---- 112,117 ----
-diff -C3 -r mysql-udf-orig/udf_median.cc udf_median.cc
-*** mysql-udf-orig/udf_median.cc	2004-07-16 00:11:52.000000000 +0200
---- udf_median.cc	2005-10-05 13:49:00.000000000 +0200
-***************
-*** 46,51 ****
---- 46,52 ----
-  my_bool median_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void median_deinit( UDF_INIT* initid );
-  void median_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void median_clear( UDF_INIT* initid, char* is_null, char *error );
-  void median_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double median( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 116,121 ****
---- 117,128 ----
-  
-  void median_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   median_clear(initid, is_null, is_error);
-+   median_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void median_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    median_data *buffer = (median_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 131,140 ****
-  
-    buffer->values=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   median_add( initid, args, is_null, is_error );
-  }
-  
-- 
-  void median_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-    if (args->args[0]!=NULL)
---- 138,145 ----
-diff -C3 -r mysql-udf-orig/udf_skewness.cc udf_skewness.cc
-*** mysql-udf-orig/udf_skewness.cc	2004-07-15 23:56:06.000000000 +0200
---- udf_skewness.cc	2005-10-05 14:51:28.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 46,51 ****
---- 47,53 ----
-  my_bool skewness_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void skewness_deinit( UDF_INIT* initid );
-  void skewness_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void skewness_clear( UDF_INIT* initid, char* is_null, char *error );
-  void skewness_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double skewness( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 116,121 ****
---- 118,129 ----
-  
-  void skewness_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   skewness_clear( initid, is_null, is_error );
-+   skewness_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void skewness_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    skewness_data *buffer = (skewness_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 131,137 ****
-  
-    buffer->values=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   skewness_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 139,144 ----
-diff -C3 -r mysql-udf-orig/udf_slope.cc udf_slope.cc
-*** mysql-udf-orig/udf_slope.cc	2004-07-16 00:28:02.000000000 +0200
---- udf_slope.cc	2005-10-05 14:53:30.000000000 +0200
-***************
-*** 49,54 ****
---- 49,55 ----
-  my_bool slope_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void slope_deinit( UDF_INIT* initid );
-  void slope_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void slope_clear( UDF_INIT* initid, char* is_null, char *error );
-  void slope_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double slope( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  
-***************
-*** 134,139 ****
---- 135,146 ----
-  
-  void slope_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   slope_clear( initid, is_null, is_error );
-+   slope_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void slope_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    regression_data *buffer = (regression_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 156,162 ****
-    buffer->valuesx=(double *) malloc(BUFFERSIZE*sizeof(double));
-    buffer->valuesy=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   slope_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 163,168 ----
-diff -C3 -r mysql-udf-orig/udf_stdnorm_density.cc udf_stdnorm_density.cc
-*** mysql-udf-orig/udf_stdnorm_density.cc	2004-07-16 00:00:20.000000000 +0200
---- udf_stdnorm_density.cc	2005-06-01 11:43:29.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 42,48 ****
-  {
-  
-  my_bool stdnorm_density_init(UDF_INIT *, UDF_ARGS *args, char *message);
-! double stdnorm_density_(UDF_INIT *initid, UDF_ARGS *args, char *is_null,char *error);
-  
-  }
-  
---- 43,49 ----
-  {
-  
-  my_bool stdnorm_density_init(UDF_INIT *, UDF_ARGS *args, char *message);
-! double stdnorm_density(UDF_INIT *initid, UDF_ARGS *args, char *is_null,char *error);
-  
-  }
-  
-diff -C3 -r mysql-udf-orig/udf_weightedavg.cc udf_weightedavg.cc
-*** mysql-udf-orig/udf_weightedavg.cc	2004-07-29 21:15:43.000000000 +0200
---- udf_weightedavg.cc	2005-10-05 14:55:18.000000000 +0200
-***************
-*** 44,49 ****
---- 44,50 ----
-  my_bool weightedavg_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void weightedavg_deinit( UDF_INIT* initid );
-  void weightedavg_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void weightedavg_clear( UDF_INIT* initid, char* is_null, char *error );
-  void weightedavg_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double weightedavg( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 111,116 ****
---- 112,124 ----
-  
-  void weightedavg_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   weightedavg_clear( initid, is_null, is_error );
-+   weightedavg_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ 
-+ void weightedavg_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    weightedavg_data *buffer = (weightedavg_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->datasum = 0;
-***************
-*** 118,124 ****
-    *is_null = 0;
-    *is_error = 0;
-  
--   weightedavg_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 126,131 ----
diff --git a/databases/mysql-udf/pkg-descr b/databases/mysql-udf/pkg-descr
deleted file mode 100644
index 6525feaf70a7..000000000000
--- a/databases/mysql-udf/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This package adds several user-defined statistics functions
-to the MySQL server providing the ability to:
-
-    * calculate the median of any values,
-    * calculate the skewness and kurtosis of a distribution of value
-    * retrieve the effective length of the longest value in a STRING column,
-    * get the longest value from a STRING column,
-    * calculate the faculty of a value,
-    * calculate linear regression parameters (intercept, slope, correlation
-      coefficent) of any values
diff --git a/databases/mysql-udf/pkg-message b/databases/mysql-udf/pkg-message
deleted file mode 100644
index 157d9ddb2bc8..000000000000
--- a/databases/mysql-udf/pkg-message
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To add the custom functions to your MySQL server use the following syntax:
-(you may install only the functions you need):
-
-CREATE AGGREGATE FUNCTION median RETURNS REAL SONAME 'udf_median.so';
-CREATE AGGREGATE FUNCTION correlation RETURNS REAL SONAME 'udf_correlation.so';
-CREATE AGGREGATE FUNCTION intercept RETURNS REAL SONAME 'udf_intercept.so';
-CREATE AGGREGATE FUNCTION slope RETURNS REAL SONAME 'udf_slope.so';
-CREATE AGGREGATE FUNCTION skewness RETURNS REAL SONAME 'udf_skewness.so';
-CREATE AGGREGATE FUNCTION kurtosis RETURNS REAL SONAME 'udf_kurtosis.so';
-CREATE FUNCTION confidence_higher RETURNS REAL SONAME 'udf_confidence_higher.so';
-CREATE FUNCTION confidence_lower RETURNS REAL SONAME 'udf_confidence_lower.so';
-CREATE FUNCTION stdnorm_density RETURNS REAL SONAME 'udf_stdnorm_density.so';
-CREATE FUNCTION stdnorm_dist RETURNS REAL SONAME 'udf_stdnorm_dist.so';
-CREATE AGGREGATE FUNCTION geomean RETURNS REAL SONAME 'udf_geomean.so';
-CREATE AGGREGATE FUNCTION weightedavg RETURNS REAL SONAME 'udf_weightedavg.so';
-CREATE FUNCTION noverm RETURNS INTEGER SONAME 'udf_noverm.so';
-CREATE FUNCTION faculty RETURNS REAL SONAME 'udf_faculty.so';
-CREATE AGGREGATE FUNCTION COLWIDTH RETURNS INTEGER SONAME 'udf_colwidth.so';
-CREATE AGGREGATE FUNCTION LONGEST RETURNS STRING SONAME 'udf_longest.so';
-
-Example for deinstalling a function:
-DROP FUNCTION median;
-
-For function descriptions, see the following webpage:
-http://mysql-udf.sourceforge.net/
-EOM
-}
-]