Upgrade, 1.0.7 -> 1.0.14.

Note this port is RESTRICTED now, it's not free for commercial entities.

Reviewed by:	chuckr@glue.md.edu
Submitted by:	james@nexis.net and br@stiller.netland.inka.de, among others.

8 files changed, 50 insertions, 326 deletions

diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index c3a664f51647..0811789ae1e3 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -1,20 +1,28 @@
 # New ports collection makefile for:	msql
-# Version required:	1.0.7
+# Version required:	1.0.14
 # Date created:		14 January 1995
 # Whom:			mr (original)
 #
-# $Id: Makefile,v 1.8 1995/08/28 07:49:48 asami Exp $
+# $Id: Makefile,v 1.9 1995/09/14 11:27:52 asami Exp $
 #
 
-DISTNAME=	msql-1.0.7
+DISTNAME=	msql-1.0.14
 CATEGORIES+=	databases
 MASTER_SITES=	ftp://bond.edu.au/pub/Minerva/msql/
 
 IS_INTERACTIVE=	yes
 PREFIX=		/usr/local/Minerva
 NO_MTREE=	yes
-# restrictive copyright (no commercial use)
-NO_PACKAGE=	yes
+RESTRICTED=	"restrictive copyright (no commercial use)"
 
-.include <bsd.port.mk>
+post-install:
+.for file in License Rates.txt mSQL-Invoice.txt
+	cp ${WRKSRC}/doc/${file} ${PREFIX}/doc
+.endfor
+.if !defined(NOPORTDOCS)
+.for file in HISTORY acl.txt mSQL-1.0.11.ps
+	cp ${WRKSRC}/doc/${file} ${PREFIX}/doc
+.endfor
+.endif
 
+.include <bsd.port.mk>
diff --git a/databases/msql/distinfo b/databases/msql/distinfo
index dfed846fce0a..df61bb299843 100644
--- a/databases/msql/distinfo
+++ b/databases/msql/distinfo
@@ -1 +1 @@
-MD5 (msql-1.0.7.tar.gz) = cc370f8742a9c19f2dda1d48468c8c54
+MD5 (msql-1.0.14.tar.gz) = 6fca63f3b90bb18837e7faeb7f419aec
diff --git a/databases/msql/pkg-descr b/databases/msql/pkg-descr
index 95b1c50f767e..e76fa31c6320 100644
--- a/databases/msql/pkg-descr
+++ b/databases/msql/pkg-descr
@@ -1,146 +1,5 @@
-README for mSQL version 1.0	14 December 1994
-----------------------------------------------------------------------------
+mSQL (Mini-SQL) is a database manager.  Refer to the documents in
+/usr/local/Minerva/docs for details.
 
