[pkgsrc/trunk]: pkgsrc/databases Fix breakage added in last commits in mysql4...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/databases Fix breakage added in last commits in mysql4...
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:48:26 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef49248c8436
branches:  trunk
changeset: 483164:ef49248c8436
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Nov 08 18:19:41 2004 +0000

description:
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:

 databases/mysql4-client/Makefile         |    8 +-
 databases/mysql4-client/Makefile.common  |   16 ++-
 databases/mysql4-client/PLIST            |  151 +------------------------------
 databases/mysql4-client/distinfo         |    5 +-
 databases/mysql4-client/patches/patch-av |   20 ++++
 databases/mysql4-client/patches/patch-aw |   17 +++
 databases/mysql4-client/patches/patch-ax |   37 +++++++
 databases/mysql4-server/Makefile         |   11 +-
 databases/mysql4-server/distinfo         |    5 +-
 databases/mysql4-server/patches/patch-ae |   12 --
 databases/mysql4-server/patches/patch-af |    4 +-
 11 files changed, 102 insertions(+), 184 deletions(-)

diffs (truncated from 451 to 300 lines):

diff -r 04ec1584f429 -r ef49248c8436 databases/mysql4-client/Makefile
--- a/databases/mysql4-client/Makefile  Mon Nov 08 17:10:24 2004 +0000
+++ b/databases/mysql4-client/Makefile  Mon Nov 08 18:19:41 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/11/01 20:00:51 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2004/11/08 18:19:41 xtraeme Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
-PKGREVISION=           1
+PKGREVISION=           2
 SVR4_PKGNAME=          mysqc
 COMMENT=               MySQL 4, a free SQL database (client)
 
@@ -11,6 +11,7 @@
 
 .include "Makefile.common"
 
+CONFIGURE_ARGS+=       --without-extra-tools
 CONFIGURE_ARGS+=       --without-server
 CONFIGURE_ARGS+=       --enable-thread-safe-client
 UNWRAP_FILES=          scripts/mysql_config
@@ -18,9 +19,6 @@
 INFO_FILES=            mysql.info
 
 post-install:
-       cd ${PREFIX}/man/man1 && \
-                ${RM} -f mysqld.1 mysqld_multi.1 mysqld_safe.1 safe_mysqld.1
-       cd ${PREFIX}/share/mysql && ${RM} -f mysql.server
        ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
 .include "../../devel/readline/buildlink3.mk"
diff -r 04ec1584f429 -r ef49248c8436 databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common   Mon Nov 08 17:10:24 2004 +0000
+++ b/databases/mysql4-client/Makefile.common   Mon Nov 08 18:19:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2004/11/01 08:30:24 grant Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/11/08 18:19:41 xtraeme Exp $
 
 DISTNAME=              mysql-4.1.7
 CATEGORIES=            databases
@@ -53,6 +53,10 @@
 CONFIGURE_ARGS+=       --with-charset=${MYSQL_CHARSET}
 CONFIGURE_ARGS+=       --with-extra-charsets=${MYSQL_EXTRA_CHARSET}
 
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ARGS+=       --enable-assembler
+.endif
+
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=                F77=${FALSE}
 
@@ -65,6 +69,15 @@
 CXXFLAGS+=             -DHAVE_CURSES_H
 .endif
 
+.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
+
 USE_LANGUAGES=         c c++
 USE_GNU_TOOLS+=                make
 USE_PERL5=             # defined
@@ -85,4 +98,3 @@
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff -r 04ec1584f429 -r ef49248c8436 databases/mysql4-client/PLIST
--- a/databases/mysql4-client/PLIST     Mon Nov 08 17:10:24 2004 +0000
+++ b/databases/mysql4-client/PLIST     Mon Nov 08 18:19:41 2004 +0000
@@ -1,52 +1,28 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/31 10:14:14 grant Exp $
-bin/client_test
-bin/comp_err
-bin/isamchk
-bin/isamlog
-bin/make_win_binary_distribution
-bin/make_win_src_distribution
+@comment $NetBSD: PLIST,v 1.9 2004/11/08 18:19:41 xtraeme Exp $
 bin/msql2mysql
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
 bin/mysql
 bin/mysql_config
 bin/mysql_convert_table_format
 bin/mysql_create_system_tables
 bin/mysql_explain_log
 bin/mysql_find_rows
-bin/mysql_fix_extensions
 bin/mysql_fix_privilege_tables
-bin/mysql_install_db
-bin/mysql_secure_installation
 bin/mysql_setpermission
 bin/mysql_tableinfo
-bin/mysql_tzinfo_to_sql
-bin/mysql_waitpid
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbinlog
 bin/mysqlbug
 bin/mysqlcheck
-bin/mysqld_multi
-bin/mysqld_safe
 bin/mysqldump
 bin/mysqldumpslow
 bin/mysqlhotcopy
 bin/mysqlimport
-bin/mysqlmanager
 bin/mysqlmanager-pwgen
 bin/mysqlmanagerc
 bin/mysqlshow
 bin/mysqltest
-bin/pack_isam
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
 include/mysql/errmsg.h
 include/mysql/keycache.h
 include/mysql/m_ctype.h
@@ -77,20 +53,8 @@
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
 include/mysql/typelib.h
