27 files changed, 314 insertions, 350 deletions

diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index 2388bfe5cbd6..22e773b5415c 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	msql
-PORTVERSION=	2.0.4.1
+PORTVERSION=    2.0.11
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
@@ -21,21 +21,25 @@ MAKE_ENV+=	WRKSRC=${WRKSRC}
 # dumped your databases (or just build with -DOVERWRITE_DB)
 #OVERWRITE_DB=	YES
 
+post-patch:
+		cp ${FILESDIR}/sobject.mm ${WRKSRC}/src/makegen
+
 do-configure:
-		cd ${WRKSRC}; make target
+		cd ${WRKSRC}; ${MAKE} target
 		cd ${WRKSRC}/targets/freebsd; ${SETENV} ${MAKE_ENV} ./setup
-		@${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/customize_scripts
+		@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/customize_scripts
 
 pre-install:
-		@${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
-		@${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
+		@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/check_old_version
+		@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/createuser
 
 post-install:
 		@${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin
 		@${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/msql
-		@for file in msql2d msqladmin msqlimport msqlexport; do\
+		@for file in msqladmin msqlimport msqlexport; do\
 			/usr/bin/chgrp msql ${PREFIX}/bin/$$file; \
 		done
+		/usr/bin/chgrp msql ${PREFIX}/sbin/msql2d
 		@for file in RELEASE_NOTES MSQL_BOOK INSTALL; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/msql; \
 		done
diff --git a/databases/msql3/distinfo b/databases/msql3/distinfo
index 0b1c1e5cf67f..d43a362eaf34 100644
--- a/databases/msql3/distinfo
+++ b/databases/msql3/distinfo
@@ -1 +1 @@
-MD5 (msql-2.0.4.1.tar.gz) = d715775b36d3488432b7abb785090251
+MD5 (msql-2.0.11.tar.gz) = 199890d9cd536d878f68458f4f5db3e5
diff --git a/databases/msql3/files/msql2.sh b/databases/msql3/files/msql2.sh
index b6aa3f232519..54e0e7762406 100644
--- a/databases/msql3/files/msql2.sh
+++ b/databases/msql3/files/msql2.sh
@@ -7,7 +7,7 @@ fi
 
 case "$1" in
 start)
-	[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c "exec ${PREFIX}/bin/msql2d" > /dev/null 2>&1 & && echo -n ' msql2'
+	[ -x ${PREFIX}/sbin/msql2d ] && su -f -l msql -c "exec ${PREFIX}/sbin/msql2d" > /dev/null 2>&1 & && echo -n ' msql2'
 	;;
 stop)
 	killall msql2d && echo -n ' msql2d' && rm -f ${PREFIX}/etc/msql2/msql2d.pid
diff --git a/databases/msql3/files/patch-ab b/databases/msql3/files/patch-ab
index d2604d398599..09e6675f2872 100644
--- a/databases/msql3/files/patch-ab
+++ b/databases/msql3/files/patch-ab
@@ -1,6 +1,6 @@
---- 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 @@
+--- scripts/run_daemon.orig	Thu Aug 19 07:33:07 1999
++++ scripts/run_daemon	Sat Jan 27 11:08:59 2001
+@@ -9,24 +9,26 @@
  #
  #					bambi@Bond.edu.au
  
@@ -29,10 +29,12 @@
  while :
  do
 -	cd ${INST_DIR}/debug/${PROG}
+-	${INST_DIR}/bin/${PROG} > output 2>&1
 +	cd /tmp/debug/${PROG}
- 	${INST_DIR}/bin/${PROG} > output 2>&1
++	${INST_DIR}/sbin/${PROG} > output 2>&1
  	echo "Program : ${PROG}
  Time : `date`
+ Program Output
 @@ -34,6 +36,6 @@
  
  " > mail.tmp
diff --git a/databases/msql3/files/patch-ac b/databases/msql3/files/patch-ac
index 81b33b652da2..e2e743225276 100644
--- a/databases/msql3/files/patch-ac
+++ b/databases/msql3/files/patch-ac
@@ -1,5 +1,5 @@
---- 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
+--- src/conf/site.mm.in.orig	Thu Aug 19 07:33:09 1999
++++ src/conf/site.mm.in	Sat Jan 27 08:26:29 2001
 @@ -3,8 +3,8 @@
  #
  
@@ -10,17 +10,11 @@
 +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
- 
+ LINK_ONLY_FLAGS= @LINUX_DYNAMIC@
+@@ -44,5 +44,5 @@
  # Directory for pid file
  PID_DIR= @PID_DIR@
  
--CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
-+CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS)
+-CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE)
++CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE)
  LDLIBS= -L$(TOP)/lib $(EXTRA_LIB)
diff --git a/databases/msql3/files/patch-ad b/databases/msql3/files/patch-ad
index 3c3e6e2123cf..a5ca8a60afce 100644
--- a/databases/msql3/files/patch-ad
+++ b/databases/msql3/files/patch-ad
@@ -1,5 +1,5 @@
---- scripts/make-install.orig	Sat Jan 18 08:53:09 1997
-+++ scripts/make-install	Thu Jul 10 14:08:57 1997
+--- scripts/make-install.orig	Thu Aug 19 07:33:07 1999
++++ scripts/make-install	Sat Jan 27 10:52:17 2001
 @@ -1,16 +1,15 @@
  #!/bin/sh
  
@@ -16,6 +16,7 @@
 -scripts/mkinstalldirs 0755    $INST_DIR/www
 -scripts/mkinstalldirs 0755    $INST_DIR/misc
 -scripts/mkinstalldirs 0755    $INST_DIR/makegen
+-scripts/mkinstalldirs 0755    $INST_DIR/modules
 +scripts/mkinstalldirs 0755    $INST_DIR/etc/msql2
 +scripts/mkinstalldirs 0700    /var/db/msqldb
 +scripts/mkinstalldirs 0700    /var/db/msqldb/.tmp
@@ -24,5 +25,5 @@
 +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
++scripts/mkinstalldirs 0755    $INST_DIR/libexec/msql
  
diff --git a/databases/msql3/files/patch-ae b/databases/msql3/files/patch-ae
index 52771f4ca9d6..4ca7032adbf7 100644
--- a/databases/msql3/files/patch-ae
+++ b/databases/msql3/files/patch-ae
@@ -1,6 +1,14 @@
---- 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 @@
+--- src/Makefile.tmpl.orig	Thu Aug 19 07:33:07 1999
++++ src/Makefile.tmpl	Sat Jan 27 08:10:08 2001
+@@ -14,7 +14,6 @@
+ 
+ 
+ !directory common all,clean,install
+-!directory regexp all,clean,install
+ !directory msql all,clean,install
+ 
+ !directory lang-common all,clean,install
+@@ -31,19 +30,19 @@
  	echo
  
  install ::
diff --git a/databases/msql3/files/patch-af b/databases/msql3/files/patch-af
index 0d247f5ce08e..6379991ea961 100644
--- a/databases/msql3/files/patch-af
+++ b/databases/msql3/files/patch-af
@@ -1,6 +1,24 @@
---- 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 @@
+--- src/msql/Makefile.tmpl.orig	Thu Aug 19 07:33:13 1999
++++ src/msql/Makefile.tmpl	Sat Jan 27 11:04:06 2001
+@@ -67,7 +67,7 @@
+ !object select_test.o select_test.c 
+ !program select_test select_test.o,libmsql.a
+ 
+-!program msql2d msqld.o,msql_yacc.o,msql_lex.o,msql_proc.o,net.o,msqldb.o,acl.o,index.o,types.o,regex.o,varchar.o,memory.o,table.o,select.o,cra.o,sort.o,distinct.o,sysvar.o,funct.o,avl_tree.o ../common/debug.o,../common/strtoul.o,-lregexp,libmsql.a
++!program msql2d msqld.o,msql_yacc.o,msql_lex.o,msql_proc.o,net.o,msqldb.o,acl.o,index.o,types.o,regex.o,varchar.o,memory.o,table.o,select.o,cra.o,sort.o,distinct.o,sysvar.o,funct.o,avl_tree.o ../common/debug.o,../common/strtoul.o,-lcompat,libmsql.a
+ 
+ msql2d: libmsql.a
+ 
+@@ -76,7 +76,7 @@
+ 	msqldb.o 
+ 
+ !install msql $(INST_DIR)/bin/msql 0755
+-!install msql2d $(INST_DIR)/bin/msql2d 0750 $(ROOT)
++!install msql2d $(INST_DIR)/sbin/msql2d 0750 $(ROOT)
+ !install msqladmin $(INST_DIR)/bin/msqladmin 0750 $(ROOT)
+ !install msqlexport $(INST_DIR)/bin/msqlexport 0750 $(ROOT)
+ !install msqlimport $(INST_DIR)/bin/msqlimport 0750 $(ROOT)
+@@ -84,7 +84,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)
diff --git a/databases/msql3/files/patch-ag b/databases/msql3/files/patch-ag
index 3ec810f95f4f..9f1f6bf41c1a 100644
--- a/databases/msql3/files/patch-ag
+++ b/databases/msql3/files/patch-ag
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/msql/config.c.orig	Thu Aug 19 07:33:13 1999
++++ src/msql/config.c	Sat Jan 27 07:42:07 2001
+@@ -344,11 +344,11 @@
  	msqlConfigLoaded = 1;
  	if (file)
  	{
@@ -14,12 +14,12 @@
  			fp = fopen(buf,"r");
  		}
  		if (!fp)