-
-What's new in 1.0
------------------
-
-1.0 is actually what was going to be 0.3-release.  I decided to give it
-a "real" number because it has enough features and appears stable enough
-to be used seriously now (we're even using it in production at Bond 
-hanging of the back of our WWW server and campus user database). 2
-months of alpha and beta testing has produced what appears to be a
-pretty solid hunk of code.
-
-1.0 brings per-database access control, joins, ordering, mmap() support
-if you have it (and it'll do shared read/write regions - unlike Linux, HPUX
-etc), distinct, and many bug fixes to mSQL.  The doco has also been updated 
-for for this release to reflect the changes to both the SQL supported
-and also the API and programs.
-
-
-msqladmin now offers a "shutdown" command and also a "reload" command
-for reloading the access control info on the fly.  You can only run
-msqladmin as root (or whoever you specified as the root user) from the
-local machine.  There's further info  about the access control mechanism 
-in the manual.
-
-msqladmin also offers a version command.  This will report the version
-of msqladmin, the version of the server it's talking to, and the
-protocol version used to talk to the server.
-
-msql will use the VISUAL environment variable for your editor rather
-than forcing you to use vi.  If it isn't set it'll default to vi anyway.
-
-A new program called msqldump is included to generate an ASCII dump of a
-table or an entire database.  The output is formatted as an msql script
-and includes the "create table" and "insert" commands required to
-recreate whatever was dumped.  It'll work over the net too so you can
-grab an entire database off a remote box.
-
-The MSQL_HOST environment variable has gone.  All msql programs now
-offer a -h option for talking to a remote host.  In the API, if
-msqlConnect() is called with NULL, it forces it to use the UNIX socket
-on the local host.
-
-The lex/flex based scanner has been replaced by a hand written C
-scanner.  This removes a heap of portability problems with various
-version of lex/flex and the good old "I'm flex but I'll call myself lex"
-problem on Linux and *BSD.
-
-A regression test suite is now available in tests/rtest.  Run it after
-you've compiled and installed the code to ensure that it's working OK.
-
-
-General Info
-------------
-
-mSQL has been developed under Sun OS 4.1.1 but has been tested under
-Solaris 2.3, Ultrix 4.3, Linux, FreeBSD 2, and OSF/1 (cc not gcc).  That 
-said, it should "autoconf" and build on most BSD derived systems, SVR4 
-based systems or POSIX O/S's (that should cover most of them).  It has been
-reported that it works out-of-the-box on HP-UX, NeXT, SCO, Sequent,
-Cray, Tandem and a few others.  I haven't tested these so buyer beware.
-
-
-Installation
-------------
-
-To build mSQL, type "make target" in the top directory.  This will build
-a directory where the object files for your system will be made.  This
-mechanism allows you to NFS mount the sources onto different machines
-and build mSQL on different platforms without having to make copies of 
-the sources.  The directory will be under the "targets" directory (e.g.
-$(TOP)/targets/Solaris-2.3-Sparc )
-
-Once the target directory has been created, change directory into it and
-run "setup".  That will run autoconf and some other configuration
-scripts.  Once that has completed, just type make.  You should install
-the software with "make install" when you're happy with it.  
-
-The default installation directory is /usr/local/Minerva.  This area is
-shared by all the development of Minerva (including the ESL scripting
-language and Minerva itself).  It's probably a good idea to leave it as
-that rather than /usr/local/msql or similar if you wish to use ESL
-(check out doc/Minerva for details on ESL or grab the ESL manual via ftp
-from Bond.edu.au in /pub/Minerva/esl )
-
-
-Testing the software
---------------------
-
-Once it is installed, you can try the sample mSQL script provided in
-the msql source directory.  Fire up the server using
-
-	/usr/local/Minerva/bin/msqld&
-
-Create a test database using
-
-	/usr/local/Minerva/bin/msqladmin create test
-
-Run the script through the terminal monitor using
-
-	/usr/local/Minerva/bin/msql test < sample.msql
-
-There are also some further test scripts in the tests directory.  The
-"killer" test will produce performance figures about mSQL running on
-your machine.  details such as the number of operations per second for
-inserts, fills and selects on both keyed and flat tables is generated.
-
-For a real test, run the regression test suite (rtest) in the tests
-directory.
-
-
-Notes :
-------
-
-	o  Because this stuff is pretty new, there's a script in the
-	scripts directory that you may want to use to run the server.  It
-	restarts the server if it crashes and mails you a notification
-	of the failure.  It's called run_daemon and may save you some 
-	heart ache.
-
-	o  If you run this on a Cray (what?  you don't have a Y-MP at
-	home? :) you'll have to add -lsocket to EXTRA_LIB in site.mm
-	after you run setup.
-
-	o  OSF/1 and gcc don't appear to like this stuff.  If you're
-	using OSF/1 use the standard DEC compiler and everything is
-	fine.
-
-	o The manual is formatted for an A4 page.  I have run the 
-	postscript through a filter that should let it print on any
-	paper size although the margins may get stuffed up a bit.
-
-
-If you decide to use mSQL for anything, could you drop me a line.  I'd
-like to keep track of just how many people are using it and what it's
-being used for.  You may also wish to join the mailing list by sending a
-message to msql-list-request@Bond.edu.au.
-
-
-   __                                  David J. Hughes  -  Bambi@Bond.edu.au
-  /  \               /  /   /           http://Bond.edu.au/People/bambi.html
- /___/ __   _   ____/  /   / _     
-/   \ /  \ / \ /   /  /   / / \  /   Senior Network Programmer, Bond University
-\___/ \__//  / \__/   \__/ /  / /    Qld.   4229   AUSTRALIA    (+61 75 951450)
+Note that this version is freeware only for non-commercial entities.
+Read the file "License" in the documentation directory for details.
diff --git a/databases/msql/pkg-plist b/databases/msql/pkg-plist
index d338a8faccbe..318241e09292 100644
--- a/databases/msql/pkg-plist
+++ b/databases/msql/pkg-plist
@@ -1,21 +1,16 @@
 @cd /usr/local/Minerva
-@mode 755
-@owner root
-@group bin
 bin/msql
-@mode 4750
 bin/msqld
 bin/msqladmin
-@mode 4755
 bin/relshow
 bin/msqldump
-@mode 644
 include/msql.h
-@mode 644
 lib/libmsql.a
