14 files changed, 278 insertions, 290 deletions

diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index eb80d98dabcc..5e72ca8d6c27 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -1,20 +1,17 @@
 # New ports collection makefile for:	msql2
-# Version required:	2.0.3
+# Version required:	2.0.4.1
 # Date created:		December 17th 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.25 1998/02/27 11:42:55 obrien Exp $
+# $Id: Makefile,v 1.26 1998/02/27 11:50:28 obrien Exp $
 #
 
-DISTNAME=	msql-2.0.3
+DISTNAME=	msql-2.0.4.1
 CATEGORIES=	databases
-MASTER_SITES=	http://www2.nerosworld.com/msql/ \
-		http://hughes.com.au/software/msql2/
+MASTER_SITES=	http://www.hughes.com.au/software/msql2/
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BROKEN=	"PR 5868 : PLIST broken, not PREFIX clean"
-
 # Not free for commercial use.  Must create a user on the local system
 NO_PACKAGE=	YES
 RESTRICTED=	"restrictive copyright (no commercial use)"
@@ -27,7 +24,7 @@ MAKE_ENV+=	WRKSRC=${WRKSRC}
 
 do-configure:
 		cd ${WRKSRC}; make target
-		cd ${WRKSRC}/targets/freebsd; sh setup
+		cd ${WRKSRC}/targets/freebsd; ${SETENV} ${MAKE_ENV} ./setup
 		@${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/customize_scripts
 
 pre-install:
diff --git a/databases/msql/distinfo b/databases/msql/distinfo
index 5bed92079270..0b1c1e5cf67f 100644
--- a/databases/msql/distinfo
+++ b/databases/msql/distinfo
@@ -1 +1 @@
-MD5 (msql-2.0.3.tar.gz) = 61050ab3a9af5f18692583adb07dd291
+MD5 (msql-2.0.4.1.tar.gz) = d715775b36d3488432b7abb785090251
diff --git a/databases/msql/files/patch-ac b/databases/msql/files/patch-ac
index 15b4b0aef372..81b33b652da2 100644
--- a/databases/msql/files/patch-ac
+++ b/databases/msql/files/patch-ac
@@ -1,15 +1,17 @@
---- src/conf/site.mm.in.orig	Mon Aug 25 21:56:13 1997
-+++ src/conf/site.mm.in	Mon Aug 25 21:56:30 1997
-@@ -4,7 +4,7 @@
+--- src/conf/site.mm.in.orig	Fri May 29 19:21:51 1998
++++ src/conf/site.mm.in	Fri Aug 28 16:24:37 1998
+@@ -3,8 +3,8 @@
+ #
  
  
- COMPILER= @CC@
+-COMPILER= @CC@
 -INST_DIR= /usr/local/Hughes
-+INST_DIR= /usr/local
++COMPILER:= $(CC)
++INST_DIR:= $(PREFIX)
  HAVE_DYNAMIC= -DHAVE_DYNAMIC
  CC_ONLY_FLAGS=
  LINK_ONLY_FLAGS=
-@@ -34,7 +34,7 @@
+@@ -34,10 +34,10 @@
  EXTRA_LIB= @LIBS@
  
  # Any other CFlags required
@@ -18,3 +20,7 @@
  
  # Directory for pid file
  PID_DIR= @PID_DIR@
+ 
+-CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
++CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS)
+ LDLIBS= -L$(TOP)/lib $(EXTRA_LIB)
diff --git a/databases/msql/files/patch-ag b/databases/msql/files/patch-ag
index f89720db93ca..3ec810f95f4f 100644
--- a/databases/msql/files/patch-ag
+++ b/databases/msql/files/patch-ag
@@ -1,6 +1,20 @@
---- src/msql/config.c.orig	Wed Jan 29 12:18:00 1997
-+++ src/msql/config.c	Tue Feb  4 17:30:15 1997
-@@ -284,7 +284,7 @@
+--- src/msql/config.c.orig	Fri May 29 19:21:56 1998
++++ src/msql/config.c	Fri Aug 28 17:14:21 1998
+@@ -306,11 +306,11 @@
+ 	msqlConfigLoaded = 1;
+ 	if (file)
+ 	{
+-		snprintf(buf,sizeof(buf),"%s/%s", INST_DIR, file);
++		snprintf(buf,sizeof(buf),"%s/etc/msql2/%s", INST_DIR, file);
+ 		fp = fopen(buf,"r");
+ 		if (!fp)
+ 		{
+-			snprintf(buf,sizeof(buf),"%s/%s.conf",INST_DIR,file);
++			snprintf(buf,sizeof(buf),"%s/etc/msql2/%s.conf",INST_DIR,file);
+ 			fp = fopen(buf,"r");
+ 		}
+ 		if (!fp)
+@@ -325,7 +325,7 @@
  	}
  	else
  	{
diff --git a/databases/msql/files/patch-am b/databases/msql/files/patch-am
index 17f06135e704..a10e4099d0b1 100644
--- a/databases/msql/files/patch-am
+++ b/databases/msql/files/patch-am
@@ -1,24 +1,24 @@
---- 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 @@
+--- 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");
++	(void)snprintf(path, MAXPATHLEN, "var/db/msqldb");
  	dirp = opendir(path);
  	if (!dirp)
  	{
-@@ -187,7 +187,7 @@
+@@ -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",db);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s");
  	dirp = opendir(path);
  	if (!dirp)
  	{
-@@ -1130,7 +1130,7 @@
+@@ -1441,7 +1441,7 @@
  	struct	stat buf;
  
  	msqlTrace(TRACE_IN,"msqlInit()");
@@ -26,149 +26,146 @@
 +	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s",db);
  	if (stat(path,&buf) < 0)
  	{
- 		snprintf(errMsg,BAD_DB_ERROR,db);
-@@ -1165,8 +1165,7 @@
+ 		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);
- #ifdef OS2
- 	fd = _sopen(defPath,O_RDONLY,SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1239,8 +1239,7 @@
++	(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);
- 	(void)unlink(datPath);
++	(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, 
-@@ -1279,8 +1279,7 @@
- 	** Create an empty index def file
- 	*/
- 	
--	(void)snprintf(idxPath, MAXPATHLEN, "%s/msqldb/%s/%s.idx",
--		msqlHomeDir,db,table);
-+	(void)snprintf(idxPath, MAXPATHLEN, "/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,8 +1302,7 @@
- 	/*
+ 		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);
- 	(void)unlink(oflPath);
++	(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, 
-@@ -1454,10 +1454,10 @@
+ 		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(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);
++	(void)snprintf(idxPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",
++		db, index->table, index->name);
  
  #ifdef OS2
-@@ -1718,8 +1718,7 @@
+         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,
--		db,table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- 	fp = fopen(path, MAXPATHLEN, "rb");
- #else
-@@ -1733,18 +1733,15 @@
- 	}
- 	(void)fclose(fp);
- 	unlink(path);
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.dat",msqlHomeDir,
--		db,table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.dat",db,table);
- 	unlink(path);
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.ofl",msqlHomeDir,
--		db,table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.ofl",db,table);
- 	unlink(path);
- 
- 	/*
- 	** Take care of the index files.
- 	*/
--	(void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
--		db,table);
-+	(void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx",db,table);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.def",
+ 		db,table);
+ 	cp = (char *)rindex(path,'.');
  #ifdef OS2
-         fd = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1751,9 +1751,9 @@
- 	{
- 		while(read(fd,&tmp,sizeof(tmp)) == sizeof(tmp))
- 		{
--			(void)snprintf(path,MAXPATHLEN,
--				"%s/msqldb/%s/%s.idx-%s",
--				msqlHomeDir,db,table,tmp.name);
-+			(void)snprintf(path, MAXPATHLEN,
-+				"/var/db/msqldb/%s/%s.idx-%s",
-+				db,table,tmp.name);
- 			unlink(path);
- 		}
- 		close(fd);
-@@ -1791,7 +1791,7 @@
+@@ -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",
++	(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);
-@@ -1804,7 +1804,7 @@
+@@ -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);
++	(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, 
-@@ -1855,7 +1855,7 @@
+ 		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,
++	snprintf(tmpPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",db,
                  index->table, index->name);
  	unlink(tmpPath);
  
-@@ -2412,7 +2412,7 @@
+@@ -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);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
  	dirp = opendir(path);
  	if (dirp)
  	{
-@@ -2459,7 +2459,7 @@
+@@ -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);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
  	dirp = opendir(path);
  	if (!dirp)
  	{
diff --git a/databases/msql/files/patch-ao b/databases/msql/files/patch-ao
index 66b1e468884e..5e8b8e9d683e 100644
--- a/databases/msql/files/patch-ao
+++ b/databases/msql/files/patch-ao
@@ -1,8 +1,20 @@
---- src/conf/site.mm.in.orig	Wed Oct 15 01:43:58 1997
-+++ src/conf/site.mm.in	Wed Oct 15 01:44:48 1997
-@@ -6 +6 @@
--COMPILER= @CC@
-+COMPILER:= $(CC)
-@@ -42 +42 @@
--CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
-+CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS)
+--- src/msql/sort.c.orig	Fri Aug 28 17:20:10 1998
++++ src/msql/sort.c	Fri Aug 28 17:18:42 1998
+@@ -280,7 +280,7 @@
+ 	/*
+ 	** Create the dummy output table 
+ 	*/
+-	snprintf(dataPath,MAXPATHLEN,"%s/msqldb/.tmp/%s.tmp",INST_DIR,
++	snprintf(dataPath,MAXPATHLEN,"/var/db/msqldb/.tmp/%s.tmp",
+ 		entry->table);
+ 	tmp.dataFD = open(dataPath, O_CREAT|O_RDWR, 0600);
+         bzero(&sblock, sizeof(sblock));
+@@ -328,7 +328,7 @@
+ 	/*
+ 	** Swap the new table into place
+ 	*/
+-	snprintf(oldPath,MAXPATHLEN,"%s/msqldb/.tmp/%s.dat",INST_DIR,
++	snprintf(oldPath,MAXPATHLEN,"/var/db/msqldb/.tmp/%s.dat",
+ 		entry->table);
+ 	munmap(entry->dataMap, entry->size);
+ 	close(entry->dataFD);
diff --git a/databases/msql/pkg-plist b/databases/msql/pkg-plist
index 03a4068058eb..ce459cf0bea3 100644
--- a/databases/msql/pkg-plist
+++ b/databases/msql/pkg-plist
@@ -6,6 +6,7 @@ bin/msqldump
 bin/msqlexport
 bin/msqlimport
 bin/relshow
+bin/run_daemon
 bin/w3-auth
 bin/w3-msql
 etc/msql2/msql.acl.sample
@@ -43,37 +44,6 @@ 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/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/doc/msql/post-install-notes
 share/msql/makegen/directory.mm
 share/msql/makegen/install.mm
@@ -89,7 +59,6 @@ share/msql/makegen/site.mm
 share/msql/makegen/touch.mm
 share/msql/makegen/yacc.mm
 share/msql/misc/setup_w3auth
-share/msql/misc/setup_www
 share/msql/www/bookmarks/README
 share/msql/www/bookmarks/Welcome.html
 share/msql/www/bookmarks/add.html
@@ -124,7 +93,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/manual-html
 @dirrm share/doc/msql
 @dirrm share/msql/makegen
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index eb80d98dabcc..5e72ca8d6c27 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -1,20 +1,17 @@
 # New ports collection makefile for:	msql2
-# Version required:	2.0.3
+# Version required:	2.0.4.1
 # Date created:		December 17th 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.25 1998/02/27 11:42:55 obrien Exp $
+# $Id: Makefile,v 1.26 1998/02/27 11:50:28 obrien Exp $
 #
 
-DISTNAME=	msql-2.0.3
+DISTNAME=	msql-2.0.4.1
 CATEGORIES=	databases
-MASTER_SITES=	http://www2.nerosworld.com/msql/ \
-		http://hughes.com.au/software/msql2/
+MASTER_SITES=	http://www.hughes.com.au/software/msql2/
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BROKEN=	"PR 5868 : PLIST broken, not PREFIX clean"
-
 # Not free for commercial use.  Must create a user on the local system
 NO_PACKAGE=	YES
 RESTRICTED=	"restrictive copyright (no commercial use)"
@@ -27,7 +24,7 @@ MAKE_ENV+=	WRKSRC=${WRKSRC}
 
 do-configure:
 		cd ${WRKSRC}; make target
-		cd ${WRKSRC}/targets/freebsd; sh setup
+		cd ${WRKSRC}/targets/freebsd; ${SETENV} ${MAKE_ENV} ./setup
 		@${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/customize_scripts
 
 pre-install:
diff --git a/databases/msql3/distinfo b/databases/msql3/distinfo
index 5bed92079270..0b1c1e5cf67f 100644
--- a/databases/msql3/distinfo
+++ b/databases/msql3/distinfo
@@ -1 +1 @@
-MD5 (msql-2.0.3.tar.gz) = 61050ab3a9af5f18692583adb07dd291
+MD5 (msql-2.0.4.1.tar.gz) = d715775b36d3488432b7abb785090251
diff --git a/databases/msql3/files/patch-ac b/databases/msql3/files/patch-ac
index 15b4b0aef372..81b33b652da2 100644
--- a/databases/msql3/files/patch-ac
+++ b/databases/msql3/files/patch-ac
@@ -1,15 +1,17 @@
---- src/conf/site.mm.in.orig	Mon Aug 25 21:56:13 1997
-+++ src/conf/site.mm.in	Mon Aug 25 21:56:30 1997
-@@ -4,7 +4,7 @@
+--- src/conf/site.mm.in.orig	Fri May 29 19:21:51 1998
++++ src/conf/site.mm.in	Fri Aug 28 16:24:37 1998
+@@ -3,8 +3,8 @@
+ #
  
  
- COMPILER= @CC@
+-COMPILER= @CC@
 -INST_DIR= /usr/local/Hughes
-+INST_DIR= /usr/local
++COMPILER:= $(CC)
++INST_DIR:= $(PREFIX)
  HAVE_DYNAMIC= -DHAVE_DYNAMIC
  CC_ONLY_FLAGS=
  LINK_ONLY_FLAGS=
-@@ -34,7 +34,7 @@
+@@ -34,10 +34,10 @@
  EXTRA_LIB= @LIBS@
  
  # Any other CFlags required
@@ -18,3 +20,7 @@
  
  # Directory for pid file
  PID_DIR= @PID_DIR@
+ 
+-CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
++CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS)
+ LDLIBS= -L$(TOP)/lib $(EXTRA_LIB)
diff --git a/databases/msql3/files/patch-ag b/databases/msql3/files/patch-ag
index f89720db93ca..3ec810f95f4f 100644
--- a/databases/msql3/files/patch-ag
+++ b/databases/msql3/files/patch-ag
@@ -1,6 +1,20 @@
---- src/msql/config.c.orig	Wed Jan 29 12:18:00 1997
-+++ src/msql/config.c	Tue Feb  4 17:30:15 1997
-@@ -284,7 +284,7 @@
+--- src/msql/config.c.orig	Fri May 29 19:21:56 1998
++++ src/msql/config.c	Fri Aug 28 17:14:21 1998
+@@ -306,11 +306,11 @@
+ 	msqlConfigLoaded = 1;
+ 	if (file)
+ 	{
+-		snprintf(buf,sizeof(buf),"%s/%s", INST_DIR, file);
++		snprintf(buf,sizeof(buf),"%s/etc/msql2/%s", INST_DIR, file);
+ 		fp = fopen(buf,"r");
+ 		if (!fp)
+ 		{
+-			snprintf(buf,sizeof(buf),"%s/%s.conf",INST_DIR,file);
++			snprintf(buf,sizeof(buf),"%s/etc/msql2/%s.conf",INST_DIR,file);
+ 			fp = fopen(buf,"r");
+ 		}
+ 		if (!fp)
+@@ -325,7 +325,7 @@
  	}
  	else
  	{
diff --git a/databases/msql3/files/patch-am b/databases/msql3/files/patch-am
index 17f06135e704..a10e4099d0b1 100644
--- a/databases/msql3/files/patch-am
+++ b/databases/msql3/files/patch-am
@@ -1,24 +1,24 @@
---- 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 @@
+--- 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");
++	(void)snprintf(path, MAXPATHLEN, "var/db/msqldb");
  	dirp = opendir(path);
  	if (!dirp)
  	{
-@@ -187,7 +187,7 @@
+@@ -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",db);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s");
  	dirp = opendir(path);
  	if (!dirp)
  	{
-@@ -1130,7 +1130,7 @@
+@@ -1441,7 +1441,7 @@
  	struct	stat buf;
  
  	msqlTrace(TRACE_IN,"msqlInit()");
@@ -26,149 +26,146 @@
 +	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s",db);
  	if (stat(path,&buf) < 0)
  	{
- 		snprintf(errMsg,BAD_DB_ERROR,db);
-@@ -1165,8 +1165,7 @@
+ 		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);
- #ifdef OS2
- 	fd = _sopen(defPath,O_RDONLY,SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1239,8 +1239,7 @@
++	(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);
- 	(void)unlink(datPath);
++	(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, 
-@@ -1279,8 +1279,7 @@
- 	** Create an empty index def file
- 	*/
- 	
--	(void)snprintf(idxPath, MAXPATHLEN, "%s/msqldb/%s/%s.idx",
--		msqlHomeDir,db,table);
-+	(void)snprintf(idxPath, MAXPATHLEN, "/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,8 +1302,7 @@
- 	/*
+ 		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);
- 	(void)unlink(oflPath);
++	(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, 
-@@ -1454,10 +1454,10 @@
+ 		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(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);
++	(void)snprintf(idxPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",
++		db, index->table, index->name);
  
  #ifdef OS2
-@@ -1718,8 +1718,7 @@
+         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,
--		db,table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",db,table);
- #ifdef OS2
- 	fp = fopen(path, MAXPATHLEN, "rb");
- #else
-@@ -1733,18 +1733,15 @@
- 	}
- 	(void)fclose(fp);
- 	unlink(path);
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.dat",msqlHomeDir,
--		db,table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.dat",db,table);
- 	unlink(path);
--	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.ofl",msqlHomeDir,
--		db,table);
-+	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.ofl",db,table);
- 	unlink(path);
- 
- 	/*
- 	** Take care of the index files.
- 	*/
--	(void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
--		db,table);
-+	(void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx",db,table);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.def",
+ 		db,table);
+ 	cp = (char *)rindex(path,'.');
  #ifdef OS2
-         fd = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
- #else
-@@ -1751,9 +1751,9 @@
- 	{
- 		while(read(fd,&tmp,sizeof(tmp)) == sizeof(tmp))
- 		{
--			(void)snprintf(path,MAXPATHLEN,
--				"%s/msqldb/%s/%s.idx-%s",
--				msqlHomeDir,db,table,tmp.name);
-+			(void)snprintf(path, MAXPATHLEN,
-+				"/var/db/msqldb/%s/%s.idx-%s",
-+				db,table,tmp.name);
- 			unlink(path);
- 		}
- 		close(fd);
-@@ -1791,7 +1791,7 @@
+@@ -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",
++	(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);
-@@ -1804,7 +1804,7 @@
+@@ -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);
++	(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, 
-@@ -1855,7 +1855,7 @@
+ 		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,
++	snprintf(tmpPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",db,
                  index->table, index->name);
  	unlink(tmpPath);
  
-@@ -2412,7 +2412,7 @@
+@@ -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);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
  	dirp = opendir(path);
  	if (dirp)
  	{
-@@ -2459,7 +2459,7 @@
+@@ -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);
++	(void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
  	dirp = opendir(path);
  	if (!dirp)
  	{
diff --git a/databases/msql3/files/patch-ao b/databases/msql3/files/patch-ao
index 66b1e468884e..5e8b8e9d683e 100644
--- a/databases/msql3/files/patch-ao
+++ b/databases/msql3/files/patch-ao
@@ -1,8 +1,20 @@
---- src/conf/site.mm.in.orig	Wed Oct 15 01:43:58 1997
-+++ src/conf/site.mm.in	Wed Oct 15 01:44:48 1997
-@@ -6 +6 @@
--COMPILER= @CC@
-+COMPILER:= $(CC)
-@@ -42 +42 @@
--CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
-+CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS)
+--- src/msql/sort.c.orig	Fri Aug 28 17:20:10 1998
++++ src/msql/sort.c	Fri Aug 28 17:18:42 1998
+@@ -280,7 +280,7 @@
+ 	/*
+ 	** Create the dummy output table 
+ 	*/
+-	snprintf(dataPath,MAXPATHLEN,"%s/msqldb/.tmp/%s.tmp",INST_DIR,
++	snprintf(dataPath,MAXPATHLEN,"/var/db/msqldb/.tmp/%s.tmp",
+ 		entry->table);
+ 	tmp.dataFD = open(dataPath, O_CREAT|O_RDWR, 0600);
+         bzero(&sblock, sizeof(sblock));
+@@ -328,7 +328,7 @@
+ 	/*
+ 	** Swap the new table into place
+ 	*/
+-	snprintf(oldPath,MAXPATHLEN,"%s/msqldb/.tmp/%s.dat",INST_DIR,
++	snprintf(oldPath,MAXPATHLEN,"/var/db/msqldb/.tmp/%s.dat",
+ 		entry->table);
+ 	munmap(entry->dataMap, entry->size);
+ 	close(entry->dataFD);
diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist
index 03a4068058eb..ce459cf0bea3 100644
--- a/databases/msql3/pkg-plist
+++ b/databases/msql3/pkg-plist
@@ -6,6 +6,7 @@ bin/msqldump
 bin/msqlexport
 bin/msqlimport
 bin/relshow
+bin/run_daemon
 bin/w3-auth
 bin/w3-msql
 etc/msql2/msql.acl.sample
@@ -43,37 +44,6 @@ 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/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/doc/msql/post-install-notes
 share/msql/makegen/directory.mm
 share/msql/makegen/install.mm
@@ -89,7 +59,6 @@ share/msql/makegen/site.mm
 share/msql/makegen/touch.mm
 share/msql/makegen/yacc.mm
 share/msql/misc/setup_w3auth
-share/msql/misc/setup_www
 share/msql/www/bookmarks/README
 share/msql/www/bookmarks/Welcome.html
 share/msql/www/bookmarks/add.html
@@ -124,7 +93,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/manual-html
 @dirrm share/doc/msql
 @dirrm share/msql/makegen