-@@ -325,7 +325,7 @@
- 	}
- 	else
- 	{
+@@ -385,7 +385,7 @@
+ #endif
+ 
+ #if defined(_OS_UNIX)
 -		snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR);
 +		snprintf(buf,sizeof(buf),"%s/etc/msql2/msql.conf", INST_DIR);
+ #endif
  		fp = fopen(buf,"r");
  	}
- 	if (!fp)
diff --git a/databases/msql3/files/patch-ai b/databases/msql3/files/patch-ai
index dcf168a1f723..b4d54537c56d 100644
--- a/databases/msql3/files/patch-ai
+++ b/databases/msql3/files/patch-ai
@@ -1,21 +1,11 @@
---- 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)
+--- src/msql/msqld.c.orig	Thu Aug 19 07:33:20 1999
++++ src/msql/msqld.c	Sat Jan 27 07:45:13 2001
+@@ -749,7 +749,7 @@
+ #endif
+ #if defined(_OS_UNIX)
  	{
 -		snprintf(confFile,sizeof(confFile),"%s/msql.conf", INST_DIR);
 +		snprintf(confFile,sizeof(confFile),"%s/etc/msql2/msql.conf", INST_DIR);
  	}
+ #endif
  	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
index 9769dc5953e4..dbde5e233f4f 100644
--- a/databases/msql3/files/patch-aj
+++ b/databases/msql3/files/patch-aj
@@ -1,7 +1,11 @@
---- 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 @@
+--- misc/msql.conf.orig	Thu Aug 19 07:33:07 1999
++++ misc/msql.conf	Sat Jan 27 07:56:32 2001
+@@ -18,12 +18,12 @@
+ [general]
+ 
  Inst_Dir = _INST_