-@mode 644
-doc/mSQL-1.0.ps
-doc/License.mSQL
-@mode 600
+doc/HISTORY
+doc/License
+doc/Rates.txt
+doc/acl.txt
+doc/mSQL-1.0.11.ps
+doc/mSQL-Invoice.txt
 msql.acl.sample
 @exec mkdir -p %D/msqldb/.tmp
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index c3a664f51647..0811789ae1e3 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -1,20 +1,28 @@
 # New ports collection makefile for:	msql
-# Version required:	1.0.7
+# Version required:	1.0.14
 # Date created:		14 January 1995
 # Whom:			mr (original)
 #
-# $Id: Makefile,v 1.8 1995/08/28 07:49:48 asami Exp $
+# $Id: Makefile,v 1.9 1995/09/14 11:27:52 asami Exp $
 #
 
-DISTNAME=	msql-1.0.7
+DISTNAME=	msql-1.0.14
 CATEGORIES+=	databases
 MASTER_SITES=	ftp://bond.edu.au/pub/Minerva/msql/
 
 IS_INTERACTIVE=	yes
 PREFIX=		/usr/local/Minerva
 NO_MTREE=	yes
-# restrictive copyright (no commercial use)
-NO_PACKAGE=	yes
+RESTRICTED=	"restrictive copyright (no commercial use)"
 
-.include <bsd.port.mk>
+post-install:
+.for file in License Rates.txt mSQL-Invoice.txt
+	cp ${WRKSRC}/doc/${file} ${PREFIX}/doc
+.endfor
+.if !defined(NOPORTDOCS)
+.for file in HISTORY acl.txt mSQL-1.0.11.ps
+	cp ${WRKSRC}/doc/${file} ${PREFIX}/doc
+.endfor
+.endif
 
+.include <bsd.port.mk>
diff --git a/databases/msql3/distinfo b/databases/msql3/distinfo
index dfed846fce0a..df61bb299843 100644
--- a/databases/msql3/distinfo
+++ b/databases/msql3/distinfo
@@ -1 +1 @@
-MD5 (msql-1.0.7.tar.gz) = cc370f8742a9c19f2dda1d48468c8c54
+MD5 (msql-1.0.14.tar.gz) = 6fca63f3b90bb18837e7faeb7f419aec
diff --git a/databases/msql3/pkg-descr b/databases/msql3/pkg-descr
index 95b1c50f767e..e76fa31c6320 100644
--- a/databases/msql3/pkg-descr
+++ b/databases/msql3/pkg-descr
@@ -1,146 +1,5 @@
-README for mSQL version 1.0	14 December 1994
-----------------------------------------------------------------------------
+mSQL (Mini-SQL) is a database manager.  Refer to the documents in
+/usr/local/Minerva/docs for details.
 
