diff options
author | frueauf <frueauf@pkgsrc.org> | 1999-02-04 21:35:01 +0000 |
---|---|---|
committer | frueauf <frueauf@pkgsrc.org> | 1999-02-04 21:35:01 +0000 |
commit | 846e0302382fa3d6997c4c1203279f1e26d7db2b (patch) | |
tree | 30c67a96488a997756594489c80c64b1d44d944e /databases | |
parent | e9be2ced122337622764a311189b2e99ebe1f800 (diff) | |
download | pkgsrc-846e0302382fa3d6997c4c1203279f1e26d7db2b.tar.gz |
Some cleanups:
- add -Dunix for some files which relied on it to be defined
- run `mysqladmin shutdown` right after mysql_install_db to
prevent blind running mysql daemon, pointed out in pr 6533 by
Matthew Green
- set NO_PACKAGE if we build/install the server case - mysql_install_db
needs the data dir from the source distribution to work - this
never worked for binary packages! Remove the bogus exec in PLIST-server
too as consequence.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mysql/Makefile | 6 | ||||
-rw-r--r-- | databases/mysql/patches/patch-aa | 15 | ||||
-rw-r--r-- | databases/mysql/patches/patch-ad | 13 | ||||
-rw-r--r-- | databases/mysql/pkg/PLIST-server | 3 |
4 files changed, 30 insertions, 7 deletions
diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index 0d56e0a73c1..6bac0d8bfc0 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1999/02/04 15:47:35 frueauf Exp $ +# $NetBSD: Makefile,v 1.15 1999/02/04 21:35:01 frueauf Exp $ # # note: if updated, update shlib version number in patch-aa @@ -44,8 +44,10 @@ pre-configure: @${ECHO} 'support library and clients will be built.' @${ECHO} '##########################################' .else +NO_PACKAGE= "mysql_install_db needs data dir from distribution." + post-install: - (cd ${WRKSRC}; ./scripts/mysql_install_db) + (cd ${WRKSRC}; ./scripts/mysql_install_db && mysqladmin shutdown) @${CAT} ${PKGDIR}/PLIST-server >>${PLIST_SRC} .endif diff --git a/databases/mysql/patches/patch-aa b/databases/mysql/patches/patch-aa index f051f7a46bb..e759112d5f8 100644 --- a/databases/mysql/patches/patch-aa +++ b/databases/mysql/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:18 agc Exp $ +$NetBSD: patch-aa,v 1.4 1999/02/04 21:35:01 frueauf Exp $ ---- client/Makefile.in.orig Tue Jun 30 08:14:37 1998 -+++ client/Makefile.in Fri Jul 17 12:20:34 1998 +--- client/Makefile.in.orig Wed Jul 8 11:10:53 1998 ++++ client/Makefile.in Thu Feb 4 17:12:10 1999 @@ -42,8 +42,8 @@ AUTOHEADER = @AUTOHEADER@ @@ -40,6 +40,15 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:18 agc Exp $ mysql_DEPENDENCIES= $(LIBRARIES) mysqladmin_DEPENDENCIES= $(LIBRARIES) mysqlshow_DEPENDENCIES= $(LIBRARIES) +@@ -167,7 +167,7 @@ + CLEANFILES = $(libmysqlclient_a_LIBADD) $(SHLIBOBJS) \ + libmysqlclient.so libmysqlclient.so.@VERSION@ + +-DEFS = -DUNDEF_THREADS_HACK ++DEFS = -DUNDEF_THREADS_HACK -Dunix + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = @@ -218,10 +218,10 @@ select_test_LDFLAGS = CXXFLAGS = @CXXFLAGS@ diff --git a/databases/mysql/patches/patch-ad b/databases/mysql/patches/patch-ad new file mode 100644 index 00000000000..79f230a100e --- /dev/null +++ b/databases/mysql/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.3 1999/02/04 21:35:01 frueauf Exp $ + +--- dbug/Makefile.in-orig Wed Jul 8 11:11:32 1998 ++++ dbug/Makefile.in Thu Feb 4 17:14:29 1999 +@@ -142,7 +142,7 @@ + LIBRARIES = $(pkglib_LIBRARIES) + + +-DEFS = @DEFS@ -I. -I$(srcdir) -I.. ++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -Dunix + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ diff --git a/databases/mysql/pkg/PLIST-server b/databases/mysql/pkg/PLIST-server index 6575381136b..bac88623f75 100644 --- a/databases/mysql/pkg/PLIST-server +++ b/databases/mysql/pkg/PLIST-server @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST-server,v 1.1 1998/07/20 14:49:52 tv Exp $ +@comment $NetBSD: PLIST-server,v 1.2 1999/02/04 21:35:01 frueauf Exp $ bin/comp_err bin/isamchk bin/isamlog @@ -40,7 +40,6 @@ 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 @dirrm lib/mysql @dirrm share/mysql/czech @dirrm share/mysql/dutch |