o Add missing RCSID tags to patch-a{a,m} and use pkglint.

o Explain how to start mysqld correctly, PKG_RCD_SCRIPTS {dis,en}abled;
  closes PR pkg/29579.

5 files changed, 18 insertions, 8 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 099bdea00bb..f169022426d 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2005/02/18 00:48:05 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.33 2005/03/08 16:48:11 xtraeme Exp $
 
 DISTNAME=		mysql-4.1.10
 CATEGORIES=		databases
@@ -79,7 +79,7 @@ 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
@@ -100,7 +100,7 @@ SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
 SUBST_SED.mk=		-e "/^install-exec:/s/install-pkglibLIBRARIES//"
 SUBST_MESSAGE.mk=	"Fixing Makefiles."
 SUBST_STAGE.scripts=	post-extract
-SUBST_FILES.scripts=	scripts/mysql_install_db.sh scripts/mysqld_safe.sh	
+SUBST_FILES.scripts=	scripts/mysql_install_db.sh scripts/mysqld_safe.sh
 SUBST_SED.scripts=	-e "s,chown,${CHOWN},g"
 SUBST_MESSAGE.scripts=	"Fixing scripts."
 
diff --git a/databases/mysql4-server/MESSAGE b/databases/mysql4-server/MESSAGE
index 4a12e6b477c..c40c59b44f3 100644
--- a/databases/mysql4-server/MESSAGE
+++ b/databases/mysql4-server/MESSAGE
@@ -1,13 +1,19 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2005/02/16 02:21:37 xtraeme Exp $
+$NetBSD: MESSAGE,v 1.6 2005/03/08 16:48:11 xtraeme Exp $
 
 You can start the MySQL server doing the following steps:
 
 $ echo "mysqld=yes" >> /etc/rc.conf # NetBSD or a system with rc.d
 
+If you are using PKG_RCD_SCRIPTS=YES, try the following:
+
 $ ${RCD_SCRIPTS_DIR}/mysqld start
 
-After the tables are set up and the MySQL server is running, 
+Otherwise try:
+
+$ ${LOCALBASE}/${RCD_SCRIPTS_EXAMPLEDIR}/mysqld start
+
+After the tables are set up and the MySQL server is running,
 please remember to set a password for the MySQL root user!
 This is done by running both:
 
diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index d62069c68df..63c9e3a2db3 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.14 2005/02/23 16:33:06 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/03/08 16:48:11 xtraeme Exp $
 
 SHA1 (mysql-4.1.10.tar.gz) = 59590d2a067c40d248fa9ef8689ef51ac46ac261
 RMD160 (mysql-4.1.10.tar.gz) = d3cce10d1fa25cd6b63087aa748226c0db5b6bae
 Size (mysql-4.1.10.tar.gz) = 22563415 bytes
-SHA1 (patch-aa) = 1fd6136e4b8212cce4d68bb33c9dcddeca2e3d59
+SHA1 (patch-aa) = abeac9fcc34ae3f4b9aa52e9b18380db2363155d
 SHA1 (patch-ab) = 0857856085c6d3d498cd404e7f8203a2b4d04ae8
 SHA1 (patch-ac) = ba78b6168d79520cc6bee8e06e89ca3fe90d92a1
 SHA1 (patch-af) = 2accaca59821f0e82944690f41f905f6560bd76f
 SHA1 (patch-al) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
-SHA1 (patch-am) = 8da1f42e0524512cdba953833420650922a27ccb
+SHA1 (patch-am) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
 SHA1 (patch-aq) = b971690206b416e75046cca3e53f6222b55725c5
 SHA1 (patch-ar) = bb3329100655d99484934e69d5c8a7e3dc459542
 SHA1 (patch-as) = a31086086d934e2289b90365c2fd79f1ee059d53
diff --git a/databases/mysql4-server/patches/patch-aa b/databases/mysql4-server/patches/patch-aa
index d664846b629..f3ead2905f6 100644
--- a/databases/mysql4-server/patches/patch-aa
+++ b/databases/mysql4-server/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.8 2005/03/08 16:48:11 xtraeme Exp $
+
 --- Makefile.in.orig	2005-01-17 15:15:42.000000000 +0100
 +++ Makefile.in	2005-01-17 15:16:11.000000000 +0100
 @@ -339,12 +339,8 @@
diff --git a/databases/mysql4-server/patches/patch-am b/databases/mysql4-server/patches/patch-am
index 87b8b1fbcdd..044838c5ad9 100644
--- a/databases/mysql4-server/patches/patch-am
+++ b/databases/mysql4-server/patches/patch-am
@@ -1,3 +1,5 @@
+$NetBSD: patch-am,v 1.7 2005/03/08 16:48:11 xtraeme Exp $
+
 --- scripts/mysqld_safe.sh.orig	2005-01-17 15:16:35.000000000 +0100
 +++ scripts/mysqld_safe.sh	2005-01-17 15:20:03.000000000 +0100
 @@ -253,6 +253,14 @@