-
-What's new in 1.0
------------------
-
-1.0 is actually what was going to be 0.3-release.  I decided to give it
-a "real" number because it has enough features and appears stable enough
-to be used seriously now (we're even using it in production at Bond 
-hanging of the back of our WWW server and campus user database). 2
-months of alpha and beta testing has produced what appears to be a
-pretty solid hunk of code.
-
-1.0 brings per-database access control, joins, ordering, mmap() support
-if you have it (and it'll do shared read/write regions - unlike Linux, HPUX
-etc), distinct, and many bug fixes to mSQL.  The doco has also been updated 
-for for this release to reflect the changes to both the SQL supported
-and also the API and programs.
-
-
-msqladmin now offers a "shutdown" command and also a "reload" command
-for reloading the access control info on the fly.  You can only run
-msqladmin as root (or whoever you specified as the root user) from the
-local machine.  There's further info  about the access control mechanism 
-in the manual.
-
-msqladmin also offers a version command.  This will report the version
-of msqladmin, the version of the server it's talking to, and the
-protocol version used to talk to the server.
-
-msql will use the VISUAL environment variable for your editor rather
-than forcing you to use vi.  If it isn't set it'll default to vi anyway.
-
-A new program called msqldump is included to generate an ASCII dump of a
-table or an entire database.  The output is formatted as an msql script
-and includes the "create table" and "insert" commands required to
-recreate whatever was dumped.  It'll work over the net too so you can
-grab an entire database off a remote box.
-
-The MSQL_HOST environment variable has gone.  All msql programs now
-offer a -h option for talking to a remote host.  In the API, if
-msqlConnect() is called with NULL, it forces it to use the UNIX socket
-on the local host.
-
-The lex/flex based scanner has been replaced by a hand written C
-scanner.  This removes a heap of portability problems with various
-version of lex/flex and the good old "I'm flex but I'll call myself lex"
-problem on Linux and *BSD.
-
-A regression test suite is now available in tests/rtest.  Run it after
-you've compiled and installed the code to ensure that it's working OK.
-
-
-General Info
-------------
-
-mSQL has been developed under Sun OS 4.1.1 but has been tested under
-Solaris 2.3, Ultrix 4.3, Linux, FreeBSD 2, and OSF/1 (cc not gcc).  That 
-said, it should "autoconf" and build on most BSD derived systems, SVR4 
-based systems or POSIX O/S's (that should cover most of them).  It has been
-reported that it works out-of-the-box on HP-UX, NeXT, SCO, Sequent,
-Cray, Tandem and a few others.  I haven't tested these so buyer beware.
-
-
-Installation
-------------
-
-To build mSQL, type "make target" in the top directory.  This will build
-a directory where the object files for your system will be made.  This
-mechanism allows you to NFS mount the sources onto different machines
-and build mSQL on different platforms without having to make copies of 
-the sources.  The directory will be under the "targets" directory (e.g.
-$(TOP)/targets/Solaris-2.3-Sparc )
-
-Once the target directory has been created, change directory into it and
-run "setup".  That will run autoconf and some other configuration
-scripts.  Once that has completed, just type make.  You should install
-the software with "make install" when you're happy with it.  
-
-The default installation directory is /usr/local/Minerva.  This area is
-shared by all the development of Minerva (including the ESL scripting
-language and Minerva itself).  It's probably a good idea to leave it as
-that rather than /usr/local/msql or similar if you wish to use ESL
-(check out doc/Minerva for details on ESL or grab the ESL manual via ftp
-from Bond.edu.au in /pub/Minerva/esl )
-
-
-Testing the software
---------------------
-
-Once it is installed, you can try the sample mSQL script provided in
-the msql source directory.  Fire up the server using
-
-	/usr/local/Minerva/bin/msqld&
-
-Create a test database using
-
-	/usr/local/Minerva/bin/msqladmin create test
-
-Run the script through the terminal monitor using
-
-	/usr/local/Minerva/bin/msql test < sample.msql
-
-There are also some further test scripts in the tests directory.  The
-"killer" test will produce performance figures about mSQL running on
-your machine.  details such as the number of operations per second for
-inserts, fills and selects on both keyed and flat tables is generated.
-
-For a real test, run the regression test suite (rtest) in the tests
-directory.
-
-
-Notes :
-------
-
-	o  Because this stuff is pretty new, there's a script in the
-	scripts directory that you may want to use to run the server.  It
-	restarts the server if it crashes and mails you a notification
-	of the failure.  It's called run_daemon and may save you some 
-	heart ache.
-
-	o  If you run this on a Cray (what?  you don't have a Y-MP at
-	home? :) you'll have to add -lsocket to EXTRA_LIB in site.mm
-	after you run setup.
-
-	o  OSF/1 and gcc don't appear to like this stuff.  If you're
-	using OSF/1 use the standard DEC compiler and everything is
-	fine.
-
-	o The manual is formatted for an A4 page.  I have run the 
-	postscript through a filter that should let it print on any
-	paper size although the margins may get stuffed up a bit.
-
-
-If you decide to use mSQL for anything, could you drop me a line.  I'd
-like to keep track of just how many people are using it and what it's
-being used for.  You may also wish to join the mailing list by sending a
-message to msql-list-request@Bond.edu.au.
-
-
-   __                                  David J. Hughes  -  Bambi@Bond.edu.au
-  /  \               /  /   /           http://Bond.edu.au/People/bambi.html
- /___/ __   _   ____/  /   / _     
-/   \ /  \ / \ /   /  /   / / \  /   Senior Network Programmer, Bond University
-\___/ \__//  / \__/   \__/ /  / /    Qld.   4229   AUSTRALIA    (+61 75 951450)
+Note that this version is freeware only for non-commercial entities.
+Read the file "License" in the documentation directory for details.
diff --git a/databases/msql3/pkg-plist b/databases/msql3/pkg-plist
index d338a8faccbe..318241e09292 100644
--- a/databases/msql3/pkg-plist
+++ b/databases/msql3/pkg-plist
@@ -1,21 +1,16 @@
 @cd /usr/local/Minerva
-@mode 755
-@owner root
-@group bin
 bin/msql
-@mode 4750
 bin/msqld
 bin/msqladmin
-@mode 4755
 bin/relshow
 bin/msqldump
-@mode 644
 include/msql.h
-@mode 644
 lib/libmsql.a
-@mode 644
-doc/mSQL-1.0.ps
-doc/License.mSQL
-@mode 600
+doc/HISTORY
+doc/License
+doc/Rates.txt
+doc/acl.txt
+doc/mSQL-1.0.11.ps
+doc/mSQL-Invoice.txt
 msql.acl.sample
 @exec mkdir -p %D/msqldb/.tmp