+-DB_Dir = %I/msqldb
++DB_Dir = /var/db/msqldb
  mSQL_User = msql
  Admin_User = root
 -Pid_File = %I/msql2d.pid
diff --git a/databases/msql3/files/patch-ak b/databases/msql3/files/patch-ak
index ead616de559e..5004489d2098 100644
--- a/databases/msql3/files/patch-ak
+++ b/databases/msql3/files/patch-ak
@@ -1,22 +1,11 @@
---- 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;
+--- src/w3-msql/Makefile.tmpl.bak	Thu Aug 19 07:33:22 1999
++++ src/w3-msql/Makefile.tmpl	Sat Jan 27 08:36:58 2001
+@@ -14,7 +14,7 @@
+ !object w3-msql.o w3-msql.c
+ !object w3-auth.o w3-auth.c
+ 
+-!program w3-msql mod_w3msql.o,w3-msql.o,lexer.o,modules.o,auth.o,http.o,../lang-common/mod_std.o,../lang-common/mod_msql.o,../lang-common/liblite.a,../msql/libmsql.a,../regexp/libregexp.a
++!program w3-msql mod_w3msql.o,w3-msql.o,lexer.o,modules.o,auth.o,http.o,../lang-common/mod_std.o,../lang-common/mod_msql.o,../lang-common/liblite.a,../msql/libmsql.a,-lcompat
+ 
+ !program w3-auth w3-auth.o,http.o,../lang-common/fcrypt.o,../msql/libmsql.a
  
