Upgrade to 2.90beta3

6 files changed, 133 insertions, 120 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index bda938f720b3..2652fc7ad7b8 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for: analog
-# Version required:     2.11
+# Version required:     2.90beta3
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.8 1997/05/02 23:16:50 ache Exp $
+# $Id: Makefile,v 1.9 1997/05/07 19:51:22 ache Exp $
 #
 
-DISTNAME=       analog2.11
-PKGNAME=        analog-2.11
+DISTNAME=       analog2.90beta3
+PKGNAME=        analog-2.90b3
 CATEGORIES=	www
 MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 		http://www.lightside.net/analog/ \
@@ -17,7 +17,9 @@ MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 		ftp://download.netvision.net.il/pub/mirrors/analog/ \
 		ftp://mabuse.phil.uni-passau.de/pub/mirrors/analog/
 
-MAINTAINER=	jfitz@freebsd.org
+MAINTAINER=     ache@freebsd.org
+
+MAKE_FLAGS=     -DPREFIX=${PREFIX} -f
 
 do-install:
 	install -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
@@ -26,9 +28,8 @@ do-install:
 		${PREFIX}/lib/analog/lang
 	install -d -o nobody -g nogroup -m 755 \
 		${PREFIX}/www/data/images
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} Readme.html Licence \
-		${PREFIX}/share/doc/analog
+	cd ${WRKSRC}/docs && \
+		${INSTALL_DATA} * ${PREFIX}/share/doc/analog
 	cd ${WRKSRC}/images && \
 		${INSTALL_DATA} * ${PREFIX}/www/data/images
 	cd ${WRKSRC}/lang && \
@@ -36,18 +37,20 @@ do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} analog ${PREFIX}/bin
 	cd ${WRKSRC} && \
-	for file in domains.tab primes.tab analog.cfg ; do \
+	for file in domains.tab ; do \
 	    if [ -f ${PREFIX}/lib/analog/$$file ] ; then \
 		${INSTALL_DATA} -m 644 $$file ${PREFIX}/lib/analog/$$file-dist ; \
 	    else \
 		${INSTALL_DATA} -m 644 $$file ${PREFIX}/lib/analog/$$file ; \
 	    fi ; \
 	done
-	cd ${WRKSRC} && make form
-	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} analform.cgi ${PREFIX}/www/cgi-bin
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} analogform.html \
-		${PREFIX}/share/doc/analog
+	for file in analog.cfg ; do \
+	    if [ -f ${PREFIX}/etc/$$file ] ; then \
+		${INSTALL_DATA} -m 644 $$file ${PREFIX}/etc/$$file-dist ; \
+	    else \
+		${INSTALL_DATA} -m 644 $$file ${PREFIX}/etc/$$file ; \
+	    fi ; \
+	done
 
 .include <bsd.port.mk>
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 48b99e5728e7..8e0416b2b751 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog2.11.tar.gz) = 73ee7309353718b17b37b49745bdde7f
+MD5 (analog2.90beta3.tar.gz) = ba2969658d479fc16c0025e097fa004e
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 60ab16f52f16..2b47d09ef369 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,25 +1,32 @@
-*** Makefile.orig	Fri Mar 14 20:33:08 1997
---- Makefile	Sat May  3 03:09:30 1997
+*** Makefile.orig	Wed Apr  8 17:37:54 1998
+--- Makefile	Wed Apr  8 19:42:19 1998
 ***************
-*** 2,8 ****
-  # Please read Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
+*** 2,11 ****
+  # Please read docs/Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
   CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
   #                    compilers need different CFLAGS, e.g., -O instead of -O2.
 ! CFLAGS = -O2       # options, e.g. for optimisation or ANSI compilation.
-  DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT
+  #                    HP/UX cc needs -Aa
+  #                    Some Linuces might need -I/usr/src/linux/include
+! DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT
   OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC or VMS
-  LIBS = -lm         # extra libraries needed; Solaris 2 (SunOS 5) needs
---- 2,8 ----
-  # Please read Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
+  LIBS =             # extra libraries needed; Solaris 2 (SunOS 5) needs
+  #                    LIBS = -lnsl and SCO Unix needs LIBS = -lsocket
+--- 2,12 ----
+  # Please read docs/Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
   CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
   #                    compilers need different CFLAGS, e.g., -O instead of -O2.
 ! #CFLAGS = -O2       # options, e.g. for optimisation or ANSI compilation.
-  DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT
+  #                    HP/UX cc needs -Aa
+  #                    Some Linuces might need -I/usr/src/linux/include
+! #DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT
+! DEFS = -DPREFIX=\"$(PREFIX)\"
   OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC or VMS
-  LIBS = -lm         # extra libraries needed; Solaris 2 (SunOS 5) needs
+  LIBS =             # extra libraries needed; Solaris 2 (SunOS 5) needs
+  #                    LIBS = -lnsl and SCO Unix needs LIBS = -lsocket
 ***************
