Upgrade to 1.0.5. Change default dir for pid's to /var/run like

the rest of the system

8 files changed, 82 insertions, 32 deletions

diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index cc2671a6c1a7..f0363924f28a 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -3,10 +3,10 @@
 # Date created:		?
 # Whom:			mr (original)
 #
-# $Id: Makefile,v 1.2 1995/01/15 05:17:22 gpalmer Exp $
+# $Id: Makefile,v 1.3 1995/02/11 13:48:55 asami Exp $
 #
 
-DISTNAME=	msql-1.0
+DISTNAME=	msql-1.0.5
 EXTRACT_SUFX=	.tar.gz
 MASTER_SITES=		ftp://bond.edu.au/pub/Minerva/msql/
 IS_INTERACTIVE=		YES
diff --git a/databases/msql/distinfo b/databases/msql/distinfo
index 35e01596bf1b..a2c1b1dbcc5a 100644
--- a/databases/msql/distinfo
+++ b/databases/msql/distinfo
@@ -1 +1 @@
-MD5 (msql-1.0.tar.gz) = bcb80a68ef3113b669381698cad73bee
+MD5 (msql-1.0.5.tar.gz) = 385490c624df569837889e3bc5592305
diff --git a/databases/msql/files/patch-aa b/databases/msql/files/patch-aa
index 88315504e035..7de800054139 100644
--- a/databases/msql/files/patch-aa
+++ b/databases/msql/files/patch-aa
@@ -1,13 +1,22 @@
-*** Makefile.orig	Thu Jan 12 21:18:36 1995
---- Makefile	Thu Jan 12 21:32:38 1995
+*** Makefile.orig	Tue Feb  7 17:03:58 1995
+--- Makefile	Wed Feb 22 18:04:45 1995
 ***************
-*** 20,24 ****
+*** 18,29 ****
+  SHELL=/bin/sh
+  
   all:
 ! 	@ echo ""; echo "You have not read the installation procedures.";\
 ! 	echo "Please read the README file for build instructions.";\
 ! 	echo
   
---- 20,27 ----
+  target:
+  	@ scripts/make-target
+  
+  
+  
+--- 18,33 ----
+  SHELL=/bin/sh
+  
   all:
 ! 	cd targets/freebsd ;\
 ! 	make all
@@ -16,12 +25,9 @@
 ! 	cd targets/freebsd ;\
 ! 	make install
   
-***************
-*** 34,36 ****
-  	echo ;\
-! 	TARG=`scripts/sys-arch`  ;\
-  	if test -d targets/$${TARG} ;\
---- 37,39 ----
-  	echo ;\
-! 	TARG=freebsd;\
-  	if test -d targets/$${TARG} ;\
+  target:
+  	@ scripts/make-target
++ 	@ ( ARCH=`scripts/sys-arch` ; cd targets; ln -s $$ARCH freebsd)
+  
+  
+  
diff --git a/databases/msql/files/patch-ab b/databases/msql/files/patch-ab
new file mode 100644
index 000000000000..9ab38443ed83
--- /dev/null
+++ b/databases/msql/files/patch-ab
@@ -0,0 +1,19 @@
+*** src/setup.orig	Wed Feb 22 18:16:06 1995
+--- src/setup	Wed Feb 22 18:16:20 1995
+***************
+*** 47,53 ****
+  fi
+  
+  
+! PID_DIRS="/var/adm /var/log /usr/adm /private/adm"
+  PID_DIR=""
+  for dir in $PID_DIRS
+  do
+--- 47,53 ----
+  fi
+  
+  
+! PID_DIRS="/var/run /var/adm /var/log /usr/adm /private/adm"
+  PID_DIR=""
+  for dir in $PID_DIRS
+  do
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index cc2671a6c1a7..f0363924f28a 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -3,10 +3,10 @@
 # Date created:		?
 # Whom:			mr (original)
 #
-# $Id: Makefile,v 1.2 1995/01/15 05:17:22 gpalmer Exp $
+# $Id: Makefile,v 1.3 1995/02/11 13:48:55 asami Exp $
 #
 
-DISTNAME=	msql-1.0
+DISTNAME=	msql-1.0.5
 EXTRACT_SUFX=	.tar.gz
 MASTER_SITES=		ftp://bond.edu.au/pub/Minerva/msql/
 IS_INTERACTIVE=		YES
diff --git a/databases/msql3/distinfo b/databases/msql3/distinfo
index 35e01596bf1b..a2c1b1dbcc5a 100644
--- a/databases/msql3/distinfo
+++ b/databases/msql3/distinfo
@@ -1 +1 @@
-MD5 (msql-1.0.tar.gz) = bcb80a68ef3113b669381698cad73bee
+MD5 (msql-1.0.5.tar.gz) = 385490c624df569837889e3bc5592305
diff --git a/databases/msql3/files/patch-aa b/databases/msql3/files/patch-aa
index 88315504e035..7de800054139 100644
--- a/databases/msql3/files/patch-aa
+++ b/databases/msql3/files/patch-aa
@@ -1,13 +1,22 @@
-*** Makefile.orig	Thu Jan 12 21:18:36 1995
---- Makefile	Thu Jan 12 21:32:38 1995
+*** Makefile.orig	Tue Feb  7 17:03:58 1995
+--- Makefile	Wed Feb 22 18:04:45 1995
 ***************
-*** 20,24 ****
+*** 18,29 ****
+  SHELL=/bin/sh
+  
   all:
 ! 	@ echo ""; echo "You have not read the installation procedures.";\
 ! 	echo "Please read the README file for build instructions.";\
 ! 	echo
   
---- 20,27 ----
+  target:
+  	@ scripts/make-target
+  
+  
+  
+--- 18,33 ----
+  SHELL=/bin/sh
+  
   all:
 ! 	cd targets/freebsd ;\
 ! 	make all
@@ -16,12 +25,9 @@
 ! 	cd targets/freebsd ;\
 ! 	make install
   
-***************
-*** 34,36 ****
-  	echo ;\
-! 	TARG=`scripts/sys-arch`  ;\
-  	if test -d targets/$${TARG} ;\
---- 37,39 ----
-  	echo ;\
-! 	TARG=freebsd;\
-  	if test -d targets/$${TARG} ;\
+  target:
+  	@ scripts/make-target
++ 	@ ( ARCH=`scripts/sys-arch` ; cd targets; ln -s $$ARCH freebsd)
+  
+  
+  
diff --git a/databases/msql3/files/patch-ab b/databases/msql3/files/patch-ab
new file mode 100644
index 000000000000..9ab38443ed83
--- /dev/null
+++ b/databases/msql3/files/patch-ab
@@ -0,0 +1,19 @@
+*** src/setup.orig	Wed Feb 22 18:16:06 1995
+--- src/setup	Wed Feb 22 18:16:20 1995
+***************
+*** 47,53 ****
+  fi
+  
+  
+! PID_DIRS="/var/adm /var/log /usr/adm /private/adm"
+  PID_DIR=""
+  for dir in $PID_DIRS
+  do
+--- 47,53 ----
+  fi
+  
+  
+! PID_DIRS="/var/run /var/adm /var/log /usr/adm /private/adm"
+  PID_DIR=""
+  for dir in $PID_DIRS
+  do