This commit was manufactured by cvs2svn to create tag 'RELEASE_4_1_1'.release/4.1.1

17 files changed, 0 insertions, 606 deletions

diff --git a/databases/msql3/files/msql2.sh b/databases/msql3/files/msql2.sh
deleted file mode 100644
index 4f9ff5c87c16..000000000000
--- a/databases/msql3/files/msql2.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && echo -n ' msql2'
-	;;
-stop)
-	killall msql2d && echo -n ' msql2d'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/databases/msql3/files/patch-aa b/databases/msql3/files/patch-aa
deleted file mode 100644
index d8250563197f..000000000000
--- a/databases/msql3/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Tue Dec 17 11:12:16 1996
-+++ Makefile	Tue Dec 17 11:13:26 1996
-@@ -18,14 +18,16 @@
- SHELL=/bin/sh
- 
- all:
--	@ echo ""; echo "You have not read the installation procedures.";\
--	echo "Please read the README file for build instructions.";\
--	echo
-+	cd targets/freebsd ;\
-+	make all
-+
-+install:
-+	cd targets/freebsd ;\
-+	make install
- 
- target:
- 	@ scripts/make-target
--
--
-+	@ ( ARCH=`scripts/sys-arch`; cd targets; ln -s $$ARCH freebsd)
- 
- dist:
- 	@ echo; echo -n "Full Distribution - Enter archive file name : " ;\
diff --git a/databases/msql3/files/patch-ab b/databases/msql3/files/patch-ab
deleted file mode 100644
index d2604d398599..000000000000
--- a/databases/msql3/files/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
---- scripts/run_daemon.orig	Mon Dec 16 03:44:22 1996
-+++ scripts/run_daemon	Sun Dec 22 15:54:18 1996
-@@ -9,23 +9,25 @@
- #
- #					bambi@Bond.edu.au
- 
--INST_DIR=/usr/local/Minerva
--ADMIN="you@some.machine"
-+umask 077
-+
-+INST_DIR=%%PREFIX%%
-+ADMIN="root@%%HOSTNAME%%"
- PROG=$1
- 
--if test ! -d "${INST_DIR}/debug"
-+if test ! -d "/tmp/debug"
- then
--	mkdir ${INST_DIR}/debug
-+	mkdir /tmp/debug
- fi
- 
--if test ! -d "${INST_DIR}/debug/${PROG}"
-+if test ! -d "/tmp/debug/${PROG}"
- then
--	mkdir ${INST_DIR}/debug/${PROG}
-+	mkdir /tmp/debug/${PROG}
- fi
- 
- while :
- do
--	cd ${INST_DIR}/debug/${PROG}
-+	cd /tmp/debug/${PROG}
- 	${INST_DIR}/bin/${PROG} > output 2>&1
- 	echo "Program : ${PROG}
- Time : `date`
-@@ -34,6 +36,6 @@
- 
- " > mail.tmp
- 	cat output >> mail.tmp
--	/usr/ucb/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp
-+	/usr/bin/mail -s "Minerva Daemon Crash Report" ${ADMIN} < mail.tmp
- 	sleep 15
- done
diff --git a/databases/msql3/files/patch-ac b/databases/msql3/files/patch-ac
deleted file mode 100644
index 81b33b652da2..000000000000
--- a/databases/msql3/files/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/conf/site.mm.in.orig	Fri May 29 19:21:51 1998
-+++ src/conf/site.mm.in	Fri Aug 28 16:24:37 1998
-@@ -3,8 +3,8 @@
- #
- 
- 
--COMPILER= @CC@
--INST_DIR= /usr/local/Hughes
-+COMPILER:= $(CC)
-+INST_DIR:= $(PREFIX)
- HAVE_DYNAMIC= -DHAVE_DYNAMIC
- CC_ONLY_FLAGS=
- LINK_ONLY_FLAGS=
-@@ -34,10 +34,10 @@
- EXTRA_LIB= @LIBS@
- 
- # Any other CFlags required
--EXTRA_CFLAGS= @DEFS@ $(SSIZE_T) $(U_INT) $(BITTYPES)
-+EXTRA_CFLAGS= @DEFS@ $(SSIZE_T) $(U_INT) $(BITTYPES) -fpic
- 
- # Directory for pid file
- PID_DIR= @PID_DIR@
- 
--CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
-+CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS)
- LDLIBS= -L$(TOP)/lib $(EXTRA_LIB)
diff --git a/databases/msql3/files/patch-ad b/databases/msql3/files/patch-ad
deleted file mode 100644
index 3c3e6e2123cf..000000000000
--- a/databases/msql3/files/patch-ad
+++ /dev/null
@@ -1,28 +0,0 @@
---- scripts/make-install.orig	Sat Jan 18 08:53:09 1997
-+++ scripts/make-install	Thu Jul 10 14:08:57 1997
-@@ -1,16 +1,15 @@
- #!/bin/sh
- 
--INST_DIR=$1
-+INST_DIR=$PREFIX
- 
--scripts/mkinstalldirs 0755    $INST_DIR/bin 
--scripts/mkinstalldirs 0755    $INST_DIR/include 
- scripts/mkinstalldirs 0755    $INST_DIR/include/common
--scripts/mkinstalldirs 0755    $INST_DIR/lib
--scripts/mkinstalldirs 0755    $INST_DIR/msqldb
--scripts/mkinstalldirs 0755    $INST_DIR/msqldb/.tmp
--scripts/mkinstalldirs 0755    $INST_DIR/doc
--scripts/mkinstalldirs 0755    $INST_DIR/www
--scripts/mkinstalldirs 0755    $INST_DIR/misc
--scripts/mkinstalldirs 0755    $INST_DIR/makegen
-+scripts/mkinstalldirs 0755    $INST_DIR/etc/msql2
-+scripts/mkinstalldirs 0700    /var/db/msqldb
-+scripts/mkinstalldirs 0700    /var/db/msqldb/.tmp
-+scripts/mkinstalldirs 0755    $INST_DIR/share/doc/msql
-+scripts/mkinstalldirs 0755    $INST_DIR/share/msql/misc
-+scripts/mkinstalldirs 0755    $INST_DIR/share/msql/www
-+scripts/mkinstalldirs 0755    $INST_DIR/share/msql/makegen
-+/usr/sbin/chown -R msql.msql /var/db/msqldb
- scripts/mkinstalldirs 0755    $INST_DIR/modules
- 
diff --git a/databases/msql3/files/patch-ae b/databases/msql3/files/patch-ae
deleted file mode 100644
index 52771f4ca9d6..000000000000
--- a/databases/msql3/files/patch-ae
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/Makefile.tmpl.orig	Tue Jul  8 03:06:49 1997
-+++ src/Makefile.tmpl	Thu Jul 10 13:46:24 1997
-@@ -31,19 +31,19 @@
- 	echo
- 
- install ::
--	@cp -r ../../doc/* $(INST_DIR)/doc; \\
--	cp -r ../../demos/w3-msql/* $(INST_DIR)/www; \\
--	cp -r ../../misc/setup_* $(INST_DIR)/misc; \\
--	cp ../../README* $(INST_DIR);\\
--	cp makegen/* $(INST_DIR)/makegen;\\
--	chmod 755 $(INST_DIR)/makegen/*;\\
--	cp site.mm $(INST_DIR)/makegen;\\
--        if test -f $(INST_DIR)/msql.conf;\
-+	@cp -r ../../doc/* $(INST_DIR)/share/doc/msql; \\
-+	cp -r ../../demos/w3-msql/* $(INST_DIR)/share/msql/www; \\
-+	cp -r ../../misc/setup_* $(INST_DIR)/share/msql/misc; \\
-+	cp ../../README* $(INST_DIR)/share/doc/msql;\\
-+	cp makegen/* $(INST_DIR)/share/msql/makegen;\\
-+	chmod 755 $(INST_DIR)/share/msql/makegen/*;\\
-+	cp site.mm $(INST_DIR)/share/msql/makegen;\\
-+        if test -f $(INST_DIR)/etc/msql2/msql.conf;\
-         then\
--                rm -f $(INST_DIR)/msql.conf.old;\
--                mv $(INST_DIR)/msql.conf $(INST_DIR)/msql.conf.old;\
-+                rm -f $(INST_DIR)/etc/msql2/msql.conf.old;\
-+                mv $(INST_DIR)/etc/msql2/msql.conf $(INST_DIR)/etc/msql2/msql.conf.old;\
-         fi;\
--	sed "s,_INST_,$(INST_DIR),"< ../../misc/msql.conf >$(INST_DIR)/msql.conf;\\
-+	sed "s,_INST_,$(INST_DIR),"< ../../misc/msql.conf >$(INST_DIR)/etc/msql2/msql.conf;\\
- 	echo ;\\
- 	echo ;\\
- 	echo ;\\
diff --git a/databases/msql3/files/patch-af b/databases/msql3/files/patch-af
deleted file mode 100644
index 0d247f5ce08e..000000000000
--- a/databases/msql3/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/msql/Makefile.tmpl.orig	Mon Jan 13 10:15:48 1997
-+++ src/msql/Makefile.tmpl	Sun Jan 19 14:47:28 1997
-@@ -78,7 +78,7 @@
- !install msqldump $(INST_DIR)/bin/msqldump 0755 $(ROOT)
- !libinstall libmsql.a $(INST_DIR)/lib/libmsql.a 744 $(ROOT)
- !install msql.h $(INST_DIR)/include/msql.h 744 $(ROOT)
--!install sample.acl $(INST_DIR)/msql.acl.sample 700 $(ROOT)
-+!install sample.acl $(INST_DIR)/etc/msql2/msql.acl.sample 700 $(ROOT)
- 
- lextest :: msql_lex.c
- 	$(CC) $(CC_FLAGS) -DDEBUG msql_lex.c -o lextest
diff --git a/databases/msql3/files/patch-ag b/databases/msql3/files/patch-ag
deleted file mode 100644
index 3ec810f95f4f..000000000000
--- a/databases/msql3/files/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/msql/config.c.orig	Fri May 29 19:21:56 1998
-+++ src/msql/config.c	Fri Aug 28 17:14:21 1998
-@@ -306,11 +306,11 @@
- 	msqlConfigLoaded = 1;
- 	if (file)
- 	{
--		snprintf(buf,sizeof(buf),"%s/%s", INST_DIR, file);
-+		snprintf(buf,sizeof(buf),"%s/etc/msql2/%s", INST_DIR, file);
- 		fp = fopen(buf,"r");
- 		if (!fp)
- 		{
--			snprintf(buf,sizeof(buf),"%s/%s.conf",INST_DIR,file);
-+			snprintf(buf,sizeof(buf),"%s/etc/msql2/%s.conf",INST_DIR,file);
- 			fp = fopen(buf,"r");
- 		}
- 		if (!fp)
-@@ -325,7 +325,7 @@
- 	}
- 	else
- 	{
--		snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR);
-+		snprintf(buf,sizeof(buf),"%s/etc/msql2/msql.conf", INST_DIR);
- 		fp = fopen(buf,"r");
- 	}
- 	if (!fp)
diff --git a/databases/msql3/files/patch-ah b/databases/msql3/files/patch-ah
deleted file mode 100644
index 252fb5fdec3a..000000000000
--- a/databases/msql3/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/msql/msqladmin.c.orig	Mon Jan 13 10:16:02 1997
-+++ src/msql/msqladmin.c	Sun Jan 19 14:05:53 1997
-@@ -257,7 +257,7 @@
- 		printf("\tTarget platform \t%s\n\n",TARGET);
- 
- 		printf("Configuration Details :-\n\n");
--		printf("\tDefault config file\t%s/msql.conf\n",INST_DIR);
-+		printf("\tDefault config file\t%s/etc/msql2/msql.conf\n",INST_DIR);
- 		printf("\tTCP socket         \t%d\n", 
- 			msqlGetIntConf("tcp_port"));
- 		printf("\tUNIX socket        \t%s\n", 
diff --git a/databases/msql3/files/patch-ai b/databases/msql3/files/patch-ai
deleted file mode 100644
index dcf168a1f723..000000000000
--- a/databases/msql3/files/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/msql/msqld.c.orig	Mon Jul  7 01:27:28 1997
-+++ src/msql/msqld.c	Thu Jul 10 13:48:05 1997
-@@ -593,7 +593,7 @@
- 
- 	if (*confFile == 0)
- 	{
--		snprintf(confFile,sizeof(confFile),"%s/msql.conf", INST_DIR);
-+		snprintf(confFile,sizeof(confFile),"%s/etc/msql2/msql.conf", INST_DIR);
- 	}
- 	printf("\tLoading configuration from '%s'.\n",confFile);
- 	msqlLoadConfigFile(confFile);
-@@ -687,8 +687,7 @@
- 	/*
- 	** Ensure that the correct user owns the database files
- 	*/
--	snprintf(path,MAXPATHLEN, "%s/msqldb",
--		(char *)msqlGetCharConf("general","inst_dir"));
-+	strcpy(path, "/var/db/msqldb");
- 	if (stat(path,&sbuf) < 0)
- 	{
- 		printf("\nError!  Can't stat '%s'\n\n",path);
diff --git a/databases/msql3/files/patch-aj b/databases/msql3/files/patch-aj
deleted file mode 100644
index 9769dc5953e4..000000000000
--- a/databases/msql3/files/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
---- misc/msql.conf.orig	Mon Jul  7 01:44:29 1997
-+++ misc/msql.conf	Thu Jul 10 13:49:56 1997
-@@ -20,9 +20,9 @@
- Inst_Dir = _INST_
- mSQL_User = msql
- Admin_User = root
--Pid_File = %I/msql2d.pid
-+Pid_File = %I/etc/msql2/msql2d.pid
- TCP_Port = 1114
--UNIX_Port = %I/msql2.sock
-+UNIX_Port = %I/etc/msql2/msql2.sock
- 
- [system]
- 
diff --git a/databases/msql3/files/patch-ak b/databases/msql3/files/patch-ak
deleted file mode 100644
index ead616de559e..000000000000
--- a/databases/msql3/files/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/msql/index.c	Fri Feb  7 10:06:42 1997
-+++ src/msql/index.c	Fri Feb  7 10:17:04 1997
-@@ -105,8 +105,7 @@
-                 fd;
- 
-         msqlTrace(TRACE_IN,"loadIndices()");
--        (void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.idx",
--		msqlHomeDir,db,table);
-+        (void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx",db,table);
- #ifdef OS2
-         fd = _sopen(path ,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -163,8 +163,8 @@
- 				curIndex->next = NULL;
- 			}
-                 }
--		snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.idx-%s",
--			msqlHomeDir,db,table, curIndex->name);
-+		snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",
-+			db,table, curIndex->name);
- 		curIndex->tree = avlOpen(path);
- 		curIndex->buf = (char *)malloc(curIndex->length + 1);
diff --git a/databases/msql3/files/patch-al b/databases/msql3/files/patch-al
deleted file mode 100644
index 6e64dbc12862..000000000000
--- a/databases/msql3/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/msql/acl.c.orig	Sat Jun 14 20:42:23 1997
-+++ src/msql/acl.c	Thu Jul 10 13:51:07 1997
-@@ -114,7 +114,7 @@
- 	/*
- 	** Open the acl file
- 	*/
--	(void)snprintf(path,MAXPATHLEN,"%s/msql.acl", 
-+	(void)snprintf(path,MAXPATHLEN,"%s/etc/msql2/msql.acl", 
- 		(char *)msqlGetCharConf("general", "inst_dir"));
- 	fp = fopen(path,"r");
- 	if (!fp)
diff --git a/databases/msql3/files/patch-am b/databases/msql3/files/patch-am
deleted file mode 100644
index a10e4099d0b1..000000000000
--- a/databases/msql3/files/patch-am
+++ /dev/null
@@ -1,171 +0,0 @@
---- src/msql/msqldb.c.orig	Fri Aug 28 14:57:51 1998
-+++ src/msql/msqldb.c	Fri Aug 28 15:04:11 1998
-@@ -136,7 +136,7 @@
- #endif
- 
- 	msqlTrace(TRACE_IN,"msqlListDBs()");
--	(void)snprintf(path, MAXPATHLEN, "%s/msqldb",msqlHomeDir);
-+	(void)snprintf(path, MAXPATHLEN, "var/db/msqldb");
- 	dirp = opendir(path);
- 	if (!dirp)
- 	{
-@@ -199,7 +199,7 @@
- #endif
- 
- 	msqlTrace(TRACE_IN,"msqlListTables()");
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s",msqlHomeDir,db);
-+	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s");
- 	dirp = opendir(path);
- 	if (!dirp)
- 	{
-@@ -1441,7 +1441,7 @@
- 	struct	stat buf;
- 
- 	msqlTrace(TRACE_IN,"msqlInit()");
--	(void)snprintf(path, MAXPATHLEN, "%s/msqldb/%s",msqlHomeDir,db);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s",db);
- 	if (stat(path,&buf) < 0)
- 	{
- 		snprintf(errMsg, MAX_ERR_MSG, BAD_DB_ERROR,db);
-@@ -1479,8 +1479,8 @@
- 	/*
- 	** Write the catalog entry
- 	*/
--	(void)snprintf(defPath, MAXPATHLEN, "%s/msqldb/%s/%s.def",
--		msqlHomeDir,db,table);
-+	(void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",
-+		db,table);
- 	if (stat(defPath, &sbuf) >= 0)
- 	{
- 		snprintf(errMsg,MAX_ERR_MSG,TABLE_EXISTS_ERROR,table);
-@@ -1531,8 +1531,8 @@
- 	** Create an empty table
- 	*/
- 	
--	(void)snprintf(datPath,MAXPATHLEN, "%s/msqldb/%s/%s.dat",
--		msqlHomeDir,db,table);
-+	(void)snprintf(datPath,MAXPATHLEN, "/var/db/msqldb/%s/%s.dat",
-+		db,table);
- #ifdef OS2
-         fd = _sopen(datPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO, 
- 		S_IREAD | S_IWRITE);
-@@ -1577,8 +1577,8 @@
- 	** 
- 	** Create an empty overflow file
- 	*/
--	(void)snprintf(oflPath,MAXPATHLEN,"%s/msqldb/%s/%s.ofl",
--		msqlHomeDir,db,table);
-+	(void)snprintf(oflPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.ofl",
-+		db,table);
- #ifdef OS2
-         fd = _sopen(oflPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO, 
- 		S_IREAD | S_IWRITE);
-@@ -1745,11 +1745,11 @@
- 	/*
- 	** Can't clash with another index either
- 	*/
--	(void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
-+	(void)snprintf(defPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx",
- 		db, index->table);
- 
--	(void)snprintf(idxPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx-%s",
--		msqlHomeDir,db, index->table, index->name);
-+	(void)snprintf(idxPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",
-+		db, index->table, index->name);
- 
- #ifdef OS2
-         fd = _sopen(defPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO, 
-@@ -1989,7 +1989,7 @@
- 	/*
- 	** Now blow away the table files
- 	*/
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.def",msqlHomeDir,
-+	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.def",
- 		db,table);
- 	cp = (char *)rindex(path,'.');
- #ifdef OS2
-@@ -2072,7 +2072,7 @@
- 		return(-1);
- 	}
- 
--	(void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
-+	(void)snprintf(defPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx",
- 		db, index->table);
- #ifdef OS2
-         in = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
-@@ -2086,8 +2086,8 @@
- 		msqlTrace(TRACE_OUT,"msqlDropIndex()");
- 		return(-1);
- 	}
--	(void)snprintf(tmpPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx-tmp",
--		msqlHomeDir,db, index->table);
-+	(void)snprintf(tmpPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-tmp",
-+		db, index->table);
- #ifdef OS2
-         out = _sopen(tmpPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO, 
- 		S_IREAD | S_IWRITE);
-@@ -2137,7 +2137,7 @@
- 	*/
- 	unlink(defPath);
- 	rename(tmpPath,defPath);
--	snprintf(tmpPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
-+	snprintf(tmpPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",db,
-                 index->table, index->name);
- 	unlink(tmpPath);
- 
-@@ -2757,7 +2757,7 @@
- 	** See if the directory exists
- 	*/
- 
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, db);
-+	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
- 	dirp = opendir(path);
- 	if (dirp)
- 	{
-@@ -2807,7 +2807,7 @@
- 	** See if the "to" directory exists
- 	*/
- 
--	(void)snprintf(toPath,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, toDB);
-+	(void)snprintf(toPath,MAXPATHLEN,"/var/db/msqldb/%s", toDB);
- 	dirp = opendir(toPath);
- 	if (dirp)
- 	{
-@@ -2822,8 +2822,7 @@
- 	** See if the "from" directory exists
- 	*/
- 
--	(void)snprintf(fromPath,MAXPATHLEN, "%s/msqldb/%s", msqlHomeDir, 
--		fromDB);
-+	(void)snprintf(fromPath,MAXPATHLEN, "/var/db/msqldb/%s", fromDB);
- 	dirp = opendir(fromPath);
- 	if (!dirp)
- 	{
-@@ -2886,7 +2885,7 @@
- 	** See if the "to" directory exists
- 	*/
- 
--	(void)snprintf(toPath,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, toDB);
-+	(void)snprintf(toPath,MAXPATHLEN,"/var/db/msqldb/%s", toDB);
- 	dirp = opendir(toPath);
- 	if (dirp)
- 	{
-@@ -2901,8 +2900,7 @@
- 	** See if the "from" directory exists
- 	*/
- 
--	(void)snprintf(fromPath,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, 
--		fromDB);
-+	(void)snprintf(fromPath,MAXPATHLEN,"/var/db/msqldb/%s", fromDB);
- 	dirp = opendir(fromPath);
- 	if (!dirp)
- 	{
-@@ -2948,7 +2946,7 @@
- 	** See if the directory exists
- 	*/
- 
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, db);
-+	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
- 	dirp = opendir(path);
- 	if (!dirp)
- 	{
diff --git a/databases/msql3/files/patch-an b/databases/msql3/files/patch-an
deleted file mode 100644
index ce08707d13fb..000000000000
--- a/databases/msql3/files/patch-an
+++ /dev/null
@@ -1,71 +0,0 @@
---- src/msql/table.c	Fri Feb  7 10:06:42 1997
-+++ src/msql/table.c	Fri Feb  7 10:16:35 1997
-@@ -100,8 +100,7 @@
- {
- 	char	path[MAXPATHLEN];
- 
--	(void)snprintf(path, MAXPATHLEN, "%s/msqldb/%s/%s.dat",msqlHomeDir,db,
--		table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.dat",db,table);
- #ifdef OS2
-         return(_sopen(path, MAXPATHLEN, O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
- #else
-@@ -115,8 +115,7 @@
- {
- 	char	path[MAXPATHLEN];
- 
--	(void)snprintf(path, MAXPATHLEN,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,
--		table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.ofl",db,table);
- #ifdef OS2
-         return(_sopen(path, MAXPATHLEN, O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
- #else
-@@ -300,8 +300,7 @@
- 	static	char buf[MAX_FIELDS * sizeof(field_t)];
- 
- 	msqlTrace(TRACE_IN,"readTableDef()");
--	(void)snprintf(path, MAXPATHLEN, "%s/msqldb/%s/%s.def",msqlHomeDir,
--		db,table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
-         fd = _sopen(path, MAXPATHLEN,  O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -367,7 +367,7 @@
- 	DIR	*dirp;
- 	char	path[MAXPATHLEN];
- 
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/.tmp",msqlHomeDir);
-+	(void)strcpy(path, "/var/db/msqldb/.tmp");
- 	dirp = opendir(path);
- 	if (!dirp)
- 	{
-@@ -387,7 +387,7 @@
- 			cur = readdir(dirp);
- 			continue;
- 		}
--		(void)snprintf(path,MAXPATHLEN,"%s/msqldb/.tmp/%s",msqlHomeDir,
-+		(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/.tmp/%s",
- 			cur->d_name);
- 		unlink(path);
- 		cur = readdir(dirp);
-@@ -434,8 +434,7 @@
- 	{
- 		tmpfile = cp+1;
- 	}
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,
--		tmpfile);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/.tmp/%s.dat",tmpfile);
- 
- 
- 	/*
-@@ -642,8 +642,8 @@
- 	char	path[MAXPATHLEN];
- 
-         msqlTrace(TRACE_IN,"freeTmpTable()");
--	(void)snprintf(path,MAXPATHLEN, "%s/msqldb/.tmp/%s.dat",msqlHomeDir,
--		entry->table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/.tmp/%s.dat",
-+		entry->table);
- 	freeTableDef(entry->def);
- 	entry->def = NULL;
- 	*(entry->db) = 0;
diff --git a/databases/msql3/files/patch-ao b/databases/msql3/files/patch-ao
deleted file mode 100644
index 5e8b8e9d683e..000000000000
--- a/databases/msql3/files/patch-ao
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/msql/sort.c.orig	Fri Aug 28 17:20:10 1998
-+++ src/msql/sort.c	Fri Aug 28 17:18:42 1998
-@@ -280,7 +280,7 @@
- 	/*
- 	** Create the dummy output table 
- 	*/
--	snprintf(dataPath,MAXPATHLEN,"%s/msqldb/.tmp/%s.tmp",INST_DIR,
-+	snprintf(dataPath,MAXPATHLEN,"/var/db/msqldb/.tmp/%s.tmp",
- 		entry->table);
- 	tmp.dataFD = open(dataPath, O_CREAT|O_RDWR, 0600);
-         bzero(&sblock, sizeof(sblock));
-@@ -328,7 +328,7 @@
- 	/*
- 	** Swap the new table into place
- 	*/
--	snprintf(oldPath,MAXPATHLEN,"%s/msqldb/.tmp/%s.dat",INST_DIR,
-+	snprintf(oldPath,MAXPATHLEN,"/var/db/msqldb/.tmp/%s.dat",
- 		entry->table);
- 	munmap(entry->dataMap, entry->size);
- 	close(entry->dataFD);
diff --git a/databases/msql3/files/post-install-notes b/databases/msql3/files/post-install-notes
deleted file mode 100644
index 71ae6e0c0e3a..000000000000
--- a/databases/msql3/files/post-install-notes
+++ /dev/null
@@ -1,55 +0,0 @@
-                     README for Mini SQL Version 2.0
--------------------------------------------------------------------------------
-
-Welcome to the production release of Mini SQL 2.0!  The 2.0 code has
-been undergoing Beta testing for many months now and has proven to be
-stable enough for a production release.  Development and bug fixing will
-continue as problems are identified so please check our web site
-regularly for upates at http://www.Hughes.com.au/
-
-As the software has now officially left the Beta test stage, it is being
-released as a commercial package.  The software may be evaluated for 14
-days before a license fee is due.  If you continue to use the software
-after 14 days you are required to pay a licnese fee.  To license your
-copy of mSQL 2.0, simply print out the invoice form located in the doc/
-directory of this distribution and return it with payment to us either
-via postal mail or via fax.  Our fax number and postal address has
-changed since the 1.x release so please check the details before sending
-your payment.
-
-
-FreeBSD-specific port notes
----------------------------
-
-The port of mSQL 1.x lived in it's own tree, /usr/local/Minerva.  At the
-time, mSQL was a part of a larger project called Minerva, to which other
-tools would be added.  These other tools would also live in
-/usr/local/Minerva.
-
-As of the 2.x release of mSQL, the author of mSQL has put many of these
-tools into the base mSQL distribution, and so it is no longer feasible to
-have the program live in it's own directory.
-
-So, in keeping with the BSD directory tree structure, you will find the
-following changes between the "official" mSQL 2.x distribution and the
-FreeBSD port :
-
-
-Documentation states:			Port uses:
-=====================			==========================
-/usr/local/Hughes			/usr/local
-/usr/local/Hughes/msqldb		/var/db/msqldb
-/usr/local/Hughes/msql2.sock		/usr/local/etc/msql2/msql2.sock
-/usr/local/Hughes/msql2.pid		/usr/local/etc/msql2/msql2.pid
-/usr/local/Hughes/msql.conf		/usr/local/etc/msql2/msql.conf
-/usr/local/Hughes/msql.acl		/usr/local/etc/msql2/msql.acl
-
-To start the daemon, run /usr/local/etc/rc.d/msql2.sh as root.  This will
-start the daemon as the 'msql' user to make sure that the access permissions
-are correct.  This script will be executed upon system startup.
-
-Remember that mSQL is not free for use.  Please see
-/usr/local/share/doc/msql/License for details.
-
---
-j.