diff options
author | jlam <jlam@pkgsrc.org> | 2001-05-02 08:22:28 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-05-02 08:22:28 +0000 |
commit | a8f52f2adae1b0d6ced2977f01ffe0707c70e18e (patch) | |
tree | 238f28220cf06bf5270cc30229506b0211f64ca9 /databases/mysql-client | |
parent | 981957ed83daac71acc42ce9ababdad811063238 (diff) | |
download | pkgsrc-a8f52f2adae1b0d6ced2977f01ffe0707c70e18e.tar.gz |
* Rearrange MySQL build structure by providing a Makefile.common that is
included by both mysql-server/Makefile and mysql-client/Makefile.
* Remove some unnecessary patches from mysql-client.
* Remove build dependency on autoconf as we don't really need to use it.
* Improve detection of native readline library.
* Provide INSTALL/DEINSTALL scripts to perform initial database setup and
to remind the package administrator to remove unnecessary directories upon
package removal.
* Use complete path to chown in various installed scripts. Fixes pkg/12725.
* Install server manpages with the server package. Fixes pkg/12724.
Diffstat (limited to 'databases/mysql-client')
-rw-r--r-- | databases/mysql-client/Makefile | 47 | ||||
-rw-r--r-- | databases/mysql-client/Makefile.common | 55 | ||||
-rw-r--r-- | databases/mysql-client/distinfo | 6 | ||||
-rw-r--r-- | databases/mysql-client/patches/patch-aa | 13 | ||||
-rw-r--r-- | databases/mysql-client/patches/patch-ab | 29 | ||||
-rw-r--r-- | databases/mysql-client/patches/patch-ad | 14 | ||||
-rw-r--r-- | databases/mysql-client/patches/patch-af | 38 | ||||
-rw-r--r-- | databases/mysql-client/pkg/DESCR | 23 | ||||
-rw-r--r-- | databases/mysql-client/pkg/PLIST | 26 |
9 files changed, 143 insertions, 108 deletions
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index c71bdc942a9..5c337670904 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,35 +1,36 @@ -# $NetBSD: Makefile,v 1.13 2001/03/26 13:26:42 bad Exp $ +# $NetBSD: Makefile,v 1.14 2001/05/02 08:22:28 jlam Exp $ # -DISTNAME= mysql-3.23.35 -PKGNAME= ${DISTNAME:S/-/-client-/} -CATEGORIES= databases -MASTER_SITES= ftp://ftp.mysql.com/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/ -COMMENT= MySQL, a free SQL database (client) +PKGNAME= ${DISTNAME:S/-/-client-/} +COMMENT= MySQL, a free SQL database (client) -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--without-perl --without-debug --without-bench \ - --without-server --with-named-curses-libs="-lcurses -ltermcap" +INFO_FILES= mysql.info -.if exists(/usr/include/readline.h) -CONFIGURE_ARGS+=--without-readline -.endif +CONFIGURE_ARGS+= --without-server -CFLAGS+= -Dunix - -USE_PERL5= yes -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +.if exists(/usr/include/readline.h) || exists(/usr/include/readline/readline.h) +CONFIGURE_ENV+= readline_lib="edit" +.else +DEPENDS+= readline>=4.0:../../devel/readline +CPPFLAGS+= -I${LOCALBASE}/include +.endif -INFO_FILES= mysql.info +# The compilation looks for <readline/readline.h>, so make sure +# /usr/include/readline.h may be accessed that way if it's the readline +# header available on the system. +# +.if exists(/usr/include/readline.h) +CPPFLAGS+= -I${WRKDIR} -EXTRACT_USING_PAX= yes +pre-build: + ${RM} -f ${WRKDIR}/readline + ${LN} -sf /usr/include ${WRKDIR}/readline +.endif -pre-install: +post-install: + cd ${PREFIX}/man/man1; ${RM} -f mysqld.1 safe_mysqld.1 ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common new file mode 100644 index 00000000000..96223c22380 --- /dev/null +++ b/databases/mysql-client/Makefile.common @@ -0,0 +1,55 @@ +# $NetBSD: Makefile.common,v 1.1 2001/05/02 08:22:28 jlam Exp $ + +DISTNAME= mysql-3.23.35 +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/ + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.mysql.com/ + +EXTRACT_USING_PAX= # defined + +.include "../../mk/bsd.prefs.mk" + +MYSQL_DATADIR?= /var/mysql + +GNU_CONFIGURE= # defined +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} +CONFIGURE_ARGS+= --with-named-z-libs=z +CONFIGURE_ARGS+= --with-libwrap +CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap" +CONFIGURE_ARGS+= --without-perl + +# We always use our own readline, either system- or pkgsrc-supplied. +CONFIGURE_ARGS+= --without-readline + +# This forces mysql.info _not_ to be rebuilt. +CONFIGURE_ARGS+= --without-docs + +CONFIGURE_ARGS+= --without-debug +CONFIGURE_ARGS+= --without-bench +CONFIGURE_ARGS+= --with-low-memory + +CPPFLAGS+= -Dunix + +USE_PERL5= # defined +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig + +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 + cd ${WRKSRC}/scripts; \ + for file in mysql_install_db.sh safe_mysqld.sh; do \ + ${MV} $${file} $${file}.orig; \ + ${SED} -e "s,chown,${CHOWN},g" \ + $${file}.orig > $${file}; \ + ${RM} $${file}.orig; \ + done diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo index d723c5faab4..9e8314613d2 100644 --- a/databases/mysql-client/distinfo +++ b/databases/mysql-client/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 16:10:59 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/02 08:22:28 jlam Exp $ SHA1 (mysql-3.23.35.tar.gz) = c1532aa954d613d0a4ebdae046ae23427e4ee327 Size (mysql-3.23.35.tar.gz) = 10929885 bytes -SHA1 (patch-aa) = db831da5bb127f814d3941875b87fd1ca1010994 -SHA1 (patch-ab) = 80aae154661d64092b4059b29e8c12307fe6394c -SHA1 (patch-ad) = cc0bccc696a189604dbec5ffe1a25e55e9e5da2d +SHA1 (patch-af) = c8b613527e92c4a9c85992c135dd35e330580d23 diff --git a/databases/mysql-client/patches/patch-aa b/databases/mysql-client/patches/patch-aa deleted file mode 100644 index ffa6decec89..00000000000 --- a/databases/mysql-client/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2001/03/26 13:26:44 bad Exp $ - ---- client/Makefile.in.orig Mon Jan 22 14:44:00 2001 -+++ client/Makefile.in Thu Feb 1 22:50:13 2001 -@@ -190,7 +190,7 @@ - mysqltest_DEPENDENCIES = $(LIBRARIES) $(pkglib_LTLIBRARIES) - - # Fix for mit-threads --DEFS = -DUNDEF_THREADS_HACK -+DEFS = -DUNDEF_THREADS_HACK -Dunix - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/databases/mysql-client/patches/patch-ab b/databases/mysql-client/patches/patch-ab deleted file mode 100644 index d890cd520f0..00000000000 --- a/databases/mysql-client/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2001/03/26 13:26:44 bad Exp $ - ---- configure.orig Mon Jan 22 14:37:14 2001 -+++ configure Thu Feb 1 22:48:00 2001 -@@ -2050,6 +2050,7 @@ - *) lt_target="$target" ;; - esac - -+if false; then - # Check for any special flags to pass to ltconfig. - # - # the following will cause an existing older ltconfig to fail, so -@@ -2208,6 +2209,7 @@ - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. -@@ -9328,7 +9330,7 @@ - # This requires readline to be in a standard place. Mosty for linux - # there readline may be a shared library. - readline_dir="" -- readline_link="-lreadline" -+ readline_link="-ledit" - fi - - diff --git a/databases/mysql-client/patches/patch-ad b/databases/mysql-client/patches/patch-ad deleted file mode 100644 index 2bc6dc97476..00000000000 --- a/databases/mysql-client/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2001/03/26 13:26:44 bad Exp $ - ---- readline/Makefile.in.orig Mon Jan 22 14:43:57 2001 -+++ readline/Makefile.in Thu Feb 1 22:48:01 2001 -@@ -395,7 +395,8 @@ - - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am --install: install-am -+install: all -+ @: - uninstall-am: uninstall-pkgincludeHEADERS - uninstall: uninstall-am - all-am: Makefile $(LIBRARIES) $(HEADERS) diff --git a/databases/mysql-client/patches/patch-af b/databases/mysql-client/patches/patch-af new file mode 100644 index 00000000000..4ce9bf24133 --- /dev/null +++ b/databases/mysql-client/patches/patch-af @@ -0,0 +1,38 @@ +$NetBSD: patch-af,v 1.1 2001/05/02 08:22:30 jlam Exp $ + +--- configure.orig Thu Mar 15 19:52:05 2001 ++++ configure +@@ -5004,7 +5004,10 @@ + #define HAVE_LIBWRAP 1 + EOF + +- WRAPLIBS="-L$with_libwrap/lib -lwrap" ++ if test "$with_libwrap" != "yes"; then ++ WRAPLIBS="-L${with_libwrap}/lib" ++ fi ++ WRAPLIBS="${WRAPLIBS} -lwrap" + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -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" + +- MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread" ++ MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a" + + LIBS="$MT_LD_ADD $LIBS" + echo "" diff --git a/databases/mysql-client/pkg/DESCR b/databases/mysql-client/pkg/DESCR index 4693dde9acf..23500c3f7ba 100644 --- a/databases/mysql-client/pkg/DESCR +++ b/databases/mysql-client/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 client programs and libraries. diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST index 91f1fbd6951..2a97dc18c9e 100644 --- a/databases/mysql-client/pkg/PLIST +++ b/databases/mysql-client/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2001/03/26 13:26:44 bad Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/05/02 08:22:30 jlam Exp $ bin/msql2mysql bin/mysql bin/mysql_config @@ -45,28 +45,26 @@ lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.10 lib/mysql/libmysqlclient.so.10.0 -share/mysql/binary-configure -share/mysql/make_binary_distribution -share/mysql/my-huge.cnf -share/mysql/my-large.cnf -share/mysql/my-medium.cnf -share/mysql/my-small.cnf -share/mysql/mysql-3.23.35.spec -share/mysql/mysql-log-rotate -share/mysql/mysql.server man/man1/isamchk.1 man/man1/isamlog.1 man/man1/mysql.1 man/man1/mysql_zap.1 man/man1/mysqlaccess.1 man/man1/mysqladmin.1 -man/man1/mysqld.1 man/man1/mysqld_multi.1 man/man1/mysqldump.1 man/man1/mysqlshow.1 man/man1/perror.1 man/man1/replace.1 -man/man1/safe_mysqld.1 -@dirrm include/mysql -@dirrm lib/mysql +share/mysql/binary-configure +share/mysql/make_binary_distribution +share/mysql/my-huge.cnf +share/mysql/my-large.cnf +share/mysql/my-medium.cnf +share/mysql/my-small.cnf +share/mysql/mysql-3.23.35.spec +share/mysql/mysql-log-rotate +share/mysql/mysql.server @dirrm share/mysql +@dirrm lib/mysql +@dirrm include/mysql |