fix PLIST conflicts with mysql4-client

mysql4-server/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/08/08 14:50:34 adrian_p Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/10/13 16:15:43 adrian_p Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -17,30 +17,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 etc/rc.d/mysqld
-include/mysql/errmsg.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_no_pthread.h
-include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
-include/mysql/my_sys.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
-include/mysql/raid.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
@@ -52,12 +28,6 @@ lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
 man/man1/mysqld.1
-man/man1/mysqld_safe.1
-share/mysql/Description.plist
-share/mysql/Info.plist
-share/mysql/MySQL-shared-compat.spec
-share/mysql/StartupParameters.plist
-share/mysql/binary-configure
 share/mysql/charsets/Index
 share/mysql/charsets/README
 share/mysql/charsets/cp1251.conf
@@ -108,12 +78,6 @@ 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-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.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -123,8 +87,6 @@ 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
@@ -160,6 +122,3 @@ share/mysql/ukrainian/errmsg.txt
 @dirrm share/mysql/danish
 @dirrm share/mysql/czech
 @dirrm share/mysql/charsets
-@dirrm share/mysql
-@dirrm lib/mysql
-@dirrm include/mysql

mysql4-server/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2003/10/13 14:44:37 adrian_p Exp $
+$NetBSD: distinfo,v 1.13 2003/10/13 16:15:43 adrian_p Exp $
 
 SHA1 (mysql-4.0.15a.tar.gz) = 6d3cf9f3c56859a173048552df31471b64ec7475
 Size (mysql-4.0.15a.tar.gz) = 12785355 bytes
@@ -10,3 +10,7 @@ SHA1 (patch-am) = ea8d41e90871c7434705e39098f3df77322bf604
 SHA1 (patch-an) = ba04ea1343a972b10dc562da99f6536ce982f2dd
 SHA1 (patch-ao) = f21de256c43e43693e846444ed0c4d2641cc6f8d
 SHA1 (patch-ap) = 1706b2fc111a97ec24919ddfea01087fbe633efd
+SHA1 (patch-aq) = 9b3612a95f4409dc062951fbc2636df63d7b7998
+SHA1 (patch-ar) = dfb126a4cca3bb6fd06608222277ed8773b3d34d
+SHA1 (patch-as) = 3e2266ce1942715a21ae1e686b162c198811fb49
+SHA1 (patch-at) = 459e33b9e06f3ffc78d5dfc7e43068eb10e21b0d

mysql4-server/patches/patch-aq

@@ -0,0 +1,20 @@
+$NetBSD: patch-aq,v 1.1 2003/10/13 16:15:43 adrian_p Exp $
+
+--- include/Makefile.in.orig	Mon Oct 13 17:24:51 2003
++++ include/Makefile.in	Mon Oct 13 17:30:05 2003
+@@ -205,13 +205,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ 
+-BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
+-pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h \
+-			mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
+-		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+-			errmsg.h my_global.h my_net.h my_alloc.h \
+-			my_getopt.h sslopt-longopts.h my_dir.h \
+-			sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
++BUILT_SOURCES = 
++pkginclude_HEADERS = $(BUILT_SOURCES)
+ 
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ 			nisam.h heap.h merge.h my_bitmap.h\

mysql4-server/patches/patch-ar

@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2003/10/13 16:15:43 adrian_p Exp $
+
+--- man/Makefile.in.orig	Mon Oct 13 17:44:31 2003
++++ man/Makefile.in	Mon Oct 13 17:44:50 2003
+@@ -207,7 +207,7 @@
+ 
+ man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
+ 		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
+-		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
++		perror.1 replace.1 mysql_fix_privilege_tables.1
+ 
+ 
+ EXTRA_DIST = $(man_MANS)

mysql4-server/patches/patch-as

@@ -0,0 +1,21 @@
+$NetBSD: patch-as,v 1.1 2003/10/13 16:15:43 adrian_p Exp $
+
+--- support-files/Makefile.in.orig	Mon Oct 13 17:48:34 2003
++++ support-files/Makefile.in	Mon Oct 13 17:50:44 2003
+@@ -219,15 +219,7 @@
+ 
+ SUBDIRS = MacOSX
+ 
+-pkgdata_DATA = my-small.cnf \
+-			my-medium.cnf \
+-			my-large.cnf \
+-			my-huge.cnf \
+-			mysql-log-rotate \
+-			mysql-@VERSION@.spec \
+-			binary-configure \
+-			MySQL-shared-compat.spec
+-
++pkgdata_DATA = 
+ 
+ pkgdata_SCRIPTS = mysql.server
+ 

mysql4-server/patches/patch-at

@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.1 2003/10/13 16:15:43 adrian_p Exp $
+
+--- support-files/MacOSX/Makefile.in.orig	Mon Oct 13 17:53:21 2003
++++ support-files/MacOSX/Makefile.in	Mon Oct 13 17:53:55 2003
+@@ -217,11 +217,7 @@
+ 		StartupItem.postinstall
+ 
+ 
+-pkgdata_DATA = Info.plist \
+-		Description.plist \
+-		StartupParameters.plist \
+-		postinstall \
+-		preinstall
++pkgdata_DATA =
+ 
+ 
+ CLEANFILES = Info.plist \