-         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-am b/databases/msql3/files/patch-am
index a10e4099d0b1..8b687c88e491 100644
--- a/databases/msql3/files/patch-am
+++ b/databases/msql3/files/patch-am
@@ -1,171 +1,20 @@
---- 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)
- 	{
+--- src/msql/regex.c.orig	Thu Aug 19 07:33:20 1999
++++ src/msql/regex.c	Sat Jan 27 09:07:01 2001
+@@ -47,7 +47,7 @@
+ #include <common/debug.h>
+ #include <common/site.h>
+ #include <common/portability.h>
+-#include <regexp/regexp.h>
++#include <regexp.h>
+ 
+ 
+ #if defined(_OS_WIN32)
+@@ -440,7 +440,7 @@
+  * executor in order to indicate that they have experienced errors.
+  * In mSQL's case, simply incrementing regErrFlag is all that is needed.
+  */
+-void regerror()
++void regerror(const char *s)
+ {
+   regErrFlag++;
+ }
diff --git a/databases/msql3/files/patch-an b/databases/msql3/files/patch-an
index ce08707d13fb..9b3874846332 100644
--- a/databases/msql3/files/patch-an
+++ b/databases/msql3/files/patch-an
@@ -1,71 +1,11 @@
---- 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];
+--- src/msql/sysvar.c.bak	Thu Aug 19 07:33:20 1999
++++ src/msql/sysvar.c	Sat Jan 27 08:47:48 2001
+@@ -46,7 +46,7 @@
+ #include <common/debug.h>
+ #include <common/site.h>
+ #include <common/portability.h>
+-#include <regexp/regexp.h>
++#include <regexp.h>
  