-*** 22,27 ****
---- 22,29 ----
+*** 26,31 ****
+--- 27,34 ----
   FORMSRC = analform.c        # The source code for that program
   FORMHTML = analogform.html  # Where the form itself will go
   FORMOPTS =                  # Extra analog options when constructing the form
diff --git a/www/analog/files/patch-ab b/www/analog/files/patch-ab
index 3ceeff668c51..60abc63e21ed 100644
--- a/www/analog/files/patch-ab
+++ b/www/analog/files/patch-ab
@@ -1,76 +1,66 @@
-*** analhead.h.orig	Fri Mar 14 20:33:09 1997
---- analhead.h	Wed May  7 23:27:03 1997
+*** analhead.h.orig	Wed Apr  8 17:48:58 1998
+--- analhead.h	Wed Apr  8 19:32:48 1998
 ***************
-*** 14,25 ****
-  /* the name of your organisation or WWW host. This is used for printing
-     at the top of the output */
+*** 5,10 ****
+--- 5,13 ----
   
-! #define HOSTURL "http://www.statslab.cam.ac.uk/"
+  #ifndef ANALHEAD
+  #define ANALHEAD
++ #ifndef PREFIX
++ #define PREFIX "/usr/local"
++ #endif
+  
+  /*** The first few options -- up to LOGO -- are ones that you may want to
+       change before compiling the program for the first time. However, all of
+***************
+*** 18,25 ****
   /* the URL of your host's home page, for linking to at the top of the
-     output; use "-" for no linking. */
+     output; use "none" for no linking. */
   
 ! #define HTTPDIR "/usr/local/etc/httpd/"
-! #define ANALOGDIR HTTPDIR "analog/"
+! #define ANALOGDIR HTTPDIR"analog/"
   /* The directories where your HTTP stuff lives and where your analog stuff
      lives. You don't really need these; they are just used in this file to
      build up other filenames. Note how you can stick together names by
---- 14,24 ----
-  /* the name of your organisation or WWW host. This is used for printing
-     at the top of the output */
-  
-! #define HOSTURL "-"
+--- 21,27 ----
   /* the URL of your host's home page, for linking to at the top of the
-     output; use "-" for no linking. */
+     output; use "none" for no linking. */
   
-! #define ANALOGDIR "/usr/local/lib/analog/"
+! #define ANALOGDIR PREFIX"/lib/analog/"
   /* The directories where your HTTP stuff lives and where your analog stuff
      lives. You don't really need these; they are just used in this file to
      build up other filenames. Note how you can stick together names by
 ***************
-*** 30,36 ****
-  /* the name of the file where the domain definitions live; see README.html
-     for the format of this file */
+*** 29,35 ****
+  #define DOMAINSFILE ANALOGDIR"domains.tab"
+  /* the file where the domain definitions live; see docs/domfile.html */
   
-! #define LOGFILE HTTPDIR "logs/access_log"
-  /* The name of the default logfile; use "stdin" for stdin.
-     Can be a list, separated by commas (but no spaces). */
+! #define LOGFILE HTTPDIR"logs/access_log"
+  /* The name of the default logfile. Can be a list, separated by commas
+     (but no spaces), and can include wild cards. */
   
---- 29,35 ----
-  /* the name of the file where the domain definitions live; see README.html
-     for the format of this file */
+--- 31,37 ----
+  #define DOMAINSFILE ANALOGDIR"domains.tab"
+  /* the file where the domain definitions live; see docs/domfile.html */
   
 ! #define LOGFILE "/var/log/httpd-access.log"
-  /* The name of the default logfile; use "stdin" for stdin.
-     Can be a list, separated by commas (but no spaces). */
+  /* The name of the default logfile. Can be a list, separated by commas
+     (but no spaces), and can include wild cards. */
   
 ***************
-*** 93,106 ****
-  #define CACHEFILE "none"
-  /* The default file of cached time info. Use "none" for none. */
-  
-! #define REFERRER_LOG HTTPDIR "logs/referer_log"
-  /* The name of the default referrer log (= referer_log). Use "none" for none.
-     Can be a list, separated by commas. */
-  
-! #define BROWSER_LOG HTTPDIR "logs/agent_log"
-  /* The name of the default browser log (= agent_log) similarly. */
-  
-! #define ERROR_LOG HTTPDIR "logs/error_log"
-  /* The name of the default error_log similarly. */
-  
-  #define NUMLOOKUP (OFF)
---- 92,105 ----
-  #define CACHEFILE "none"
-  /* The default file of cached time info. Use "none" for none. */
+*** 41,47 ****
+  #define LANGDIR ANALOGDIR"lang/"
+  /* Directory where the language files live. */
   
-! #define REFERRER_LOG "none"
-  /* The name of the default referrer log (= referer_log). Use "none" for none.
-     Can be a list, separated by commas. */
+! #define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg"
+  /* the name of the default configuration file; see README.html for a
+     description of this file. Use "none" for no configuration file. */
   