-lib/mysql/libdbug.a
-lib/mysql/libheap.a
-lib/mysql/libmerge.a
-lib/mysql/libmyisam.a
-lib/mysql/libmyisammrg.a
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
-lib/mysql/libmystrings.a
-lib/mysql/libmysys.a
-lib/mysql/libnisam.a
-lib/mysql/libvio.a
-libexec/mysqld
-man/man1/isamchk.1
-man/man1/isamlog.1
 man/man1/mysql.1
 man/man1/mysql_fix_privilege_tables.1
 man/man1/mysql_zap.1
@@ -98,121 +62,8 @@
 man/man1/mysqladmin.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
-man/man1/perror.1
-man/man1/replace.1
-share/mysql/Description.plist
-share/mysql/Info.plist
-share/mysql/MySQL-shared-compat.spec
-share/mysql/StartupParameters.plist
-share/mysql/charsets/Index.xml
-share/mysql/charsets/README
-share/mysql/charsets/armscii8.xml
-share/mysql/charsets/ascii.xml
-share/mysql/charsets/cp1250.xml
-share/mysql/charsets/cp1251.xml
-share/mysql/charsets/cp1256.xml
-share/mysql/charsets/cp1257.xml
-share/mysql/charsets/cp850.xml
-share/mysql/charsets/cp852.xml
-share/mysql/charsets/cp866.xml
-share/mysql/charsets/dec8.xml
-share/mysql/charsets/geostd8.xml
-share/mysql/charsets/greek.xml
-share/mysql/charsets/hebrew.xml
-share/mysql/charsets/hp8.xml
-share/mysql/charsets/keybcs2.xml
-share/mysql/charsets/koi8r.xml
-share/mysql/charsets/koi8u.xml
-share/mysql/charsets/latin1.xml
-share/mysql/charsets/latin2.xml
-share/mysql/charsets/latin5.xml
-share/mysql/charsets/latin7.xml
-share/mysql/charsets/macce.xml
-share/mysql/charsets/macroman.xml
-share/mysql/charsets/swe7.xml
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/danish/errmsg.sys
-share/mysql/danish/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
-share/mysql/english/errmsg.sys
-share/mysql/english/errmsg.txt
-share/mysql/estonian/errmsg.sys
-share/mysql/estonian/errmsg.txt
 share/mysql/fill_help_tables.sql
-share/mysql/french/errmsg.sys
-share/mysql/french/errmsg.txt
-share/mysql/german/errmsg.sys
-share/mysql/german/errmsg.txt
-share/mysql/greek/errmsg.sys
-share/mysql/greek/errmsg.txt
-share/mysql/hungarian/errmsg.sys
-share/mysql/hungarian/errmsg.txt
-share/mysql/italian/errmsg.sys
-share/mysql/italian/errmsg.txt
-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/my-huge.cnf
-share/mysql/my-innodb-heavy-4G.cnf
-share/mysql/my-large.cnf
-share/mysql/my-medium.cnf
-share/mysql/my-small.cnf
-share/mysql/mysql-${PKGVERSION}.spec
-share/mysql/mysql-log-rotate
 share/mysql/mysql_fix_privilege_tables.sql
-share/mysql/norwegian-ny/errmsg.sys
-share/mysql/norwegian-ny/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/portuguese/errmsg.sys
-share/mysql/portuguese/errmsg.txt
-share/mysql/postinstall
-share/mysql/preinstall
-share/mysql/romanian/errmsg.sys
-share/mysql/romanian/errmsg.txt
-share/mysql/russian/errmsg.sys
-share/mysql/russian/errmsg.txt
-share/mysql/serbian/errmsg.sys
-share/mysql/serbian/errmsg.txt
-share/mysql/slovak/errmsg.sys
-share/mysql/slovak/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/ukrainian/errmsg.sys
-share/mysql/ukrainian/errmsg.txt
-@dirrm share/mysql/ukrainian
-@dirrm share/mysql/swedish
-@dirrm share/mysql/spanish
-@dirrm share/mysql/slovak
-@dirrm share/mysql/serbian
-@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
 @dirrm share/mysql
 @dirrm lib/mysql
 @dirrm include/mysql
diff -r 04ec1584f429 -r ef49248c8436 databases/mysql4-client/distinfo
--- a/databases/mysql4-client/distinfo  Mon Nov 08 17:10:24 2004 +0000
+++ b/databases/mysql4-client/distinfo  Mon Nov 08 18:19:41 2004 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.9 2004/11/01 20:23:21 jdolecek 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-af) = 890b096c132339660cff33128d410a99646f49e1
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
+SHA1 (patch-av) = bc68c2e72d41e920f981c2ac277bcd5c8ff91611
+SHA1 (patch-aw) = d431580785ecddda8af80e6b816f5eabcba55a27
+SHA1 (patch-ax) = 5421a348d7a43ea30c570a09d1250a7e25ec00f9
diff -r 04ec1584f429 -r ef49248c8436 databases/mysql4-client/patches/patch-av
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql4-client/patches/patch-av  Mon Nov 08 18:19:41 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-av,v 1.1 2004/11/08 18:19:41 xtraeme Exp $
+
+--- Makefile.in.orig   2004-11-08 17:03:55.000000000 +0100
++++ Makefile.in        2004-11-08 17:05:09.000000000 +0100
+@@ -301,14 +301,7 @@
+ 
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
+-                      @readline_topdir@ sql-common \
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Added entries for updating gcc34 and gcc34-ada
Next by Date: [pkgsrc/trunk]: pkgsrc/mail/spamassassin Update to 3.0.1.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Added entries for updating gcc34 and gcc34-ada
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail/spamassassin Update to 3.0.1.
Indexes:
Home | Main Index | Thread Index | Old Index