--	(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;
+ #if defined(_OS_WIN32)
diff --git a/databases/msql3/files/patch-ao b/databases/msql3/files/patch-ao
index 5e8b8e9d683e..a3ca64ea16c4 100644
--- a/databases/msql3/files/patch-ao
+++ b/databases/msql3/files/patch-ao
@@ -1,20 +1,11 @@
---- 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);
+--- src/msql/types.c.bak	Thu Aug 19 07:33:20 1999
++++ src/msql/types.c	Sat Jan 27 08:47:48 2001
+@@ -47,7 +47,7 @@
+ #include <common/debug.h>
+ #include <common/site.h>
+ #include <common/portability.h>
+-#include <regexp/regexp.h>
++#include <regexp.h>
+ 
+ 
+ #if defined(_OS_WIN32)
diff --git a/databases/msql3/files/patch-ap b/databases/msql3/files/patch-ap
new file mode 100644
index 000000000000..ef4ad1c4a1f6
--- /dev/null
+++ b/databases/msql3/files/patch-ap
@@ -0,0 +1,11 @@
+--- src/msql/varchar.c.bak	Thu Aug 19 07:33:20 1999
++++ src/msql/varchar.c	Sat Jan 27 08:47:48 2001
+@@ -47,7 +47,7 @@
+ #include <common/debug.h>
+ #include <common/site.h>
+ #include <common/portability.h>
+-#include <regexp/regexp.h>
++#include <regexp.h>
+ 
+ 
+ #if defined(_OS_WIN32)
diff --git a/databases/msql3/files/patch-aq b/databases/msql3/files/patch-aq
new file mode 100644
index 000000000000..8bbb17ac32c5
--- /dev/null
+++ b/databases/msql3/files/patch-aq
@@ -0,0 +1,11 @@
+--- src/w3-msql/mod_w3msql.c.bak	Thu Aug 19 07:33:23 1999
++++ src/w3-msql/mod_w3msql.c	Sat Jan 27 08:51:39 2001
+@@ -35,7 +35,7 @@
+ 
+ #include <common/portability.h>
+ #include "lite.h"
+-#include "regexp/regexp.h"
++#include <regexp.h>
+ 
+ #include <time.h>
+ 
diff --git a/databases/msql3/files/patch-ar b/databases/msql3/files/patch-ar
new file mode 100644
index 000000000000..e288ac89def7
--- /dev/null
+++ b/databases/msql3/files/patch-ar
@@ -0,0 +1,11 @@
+--- src/lite/mod_lite.c.bak	Thu Aug 19 07:33:12 1999
++++ src/lite/mod_lite.c	Sat Jan 27 08:52:54 2001
+@@ -31,7 +31,7 @@
+ #include <sys/socket.h>
+ 
+ #include "lite.h"
+-#include "regexp/regexp.h"
++#include <regexp.h>
+ 
+ #include <time.h>
+ 
diff --git a/databases/msql3/files/patch-as b/databases/msql3/files/patch-as
new file mode 100644
index 000000000000..3b8259372891
--- /dev/null
+++ b/databases/msql3/files/patch-as
@@ -0,0 +1,25 @@
+--- src/lite/Makefile.tmpl.orig	Thu Aug 19 07:33:12 1999
++++ src/lite/Makefile.tmpl	Sat Jan 27 11:16:03 2001
+@@ -10,11 +10,11 @@
+ 
+ !object lite.o lite.c
+ !object lite_lex.o lite_lex.c
+-!object mod_lite.o mod_lite.c
++!sobject mod_lite.o mod_lite.c
+ !object modules.o modules.c
+ 
+ 
+-!program lite mod_lite.o,../lang-common/mod_std.o,../lang-common/mod_msql.o,lite.o,lite_lex.o,modules.o,../msql/libmsql.a,../regexp/libregexp.a,../lang-common/liblite.a
++!program lite mod_lite.o,../lang-common/mod_std.o,../lang-common/mod_msql.o,lite.o,lite_lex.o,modules.o,../msql/libmsql.a,../lang-common/liblite.a,-lcompat
+ 
+ #
+ # Debugging compilations
+@@ -33,7 +33,7 @@
+ 
+ !install lite $(INST_DIR)/bin/lite 0755
+ !install lite_lex.o $(INST_DIR)/lib/lite_lex.o 0755
+-!install mod_lite.o $(INST_DIR)/lib/mod_lite.o 0755
++!install mod_lite.o $(INST_DIR)/libexec/msql/mod_lite.so 0755
+ 
+ mod_lite.o: ../lang-common/lite.h 
+ mod_lite.o: ../common/portability.h
diff --git a/databases/msql3/files/patch-at b/databases/msql3/files/patch-at
new file mode 100644
index 000000000000..77345aa1d9c5
--- /dev/null
+++ b/databases/msql3/files/patch-at
@@ -0,0 +1,11 @@
+--- src/lang-common/code-sim.c.bak	Thu Aug 19 07:33:10 1999
++++ src/lang-common/code-sim.c	Sat Jan 27 08:57:29 2001
+@@ -42,7 +42,7 @@
+ #include "y.tab.h"
+ #include "lite.h"
+ #include "lite_priv.h"
+-#include "regexp/regexp.h"
++#include <regexp.h>
+ 
+ extern	char	*scriptBuf;
+ extern	code_t	*codeHead;
diff --git a/databases/msql3/files/patch-au b/databases/msql3/files/patch-au
new file mode 100644
index 000000000000..88e9cd5203b1
--- /dev/null
+++ b/databases/msql3/files/patch-au
@@ -0,0 +1,11 @@
+--- src/lang-common/mod_std.c.bak	Thu Aug 19 07:33:11 1999
++++ src/lang-common/mod_std.c	Sat Jan 27 08:57:29 2001
+@@ -43,7 +43,7 @@
+ 
+ #include <common/portability.h>
+ #include "lite.h"
+-#include "regexp/regexp.h"
++#include <regexp.h>
+ 
+ #include <time.h>
+ #ifdef HAVE_SYS_TIMEB_H
diff --git a/databases/msql3/files/patch-av b/databases/msql3/files/patch-av
new file mode 100644
index 000000000000..6705fa640c9f
--- /dev/null
+++ b/databases/msql3/files/patch-av
@@ -0,0 +1,20 @@
+--- src/lang-common/types.c.orig	Thu Aug 19 07:33:11 1999
++++ src/lang-common/types.c	Sat Jan 27 09:09:39 2001
+@@ -23,7 +23,7 @@
+ 
+ #include "lite.h"
+ #include "y.tab.h"
+-#include <regexp/regexp.h>
++#include <regexp.h>
+ 
+ extern	char	*errMsg;
+ 
+@@ -811,7 +811,7 @@
+ 
+ 
+ void regerror(msg)
+-	char	*msg;
++	const char    *msg;
+ {
+ 	char	buf[160];
+ 
diff --git a/databases/msql3/files/patch-aw b/databases/msql3/files/patch-aw
new file mode 100644
index 000000000000..e0478cb3cc98
--- /dev/null
+++ b/databases/msql3/files/patch-aw
@@ -0,0 +1,20 @@
+--- src/msql/time.c.bak	Thu Aug 19 07:33:20 1999
++++ src/msql/time.c	Sat Jan 27 10:12:49 2001
+@@ -239,6 +239,7 @@
+ 		return(-1);
+ 	if (year < 100 && strlen(cp2+1) == 2)
+ 	{
++#if 0 /* regression test fails otherwise */
+ 		char	yearBuf[10];
+ 		struct	tm *locTime;
+ 		time_t	clock;
+@@ -248,6 +249,9 @@
+ 		strftime(yearBuf,10,"%Y",locTime);
+ 		yearBuf[2] = 0;
+ 		year = (atoi(yearBuf) * 100) + year;
++#else
++		year += 1900;
++#endif
+ 	}
+ 	year += 4096;
+ 
diff --git a/databases/msql3/files/patch-ax b/databases/msql3/files/patch-ax
new file mode 100644
index 000000000000..e9ec2ca87308
--- /dev/null
+++ b/databases/msql3/files/patch-ax
@@ -0,0 +1,22 @@
+--- src/lang-common/Makefile.tmpl.orig	Thu Aug 19 07:33:10 1999
++++ src/lang-common/Makefile.tmpl	Sat Jan 27 11:12:34 2001
+@@ -15,15 +15,15 @@
+ 
+ !yacc parser.y
+ 
+-!object mod_std.o mod_std.c
+-!object mod_msql.o mod_msql.c
++!sobject mod_std.o mod_std.c
++!sobject mod_msql.o mod_msql.c
+ 
+ !library_unix liblite.a symtab.c,types.c,code-gen.c,code-sim.c,extern.c,fcrypt.c,lib.c parser.o
+ !dll_os2 lite symtab.c,types.c,code-sim.c,extern.c,fcrypt.c,lib.c,code-gen.c,parser.c ../regexp/libregexp.a
+ 
+ !libinstall liblite.a $(INST_DIR)/lib/liblite.a 744 $(ROOT)
+-!install mod_std.o $(INST_DIR)/lib/mod_std.o 744 $(ROOT)
+-!install mod_msql.o $(INST_DIR)/lib/mod_msql.o 744 $(ROOT)
++!install mod_std.o $(INST_DIR)/libexec/msql/mod_std.so 744 $(ROOT)
++!install mod_msql.o $(INST_DIR)/libexec/msql/mod_msql.so 744 $(ROOT)
+ !install mod_std.h $(INST_DIR)/include/mod_std.h 744 $(ROOT)
+ !install mod_msql.h $(INST_DIR)/include/mod_msql.h 744 $(ROOT)
+ !install lite.h $(INST_DIR)/include/lite.h 744 $(ROOT)
diff --git a/databases/msql3/files/patch-ay b/databases/msql3/files/patch-ay
new file mode 100644
index 000000000000..a0782434b43c
--- /dev/null
+++ b/databases/msql3/files/patch-ay
@@ -0,0 +1,11 @@
+--- src/lang-common//extern.c.bak	Thu Aug 19 07:33:10 1999
++++ src/lang-common//extern.c	Sat Jan 27 10:38:40 2001
+@@ -282,7 +282,7 @@
+ #if defined(_OS_OS2) || defined(_OS_WIN32)
+ 	sprintf(path,"%s.dll", tmp);
+ #else
+-	sprintf(path,"%s/modules/%s.so", INST_DIR,tmp);
++	sprintf(path,"%s/libexec/msql/%s.so", INST_DIR,tmp);
+ #endif
+ 	modPtr = dlopen(path,1);
+ 	if (modPtr == NULL)
diff --git a/databases/msql3/files/sobject.mm b/databases/msql3/files/sobject.mm
new file mode 100644
index 000000000000..66fe3a45de27
--- /dev/null
+++ b/databases/msql3/files/sobject.mm
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. $MACRO_DIR/makegen/makegen.cf
+
+obj=$1
+src=$2
+shift; shift
+deps=$*
+
+base=`echo $src | sed "s/\..*//"`
+
+echo
+echo	"# Make rules for building $obj"
+echo
+echo	"$obj : $src Makefile.full $deps"
+echo	'	$(CC) $(CC_FLAGS) -fpic -DPIC -o '$obj' -c $(SOURCE_DIR)'/$src
+echo
+echo	"clean ::"
+echo	"	rm -f $obj $base.lint"
+echo
diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist
index ce459cf0bea3..f4c79750cc29 100644
--- a/databases/msql3/pkg-plist
+++ b/databases/msql3/pkg-plist
@@ -1,6 +1,5 @@
 bin/lite
 bin/msql
-bin/msql2d
 bin/msqladmin
 bin/msqldump
 bin/msqlexport
@@ -18,14 +17,13 @@ include/lite.h
 include/mod_msql.h
 include/mod_std.h
 include/msql.h
-include/regexp.h
 lib/liblite.a
 lib/libmsql.a
-lib/libregexp.a
 lib/lite_lex.o
-lib/mod_lite.o
-lib/mod_msql.o
-lib/mod_std.o
+libexec/msql/mod_lite.so
+libexec/msql/mod_msql.so
+libexec/msql/mod_std.so
+sbin/msql2d
 share/doc/msql/HISTORY
 share/doc/msql/INSTALL
 share/doc/msql/License
@@ -46,14 +44,17 @@ share/doc/msql/manual-html/manual.html
 share/doc/msql/manual.ps.gz
 share/doc/msql/post-install-notes
 share/msql/makegen/directory.mm
+share/msql/makegen/dll_os2.mm
 share/msql/makegen/install.mm
 share/msql/makegen/lex.mm
 share/msql/makegen/libinstall.mm
-share/msql/makegen/library.mm
+share/msql/makegen/library_os2.mm
+share/msql/makegen/library_unix.mm
 share/msql/makegen/makegen
 share/msql/makegen/makegen.cf
 share/msql/makegen/makegen.cf.in
 share/msql/makegen/object.mm
+share/msql/makegen/sobject.mm
 share/msql/makegen/program.mm
 share/msql/makegen/site.mm
 share/msql/makegen/touch.mm
@@ -70,15 +71,15 @@ share/msql/www/bookmarks/create.html
 share/msql/www/bookmarks/delete.gif
 share/msql/www/bookmarks/delete.html
 share/msql/www/bookmarks/dump.msql
-share/msql/www/bookmarks/home.gif
 share/msql/www/bookmarks/folder.gif
+share/msql/www/bookmarks/home.gif
 share/msql/www/bookmarks/mark-big.gif
 share/msql/www/bookmarks/remove.html
 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/bookmarks/wood.gif
 share/msql/www/graphics/add.gif
 share/msql/www/graphics/area.gif
 share/msql/www/graphics/banner.gif