>Number:         19936
>Category:       pkg
>Synopsis:       databases/mysql-client installs sysv-style init script, mysql-server doesn't
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jan 19 14:00:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Svishchev
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:
Index: databases/mysql-client/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-client/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- databases/mysql-client/Makefile     2002/12/13 14:19:54     1.21
+++ databases/mysql-client/Makefile     2003/01/19 17:45:34
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.21 2002/12/13 14:19:54 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
-PKGREVISION=           2
+PKGREVISION=           3
 SVR4_PKGNAME=          mysqc
 COMMENT=               MySQL, a free SQL database (client)
 
@@ -14,6 +14,7 @@
 
 post-install:
        cd ${PREFIX}/man/man1; ${RM} -f mysqld.1 safe_mysqld.1
+       cd ${PREFIX}/share/mysql; ${RM} -f mysql.server
        ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
 .include "../../devel/readline/buildlink2.mk"
Index: databases/mysql-client/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-client/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- databases/mysql-client/PLIST        2002/03/18 14:17:38     1.4
+++ databases/mysql-client/PLIST        2003/01/19 17:45:34
@@ -66,7 +66,6 @@
 share/mysql/my-small.cnf
 share/mysql/mysql-3.23.49.spec
 share/mysql/mysql-log-rotate
-share/mysql/mysql.server
 @dirrm share/mysql
 @dirrm lib/mysql
 @dirrm include/mysql
Index: databases/mysql-server/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-server/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- databases/mysql-server/Makefile     2003/01/03 00:38:31     1.31
+++ databases/mysql-server/Makefile     2003/01/19 17:45:34
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.31 2003/01/03 00:38:31 lukem Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-PKGREVISION=           1
+PKGREVISION=           2
 SVR4_PKGNAME=          mysqs
 COMMENT=               MySQL, a free SQL database (server)
 
@@ -39,6 +39,7 @@
 post-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/scripts/safe_mysqld ${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/man/man1
        ${INSTALL_MAN} ${WRKSRC}/man/safe_mysqld.1 ${PREFIX}/man/man1
        PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
Index: databases/mysql-server/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-server/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- databases/mysql-server/PLIST        2001/11/01 00:11:53     1.1
+++ databases/mysql-server/PLIST        2003/01/19 17:45:34
@@ -6,6 +6,7 @@
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
+bin/mysql.server
 bin/mysql_install_db
 bin/pack_isam
 bin/perror
Index: databases/mysql-server/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-server/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- databases/mysql-server/distinfo     2002/12/13 14:19:54     1.17
+++ databases/mysql-server/distinfo     2003/01/19 17:45:35
@@ -2,7 +2,7 @@
 
 SHA1 (mysql-3.23.49.tar.gz) = 0256331c7aa9388955148f80cdca382f467ad1be
 Size (mysql-3.23.49.tar.gz) = 11844905 bytes
-SHA1 (patch-aa) = d40a52dd115b3fd4236d66c2c5946fddc04f13cb
+SHA1 (patch-aa) = 62ea698d88c7f402a94f584fcb27e564c5c31276
 SHA1 (patch-ab) = 8e80dc2b0def56f3453395f8310e71f8113c7ccd
 SHA1 (patch-ac) = 29fbb5bac3a81c3f9197c2d9ff84b795cdfbcaed
 SHA1 (patch-ad) = 7127dd00a6067aa06a563c13dde1ea25e70fa7bf
Index: databases/mysql-server/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/databases/mysql-server/patches/patch-aa,v
retrieving revision 1.6
diff -u -r1.6 patch-aa
--- databases/mysql-server/patches/patch-aa     2002/03/18 14:17:44     1.6
+++ databases/mysql-server/patches/patch-aa     2003/01/19 17:45:35
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/03/18 14:17:44 martti Exp $
+$NetBSD$
 
 --- Makefile.in.orig   Thu Feb 14 18:50:36 2002
 +++ Makefile.in        Mon Mar 18 14:48:56 2002
@@ -7,7 +7,7 @@
  EXTRA_DIST = INSTALL-SOURCE README                    COPYING COPYING.LIB MIRRORS
  
 -SUBDIRS = include @docs_dirs@ @readline_dir@                  @thread_dirs@ @sql_client_dirs@                         @sql_server_dirs@ scripts tests man                     @bench_dirs@ support-files
-+SUBDIRS = @thread_dirs@ @sql_server_dirs@ tests @bench_dirs@
++SUBDIRS = @thread_dirs@ @sql_server_dirs@ tests @bench_dirs@ support-files
  
  
  # Relink after clean
>Release-Note:
>Audit-Trail:
>Unformatted: