[pkgsrc/trunk]: pkgsrc/databases/mysql5-server Solaris fixes:

[sketch <sketch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b1bb953095c
branches:  trunk
changeset: 515906:1b1bb953095c
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Mon Jul 10 20:16:53 2006 +0000

description:
Solaris fixes:

  - Pass appropriate flags to SunPro compiler to work with Solaris 9 and below
    for threading model used.

  - Pass one directory at a time to `install -d'.

diffstat:

 databases/mysql5-server/Makefile         |   9 ++++++++-
 databases/mysql5-server/distinfo         |   4 ++--
 databases/mysql5-server/patches/patch-ac |  26 ++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 7 deletions(-)

diffs (78 lines):

diff -r 0379c1ecc270 -r 1b1bb953095c databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile  Mon Jul 10 19:31:14 2006 +0000
+++ b/databases/mysql5-server/Makefile  Mon Jul 10 20:16:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/18 16:11:15 cube Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/10 20:16:53 sketch Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=          mysqs
@@ -34,6 +34,13 @@
 BUILD_DEFS+=           MYSQL_DATADIR
 BUILD_DIRS=            ${WRKSRC} ${WRKSRC}/man
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(PKGSRC_COMPILER:Msunpro)
+CFLAGS+=               -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+CXXFLAGS+=             -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
+.endif
+
 .include "../../databases/mysql5-client/buildlink3.mk"
 BUILDLINK_DEPMETHOD.readline=build
 .include "../../devel/readline/buildlink3.mk"
diff -r 0379c1ecc270 -r 1b1bb953095c databases/mysql5-server/distinfo
--- a/databases/mysql5-server/distinfo  Mon Jul 10 19:31:14 2006 +0000
+++ b/databases/mysql5-server/distinfo  Mon Jul 10 20:16:53 2006 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2006/06/03 15:29:13 tron Exp $
+$NetBSD: distinfo,v 1.9 2006/07/10 20:16:53 sketch Exp $
 
 SHA1 (mysql-5.0.22.tar.gz) = b4310bfa838771f0b01e01cf9c1f789a3bbb4b76
 RMD160 (mysql-5.0.22.tar.gz) = 12aad812756b2a97a380bc504c514db15a997362
 Size (mysql-5.0.22.tar.gz) = 19542405 bytes
 SHA1 (patch-aa) = fcd1222f9939070a45bbb8ddf72bb1bdadea1f8b
 SHA1 (patch-ab) = 56cd26b3eb125e7d9b7775c9e148118bbd3dc6b3
-SHA1 (patch-ac) = 3d2c0db20d367980280d0d42f03bfe40048109d1
+SHA1 (patch-ac) = e7b0216336a156bdd28a63b0316b9b4615d8efa7
 SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2
 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-af) = 33c7caa6fe6a61da2a60a63a058cfdbd85af1e2d
diff -r 0379c1ecc270 -r 1b1bb953095c databases/mysql5-server/patches/patch-ac
--- a/databases/mysql5-server/patches/patch-ac  Mon Jul 10 19:31:14 2006 +0000
+++ b/databases/mysql5-server/patches/patch-ac  Mon Jul 10 20:16:53 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2006/05/18 16:11:15 cube Exp $
+$NetBSD: patch-ac,v 1.3 2006/07/10 20:16:53 sketch Exp $
 
---- mysql-test/Makefile.in.orig        2006-04-26 20:31:57.000000000 +0200
-+++ mysql-test/Makefile.in
-@@ -388,7 +388,7 @@ zlib_dir = @zlib_dir@
+--- mysql-test/Makefile.in.orig        Thu May 25 09:57:37 2006
++++ mysql-test/Makefile.in     Mon Jul 10 20:00:56 2006
+@@ -388,7 +388,7 @@
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
  benchdir_root = $(prefix)
@@ -11,3 +11,21 @@
  EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
  EXTRA_DIST = $(EXTRA_SCRIPTS) 
  GENSCRIPTS = mysql-test-run install_test_db
+@@ -819,12 +819,11 @@
+       $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
+ 
+ install-data-local:
+-      $(mkinstalldirs) \
+-              $(DESTDIR)$(testdir)/t \
+-              $(DESTDIR)$(testdir)/r \
+-              $(DESTDIR)$(testdir)/include \
+-              $(DESTDIR)$(testdir)/std_data \
+-              $(DESTDIR)$(testdir)/lib
++      $(mkinstalldirs) $(DESTDIR)$(testdir)/t
++      $(mkinstalldirs) $(DESTDIR)$(testdir)/r
++      $(mkinstalldirs) $(DESTDIR)$(testdir)/include
++      $(mkinstalldirs) $(DESTDIR)$(testdir)/std_data
++      $(mkinstalldirs) $(DESTDIR)$(testdir)/lib
+       $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)
+       -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t
+       $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t