Version 3 of the Mini SQL relational database system

PR:		ports/67319
Submitted by:	Andrey Slusar <vasallia@ukr.net>
Approved by:	krion (mentor) (implicit)

39 files changed, 60 insertions, 1090 deletions

diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index cd43944c7ff1..1d2dd188fc21 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -1,17 +1,16 @@
-# New ports collection makefile for:	msql2
-# Date created:		December 17th 1996
-# Whom:			jfitz
+# New ports collection makefile for:	msql3
+# Date created:		24 May 2004
+# Whom:			Andrey Slusar <vasallia@ukr.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	msql
-PORTVERSION=	2.0.12
-PORTREVISION=	4
+PORTVERSION=	3.5
 CATEGORIES=	databases
 
 MAINTAINER=	vasallia@ukr.net
-COMMENT=	The Mini SQL server, version 2
+COMMENT=	Version 3 of the Mini SQL relational database system
 
 INSTALLS_SHLIB=	YES
 USE_PERL5=	YES
@@ -20,55 +19,39 @@ USE_REINPLACE=	YES
 # Not free for commercial use.
 RESTRICTED=	"restrictive copyright (no commercial use)"
 
-CFLAGS+=	-DANSI_ARGS
 MAKE_ENV+=	WRKSRC=${WRKSRC}
 
-# Uncomment this if you're upgrading from <= b4 to >= b5 and have already
-# dumped your databases (or just build with -DOVERWRITE_DB)
-#OVERWRITE_DB=	YES
-
 post-patch:
 		cd ${FILESDIR}; \
-		cp slibinstall.mm slibrary_unix.mm ${WRKSRC}/src/makegen
-		@${REINPLACE_CMD} -e "s|'bison -y' byacc|byacc 'bison -y'|g" \
-			${WRKSRC}/src/conf/configure
+		${REINPLACE_CMD} -e "s|'bison -y' byacc|byacc 'bison -y'|g" \
+			${WRKSRC}/conf/configure
 
 do-configure:
-		cd ${WRKSRC}; ${MAKE} target
-		cd ${WRKSRC}/targets/freebsd; ${SETENV} ${MAKE_ENV} ./setup
+		cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./setup
 		@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/customize_scripts
 
 pre-install:
-		@${SETENV} ${MAKE_ENV} ${PERL} ${SCRIPTDIR}/check_old_version
-	pwd
 		@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 		@${INSTALL_SCRIPT} ${WRKSRC}/scripts/run_daemon ${PREFIX}/bin
-		@${INSTALL_DATA} ${FILESDIR}/post-install-notes ${PREFIX}/share/doc/msql
-		@for file in msqladmin msqlimport msqlexport; do\
-			${CHGRP} msql ${PREFIX}/bin/$$file; \
-		done
-		${CHGRP} msql ${PREFIX}/sbin/msql2d
-		@for file in RELEASE_NOTES MSQL_BOOK INSTALL; do \
-			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/msql; \
+		@for f in msqladmin msqlimport msqlexport; do\
+			${CHGRP} msql ${PREFIX}/bin/${f}; \
 		done
-		@${CHMOD} 751 ${PREFIX}/etc/msql2/
-		@${CHOWN} -R msql:msql ${PREFIX}/etc/msql2/
+		${CHGRP} msql ${PREFIX}/sbin/msql3d
+		@${CHMOD} 751 ${PREFIX}/etc/msql3/
+		@${CHOWN} -R msql:msql ${PREFIX}/etc/msql3/
 		@${MKDIR} ${PREFIX}/etc/rc.d
