diff options
Diffstat (limited to 'databases/mysql-server')
| -rw-r--r-- | databases/mysql-server/Makefile | 66 | ||||
| -rw-r--r-- | databases/mysql-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysql-server/patches/patch-ae | 21 | ||||
| -rw-r--r-- | databases/mysql-server/patches/patch-af | 21 | ||||
| -rw-r--r-- | databases/mysql-server/pkg/DEINSTALL | 32 | ||||
| -rw-r--r-- | databases/mysql-server/pkg/DESCR | 23 | ||||
| -rw-r--r-- | databases/mysql-server/pkg/INSTALL | 23 | ||||
| -rw-r--r-- | databases/mysql-server/pkg/PLIST | 53 |
8 files changed, 152 insertions, 93 deletions
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index a94a236a20f..37bea7909ef 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,66 +1,42 @@ -# $NetBSD: Makefile,v 1.20 2001/03/27 03:19:49 hubertf Exp $ +# $NetBSD: Makefile,v 1.21 2001/05/02 08:22:30 jlam Exp $ # -DISTNAME= mysql-3.23.35 -PKGNAME= ${DISTNAME:S/-/-server-/}nb1 -CATEGORIES= databases -MASTER_SITES= ftp://ftp.mysql.com/MySQL-3.23/ \ - http://www.mysql.com/Downloads/MySQL-3.23/ \ - ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/ +.include "../../databases/mysql-client/Makefile.common" -MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.mysql.com/ +PKGNAME= ${DISTNAME:S/-/-server-/}nb1 COMMENT= MySQL, a free SQL database (server) -BUILD_DEPENDS= autoconf-2.13:../../devel/autoconf -DEPENDS= ${DISTNAME:S/-/-client-/}:../../databases/mysql-client - -EXTRACT_USING_PAX= yes - -.include "../../mk/bsd.prefs.mk" - -MYSQL_DATADIR?= /var/mysql - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} \ - --with-named-z-libs=z \ - --with-libwrap \ - --with-named-curses-libs="-lcurses -ltermcap" \ - --without-perl --without-debug --without-bench \ - --without-docs --with-low-memory +DEPENDS+= ${DISTNAME:S/-/-client-/}:../../databases/mysql-client # hardwire use of included mit-pthreads on NetBSD .if (${OPSYS} == "NetBSD") CONFIGURE_ARGS+= --with-mit-threads .endif -CFLAGS+= -Dunix - # platforms on which included mit-pthreads is usable -ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ - NetBSD-*-sparc NetBSD-*-m68k SunOS-*-sparc \ +ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ + NetBSD-*-sparc NetBSD-*-m68k SunOS-*-sparc \ NetBSD-*-powerpc -USE_PERL5= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -post-extract: - @cd ${WRKSRC} && for dir in dbug heap isam merge mysys strings; do \ - ${MV} $$dir/Makefile.in $$dir/Makefile.in.orig; \ - ${SED} -e '/^install-exec:/s/install-pkglibLIBRARIES//' $$dir/Makefile.in.orig >$$dir/Makefile.in; \ - done +post-configure: + cd ${WRKSRC} && ${CP} -f config.h include/my_config.h -pre-configure: - @cd ${WRKSRC}/mit-pthreads/config && ${LOCALBASE}/bin/autoconf +post-build: + cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ + ${MAKE_FLAGS} safe_mysqld mysql_install_db -post-configure: - @cd ${WRKSRC} && ${CP} config.h include/my_config.h +pre-install: + ${SED} -e "s|@MYSQL_DATADIR@|${MYSQL_DATADIR}|g" \ + -e "s|@CAT@|${CAT}|g" \ + ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} post-install: - @cd ${WRKSRC}/scripts && \ - ${MAKE_PROGRAM} safe_mysqld mysql_install_db && \ - ${INSTALL_SCRIPT} safe_mysqld mysql_install_db ${PREFIX}/bin/ - ${PREFIX}/bin/mysql_install_db --force + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/safe_mysqld ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1 + PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql-server/distinfo b/databases/mysql-server/distinfo index 82ed78d0ff8..34cbcd9e2dc 100644 --- a/databases/mysql-server/distinfo +++ b/databases/mysql-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:10:59 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/02 08:22:30 jlam Exp $ SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327 Size (mysql-3.23.35.tar.gz) = 10929885 bytes @@ -6,5 +6,5 @@ SHA1 (patch-aa) = 05c56d81e17893dd267fcd5f68d8c378f024a06f SHA1 (patch-ab) = 4f10917780d73cb4a58127b27a5d8c1c9f63e0d3 SHA1 (patch-ac) = 9ac4beb4f53cc4d4fc4ec52cf30716c8269face8 SHA1 (patch-ad) = 1aecfee152d303b3d65f3866032d2a6d49538f46 -SHA1 (patch-ae) = c77d019c8638a15ff40e9adb0e8e36762500cbd7 -SHA1 (patch-af) = 44449c93f2e12fb0e99dd02486e62c63555a07d8 +SHA1 (patch-ae) = 46fa106d1f308884594a5479ad16ff58ee9057ba +SHA1 (patch-af) = c8b613527e92c4a9c85992c135dd35e330580d23 diff --git a/databases/mysql-server/patches/patch-ae b/databases/mysql-server/patches/patch-ae index f21cd97489b..61c47caf472 100644 --- a/databases/mysql-server/patches/patch-ae +++ b/databases/mysql-server/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.3 2001/03/26 22:37:34 bad Exp $ +$NetBSD: patch-ae,v 1.4 2001/05/02 08:22:31 jlam Exp $ ---- configure.in.orig Fri Mar 16 01:51:51 2001 -+++ configure.in Sat Mar 24 02:44:15 2001 +--- configure.in.orig Thu Mar 15 19:51:51 2001 ++++ configure.in @@ -581,7 +581,10 @@ AC_MSG_RESULT(yes) AC_DEFINE(LIBWRAP) @@ -14,7 +14,20 @@ $NetBSD: patch-ae,v 1.3 2001/03/26 22:37:34 bad Exp $ AC_MSG_RESULT(no) CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}), CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}) -@@ -1951,7 +1954,7 @@ +@@ -1589,7 +1592,11 @@ + # This requires readline to be in a standard place. Mosty for linux + # there readline may be a shared library. + readline_dir="" +- readline_link="-lreadline" ++ if test -z "$readline_lib" ++ then ++ readline_lib="readline" ++ fi ++ readline_link="-l$readline_lib" + fi + AC_SUBST(readline_dir) + AC_SUBST(readline_link) +@@ -1951,7 +1958,7 @@ AC_DEFINE(HAVE_mit_thread) MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include" AC_SUBST(MT_INCLUDES) diff --git a/databases/mysql-server/patches/patch-af b/databases/mysql-server/patches/patch-af index 1bee4321ea8..18dc4388306 100644 --- a/databases/mysql-server/patches/patch-af +++ b/databases/mysql-server/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.3 2001/03/26 22:37:34 bad Exp $ +$NetBSD: patch-af,v 1.4 2001/05/02 08:22:31 jlam Exp $ ---- configure.orig Fri Mar 16 01:52:05 2001 -+++ configure Sat Mar 24 02:42:32 2001 +--- configure.orig Thu Mar 15 19:52:05 2001 ++++ configure @@ -5004,7 +5004,10 @@ #define HAVE_LIBWRAP 1 EOF @@ -14,7 +14,20 @@ $NetBSD: patch-af,v 1.3 2001/03/26 22:37:34 bad Exp $ else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 -@@ -10466,7 +10469,7 @@ +@@ -9345,7 +9348,11 @@ + # This requires readline to be in a standard place. Mosty for linux + # there readline may be a shared library. + readline_dir="" +- readline_link="-lreadline" ++ if test -z "$readline_lib" ++ then ++ readline_lib="readline" ++ fi ++ readline_link="-l$readline_lib" + fi + + +@@ -10466,7 +10473,7 @@ MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include" diff --git a/databases/mysql-server/pkg/DEINSTALL b/databases/mysql-server/pkg/DEINSTALL new file mode 100644 index 00000000000..987c461234b --- /dev/null +++ b/databases/mysql-server/pkg/DEINSTALL @@ -0,0 +1,32 @@ +#!/bin/sh +# +# $NetBSD: DEINSTALL,v 1.1 2001/05/02 08:22:31 jlam Exp $ + +PKGNAME=$1 +STAGE=$2 + +MYSQL_DATADIR="@MYSQL_DATADIR@" + +CAT="@CAT@" + +case ${STAGE} in +DEINSTALL) + ;; + +POST-DEINSTALL) + ${CAT} << EOF +=========================================================================== +If you won't be using ${PKGNAME} any longer, you may want +to remove the following directories: + + ${MYSQL_DATADIR} +=========================================================================== +EOF + ;; + +*) + echo "Unexpected argument: ${STAGE}" + exit 1 + ;; +esac +exit 0 diff --git a/databases/mysql-server/pkg/DESCR b/databases/mysql-server/pkg/DESCR index 4693dde9acf..02b7abc487b 100644 --- a/databases/mysql-server/pkg/DESCR +++ b/databases/mysql-server/pkg/DESCR @@ -1,14 +1,15 @@ -*MySQL* is a SQL (Structured Query Language) database server. -SQL is the most popular database language in the world. -*MySQL* is a client server implementation that consists of a -server daemon `mysqld' and many different client programs/libraries. +MySQL is a SQL (Structured Query Language) database server. SQL is the +most popular database language in the world. MySQL is a client-server +implementation that consists of a server daemon `mysqld' and many +different client programs/libraries. -The main goals of *MySQL* are speed and robustness. +The main goals of MySQL are speed and robustness. -The base upon which *MySQL* is built is a set of routines that have -been used in a highly demanding production environment for many years. -While *MySQL* is still in development it already offers a rich and -highly useful function set. +The base upon which MySQL is built is a set of routines that have been +used in a highly demanding production environment for many years. While +MySQL is still in development it already offers a rich and highly useful +function set. -The official way to pronounce *MySQL* is 'My Ess Que Ell' (Not -MY-SEQUEL). +The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL). + +This package contains the MySQL server programs and libraries. diff --git a/databases/mysql-server/pkg/INSTALL b/databases/mysql-server/pkg/INSTALL new file mode 100644 index 00000000000..d7d30dd27ea --- /dev/null +++ b/databases/mysql-server/pkg/INSTALL @@ -0,0 +1,23 @@ +#!/bin/sh +# +# $NetBSD: INSTALL,v 1.1 2001/05/02 08:22:31 jlam Exp $ + +PKGNAME=$1 +STAGE=$2 + +case ${STAGE} in +PRE-INSTALL) + ;; + +POST-INSTALL) + echo "-------------------------------" + echo "Initializing MySQL databases..." + echo "-------------------------------" + ${PKG_PREFIX}/bin/mysql_install_db --force + ;; + +*) + echo "Unexpected argument: ${STAGE}" + exit 1 + ;; +esac diff --git a/databases/mysql-server/pkg/PLIST b/databases/mysql-server/pkg/PLIST index 60470e9e587..619afc9c9aa 100644 --- a/databases/mysql-server/pkg/PLIST +++ b/databases/mysql-server/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2001/03/26 13:46:22 bad Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/05/02 08:22:31 jlam Exp $ bin/comp_err bin/isamchk bin/isamlog @@ -18,11 +18,13 @@ lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a lib/mysql/libmyisam.a +lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libnisam.a -lib/mysql/libmyisammrg.a libexec/mysqld +man/man1/mysqld.1 +man/man1/safe_mysqld.1 share/mysql/charsets/Index share/mysql/charsets/README share/mysql/charsets/cp1251.conf @@ -47,8 +49,6 @@ share/mysql/charsets/usa7.conf share/mysql/charsets/win1250.conf share/mysql/charsets/win1251.conf share/mysql/charsets/win1251ukr.conf -share/mysql/mi_test_all -share/mysql/mi_test_all.res share/mysql/czech/errmsg.sys share/mysql/czech/errmsg.txt share/mysql/danish/errmsg.sys @@ -73,6 +73,8 @@ share/mysql/japanese/errmsg.sys share/mysql/japanese/errmsg.txt share/mysql/korean/errmsg.sys share/mysql/korean/errmsg.txt +share/mysql/mi_test_all +share/mysql/mi_test_all.res share/mysql/norwegian-ny/errmsg.sys share/mysql/norwegian-ny/errmsg.txt share/mysql/norwegian/errmsg.sys @@ -91,26 +93,25 @@ share/mysql/spanish/errmsg.sys share/mysql/spanish/errmsg.txt share/mysql/swedish/errmsg.sys share/mysql/swedish/errmsg.txt -@exec %D/bin/mysql_install_db --force -@dirrm share/mysql/charsets -@dirrm share/mysql/czech -@dirrm share/mysql/danish -@dirrm share/mysql/dutch -@dirrm share/mysql/english -@dirrm share/mysql/estonian -@dirrm share/mysql/french -@dirrm share/mysql/german -@dirrm share/mysql/greek -@dirrm share/mysql/hungarian -@dirrm share/mysql/italian -@dirrm share/mysql/japanese -@dirrm share/mysql/korean -@dirrm share/mysql/norwegian -@dirrm share/mysql/norwegian-ny -@dirrm share/mysql/polish -@dirrm share/mysql/portuguese -@dirrm share/mysql/romanian -@dirrm share/mysql/russian -@dirrm share/mysql/slovak -@dirrm share/mysql/spanish @dirrm share/mysql/swedish +@dirrm share/mysql/spanish +@dirrm share/mysql/slovak +@dirrm share/mysql/russian +@dirrm share/mysql/romanian +@dirrm share/mysql/portuguese +@dirrm share/mysql/polish +@dirrm share/mysql/norwegian-ny +@dirrm share/mysql/norwegian +@dirrm share/mysql/korean +@dirrm share/mysql/japanese +@dirrm share/mysql/italian +@dirrm share/mysql/hungarian +@dirrm share/mysql/greek +@dirrm share/mysql/german +@dirrm share/mysql/french +@dirrm share/mysql/estonian +@dirrm share/mysql/english +@dirrm share/mysql/dutch +@dirrm share/mysql/danish +@dirrm share/mysql/czech +@dirrm share/mysql/charsets |