-! #define BROWSER_LOG "none"
-  /* The name of the default browser log (= agent_log) similarly. */
+--- 43,49 ----
+  #define LANGDIR ANALOGDIR"lang/"
+  /* Directory where the language files live. */
   
-! #define ERROR_LOG "/var/log/httpd-error.log"
-  /* The name of the default error_log similarly. */
+! #define DEFAULTCONFIGFILE PREFIX"/etc/analog.cfg"
+  /* the name of the default configuration file; see README.html for a
+     description of this file. Use "none" for no configuration file. */
   
-  #define NUMLOOKUP (OFF)
diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac
index 604396f025a2..6535d27b182a 100644
--- a/www/analog/files/patch-ac
+++ b/www/analog/files/patch-ac
@@ -1,21 +1,12 @@
-*** analhea2.h.orig	Fri Mar 14 20:36:49 1997
---- analhea2.h	Sat May  3 01:28:08 1997
+*** analog.cfg.bak	Wed Apr  8 17:38:41 1998
+--- analog.cfg	Wed Apr  8 21:33:32 1998
 ***************
-*** 81,88 ****
-  #ifndef NODIRENT
-  #ifndef VMSDIRENT
-  #ifndef MACDIRENT
-- #include <dirent.h>          /* Normal dirent */
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #else
-  #include "macdir.h"          /* Mac dirent */
---- 81,88 ----
-  #ifndef NODIRENT
-  #ifndef VMSDIRENT
-  #ifndef MACDIRENT
-  #include <sys/types.h>
-+ #include <dirent.h>          /* Normal dirent */
-  #include <sys/stat.h>
-  #else
-  #include "macdir.h"          /* Mac dirent */
+*** 6,11 ****
+--- 6,12 ----
+  #
+  #
+  # REQINCLUDE pages
++ LOGFORMAT COMBINED
+  LOGFILE logfile.log
+  HOSTNAME "[my organisation]"
+  LINKINCLUDE pages
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 2ffe67bf51c2..474e64dae168 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -1,11 +1,47 @@
 bin/analog
-share/doc/analog/Readme.html
-share/doc/analog/Licence
-share/doc/analog/analogform.html
+etc/analog.cfg
 lib/analog/domains.tab
-lib/analog/primes.tab
-lib/analog/analog.cfg
-www/cgi-bin/analform.cgi
+lib/analog/lang/ita.lng
+lib/analog/lang/ith.lng
+lib/analog/lang/uk.lng
+lib/analog/lang/us.lng
+share/doc/analog/Licence.txt
+share/doc/analog/Readme.html
+share/doc/analog/acknow.html
+share/doc/analog/alias.html
+share/doc/analog/basiccmd.html
+share/doc/analog/bugs.html
+share/doc/analog/cache.html
+share/doc/analog/compout.html
+share/doc/analog/custom.html
+share/doc/analog/debug.html
+share/doc/analog/defns.html
+share/doc/analog/dns.html
+share/doc/analog/domfile.html
+share/doc/analog/errors.html
+share/doc/analog/faq.html
+share/doc/analog/form.html
+share/doc/analog/hierreps.html
+share/doc/analog/include.html
+share/doc/analog/indx.html
+share/doc/analog/logfile.html
+share/doc/analog/lowmem.html
+share/doc/analog/mailing.html
+share/doc/analog/map.html
+share/doc/analog/meaning.html
+share/doc/analog/othreps.html
+share/doc/analog/output.html
+share/doc/analog/start.html
+share/doc/analog/startmac.html
+share/doc/analog/startpc.html
+share/doc/analog/startux.html
+share/doc/analog/syntax.html
+share/doc/analog/timereps.html
+share/doc/analog/update.html
+share/doc/analog/wasnew1.html
+share/doc/analog/wasnew2.html
+share/doc/analog/webworks.html
+share/doc/analog/whatsnew.html
 www/data/images/analogo.gif
 www/data/images/bar1.gif
 www/data/images/bar16.gif
@@ -14,21 +50,7 @@ www/data/images/bar32.gif
 www/data/images/bar4.gif
 www/data/images/bar8.gif
 www/data/images/html2.gif
-lib/analog/lang/danisha.lng
-lib/analog/lang/danishh.lng
-lib/analog/lang/englisha.lng
-lib/analog/lang/englishh.lng
-lib/analog/lang/frencha.lng
-lib/analog/lang/frenchh.lng
-lib/analog/lang/germana.lng
-lib/analog/lang/germanh.lng
-lib/analog/lang/italiana.lng
-lib/analog/lang/italianh.lng
-lib/analog/lang/spanisha.lng
-lib/analog/lang/spanishh.lng
-lib/analog/lang/usenga.lng
-lib/analog/lang/usengh.lng
 @dirrm lib/analog/lang
 @dirrm lib/analog
-@dirrm www/data/images
 @dirrm share/doc/analog
+@dirrm www/data/images