-		@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
-			${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
-			${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql2.sh \
-				${PREFIX}/etc/rc.d/msql2.sh; \
+		@if [ ! -f ${PREFIX}/etc/rc.d/msql3.sh ]; then \
+			${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/msql3.sh startup file."; \
+			${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql3.sh \
+				${PREFIX}/etc/rc.d/msql3.sh; \
 		fi
-.if !defined(BATCH)
-		@ /usr/bin/more -e ${FILESDIR}/post-install-notes
-.endif
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=- You must manually obtain ${DISTFILES} from 'http://www.Hughes.com.au/download/' and place it in ${DISTDIR}.  The distribution requires registration prior to use
+IGNORE="- You must manually obtain ${DISTFILES} from 'http://www.Hughes.com.au/download/' and place it in ${DISTDIR}.  The distribution requires registration prior to use"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/msql3/distinfo b/databases/msql3/distinfo
index 84b34837941b..48df318dd3cb 100644
--- a/databases/msql3/distinfo
+++ b/databases/msql3/distinfo
@@ -1 +1,2 @@
-MD5 (msql-2.0.12.tar.gz) = 920eaf4fd6128d8fd4dfa66301f86dcc
+MD5 (msql-3.5.tar.gz) = 8dab6a55adc5998c154000f88fba18ba
+SIZE (msql-3.5.tar.gz) = 321460
diff --git a/databases/msql3/files/msql2.sh b/databases/msql3/files/msql2.sh
deleted file mode 100644
index 79b387c01f6c..000000000000
--- a/databases/msql3/files/msql2.sh
+++ /dev/null
@@ -1,23 +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)
-	if [ -x ${PREFIX}/sbin/msql2d ]; then
-		su -f msql -c "exec ${PREFIX}/sbin/msql2d" > /dev/null 2>&1 &
-		echo -n ' msql2'
-	fi
-	;;
-stop)
-	killall msql2d && echo -n ' msql2d' && rm -f ${PREFIX}/etc/msql2/msql2d.pid
-	;;
-*)
-	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 09e6675f2872..000000000000
--- a/databases/msql3/files/patch-ab
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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
- 
--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}
--	${INST_DIR}/bin/${PROG} > output 2>&1
-+	cd /tmp/debug/${PROG}
-+	${INST_DIR}/sbin/${PROG} > output 2>&1
- 	echo "Program : ${PROG}
- Time : `date`
- Program Output
-@@ -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 8eecb6a50c94..000000000000
--- a/databases/msql3/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/conf/site.mm.in.orig	Thu Aug 19 07:33:09 1999
-+++ src/conf/site.mm.in	Sat Jan 27 23:48:19 2001
-@@ -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= @LINUX_DYNAMIC@
-@@ -44,5 +44,5 @@
- # Directory for pid file
- PID_DIR= @PID_DIR@
- 
--CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE)
-+CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE) -fpic -DPIC
- 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 fae0da1e6015..000000000000
--- a/databases/msql3/files/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
---- scripts/make-install.orig	Thu Aug 19 07:33:07 1999
-+++ scripts/make-install	Sun Jan 28 10:51:13 2001
-@@ -1,16 +1,17 @@
- #!/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/modules
-+scripts/mkinstalldirs 0755    $INST_DIR/etc/msql2
-+scripts/mkinstalldirs 0755    /var/spool/msql
-+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 /var/spool/msql
-+scripts/mkinstalldirs 0755    $INST_DIR/lib/msql
-+scripts/mkinstalldirs 0755    $INST_DIR/libexec/msql
- 
diff --git a/databases/msql3/files/patch-ae b/databases/msql3/files/patch-ae
deleted file mode 100644
index 4ca7032adbf7..000000000000
--- a/databases/msql3/files/patch-ae
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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 ::
--	@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 94faaefc436c..000000000000
--- a/databases/msql3/files/patch-af
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/msql/Makefile.tmpl.orig	Thu Aug 19 07:33:13 1999
-+++ src/msql/Makefile.tmpl	Sun Jan 28 00:11:52 2001
-@@ -34,57 +34,59 @@
- 
- !dll_os2 msql libmsql.c,net.c,config.c,time.c ../common/strlib.o,../common/tmpnam.o,../common/strerror.o,../common/strptime.o,../common/snprintf.o
- !library_unix libmsql.a libmsql.c,net.c,config.c,time.c ../common/strlib.o,../common/tmpnam.o,../common/strerror.o,../common/strptime.o,../common/snprintf.o
--
--all: ../lib/libmsql.a
--
--../lib/libmsql.a : libmsql.a
--	rm -f ../lib/libmsql.a
--	cp ../msql/libmsql.a ../lib/libmsql.a
--	$(RANLIB) ../lib/libmsql.a
-+!slibrary_unix 1 libmsql.so libmsql.c,net.c,config.c,time.c ../common/strlib.o,../common/tmpnam.o,../common/strerror.o,../common/strptime.o,../common/snprintf.o
- 
- 
- !object msqladmin.o msqladmin.c
--!program msqladmin msqladmin.o,acl.o,libmsql.a
-+!program msqladmin msqladmin.o,acl.o -L.,-lmsql
-+msqladmin: libmsql.so
- 
- !object msql.o msql.c
--!program msql msql.o,libmsql.a
-+!program msql msql.o -L.,-lmsql
-+msql: libmsql.so
- 
- !object msqldump.o msqldump.c
--!program msqldump msqldump.o,libmsql.a
-+!program msqldump msqldump.o -L.,-lmsql
-+msqldump: libmsql.so
- 
- !object msqlexport.o msqlexport.c
--!program msqlexport msqlexport.o,libmsql.a
-+!program msqlexport msqlexport.o -L.,-lmsql
-+msqlexport: libmsql.so
- 
- !object msqlimport.o msqlimport.c
--!program msqlimport msqlimport.o,libmsql.a
-+!program msqlimport msqlimport.o -L.,-lmsql
-+msqlimport: libmsql.so
- 
- !object relshow.o relshow.c 
--!program relshow relshow.o,libmsql.a
-+!program relshow relshow.o -L.,-lmsql
-+relshow: libmsql.so
- 
- !object insert_test.o insert_test.c 
--!program insert_test insert_test.o,libmsql.a
-+!program insert_test insert_test.o -L.,-lmsql
-+insert_test: libmsql.so
- 
- !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 select_test select_test.o -L.,-lmsql
-+select_test: libmsql.so
- 
--msql2d: 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,-L.,-lmsql
-+msql2d: libmsql.so
- 
- msqld-clean:
- 	rm -f msqld.o msql_yacc.o msql_lex.o msql_proc.o net.o \
- 	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)
- !install relshow $(INST_DIR)/bin/relshow 0755 $(ROOT)
- !install msqldump $(INST_DIR)/bin/msqldump 0755 $(ROOT)
- !libinstall libmsql.a $(INST_DIR)/lib/libmsql.a 744 $(ROOT)
-+!slibinstall 1 libmsql.so $(INST_DIR)/lib 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 9f1f6bf41c1a..000000000000
--- a/databases/msql3/files/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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)
- 	{
--		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)
-@@ -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");
- 	}
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 984e8b7a5b7a..000000000000
--- a/databases/msql3/files/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/msql/msqld.c.orig	Thu Aug 19 07:33:20 1999
-+++ src/msql/msqld.c	Sat Jan 27 07:45:13 2001
-@@ -23,6 +23,7 @@
- #  include <os2.h>
- #endif
- 
-+#define ANSI_ARGS
- 
- #include <stdio.h>
- #include <fcntl.h>
-@@ -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);
diff --git a/databases/msql3/files/patch-aj b/databases/msql3/files/patch-aj
deleted file mode 100644
index b8fa906c7d1a..000000000000
--- a/databases/msql3/files/patch-aj
+++ /dev/null
@@ -1,27 +0,0 @@
---- misc/msql.conf.orig	Thu Aug 19 07:33:07 1999
-+++ misc/msql.conf	Sun Jan 28 10:58:01 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
-+Pid_File = /var/spool/msql/msql2d.pid
- TCP_Port = 1114
--UNIX_Port = %I/msql2.sock
-+UNIX_Port = /var/spool/msql/msql2.sock
- 
- [system]
- 
-@@ -33,7 +33,7 @@
- Remote_Access = False
- Local_Access = True
- #Query_Log = False
--#Query_Log_File = %I/query.log
-+#Query_Log_File = /var/spool/msql/query.log
- 
- [w3-msql]
- 
diff --git a/databases/msql3/files/patch-ak b/databases/msql3/files/patch-ak
deleted file mode 100644
index 5a8adfa53822..000000000000
--- a/databases/msql3/files/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/w3-msql/Makefile.tmpl.orig	Thu Aug 19 07:33:22 1999
-+++ src/w3-msql/Makefile.tmpl	Sat Jan 27 23:54:43 2001
-@@ -14,9 +14,9 @@
- !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,-L../lang-common,-llite,-L../msql,-lmsql,-lcompat
- 
--!program w3-auth w3-auth.o,http.o,../lang-common/fcrypt.o,../msql/libmsql.a
-+!program w3-auth w3-auth.o,http.o ../lang-common/fcrypt.o,-L../msql,-lmsql
- 
- 
- #
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 8b687c88e491..000000000000
--- a/databases/msql3/files/patch-am
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 9b3874846332..000000000000
--- a/databases/msql3/files/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
- 
- 
- #if defined(_OS_WIN32)
diff --git a/databases/msql3/files/patch-ao b/databases/msql3/files/patch-ao
deleted file mode 100644
index a3ca64ea16c4..000000000000
--- a/databases/msql3/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index ef4ad1c4a1f6..000000000000
--- a/databases/msql3/files/patch-ap
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 8bbb17ac32c5..000000000000
--- a/databases/msql3/files/patch-aq
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index e288ac89def7..000000000000
--- a/databases/msql3/files/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 0cb02b0b5910..000000000000
--- a/databases/msql3/files/patch-as
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/lite/Makefile.tmpl.orig	Thu Aug 19 07:33:12 1999
-+++ src/lite/Makefile.tmpl	Sun Jan 28 10:44:59 2001
-@@ -13,8 +13,9 @@
- !object mod_lite.o mod_lite.c
- !object modules.o modules.c
- 
-+!slibrary_unix 0 mod_lite.so mod_lite.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 -L../msql,-lmsql,-L../lang-common,-llite,-lcompat
- 
- #
- # Debugging compilations
-@@ -32,8 +33,9 @@
- 
- 
- !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 lite_lex.o $(INST_DIR)/lib/msql/lite_lex.o 0755
-+!install mod_lite.o $(INST_DIR)/lib/msql/mod_lite.o 0755
-+!install mod_lite.so $(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
deleted file mode 100644
index 77345aa1d9c5..000000000000
--- a/databases/msql3/files/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 88e9cd5203b1..000000000000
--- a/databases/msql3/files/patch-au
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 6705fa640c9f..000000000000
--- a/databases/msql3/files/patch-av
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index e0478cb3cc98..000000000000
--- a/databases/msql3/files/patch-aw
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index cf4c890be3dc..000000000000
--- a/databases/msql3/files/patch-ax
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/lang-common/Makefile.tmpl.orig	Thu Aug 19 07:33:10 1999
-+++ src/lang-common/Makefile.tmpl	Sun Jan 28 10:41:37 2001
-@@ -19,11 +19,18 @@
- !object 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
-+!slibrary_unix 1 liblite.so 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
- 
-+!slibrary_unix 0 mod_std.so mod_std.c
-+!slibrary_unix 0 mod_msql.so mod_msql.c
-+
- !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)
-+!slibinstall 1 liblite.so $(INST_DIR)/lib 744 $(ROOT)
-+!install mod_std.o $(INST_DIR)/lib/msql/mod_std.o 744 $(ROOT)
-+!install mod_msql.o $(INST_DIR)/lib/msql/mod_msql.o 744 $(ROOT)
-+!install mod_std.so $(INST_DIR)/libexec/msql/mod_std.so 744 $(ROOT)
-+!install mod_msql.so $(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
deleted file mode 100644
index a0782434b43c..000000000000
--- a/databases/msql3/files/patch-ay
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/patch-az b/databases/msql3/files/patch-az
deleted file mode 100644
index bf2ebbbec755..000000000000
--- a/databases/msql3/files/patch-az
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/common/debug.c.bak	Mon Aug 20 05:19:27 2001
-+++ src/common/debug.c	Thu Sep 11 10:38:57 2003
-@@ -18,7 +18,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <string.h>
- #include "debug.h"
- 
-@@ -136,26 +136,20 @@
- 
- 
- 
--void _msqlTrace(va_alist)
--	va_dcl
-+void _msqlTrace(int dir, char *fmt, ...)
- {
- 	va_list args;
--	char	*fmt,
--		*tag;
--	int	loop,
--		dir;
-+	char    *tag;
-+	int     loop;
- 	static	int indent = 0;
- 	static 	char inTag[] = "-->",
- 		     outTag[] = "<--";
- 
--	va_start(args);
- 	if (! (debugLevel & MOD_TRACE))
- 	{
--		va_end(args);
- 		return;
- 	}
- 
--	dir = va_arg(args, int);
- 	if (dir == TRACE_IN)
- 	{
- 		tag = inTag;
-@@ -163,9 +157,9 @@
- 	}
- 	else
- 		tag = outTag;
--	fmt = (char *)va_arg(args, char *);
- 	if (!fmt)
-         	return;
-+	va_start(args, fmt);
- 	(void)vsprintf(msqlDebugBuf,fmt,args);
- 	va_end(args);
- 	printf("[%s] ",PROGNAME);
diff --git a/databases/msql3/files/patch-ba b/databases/msql3/files/patch-ba
deleted file mode 100644
index edbfe3c187c0..000000000000
--- a/databases/msql3/files/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/debug.h.bak	Mon Aug 20 05:19:27 2001
-+++ src/common/debug.h	Thu Sep 11 10:44:11 2003
-@@ -31,7 +31,7 @@
- #define TRACE_OUT	2
- 
- void	_msqlDebug();
--void	_msqlTrace();
-+void    _msqlTrace(int, char *, ...);
- void	initDebug();
- int	debugSet();
- 
diff --git a/databases/msql3/files/patch-bb b/databases/msql3/files/patch-bb
deleted file mode 100644
index aec86b51037d..000000000000
--- a/databases/msql3/files/patch-bb
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/common/strlib.c.bak	Mon Aug 20 05:19:28 2001
-+++ src/common/strlib.c	Thu Sep 11 10:49:42 2003
-@@ -19,7 +19,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <ctype.h>
- #include <common/portability.h>
- 
-@@ -92,18 +92,16 @@
- */
- 
- 
--char *dsprintf(va_alist)
--	va_dcl
-+char *dsprintf(char *fmt, ...)
- {
- 	va_list args;
- 	int	len;
--	char	*fmt,
--		*tmp;
-+	char    *tmp;
- 
--	va_start(args);
--	fmt = va_arg(args, char *);
- 	(void) bzero(strBuf,STR_LEN);
-+	va_start(args, fmt);
- 	(void) vsprintf(strBuf,fmt,args);
-+	va_end(args);
- 	len = strlen(strBuf);
- 	tmp = (char *)strdup(strBuf);
- 	if (!tmp)
-@@ -130,24 +128,20 @@
- **	Notes	: old string is freed
- */
- 
--char *dcsprintf(va_alist)
--	va_dcl
-+char *dcsprintf(char *s1, char *fmt, ...)
- {
- 	va_list	args;
--	char	*s1,
--		*tmp,
--		*fmt;
-+	char    *tmp;
- 
--	va_start(args);
--	s1 = va_arg(args, char *);
--	fmt = va_arg(args, char *);
- 	(void)bzero(strBuf,STR_LEN);
- 	if (s1)
- 	{
- 		(void)strcpy(strBuf,s1);
- 		(void)free(s1);
- 	}
-+	va_start(args, fmt);
- 	(void) vsprintf(strBuf + strlen(strBuf),fmt,args);
-+	va_end(args);
- 	tmp = (char *) strdup(strBuf);
- 	if (!tmp)
- 	{
diff --git a/databases/msql3/files/patch-bc b/databases/msql3/files/patch-bc
deleted file mode 100644
index 54be8a81c50a..000000000000
--- a/databases/msql3/files/patch-bc
+++ /dev/null
@@ -1,67 +0,0 @@
---- src/msql/libmsql.c.bak	Wed Aug 22 04:17:08 2001
-+++ src/msql/libmsql.c	Thu Sep 11 11:02:19 2003
-@@ -31,6 +31,7 @@
- #  include <stdlib.h>
- #  include <string.h>
- 
-+#define ANSI_ARGS
- 
- #if defined(_OS_WIN32)
- #  include <winsock.h>
-@@ -88,11 +88,11 @@
- RETSIGTYPE pipeHandler(int);
- #endif
- 
--#if defined(_OS_OS2) || defined (_OS_WIN32)
--static void msqlDebug( int module, ... );
-+#if defined(_OS_OS2) || defined (_OS_WIN32) || defined(ANSI_ARGS)
-+static void msqlDebug( int module, char *fmt, ... );
- #endif
- 
--#if defined(_OS_UNIX)
-+#if defined(_OS_UNIX) && !defined(ANSI_ARGS)
- static void msqlDebug();
- #endif
- 
-@@ -216,23 +216,24 @@
- */
- 
- #ifdef ANSI_ARGS
--static void msqlDebug(int module, ...)
-+static void msqlDebug(int module, char *fmt, ...)
- #else
- static void msqlDebug(va_alist)
- 	va_dcl
- #endif
- {
- 		va_list args;
--	char	msg[1024],
--		*fmt;
-+	char    msg[1024];
- 
- #ifdef ANSI_ARGS
--	va_start(args, module);
-+	va_start(args, fmt);
- #else
- 	int	module;
-+	char    *fmt;
- 
- 	va_start(args);
- 	module = (int) va_arg(args, int );
-+	fmt = (char *)va_arg(args, char *);
- #endif
- 
- 	if (! (module & debugLevel))
-@@ -241,9 +242,10 @@
- 		return;
- 	}
- 
--	fmt = (char *)va_arg(args, char *);
--	if (!fmt)
-+	if (!fmt) {
-+		va_end(args);
-         	return;
-+	}
- 	(void)vsprintf(msg,fmt,args);
- 	va_end(args);
- 	fprintf(stderr,"[libmsql] %s",msg);
diff --git a/databases/msql3/files/post-install-notes b/databases/msql3/files/post-install-notes
deleted file mode 100644
index a6f896f7838c..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            /var/spool/msql/msql2.sock
-/usr/local/Hughes/msql2.pid             /var/spool/msql/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.
diff --git a/databases/msql3/files/slibinstall.mm b/databases/msql3/files/slibinstall.mm
deleted file mode 100644
index 7349f3e65c41..000000000000
--- a/databases/msql3/files/slibinstall.mm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-. $MACRO_DIR/makegen/makegen.cf
-
-maj=$1
-src=$2
-destd=$3
-mode=$4
-owner=$5
-group=$6
-
-echo	"install ::"
-echo	"	cp $src.$maj $destd/$src.$maj"
-echo	"	ln -sf $src.$maj $destd/$src"
-if test "$mode." != "."
-then
-	echo	"	$chmod $mode $destd/$src.$maj"
-fi
-if test "$owner." = "root."
-then
-	echo	"	$chown $owner $destd/$src.$maj"
-fi
-if test "$group." != "."
-then
-	echo	"	$chgrp $group $destd/$src.$maj"
-fi
-echo
diff --git a/databases/msql3/files/slibrary_unix.mm b/databases/msql3/files/slibrary_unix.mm
deleted file mode 100644
index 9d6ea4350d64..000000000000
--- a/databases/msql3/files/slibrary_unix.mm
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-. $MACRO_DIR/makegen/makegen.cf
-
-if test $OS_TYPE != "_OS_UNIX"
-then
-	exit
-fi
-
-
-if echo '\c' | grep -s c >/dev/null 2>&1
-then
-	ECHO_N="echo -n"
-	ECHO_C=""
-else
-	ECHO_N="echo"
-	ECHO_C='\c'
-fi
-
-
-maj=$1
-lib=$2
-libsrc=`echo $3 | sed "s/,/ /g"`
-libobj=`echo $4 | sed "s/,/ /g"`
-
-for src in $libsrc
-do
-	if test -c /dev/tty
-	then
-		$ECHO_N ".$ECHO_C" > /dev/tty
-	fi
-	base=`echo $src | sed "s/\..*//"`
-	obj=`echo $src | sed "s/\.c\$/.o/"`
-	libobj="$libobj $obj"
-	echo	"$obj : $src Makefile.full"
-	echo	'	$(CC) $(CC_FLAGS) -o '"$obj"' -c '"$src"
-	echo
-	echo	"clean ::"
-	echo	"	rm -f $obj"
-	echo
-done
-
-echo	"all : $lib"
-echo
-echo	"$lib : $libobj Makefile.full"
-echo	'	$(CC) -shared -Wl,-x '"-o $lib.$maj -Wl,-soname,$lib.$maj $libobj"
-echo	"	ln -sf $lib.$maj $lib"
-echo
-echo	"clean :: "
-echo	"	rm -f $lib $lib.$maj"
-echo
diff --git a/databases/msql3/pkg-descr b/databases/msql3/pkg-descr
index 4cd75046087b..bd8c1da45d91 100644
--- a/databases/msql3/pkg-descr
+++ b/databases/msql3/pkg-descr
@@ -1,20 +1,7 @@
-	The port of mSQL 1.x lived in its 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, so it is no longer feasible to have the
-program live in its 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            /var/spool/msql/msql2.sock
-/usr/local/Hughes/msql2.pid             /var/spool/msql/msql2.pid
-/usr/local/Hughes/msql.conf		/usr/local/etc/msql2/msql.conf
-/usr/local/Hughes/msql.acl		/usr/local/etc/msql2/msql.acl
+This is version 3 of the Mini SQL (mSQL) relational database system.
+The software provides a fast and efficient database system that supports
+a supset of the ANSI SQL query language.  Application programs can use
+the mSQL client API library and access mSQL servers both on their local
+machine and over TCP/IP networks.
 
 WWW: http://www.hughes.com.au/
diff --git a/databases/msql3/pkg-install b/databases/msql3/pkg-install
index 97f3761cda54..9883ad0ba22c 100644
--- a/databases/msql3/pkg-install
+++ b/databases/msql3/pkg-install
@@ -22,8 +22,8 @@ fi
 
 if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
 	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/bin/sh" -d "/var/db/msqldb" \
-		-c "mSQL-2 pseudo-user"; \
+		-s "/bin/sh" -d "/var/db/msql3db" \
+		-c "mSQL-3 pseudo-user"; \
 	then
 		echo "Added user \"${USER}\"."
 	else
diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist
index 4728e8dc8acf..95d331f3b4d2 100644
--- a/databases/msql3/pkg-plist
+++ b/databases/msql3/pkg-plist
@@ -1,117 +1,43 @@
-bin/lite
+bin/cpi_stat
 bin/msql
+bin/msql3_broker
 bin/msqladmin
 bin/msqldump
+bin/msqlexplain
 bin/msqlexport
 bin/msqlimport
 bin/relshow
 bin/run_daemon
-bin/w3-auth
-bin/w3-msql
-etc/msql2/msql.acl.sample
-etc/msql2/msql.conf
-etc/rc.d/msql2.sh
-include/common/config.h
-include/common/portability.h
-include/lite.h
-include/mod_msql.h
-include/mod_std.h
+sbin/msql3d
+etc/msql3/msql.conf
+etc/rc.d/msql3.sh
 include/msql.h
-lib/liblite.a
-lib/liblite.so.1
-@exec ln -sf %f %B/liblite.so
-@unexec rm -f %B/liblite.so
+include/regexp.h
 lib/libmsql.a
-lib/libmsql.so.1
-@exec ln -sf %f %B/libmsql.so
-@unexec rm -f %B/libmsql.so
-lib/msql/lite_lex.o
-lib/msql/mod_lite.o
-lib/msql/mod_msql.o
-lib/msql/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
-share/doc/msql/MSQL_BOOK
-share/doc/msql/NEW_FEATURES
-share/doc/msql/README
-share/doc/msql/README.sco
-share/doc/msql/RELEASE_NOTES
-share/doc/msql/invoice.ps.gz
-share/doc/msql/invoice.txt
-share/doc/msql/manual-html/Image1.gif
-share/doc/msql/manual-html/Image2.gif
-share/doc/msql/manual-html/Image3.gif
-share/doc/msql/manual-html/Image4.gif
-share/doc/msql/manual-html/Image5.gif
-share/doc/msql/manual-html/Image6.gif
-share/doc/msql/manual-html/deer.gif
-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_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/program.mm
-share/msql/makegen/site.mm
-share/msql/makegen/slibinstall.mm
-share/msql/makegen/slibrary_unix.mm
-share/msql/makegen/touch.mm
-share/msql/makegen/yacc.mm
-share/msql/misc/setup_w3auth
-share/msql/www/bookmarks/README
-share/msql/www/bookmarks/Welcome.html
-share/msql/www/bookmarks/add.html
-share/msql/www/bookmarks/back.gif
-share/msql/www/bookmarks/book.gif
-share/msql/www/bookmarks/bookmarks.html
-share/msql/www/bookmarks/create.gif
-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/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/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
-share/msql/www/graphics/blank.gif
-share/msql/www/graphics/delete.gif
-share/msql/www/graphics/edit.gif
-share/msql/www/graphics/group.gif
-share/msql/www/graphics/hughes.gif
-share/msql/www/graphics/logout.gif
-share/msql/www/graphics/priv.gif
-share/msql/www/graphics/user.gif
-share/msql/www/graphics/view.gif
-@dirrm etc/msql2
+lib/libregexp.a
+share/msql3/makegen/directory.mm
+share/msql3/makegen/dll_os2.mm
+share/msql3/makegen/install.mm
+share/msql3/makegen/lex.mm
+share/msql3/makegen/libinstall.mm
+share/msql3/makegen/library_os2.mm
+share/msql3/makegen/library_unix.mm
+share/msql3/makegen/makegen
+share/msql3/makegen/makegen.cf
+share/msql3/makegen/object.mm
+share/msql3/makegen/program.mm
+share/msql3/makegen/site.mm
+share/msql3/makegen/touch.mm
+share/msql3/makegen/yacc.mm
+share/doc/msql3/BUGS
+share/doc/msql3/README
+share/doc/msql3/RELEASE_NOTES
+share/doc/msql3/License
+share/doc/msql3/Manual
+share/doc/msql3/Perl
+share/doc/msql3/acl.txt
+@dirrm etc/msql3
 @dirrm include/common
-@dirrm lib/msql
-@dirrm libexec/msql
-@dirrm share/doc/msql/manual-html
-@dirrm share/doc/msql
-@dirrm share/msql/makegen
-@dirrm share/msql/misc
-@dirrm share/msql/www/bookmarks
-@dirrm share/msql/www/graphics
-@dirrm share/msql/www
-@dirrm share/msql
+@dirrm share/msql3/makegen
+@dirrm share/msql3
+@dirrm share/doc/msql3
diff --git a/databases/msql3/scripts/check_old_version b/databases/msql3/scripts/check_old_version
deleted file mode 100644
index a87d343af800..000000000000
--- a/databases/msql3/scripts/check_old_version
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/perl
-#
-# $FreeBSD$
-#
-
-if( -d "/var/db/msqldb" ) {
-	chdir( "/var/db/pkg" );
-	opendir( DIR, "." );
-	@oldmsql = grep( /^msql-2.0b[1234]$/, readdir( DIR ) );
-	closedir( DIR );
-	if( @oldmsql ) {
-		if( ! $ENV{OVERWRITE_DB} ) {
-			print <<END;
-
-mSQL v2.0 beta 5 and above make changes to the AVL index format of your
-databases.  In order to preserve your existing data, you must:
-	- use msqldump to dump all your databases
-	- install beta 5 or above
-	- use msqladmin to drop and then create each of your databases
-	- use msql to reload your data
-
-If you understand the consequences of this upgrade, please re-build this
-port with the environment variable OVERWRITE_DB defined.
-
-END
-			exit 1;
-		}
-	}
-}
-
-#
-# EOF