diff options
author | xtraeme <xtraeme> | 2004-11-08 18:19:41 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2004-11-08 18:19:41 +0000 |
commit | 9f1af0bc144ede33368828bd6177bdfc9d1df3b4 (patch) | |
tree | fbc370bac0b064f4547fb6493b9402997961746b /databases/mysql4-server | |
parent | 2d487c2339ab6354eee6baf8c1a3cd7bba954670 (diff) | |
download | pkgsrc-9f1af0bc144ede33368828bd6177bdfc9d1df3b4.tar.gz |
Fix breakage added in last commits in mysql4-* packages:
* Make mysql4-client build on NetBSD 1.[56]*
* Don't install mysqld and friends in mysql4-client (eww!)
* Remove an unneeded patch.
* Remove duplicated files in mysql4-client's PLIST.
Also, use assembler functions when MACHINE_ARCH == i386.
This closes PR pkg/27154, pkg/27720, pkg/27744 and pkg/28035.
BTW, I tested them on NetBSD 1.6.2, 2.0_RC4 and -current.
Bump PKGREVISION for both packages.
Diffstat (limited to 'databases/mysql4-server')
-rw-r--r-- | databases/mysql4-server/Makefile | 11 | ||||
-rw-r--r-- | databases/mysql4-server/distinfo | 5 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-ae | 12 | ||||
-rw-r--r-- | databases/mysql4-server/patches/patch-af | 4 |
4 files changed, 6 insertions, 26 deletions
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index 143daf3ab8d..898c860fb81 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2004/10/22 01:10:04 xtraeme Exp $ +# $NetBSD: Makefile,v 1.12 2004/11/08 18:19:41 xtraeme Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} +PKGREVISION= 1 SVR4_PKGNAME= mysqs COMMENT= MySQL 4, a free SQL database (server) @@ -36,14 +37,6 @@ BUILD_DIRS= ${WRKSRC} ${WRKSRC}/man .include "../../databases/mysql4-client/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") -CFLAGS+= -DSIGNALS_DONT_BREAK_READ -CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ -CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no -CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no -.endif post-configure: cd ${WRKSRC} && ${CP} -f config.h include/my_config.h diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo index cb1d1031396..0de85df7f83 100644 --- a/databases/mysql4-server/distinfo +++ b/databases/mysql4-server/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.9 2004/10/31 08:55:20 grant Exp $ +$NetBSD: distinfo,v 1.10 2004/11/08 18:19:41 xtraeme Exp $ SHA1 (mysql-4.1.7.tar.gz) = 11c1c3a3004175d8b9ac710f9c7815cf759e6293 Size (mysql-4.1.7.tar.gz) = 19849046 bytes SHA1 (patch-aa) = 54d4f8cc3aa80fa49d7330873d41e13f0bb42100 SHA1 (patch-ab) = fa03cc4b5fe58a3436687d24dd5120d48388f721 SHA1 (patch-ac) = 184919dfda45836f0c7ad7c80e27624961ab6fea -SHA1 (patch-ae) = d5dcade3dea37c2f9be12bbddf6091ddb57344ac -SHA1 (patch-af) = 890b096c132339660cff33128d410a99646f49e1 +SHA1 (patch-af) = 270755264242a436047c749c5a3eb3aba2b6a25b SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 SHA1 (patch-am) = 2279653e5ee3df2f19242e9d4212d3666188b1d2 SHA1 (patch-aq) = 235893947fcfdcb9f5660ade38b0b6e8423529dc diff --git a/databases/mysql4-server/patches/patch-ae b/databases/mysql4-server/patches/patch-ae deleted file mode 100644 index e3a7116a329..00000000000 --- a/databases/mysql4-server/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2003/12/20 16:00:43 martti Exp $ - ---- configure.in.orig 2003-12-14 21:23:49.000000000 +0000 -+++ configure.in 2003-12-20 12:08:47.000000000 +0000 -@@ -2159,7 +2159,6 @@ - else - bench_dirs="" - fi --bench_dirs="$bench_dirs mysql-test" - AC_SUBST(bench_dirs) - - # Don't build readline, i have it already diff --git a/databases/mysql4-server/patches/patch-af b/databases/mysql4-server/patches/patch-af index d4976c006a8..8a76a1162af 100644 --- a/databases/mysql4-server/patches/patch-af +++ b/databases/mysql4-server/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.5 2004/10/31 08:55:21 grant Exp $ +$NetBSD: patch-af,v 1.6 2004/11/08 18:19:41 xtraeme Exp $ --- configure.orig 2004-10-23 17:29:20.000000000 +1000 +++ configure @@ -56,7 +56,7 @@ $NetBSD: patch-af,v 1.5 2004/10/31 08:55:21 grant Exp $ bench_dirs="" fi -bench_dirs="$bench_dirs mysql-test" -+#bench_dirs="$bench_dirs mysql-test" ++bench_dirs="$bench_dirs mysql-test" # Don't build readline, i have it already |