summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/msql/Makefile12
-rw-r--r--databases/msql/distinfo2
-rw-r--r--databases/msql/files/patch-ac8
-rw-r--r--databases/msql/files/patch-ad7
-rw-r--r--databases/msql/files/patch-ae12
-rw-r--r--databases/msql/files/patch-ai17
-rw-r--r--databases/msql/files/patch-aj18
-rw-r--r--databases/msql/files/patch-ak242
-rw-r--r--databases/msql/files/patch-al12
-rw-r--r--databases/msql/files/patch-am162
-rw-r--r--databases/msql/files/patch-an65
-rw-r--r--databases/msql/files/post-install-notes28
-rw-r--r--databases/msql/pkg-plist41
-rw-r--r--databases/msql3/Makefile12
-rw-r--r--databases/msql3/distinfo2
-rw-r--r--databases/msql3/files/patch-ac8
-rw-r--r--databases/msql3/files/patch-ad7
-rw-r--r--databases/msql3/files/patch-ae12
-rw-r--r--databases/msql3/files/patch-ai17
-rw-r--r--databases/msql3/files/patch-aj18
-rw-r--r--databases/msql3/files/patch-ak242
-rw-r--r--databases/msql3/files/patch-al12
-rw-r--r--databases/msql3/files/patch-am162
-rw-r--r--databases/msql3/files/patch-an65
-rw-r--r--databases/msql3/files/post-install-notes28
-rw-r--r--databases/msql3/pkg-plist41
26 files changed, 598 insertions, 654 deletions
diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index bb837e784596..5057ae486f40 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: msql2
-# Version required: 2.0b7.1
+# Version required: 2.0
# Date created: December 17th 1996
# Whom: jfitz
#
# $Id$
#
-DISTNAME= msql-2.0-B7.1
-PKGNAME= msql-2.0b7.1
+DISTNAME= msql-2.0-rel
+PKGNAME= msql-2.0
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.worldone.com/pub/msql/ \
- http://www2.nerosworld.com/msql/ \
+MASTER_SITES= http://www2.nerosworld.com/msql/ \
http://hughes.com.au/software/msql2/
MAINTAINTER= jfitz@FreeBSD.ORG
@@ -40,6 +39,9 @@ post-install:
@for file in msql2d msqladmin msqlimport msqlexport; do\
/usr/bin/chgrp msql ${PREFIX}/bin/$$file; \
done
+ @for file in RELEASE_NOTES MSQL_BOOK INSTALL; do \
+ ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/msql; \
+ done
@/bin/chmod 751 ${PREFIX}/etc/msql2/
@/usr/sbin/chown -R msql.msql ${PREFIX}/etc/msql2/
@${MKDIR} -p ${PREFIX}/etc/rc.d
diff --git a/databases/msql/distinfo b/databases/msql/distinfo
index 1af2a46d7c14..91a1083cdcd1 100644
--- a/databases/msql/distinfo
+++ b/databases/msql/distinfo
@@ -1 +1 @@
-MD5 (msql-2.0-B7.1.tar.gz) = 734edc40f50aa2e62ae41e092b41a567
+MD5 (msql-2.0-rel.tar.gz) = 87b4e817e36005291d1780a0bdc77c48
diff --git a/databases/msql/files/patch-ac b/databases/msql/files/patch-ac
index 7d5548ca2424..182eaa928dab 100644
--- a/databases/msql/files/patch-ac
+++ b/databases/msql/files/patch-ac
@@ -1,15 +1,15 @@
---- src/conf/site.mm.in.orig Mon Jan 13 10:15:08 1997
-+++ src/conf/site.mm.in Sun Jan 19 13:56:52 1997
+--- src/conf/site.mm.in.orig Sat Jul 5 21:28:52 1997
++++ src/conf/site.mm.in Thu Jul 10 13:44:15 1997
@@ -4,7 +4,7 @@
CC= @CC@
-INST_DIR= /usr/local/Hughes
+INST_DIR= /usr/local
+ HAVE_DYNAMIC= -DHAVE_DYNAMIC
- #
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
EXTRA_LIB= @LIBS@
# Any other CFlags required
diff --git a/databases/msql/files/patch-ad b/databases/msql/files/patch-ad
index 114d39893dc3..3c3e6e2123cf 100644
--- a/databases/msql/files/patch-ad
+++ b/databases/msql/files/patch-ad
@@ -1,6 +1,6 @@
---- scripts/make-install.orig Mon Jan 13 10:14:48 1997
-+++ scripts/make-install Sun Jan 19 14:43:51 1997
-@@ -1,16 +1,16 @@
+--- 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
@@ -20,7 +20,6 @@
+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/doc/msql/manual
+scripts/mkinstalldirs 0755 $INST_DIR/share/msql/misc
+scripts/mkinstalldirs 0755 $INST_DIR/share/msql/www
+scripts/mkinstalldirs 0755 $INST_DIR/share/msql/makegen
diff --git a/databases/msql/files/patch-ae b/databases/msql/files/patch-ae
index c84cbe97a479..52771f4ca9d6 100644
--- a/databases/msql/files/patch-ae
+++ b/databases/msql/files/patch-ae
@@ -1,6 +1,6 @@
---- src/Makefile.tmpl.orig Sat Jan 18 10:44:04 1997
-+++ src/Makefile.tmpl Tue Feb 4 17:26:44 1997
-@@ -32,19 +32,19 @@
+--- 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 ::
@@ -26,8 +26,8 @@
+ rm -f $(INST_DIR)/etc/msql2/msql.conf.old;\
+ mv $(INST_DIR)/etc/msql2/msql.conf $(INST_DIR)/etc/msql2/msql.conf.old;\
fi;\
-- cp ../../misc/msql.conf $(INST_DIR);\\
-+ cp ../../misc/msql.conf $(INST_DIR)/etc/msql2;\\
+- 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 "Installation of mSQL-2 complete." ;\\
echo ;\\
diff --git a/databases/msql/files/patch-ai b/databases/msql/files/patch-ai
index 070c8b9c4f4c..a7c866c82b8a 100644
--- a/databases/msql/files/patch-ai
+++ b/databases/msql/files/patch-ai
@@ -1,11 +1,20 @@
---- src/msql/msqld.c.orig Sat Feb 1 07:46:40 1997
-+++ src/msql/msqld.c Tue Feb 4 17:32:18 1997
-@@ -508,7 +508,7 @@
+--- 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)
{
- sprintf(confFile,"%s/msql.conf", INST_DIR);
+ sprintf(confFile,"%s/etc/msql2/msql.conf", INST_DIR);
}
- printf("Loading configuration from '%s'.\n",confFile);
+ printf("\tLoading configuration from '%s'.\n",confFile);
msqlLoadConfigFile(confFile);
+@@ -687,7 +687,7 @@
+ /*
+ ** Ensure that the correct user owns the database files
+ */
+- sprintf(path,"%s/msqldb",(char *)msqlGetCharConf("general","inst_dir"));
++ sprintf(path,"/var/db/msqldb");
+ if (stat(path,&sbuf) < 0)
+ {
+ printf("\nError! Can't stat '%s'\n\n",path);
diff --git a/databases/msql/files/patch-aj b/databases/msql/files/patch-aj
index 3091cd08bf29..9769dc5953e4 100644
--- a/databases/msql/files/patch-aj
+++ b/databases/msql/files/patch-aj
@@ -1,16 +1,14 @@
---- misc/msql.conf.orig Mon Jan 13 10:14:37 1997
-+++ misc/msql.conf Sun Jan 19 14:16:56 1997
-@@ -17,10 +17,9 @@
-
- [general]
-
--Inst_Dir = /usr/local/Hughes
-+Inst_Dir = /usr/local
+--- 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/msql2.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/msql/files/patch-ak b/databases/msql/files/patch-ak
index cf94143ff3b7..4d94bbfde825 100644
--- a/databases/msql/files/patch-ak
+++ b/databases/msql/files/patch-ak
@@ -1,4 +1,3 @@
-diff -ruN src/msql/index.c src/msql/index.c
--- src/msql/index.c Fri Feb 7 10:06:42 1997
+++ src/msql/index.c Fri Feb 7 10:17:04 1997
@@ -105,7 +105,7 @@
@@ -19,244 +18,3 @@ diff -ruN src/msql/index.c src/msql/index.c
curIndex->name);
curIndex->tree = avlOpen(path);
curIndex->buf = (char *)malloc(curIndex->length + 1);
-diff -ruN src/msql/msqld.c src/msql/msqld.c
---- src/msql/msqld.c Fri Feb 7 10:06:42 1997
-+++ src/msql/msqld.c Fri Feb 7 10:16:49 1997
-@@ -577,7 +577,7 @@
- /*
- ** Ensure that the correct user owns the database files
- */
-- sprintf(path,"%s/msqldb",(char *)msqlGetCharConf("inst_dir"));
-+ sprintf(path,"/var/db/msqldb");
- if (stat(path,&sbuf) < 0)
- {
- printf("\nError! Can't stat '%s'\n\n",path);
-diff -ruN src/msql/msqldb.c src/msql/msqldb.c
---- src/msql/msqldb.c Fri Feb 7 10:06:42 1997
-+++ src/msql/msqldb.c Fri Feb 7 10:15:22 1997
-@@ -126,7 +126,7 @@
- #endif
-
- msqlTrace(TRACE_IN,"msqlListDBs()");
-- (void)sprintf(path,"%s/msqldb",msqlHomeDir);
-+ (void)sprintf(path,"/var/db/msqldb");
- dirp = opendir(path);
- if (!dirp)
- {
-@@ -187,7 +187,7 @@
- #endif
-
- msqlTrace(TRACE_IN,"msqlListTables()");
-- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
-+ (void)sprintf(path,"/var/db/msqldb/%s",db);
- dirp = opendir(path);
- if (!dirp)
- {
-@@ -1130,7 +1130,7 @@
- struct stat buf;
-
- msqlTrace(TRACE_IN,"msqlInit()");
-- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
-+ (void)sprintf(path,"/var/db/msqldb/%s",db);
- if (stat(path,&buf) < 0)
- {
- sprintf(errMsg,BAD_DB_ERROR,db);
-@@ -1165,7 +1165,7 @@
- /*
- ** Write the catalog entry
- */
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- fd = _sopen(defPath,O_RDONLY,SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1239,7 +1239,7 @@
- ** Create an empty table
- */
-
-- (void)sprintf(datPath,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+ (void)sprintf(datPath,"/var/db/msqldb/%s/%s.dat",db,table);
- (void)unlink(datPath);
- #ifdef OS2
- fd = _sopen(datPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
-@@ -1279,7 +1279,7 @@
- ** Create an empty index def file
- */
-
-- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
-+ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx",db,table);
- (void)unlink(idxPath);
- #ifdef OS2
- fd = _sopen(idxPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
-@@ -1302,7 +1302,7 @@
- /*
- ** Create an empty overflow file
- */
-- (void)sprintf(oflPath,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+ (void)sprintf(oflPath,"/var/db/msqldb/%s/%s.ofl",db,table);
- (void)unlink(oflPath);
- #ifdef OS2
- fd = _sopen(oflPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
-@@ -1454,10 +1454,10 @@
- /*
- ** Can't clash with another index either
- */
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
- index->table);
-
-- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
-+ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx-%s",db,
- index->table, index->name);
-
- #ifdef OS2
-@@ -1718,7 +1718,7 @@
- /*
- ** Now blow away the table files
- */
-- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- fp = fopen(path,"rb");
- #else
-@@ -1733,15 +1733,15 @@
- }
- (void)fclose(fp);
- unlink(path);
-- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
- unlink(path);
-- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
- unlink(path);
-
- /*
- ** Take care of the index files.
- */
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,table);
- #ifdef OS2
- fd = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1751,8 +1751,8 @@
- {
- while(read(fd,&tmp,sizeof(tmp)) == sizeof(tmp))
- {
-- (void)sprintf(path,"%s/msqldb/%s/%s.idx-%s",
-- msqlHomeDir,db,table,tmp.name);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.idx-%s",
-+ db,table,tmp.name);
- unlink(path);
- }
- close(fd);
-@@ -1791,7 +1791,7 @@
- return(-1);
- }
-
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
- index->table);
- #ifdef OS2
- in = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
-@@ -1804,7 +1804,7 @@
- msqlTrace(TRACE_OUT,"msqlDropIndex()");
- return(-1);
- }
-- (void)sprintf(tmpPath,"%s/msqldb/%s/%s.idx-tmp",msqlHomeDir,db,
-+ (void)sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-tmp",db,
- index->table);
- #ifdef OS2
- out = _sopen(tmpPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO,
-@@ -1855,7 +1855,7 @@
- */
- unlink(defPath);
- rename(tmpPath,defPath);
-- sprintf(tmpPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
-+ sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-%s",db,
- index->table, index->name);
- unlink(tmpPath);
-
-@@ -2412,7 +2412,7 @@
- ** See if the directory exists
- */
-
-- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
-+ (void)sprintf(path,"/var/db/msqldb/%s", db);
- dirp = opendir(path);
- if (dirp)
- {
-@@ -2459,7 +2459,7 @@
- ** See if the directory exists
- */
-
-- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
-+ (void)sprintf(path,"/var/db/msqldb/%s", db);
- dirp = opendir(path);
- if (!dirp)
- {
-diff -ruN src/msql/table.c src/msql/table.c
---- src/msql/table.c Fri Feb 7 10:06:42 1997
-+++ src/msql/table.c Fri Feb 7 10:16:35 1997
-@@ -100,7 +100,7 @@
- {
- char path[MAXPATHLEN];
-
-- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
- #ifdef OS2
- return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
- #else
-@@ -115,7 +115,7 @@
- {
- char path[MAXPATHLEN];
-
-- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
- #ifdef OS2
- return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
- #else
-@@ -300,7 +300,7 @@
- static char buf[MAX_FIELDS * sizeof(field_t)];
-
- msqlTrace(TRACE_IN,"readTableDef()");
-- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- fd = _sopen(path, O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -367,7 +367,7 @@
- DIR *dirp;
- char path[MAXPATHLEN];
-
-- (void)sprintf(path,"%s/msqldb/.tmp",msqlHomeDir);
-+ (void)sprintf(path,"/var/db/msqldb/.tmp");
- dirp = opendir(path);
- if (!dirp)
- {
-@@ -387,7 +387,7 @@
- cur = readdir(dirp);
- continue;
- }
-- (void)sprintf(path,"%s/msqldb/.tmp/%s",msqlHomeDir,
-+ (void)sprintf(path,"/var/db/msqldb/.tmp/%s",
- cur->d_name);
- unlink(path);
- cur = readdir(dirp);
-@@ -434,7 +434,7 @@
- {
- tmpfile = cp+1;
- }
-- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,tmpfile);
-+ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",tmpfile);
-
-
- /*
-@@ -642,7 +642,7 @@
- char path[MAXPATHLEN];
-
- msqlTrace(TRACE_IN,"freeTmpTable()");
-- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,entry->table);
-+ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",entry->table);
- freeTableDef(entry->def);
- entry->def = NULL;
- *(entry->db) = 0;
diff --git a/databases/msql/files/patch-al b/databases/msql/files/patch-al
index e982bc5dd98a..3a751c6128a7 100644
--- a/databases/msql/files/patch-al
+++ b/databases/msql/files/patch-al
@@ -1,11 +1,11 @@
---- src/msql/acl.c.orig Mon Mar 17 13:54:34 1997
-+++ src/msql/acl.c Mon Mar 17 13:54:57 1997
-@@ -111,7 +111,7 @@
+--- 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)sprintf(path,"%s/msql.acl", (char *)msqlGetCharConf("inst_dir"));
-+ (void)sprintf(path,"%s/etc/msql2/msql.acl", (char *)msqlGetCharConf("inst_dir"));
+- (void)sprintf(path,"%s/msql.acl",
++ (void)sprintf(path,"%s/etc/msql2/msql.acl",
+ (char *)msqlGetCharConf("general", "inst_dir"));
fp = fopen(path,"r");
if (!fp)
- {
diff --git a/databases/msql/files/patch-am b/databases/msql/files/patch-am
new file mode 100644
index 000000000000..7e6773b28892
--- /dev/null
+++ b/databases/msql/files/patch-am
@@ -0,0 +1,162 @@
+--- src/msql/msqldb.c Fri Feb 7 10:06:42 1997
++++ src/msql/msqldb.c Fri Feb 7 10:15:22 1997
+@@ -126,7 +126,7 @@
+ #endif
+
+ msqlTrace(TRACE_IN,"msqlListDBs()");
+- (void)sprintf(path,"%s/msqldb",msqlHomeDir);
++ (void)sprintf(path,"/var/db/msqldb");
+ dirp = opendir(path);
+ if (!dirp)
+ {
+@@ -187,7 +187,7 @@
+ #endif
+
+ msqlTrace(TRACE_IN,"msqlListTables()");
+- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
++ (void)sprintf(path,"/var/db/msqldb/%s",db);
+ dirp = opendir(path);
+ if (!dirp)
+ {
+@@ -1130,7 +1130,7 @@
+ struct stat buf;
+
+ msqlTrace(TRACE_IN,"msqlInit()");
+- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
++ (void)sprintf(path,"/var/db/msqldb/%s",db);
+ if (stat(path,&buf) < 0)
+ {
+ sprintf(errMsg,BAD_DB_ERROR,db);
+@@ -1165,7 +1165,7 @@
+ /*
+ ** Write the catalog entry
+ */
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.def",db,table);
+ #ifdef OS2
+ fd = _sopen(defPath,O_RDONLY,SH_DENYNO, S_IREAD | S_IWRITE);
+ #else
+@@ -1239,7 +1239,7 @@
+ ** Create an empty table
+ */
+
+- (void)sprintf(datPath,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
++ (void)sprintf(datPath,"/var/db/msqldb/%s/%s.dat",db,table);
+ (void)unlink(datPath);
+ #ifdef OS2
+ fd = _sopen(datPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
+@@ -1279,7 +1279,7 @@
+ ** Create an empty index def file
+ */
+
+- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
++ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx",db,table);
+ (void)unlink(idxPath);
+ #ifdef OS2
+ fd = _sopen(idxPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
+@@ -1302,7 +1302,7 @@
+ /*
+ ** Create an empty overflow file
+ */
+- (void)sprintf(oflPath,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
++ (void)sprintf(oflPath,"/var/db/msqldb/%s/%s.ofl",db,table);
+ (void)unlink(oflPath);
+ #ifdef OS2
+ fd = _sopen(oflPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
+@@ -1454,10 +1454,10 @@
+ /*
+ ** Can't clash with another index either
+ */
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
+ index->table);
+
+- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
++ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx-%s",db,
+ index->table, index->name);
+
+ #ifdef OS2
+@@ -1718,7 +1718,7 @@
+ /*
+ ** Now blow away the table files
+ */
+- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
+ #ifdef OS2
+ fp = fopen(path,"rb");
+ #else
+@@ -1733,15 +1733,15 @@
+ }
+ (void)fclose(fp);
+ unlink(path);
+- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
+ unlink(path);
+- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
+ unlink(path);
+
+ /*
+ ** Take care of the index files.
+ */
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,table);
+ #ifdef OS2
+ fd = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
+ #else
+@@ -1751,8 +1751,8 @@
+ {
+ while(read(fd,&tmp,sizeof(tmp)) == sizeof(tmp))
+ {
+- (void)sprintf(path,"%s/msqldb/%s/%s.idx-%s",
+- msqlHomeDir,db,table,tmp.name);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.idx-%s",
++ db,table,tmp.name);
+ unlink(path);
+ }
+ close(fd);
+@@ -1791,7 +1791,7 @@
+ return(-1);
+ }
+
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
+ index->table);
+ #ifdef OS2
+ in = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
+@@ -1804,7 +1804,7 @@
+ msqlTrace(TRACE_OUT,"msqlDropIndex()");
+ return(-1);
+ }
+- (void)sprintf(tmpPath,"%s/msqldb/%s/%s.idx-tmp",msqlHomeDir,db,
++ (void)sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-tmp",db,
+ index->table);
+ #ifdef OS2
+ out = _sopen(tmpPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO,
+@@ -1855,7 +1855,7 @@
+ */
+ unlink(defPath);
+ rename(tmpPath,defPath);
+- sprintf(tmpPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
++ sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-%s",db,
+ index->table, index->name);
+ unlink(tmpPath);
+
+@@ -2412,7 +2412,7 @@
+ ** See if the directory exists
+ */
+
+- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
++ (void)sprintf(path,"/var/db/msqldb/%s", db);
+ dirp = opendir(path);
+ if (dirp)
+ {
+@@ -2459,7 +2459,7 @@
+ ** See if the directory exists
+ */
+
+- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
++ (void)sprintf(path,"/var/db/msqldb/%s", db);
+ dirp = opendir(path);
+ if (!dirp)
+ {
diff --git a/databases/msql/files/patch-an b/databases/msql/files/patch-an
new file mode 100644
index 000000000000..e693499dea56
--- /dev/null
+++ b/databases/msql/files/patch-an
@@ -0,0 +1,65 @@
+--- src/msql/table.c Fri Feb 7 10:06:42 1997
++++ src/msql/table.c Fri Feb 7 10:16:35 1997
+@@ -100,7 +100,7 @@
+ {
+ char path[MAXPATHLEN];
+
+- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
+ #ifdef OS2
+ return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
+ #else
+@@ -115,7 +115,7 @@
+ {
+ char path[MAXPATHLEN];
+
+- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
+ #ifdef OS2
+ return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
+ #else
+@@ -300,7 +300,7 @@
+ static char buf[MAX_FIELDS * sizeof(field_t)];
+
+ msqlTrace(TRACE_IN,"readTableDef()");
+- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
+ #ifdef OS2
+ fd = _sopen(path, O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
+ #else
+@@ -367,7 +367,7 @@
+ DIR *dirp;
+ char path[MAXPATHLEN];
+
+- (void)sprintf(path,"%s/msqldb/.tmp",msqlHomeDir);
++ (void)sprintf(path,"/var/db/msqldb/.tmp");
+ dirp = opendir(path);
+ if (!dirp)
+ {
+@@ -387,7 +387,7 @@
+ cur = readdir(dirp);
+ continue;
+ }
+- (void)sprintf(path,"%s/msqldb/.tmp/%s",msqlHomeDir,
++ (void)sprintf(path,"/var/db/msqldb/.tmp/%s",
+ cur->d_name);
+ unlink(path);
+ cur = readdir(dirp);
+@@ -434,7 +434,7 @@
+ {
+ tmpfile = cp+1;
+ }
+- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,tmpfile);
++ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",tmpfile);
+
+
+ /*
+@@ -642,7 +642,7 @@
+ char path[MAXPATHLEN];
+
+ msqlTrace(TRACE_IN,"freeTmpTable()");
+- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,entry->table);
++ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",entry->table);
+ freeTableDef(entry->def);
+ entry->def = NULL;
+ *(entry->db) = 0;
diff --git a/databases/msql/files/post-install-notes b/databases/msql/files/post-install-notes
index 26e58bb76507..71ae6e0c0e3a 100644
--- a/databases/msql/files/post-install-notes
+++ b/databases/msql/files/post-install-notes
@@ -1,17 +1,21 @@
- README for Mini SQL Version 2.0 Beta 1
+ README for Mini SQL Version 2.0
-------------------------------------------------------------------------------
-Welcome to Mini SQL 2! It's been a long time coming but we hope the
-wait has been worth it. As the development of mSQL 2 continues, further
-funtionality will be made available. This release concentrates on
-adding the underlying performance and data handling features to mSQL.
-
-The software has changed quite a lot since the 1.x version of mSQL.
-Some of the new features are greatly improved support for indexing your
-data, much better performance for complex queries and large data sets,
-the addition of variable length TEXT fields, support for server managed
-numeric sequences, better regular expression handling, and easier
-control over the configuration of the server.
+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
diff --git a/databases/msql/pkg-plist b/databases/msql/pkg-plist
index f3a9137688f4..f959f75ec250 100644
--- a/databases/msql/pkg-plist
+++ b/databases/msql/pkg-plist
@@ -29,42 +29,17 @@ lib/lite_lex.o
lib/mod_lite.o
lib/mod_msql.o
lib/mod_std.o
+share/doc/msql/invoice.ps.gz
+share/doc/msql/manual.ps.gz
+share/doc/msql/manual.rtf.gz
share/doc/msql/License
share/doc/msql/README
share/doc/msql/HISTORY
share/doc/msql/README.sco
+share/doc/msql/INSTALL
+share/doc/msql/RELEASE_NOTES
+share/doc/msql/MSQL_BOOK
share/doc/msql/post-install-notes
-share/doc/msql/manual/add.gif
-share/doc/msql/manual/api.htm
-share/doc/msql/manual/api.spec
-share/doc/msql/manual/area.gif
-share/doc/msql/manual/blank.gif
-share/doc/msql/manual/config.htm
-share/doc/msql/manual/create_manual
-share/doc/msql/manual/deer.gif
-share/doc/msql/manual/delete.gif
-share/doc/msql/manual/edit.gif
-share/doc/msql/manual/fast_bul.gif
-share/doc/msql/manual/group.gif
-share/doc/msql/manual/hughes.gif
-share/doc/msql/manual/info.htm
-share/doc/msql/manual/lite.htm
-share/doc/msql/manual/logout.gif
-share/doc/msql/manual/mod_msql.htm
-share/doc/msql/manual/mod_std.htm
-share/doc/msql/manual/modules.htm
-share/doc/msql/manual/new.gif
-share/doc/msql/manual/priv.gif
-share/doc/msql/manual/spec.htm
-share/doc/msql/manual/sysvar.htm
-share/doc/msql/manual/user.gif
-share/doc/msql/manual/utils.htm
-share/doc/msql/manual/view.gif
-share/doc/msql/manual/w3-auth.gif
-share/doc/msql/manual/w3-auth.htm
-share/doc/msql/manual/w3-msql.htm
-share/doc/msql/manual/w3-sec.htm
-share/doc/msql/manual/welcome.htm
share/msql/makegen/directory.mm
share/msql/makegen/install.mm
share/msql/makegen/lex.mm
@@ -78,7 +53,7 @@ share/msql/makegen/program.mm
share/msql/makegen/site.mm
share/msql/makegen/touch.mm
share/msql/makegen/yacc.mm
-share/msql/misc/setup_www
+share/msql/misc/setup_w3auth
share/msql/www/bookmarks/README
share/msql/www/bookmarks/Welcome.html
share/msql/www/bookmarks/add.html
@@ -98,6 +73,7 @@ share/msql/www/bookmarks/search.gif
share/msql/www/bookmarks/search.html
share/msql/www/bookmarks/search_result.html
share/msql/www/bookmarks/wood.gif
+share/msql/www/bookmarks/setup_bookmark
share/msql/www/graphics/add.gif
share/msql/www/graphics/area.gif
share/msql/www/graphics/banner.gif
@@ -112,7 +88,6 @@ share/msql/www/graphics/user.gif
share/msql/www/graphics/view.gif
@dirrm etc/msql2
@dirrm include/common
-@dirrm share/doc/msql/manual
@dirrm share/doc/msql
@dirrm share/msql/makegen
@dirrm share/msql/misc
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index bb837e784596..5057ae486f40 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: msql2
-# Version required: 2.0b7.1
+# Version required: 2.0
# Date created: December 17th 1996
# Whom: jfitz
#
# $Id$
#
-DISTNAME= msql-2.0-B7.1
-PKGNAME= msql-2.0b7.1
+DISTNAME= msql-2.0-rel
+PKGNAME= msql-2.0
CATEGORIES= databases
-MASTER_SITES= ftp://ftp.worldone.com/pub/msql/ \
- http://www2.nerosworld.com/msql/ \
+MASTER_SITES= http://www2.nerosworld.com/msql/ \
http://hughes.com.au/software/msql2/
MAINTAINTER= jfitz@FreeBSD.ORG
@@ -40,6 +39,9 @@ post-install:
@for file in msql2d msqladmin msqlimport msqlexport; do\
/usr/bin/chgrp msql ${PREFIX}/bin/$$file; \
done
+ @for file in RELEASE_NOTES MSQL_BOOK INSTALL; do \
+ ${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/msql; \
+ done
@/bin/chmod 751 ${PREFIX}/etc/msql2/
@/usr/sbin/chown -R msql.msql ${PREFIX}/etc/msql2/
@${MKDIR} -p ${PREFIX}/etc/rc.d
diff --git a/databases/msql3/distinfo b/databases/msql3/distinfo
index 1af2a46d7c14..91a1083cdcd1 100644
--- a/databases/msql3/distinfo
+++ b/databases/msql3/distinfo
@@ -1 +1 @@
-MD5 (msql-2.0-B7.1.tar.gz) = 734edc40f50aa2e62ae41e092b41a567
+MD5 (msql-2.0-rel.tar.gz) = 87b4e817e36005291d1780a0bdc77c48
diff --git a/databases/msql3/files/patch-ac b/databases/msql3/files/patch-ac
index 7d5548ca2424..182eaa928dab 100644
--- a/databases/msql3/files/patch-ac
+++ b/databases/msql3/files/patch-ac
@@ -1,15 +1,15 @@
---- src/conf/site.mm.in.orig Mon Jan 13 10:15:08 1997
-+++ src/conf/site.mm.in Sun Jan 19 13:56:52 1997
+--- src/conf/site.mm.in.orig Sat Jul 5 21:28:52 1997
++++ src/conf/site.mm.in Thu Jul 10 13:44:15 1997
@@ -4,7 +4,7 @@
CC= @CC@
-INST_DIR= /usr/local/Hughes
+INST_DIR= /usr/local
+ HAVE_DYNAMIC= -DHAVE_DYNAMIC
- #
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
EXTRA_LIB= @LIBS@
# Any other CFlags required
diff --git a/databases/msql3/files/patch-ad b/databases/msql3/files/patch-ad
index 114d39893dc3..3c3e6e2123cf 100644
--- a/databases/msql3/files/patch-ad
+++ b/databases/msql3/files/patch-ad
@@ -1,6 +1,6 @@
---- scripts/make-install.orig Mon Jan 13 10:14:48 1997
-+++ scripts/make-install Sun Jan 19 14:43:51 1997
-@@ -1,16 +1,16 @@
+--- 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
@@ -20,7 +20,6 @@
+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/doc/msql/manual
+scripts/mkinstalldirs 0755 $INST_DIR/share/msql/misc
+scripts/mkinstalldirs 0755 $INST_DIR/share/msql/www
+scripts/mkinstalldirs 0755 $INST_DIR/share/msql/makegen
diff --git a/databases/msql3/files/patch-ae b/databases/msql3/files/patch-ae
index c84cbe97a479..52771f4ca9d6 100644
--- a/databases/msql3/files/patch-ae
+++ b/databases/msql3/files/patch-ae
@@ -1,6 +1,6 @@
---- src/Makefile.tmpl.orig Sat Jan 18 10:44:04 1997
-+++ src/Makefile.tmpl Tue Feb 4 17:26:44 1997
-@@ -32,19 +32,19 @@
+--- 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 ::
@@ -26,8 +26,8 @@
+ rm -f $(INST_DIR)/etc/msql2/msql.conf.old;\
+ mv $(INST_DIR)/etc/msql2/msql.conf $(INST_DIR)/etc/msql2/msql.conf.old;\
fi;\
-- cp ../../misc/msql.conf $(INST_DIR);\\
-+ cp ../../misc/msql.conf $(INST_DIR)/etc/msql2;\\
+- 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 "Installation of mSQL-2 complete." ;\\
echo ;\\
diff --git a/databases/msql3/files/patch-ai b/databases/msql3/files/patch-ai
index 070c8b9c4f4c..a7c866c82b8a 100644
--- a/databases/msql3/files/patch-ai
+++ b/databases/msql3/files/patch-ai
@@ -1,11 +1,20 @@
---- src/msql/msqld.c.orig Sat Feb 1 07:46:40 1997
-+++ src/msql/msqld.c Tue Feb 4 17:32:18 1997
-@@ -508,7 +508,7 @@
+--- 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)
{
- sprintf(confFile,"%s/msql.conf", INST_DIR);
+ sprintf(confFile,"%s/etc/msql2/msql.conf", INST_DIR);
}
- printf("Loading configuration from '%s'.\n",confFile);
+ printf("\tLoading configuration from '%s'.\n",confFile);
msqlLoadConfigFile(confFile);
+@@ -687,7 +687,7 @@
+ /*
+ ** Ensure that the correct user owns the database files
+ */
+- sprintf(path,"%s/msqldb",(char *)msqlGetCharConf("general","inst_dir"));
++ sprintf(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
index 3091cd08bf29..9769dc5953e4 100644
--- a/databases/msql3/files/patch-aj
+++ b/databases/msql3/files/patch-aj
@@ -1,16 +1,14 @@
---- misc/msql.conf.orig Mon Jan 13 10:14:37 1997
-+++ misc/msql.conf Sun Jan 19 14:16:56 1997
-@@ -17,10 +17,9 @@
-
- [general]
-
--Inst_Dir = /usr/local/Hughes
-+Inst_Dir = /usr/local
+--- 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/msql2.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
index cf94143ff3b7..4d94bbfde825 100644
--- a/databases/msql3/files/patch-ak
+++ b/databases/msql3/files/patch-ak
@@ -1,4 +1,3 @@
-diff -ruN src/msql/index.c src/msql/index.c
--- src/msql/index.c Fri Feb 7 10:06:42 1997
+++ src/msql/index.c Fri Feb 7 10:17:04 1997
@@ -105,7 +105,7 @@
@@ -19,244 +18,3 @@ diff -ruN src/msql/index.c src/msql/index.c
curIndex->name);
curIndex->tree = avlOpen(path);
curIndex->buf = (char *)malloc(curIndex->length + 1);
-diff -ruN src/msql/msqld.c src/msql/msqld.c
---- src/msql/msqld.c Fri Feb 7 10:06:42 1997
-+++ src/msql/msqld.c Fri Feb 7 10:16:49 1997
-@@ -577,7 +577,7 @@
- /*
- ** Ensure that the correct user owns the database files
- */
-- sprintf(path,"%s/msqldb",(char *)msqlGetCharConf("inst_dir"));
-+ sprintf(path,"/var/db/msqldb");
- if (stat(path,&sbuf) < 0)
- {
- printf("\nError! Can't stat '%s'\n\n",path);
-diff -ruN src/msql/msqldb.c src/msql/msqldb.c
---- src/msql/msqldb.c Fri Feb 7 10:06:42 1997
-+++ src/msql/msqldb.c Fri Feb 7 10:15:22 1997
-@@ -126,7 +126,7 @@
- #endif
-
- msqlTrace(TRACE_IN,"msqlListDBs()");
-- (void)sprintf(path,"%s/msqldb",msqlHomeDir);
-+ (void)sprintf(path,"/var/db/msqldb");
- dirp = opendir(path);
- if (!dirp)
- {
-@@ -187,7 +187,7 @@
- #endif
-
- msqlTrace(TRACE_IN,"msqlListTables()");
-- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
-+ (void)sprintf(path,"/var/db/msqldb/%s",db);
- dirp = opendir(path);
- if (!dirp)
- {
-@@ -1130,7 +1130,7 @@
- struct stat buf;
-
- msqlTrace(TRACE_IN,"msqlInit()");
-- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
-+ (void)sprintf(path,"/var/db/msqldb/%s",db);
- if (stat(path,&buf) < 0)
- {
- sprintf(errMsg,BAD_DB_ERROR,db);
-@@ -1165,7 +1165,7 @@
- /*
- ** Write the catalog entry
- */
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- fd = _sopen(defPath,O_RDONLY,SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1239,7 +1239,7 @@
- ** Create an empty table
- */
-
-- (void)sprintf(datPath,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+ (void)sprintf(datPath,"/var/db/msqldb/%s/%s.dat",db,table);
- (void)unlink(datPath);
- #ifdef OS2
- fd = _sopen(datPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
-@@ -1279,7 +1279,7 @@
- ** Create an empty index def file
- */
-
-- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
-+ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx",db,table);
- (void)unlink(idxPath);
- #ifdef OS2
- fd = _sopen(idxPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
-@@ -1302,7 +1302,7 @@
- /*
- ** Create an empty overflow file
- */
-- (void)sprintf(oflPath,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+ (void)sprintf(oflPath,"/var/db/msqldb/%s/%s.ofl",db,table);
- (void)unlink(oflPath);
- #ifdef OS2
- fd = _sopen(oflPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
-@@ -1454,10 +1454,10 @@
- /*
- ** Can't clash with another index either
- */
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
- index->table);
-
-- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
-+ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx-%s",db,
- index->table, index->name);
-
- #ifdef OS2
-@@ -1718,7 +1718,7 @@
- /*
- ** Now blow away the table files
- */
-- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- fp = fopen(path,"rb");
- #else
-@@ -1733,15 +1733,15 @@
- }
- (void)fclose(fp);
- unlink(path);
-- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
- unlink(path);
-- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
- unlink(path);
-
- /*
- ** Take care of the index files.
- */
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,table);
- #ifdef OS2
- fd = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1751,8 +1751,8 @@
- {
- while(read(fd,&tmp,sizeof(tmp)) == sizeof(tmp))
- {
-- (void)sprintf(path,"%s/msqldb/%s/%s.idx-%s",
-- msqlHomeDir,db,table,tmp.name);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.idx-%s",
-+ db,table,tmp.name);
- unlink(path);
- }
- close(fd);
-@@ -1791,7 +1791,7 @@
- return(-1);
- }
-
-- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
-+ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
- index->table);
- #ifdef OS2
- in = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
-@@ -1804,7 +1804,7 @@
- msqlTrace(TRACE_OUT,"msqlDropIndex()");
- return(-1);
- }
-- (void)sprintf(tmpPath,"%s/msqldb/%s/%s.idx-tmp",msqlHomeDir,db,
-+ (void)sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-tmp",db,
- index->table);
- #ifdef OS2
- out = _sopen(tmpPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO,
-@@ -1855,7 +1855,7 @@
- */
- unlink(defPath);
- rename(tmpPath,defPath);
-- sprintf(tmpPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
-+ sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-%s",db,
- index->table, index->name);
- unlink(tmpPath);
-
-@@ -2412,7 +2412,7 @@
- ** See if the directory exists
- */
-
-- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
-+ (void)sprintf(path,"/var/db/msqldb/%s", db);
- dirp = opendir(path);
- if (dirp)
- {
-@@ -2459,7 +2459,7 @@
- ** See if the directory exists
- */
-
-- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
-+ (void)sprintf(path,"/var/db/msqldb/%s", db);
- dirp = opendir(path);
- if (!dirp)
- {
-diff -ruN src/msql/table.c src/msql/table.c
---- src/msql/table.c Fri Feb 7 10:06:42 1997
-+++ src/msql/table.c Fri Feb 7 10:16:35 1997
-@@ -100,7 +100,7 @@
- {
- char path[MAXPATHLEN];
-
-- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
- #ifdef OS2
- return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
- #else
-@@ -115,7 +115,7 @@
- {
- char path[MAXPATHLEN];
-
-- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
- #ifdef OS2
- return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
- #else
-@@ -300,7 +300,7 @@
- static char buf[MAX_FIELDS * sizeof(field_t)];
-
- msqlTrace(TRACE_IN,"readTableDef()");
-- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- fd = _sopen(path, O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -367,7 +367,7 @@
- DIR *dirp;
- char path[MAXPATHLEN];
-
-- (void)sprintf(path,"%s/msqldb/.tmp",msqlHomeDir);
-+ (void)sprintf(path,"/var/db/msqldb/.tmp");
- dirp = opendir(path);
- if (!dirp)
- {
-@@ -387,7 +387,7 @@
- cur = readdir(dirp);
- continue;
- }
-- (void)sprintf(path,"%s/msqldb/.tmp/%s",msqlHomeDir,
-+ (void)sprintf(path,"/var/db/msqldb/.tmp/%s",
- cur->d_name);
- unlink(path);
- cur = readdir(dirp);
-@@ -434,7 +434,7 @@
- {
- tmpfile = cp+1;
- }
-- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,tmpfile);
-+ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",tmpfile);
-
-
- /*
-@@ -642,7 +642,7 @@
- char path[MAXPATHLEN];
-
- msqlTrace(TRACE_IN,"freeTmpTable()");
-- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,entry->table);
-+ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",entry->table);
- freeTableDef(entry->def);
- entry->def = NULL;
- *(entry->db) = 0;
diff --git a/databases/msql3/files/patch-al b/databases/msql3/files/patch-al
index e982bc5dd98a..3a751c6128a7 100644
--- a/databases/msql3/files/patch-al
+++ b/databases/msql3/files/patch-al
@@ -1,11 +1,11 @@
---- src/msql/acl.c.orig Mon Mar 17 13:54:34 1997
-+++ src/msql/acl.c Mon Mar 17 13:54:57 1997
-@@ -111,7 +111,7 @@
+--- 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)sprintf(path,"%s/msql.acl", (char *)msqlGetCharConf("inst_dir"));
-+ (void)sprintf(path,"%s/etc/msql2/msql.acl", (char *)msqlGetCharConf("inst_dir"));
+- (void)sprintf(path,"%s/msql.acl",
++ (void)sprintf(path,"%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
new file mode 100644
index 000000000000..7e6773b28892
--- /dev/null
+++ b/databases/msql3/files/patch-am
@@ -0,0 +1,162 @@
+--- src/msql/msqldb.c Fri Feb 7 10:06:42 1997
++++ src/msql/msqldb.c Fri Feb 7 10:15:22 1997
+@@ -126,7 +126,7 @@
+ #endif
+
+ msqlTrace(TRACE_IN,"msqlListDBs()");
+- (void)sprintf(path,"%s/msqldb",msqlHomeDir);
++ (void)sprintf(path,"/var/db/msqldb");
+ dirp = opendir(path);
+ if (!dirp)
+ {
+@@ -187,7 +187,7 @@
+ #endif
+
+ msqlTrace(TRACE_IN,"msqlListTables()");
+- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
++ (void)sprintf(path,"/var/db/msqldb/%s",db);
+ dirp = opendir(path);
+ if (!dirp)
+ {
+@@ -1130,7 +1130,7 @@
+ struct stat buf;
+
+ msqlTrace(TRACE_IN,"msqlInit()");
+- (void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
++ (void)sprintf(path,"/var/db/msqldb/%s",db);
+ if (stat(path,&buf) < 0)
+ {
+ sprintf(errMsg,BAD_DB_ERROR,db);
+@@ -1165,7 +1165,7 @@
+ /*
+ ** Write the catalog entry
+ */
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.def",db,table);
+ #ifdef OS2
+ fd = _sopen(defPath,O_RDONLY,SH_DENYNO, S_IREAD | S_IWRITE);
+ #else
+@@ -1239,7 +1239,7 @@
+ ** Create an empty table
+ */
+
+- (void)sprintf(datPath,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
++ (void)sprintf(datPath,"/var/db/msqldb/%s/%s.dat",db,table);
+ (void)unlink(datPath);
+ #ifdef OS2
+ fd = _sopen(datPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
+@@ -1279,7 +1279,7 @@
+ ** Create an empty index def file
+ */
+
+- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
++ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx",db,table);
+ (void)unlink(idxPath);
+ #ifdef OS2
+ fd = _sopen(idxPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
+@@ -1302,7 +1302,7 @@
+ /*
+ ** Create an empty overflow file
+ */
+- (void)sprintf(oflPath,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
++ (void)sprintf(oflPath,"/var/db/msqldb/%s/%s.ofl",db,table);
+ (void)unlink(oflPath);
+ #ifdef OS2
+ fd = _sopen(oflPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
+@@ -1454,10 +1454,10 @@
+ /*
+ ** Can't clash with another index either
+ */
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
+ index->table);
+
+- (void)sprintf(idxPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
++ (void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx-%s",db,
+ index->table, index->name);
+
+ #ifdef OS2
+@@ -1718,7 +1718,7 @@
+ /*
+ ** Now blow away the table files
+ */
+- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
+ #ifdef OS2
+ fp = fopen(path,"rb");
+ #else
+@@ -1733,15 +1733,15 @@
+ }
+ (void)fclose(fp);
+ unlink(path);
+- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
+ unlink(path);
+- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
+ unlink(path);
+
+ /*
+ ** Take care of the index files.
+ */
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,table);
+ #ifdef OS2
+ fd = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
+ #else
+@@ -1751,8 +1751,8 @@
+ {
+ while(read(fd,&tmp,sizeof(tmp)) == sizeof(tmp))
+ {
+- (void)sprintf(path,"%s/msqldb/%s/%s.idx-%s",
+- msqlHomeDir,db,table,tmp.name);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.idx-%s",
++ db,table,tmp.name);
+ unlink(path);
+ }
+ close(fd);
+@@ -1791,7 +1791,7 @@
+ return(-1);
+ }
+
+- (void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
++ (void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
+ index->table);
+ #ifdef OS2
+ in = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
+@@ -1804,7 +1804,7 @@
+ msqlTrace(TRACE_OUT,"msqlDropIndex()");
+ return(-1);
+ }
+- (void)sprintf(tmpPath,"%s/msqldb/%s/%s.idx-tmp",msqlHomeDir,db,
++ (void)sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-tmp",db,
+ index->table);
+ #ifdef OS2
+ out = _sopen(tmpPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO,
+@@ -1855,7 +1855,7 @@
+ */
+ unlink(defPath);
+ rename(tmpPath,defPath);
+- sprintf(tmpPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
++ sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-%s",db,
+ index->table, index->name);
+ unlink(tmpPath);
+
+@@ -2412,7 +2412,7 @@
+ ** See if the directory exists
+ */
+
+- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
++ (void)sprintf(path,"/var/db/msqldb/%s", db);
+ dirp = opendir(path);
+ if (dirp)
+ {
+@@ -2459,7 +2459,7 @@
+ ** See if the directory exists
+ */
+
+- (void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
++ (void)sprintf(path,"/var/db/msqldb/%s", db);
+ dirp = opendir(path);
+ if (!dirp)
+ {
diff --git a/databases/msql3/files/patch-an b/databases/msql3/files/patch-an
new file mode 100644
index 000000000000..e693499dea56
--- /dev/null
+++ b/databases/msql3/files/patch-an
@@ -0,0 +1,65 @@
+--- src/msql/table.c Fri Feb 7 10:06:42 1997
++++ src/msql/table.c Fri Feb 7 10:16:35 1997
+@@ -100,7 +100,7 @@
+ {
+ char path[MAXPATHLEN];
+
+- (void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
+ #ifdef OS2
+ return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
+ #else
+@@ -115,7 +115,7 @@
+ {
+ char path[MAXPATHLEN];
+
+- (void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
+ #ifdef OS2
+ return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
+ #else
+@@ -300,7 +300,7 @@
+ static char buf[MAX_FIELDS * sizeof(field_t)];
+
+ msqlTrace(TRACE_IN,"readTableDef()");
+- (void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
++ (void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
+ #ifdef OS2
+ fd = _sopen(path, O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
+ #else
+@@ -367,7 +367,7 @@
+ DIR *dirp;
+ char path[MAXPATHLEN];
+
+- (void)sprintf(path,"%s/msqldb/.tmp",msqlHomeDir);
++ (void)sprintf(path,"/var/db/msqldb/.tmp");
+ dirp = opendir(path);
+ if (!dirp)
+ {
+@@ -387,7 +387,7 @@
+ cur = readdir(dirp);
+ continue;
+ }
+- (void)sprintf(path,"%s/msqldb/.tmp/%s",msqlHomeDir,
++ (void)sprintf(path,"/var/db/msqldb/.tmp/%s",
+ cur->d_name);
+ unlink(path);
+ cur = readdir(dirp);
+@@ -434,7 +434,7 @@
+ {
+ tmpfile = cp+1;
+ }
+- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,tmpfile);
++ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",tmpfile);
+
+
+ /*
+@@ -642,7 +642,7 @@
+ char path[MAXPATHLEN];
+
+ msqlTrace(TRACE_IN,"freeTmpTable()");
+- (void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,entry->table);
++ (void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",entry->table);
+ freeTableDef(entry->def);
+ entry->def = NULL;
+ *(entry->db) = 0;
diff --git a/databases/msql3/files/post-install-notes b/databases/msql3/files/post-install-notes
index 26e58bb76507..71ae6e0c0e3a 100644
--- a/databases/msql3/files/post-install-notes
+++ b/databases/msql3/files/post-install-notes
@@ -1,17 +1,21 @@
- README for Mini SQL Version 2.0 Beta 1
+ README for Mini SQL Version 2.0
-------------------------------------------------------------------------------
-Welcome to Mini SQL 2! It's been a long time coming but we hope the
-wait has been worth it. As the development of mSQL 2 continues, further
-funtionality will be made available. This release concentrates on
-adding the underlying performance and data handling features to mSQL.
-
-The software has changed quite a lot since the 1.x version of mSQL.
-Some of the new features are greatly improved support for indexing your
-data, much better performance for complex queries and large data sets,
-the addition of variable length TEXT fields, support for server managed
-numeric sequences, better regular expression handling, and easier
-control over the configuration of the server.
+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
diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist
index f3a9137688f4..f959f75ec250 100644
--- a/databases/msql3/pkg-plist
+++ b/databases/msql3/pkg-plist
@@ -29,42 +29,17 @@ lib/lite_lex.o
lib/mod_lite.o
lib/mod_msql.o
lib/mod_std.o
+share/doc/msql/invoice.ps.gz
+share/doc/msql/manual.ps.gz
+share/doc/msql/manual.rtf.gz
share/doc/msql/License
share/doc/msql/README
share/doc/msql/HISTORY
share/doc/msql/README.sco
+share/doc/msql/INSTALL
+share/doc/msql/RELEASE_NOTES
+share/doc/msql/MSQL_BOOK
share/doc/msql/post-install-notes
-share/doc/msql/manual/add.gif
-share/doc/msql/manual/api.htm
-share/doc/msql/manual/api.spec
-share/doc/msql/manual/area.gif
-share/doc/msql/manual/blank.gif
-share/doc/msql/manual/config.htm
-share/doc/msql/manual/create_manual
-share/doc/msql/manual/deer.gif
-share/doc/msql/manual/delete.gif
-share/doc/msql/manual/edit.gif
-share/doc/msql/manual/fast_bul.gif
-share/doc/msql/manual/group.gif
-share/doc/msql/manual/hughes.gif
-share/doc/msql/manual/info.htm
-share/doc/msql/manual/lite.htm
-share/doc/msql/manual/logout.gif
-share/doc/msql/manual/mod_msql.htm
-share/doc/msql/manual/mod_std.htm
-share/doc/msql/manual/modules.htm
-share/doc/msql/manual/new.gif
-share/doc/msql/manual/priv.gif
-share/doc/msql/manual/spec.htm
-share/doc/msql/manual/sysvar.htm
-share/doc/msql/manual/user.gif
-share/doc/msql/manual/utils.htm
-share/doc/msql/manual/view.gif
-share/doc/msql/manual/w3-auth.gif
-share/doc/msql/manual/w3-auth.htm
-share/doc/msql/manual/w3-msql.htm
-share/doc/msql/manual/w3-sec.htm
-share/doc/msql/manual/welcome.htm
share/msql/makegen/directory.mm
share/msql/makegen/install.mm
share/msql/makegen/lex.mm
@@ -78,7 +53,7 @@ share/msql/makegen/program.mm
share/msql/makegen/site.mm
share/msql/makegen/touch.mm
share/msql/makegen/yacc.mm
-share/msql/misc/setup_www
+share/msql/misc/setup_w3auth
share/msql/www/bookmarks/README
share/msql/www/bookmarks/Welcome.html
share/msql/www/bookmarks/add.html
@@ -98,6 +73,7 @@ share/msql/www/bookmarks/search.gif
share/msql/www/bookmarks/search.html
share/msql/www/bookmarks/search_result.html
share/msql/www/bookmarks/wood.gif
+share/msql/www/bookmarks/setup_bookmark
share/msql/www/graphics/add.gif
share/msql/www/graphics/area.gif
share/msql/www/graphics/banner.gif
@@ -112,7 +88,6 @@ share/msql/www/graphics/user.gif
share/msql/www/graphics/view.gif
@dirrm etc/msql2
@dirrm include/common
-@dirrm share/doc/msql/manual
@dirrm share/doc/msql
@dirrm share/msql/makegen
@dirrm share/msql/misc