6 files changed, 200 insertions, 108 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 1d846c635788..8d37e4b54387 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: analog
-# Version required:	1.92b1
+# Version required:     2.11
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.6 1997/04/19 18:28:20 paul Exp $
+# $Id: Makefile,v 1.7 1997/04/30 00:16:34 paul Exp $
 #
 
-DISTNAME=	analog.1.92.1
-PKGNAME=	analog-1.92.1
+DISTNAME=       analog2.11
+PKGNAME=        analog-2.11
 CATEGORIES=	www
-MASTER_SITES=	http://www.statslab.cam.ac.uk/~sret1/ \
+MASTER_SITES=   http://www.statslab.cam.ac.uk/~sret1/analog/ \
 		http://www.lightside.net/analog/ \
 		http://www.gamesdomain.com/analog/ \
 		http://www.monash.edu.au/mirror/analog/ \
@@ -19,12 +19,33 @@ MASTER_SITES=	http://www.statslab.cam.ac.uk/~sret1/ \
 
 MAINTAINER=	jfitz@freebsd.org
 
-WRKSRC=		${WRKDIR}/analog
-
 do-install:
-	@mkdir -p ${PREFIX}/share/analog
-	@(cd ${WRKSRC}; cp -r Readme.html domains.tab primes.tab images ${PREFIX}/share/analog; cp analog ${PREFIX}/bin)
-	@(cd ${PREFIX}/share/analog; chmod +r *)
-	@strip ${PREFIX}/bin/analog
+	install -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
+		${PREFIX}/share/doc/analog
+	install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
+		${PREFIX}/lib/analog/lang
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} Readme.html Licence \
+		${PREFIX}/share/doc/analog
+	cd ${WRKSRC}/images && \
+		${INSTALL_DATA} * ${PREFIX}/www/icons
+	cd ${WRKSRC}/lang && \
+		${INSTALL_DATA} * ${PREFIX}/lib/analog/lang
+	cd ${WRKSRC} && \
+		${INSTALL_PROGRAM} analog ${PREFIX}/bin
+	cd ${WRKSRC} && \
+	for file in domains.tab primes.tab analog.cfg ; 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
 
 .include <bsd.port.mk>
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 1d5f251bc02a..48b99e5728e7 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog.1.92.1.tar.gz) = bad07c63abbb0d9bd23afd97c2f27238
+MD5 (analog2.11.tar.gz) = 73ee7309353718b17b37b49745bdde7f
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 8dfc3d77f6e2..60ab16f52f16 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,20 +1,30 @@
---- Makefile.orig	Wed Oct  9 09:46:19 1996
-+++ Makefile	Mon Oct 21 20:37:22 1996
-@@ -2,7 +2,7 @@
- # Please read Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/
- CC = gcc           # which compiler to use. NB Different compilers need
- #                    different CFLAGS, e.g., -O instead of -O2.
--CFLAGS = -O2       # options, e.g. for optimisation or ANSI compilation.
-+#CFLAGS = -O2       # options, e.g. for optimisation or ANSI compilation.
- DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT
- OS = UNIX          # Operating system: UNIX, DOS, MAC or VMS
- LIBS = -lm         # extra libraries needed; Solaris 2 (SunOS 5) needs
-@@ -21,6 +21,8 @@
- 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
-+
-+all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJS) $(HEADERS) Makefile
- 	$(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
+*** Makefile.orig	Fri Mar 14 20:33:08 1997
+--- Makefile	Sat May  3 03:09:30 1997
+***************
+*** 2,8 ****
+  # Please read 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
+  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/
+  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
+  OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC or VMS
+  LIBS = -lm         # extra libraries needed; Solaris 2 (SunOS 5) needs
+***************
+*** 22,27 ****
+--- 22,29 ----
+  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
++ 
++ all: $(PROGRAM)
+  
+  $(PROGRAM): $(OBJS) $(HEADERS) Makefile
+  	$(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
diff --git a/www/analog/files/patch-ab b/www/analog/files/patch-ab
index 20e4f3522fef..d26da2562d3b 100644
--- a/www/analog/files/patch-ab
+++ b/www/analog/files/patch-ab
@@ -1,50 +1,84 @@
---- analhead.h.orig	Sat Jul 13 10:48:54 1996
-+++ analhead.h	Mon Aug  5 21:13:30 1996
-@@ -17,11 +17,11 @@
- /* the URL of your host's home page, for linking to at the top of the
-    output; use "-" for no linking. */
- 
--#define DOMAINSFILE "/usr/local/etc/httpd/analog/domains.tab"
-+#define DOMAINSFILE "/usr/local/share/analog/domains.tab"
- /* the name of the file where the domain definitions live; see README.html
-    for the format of this file */
- 
--#define LOGFILE "/usr/local/etc/httpd/logs/access_log"
-+#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). */
- 
-@@ -30,7 +30,7 @@
-    The URL can be absolute, or relative to the output page: e.g., just the
-    empty string "" for the same directory as the output page. */
- 
--#define DEFAULTCONFIGFILE "/usr/local/etc/httpd/analog/analog.cfg"
-+#define DEFAULTCONFIGFILE "none"
- /* the name of the default configuration file; see README.html for a
-    description of this file. Use "none" for no configuration file. */
- 
-@@ -80,20 +80,20 @@
- #define CACHEFILE "none"
- /* The default file of cached time info. Use "none" for none. */
- 
--#define REFERRER_LOG "/usr/local/etc/httpd/logs/referer_log"
-+#define REFERRER_LOG "/var/log/httpd-referrer.log"
- /* The name of the default referrer_log (= referer_log). Use "none" for none.
-    Can be a list, separated by commas. */
- 
--#define BROWSER_LOG "/usr/local/etc/httpd/logs/agent_log"
-+#define BROWSER_LOG "/var/logs/httpd-agent.log"
- /* The name of the default browser log (= agent_log) similarly. */
- 
--#define ERROR_LOG "/usr/local/etc/httpd/logs/error_log"
-+#define ERROR_LOG "/var/log/httpd-error.log"
- /* The name of the default error_log similarly. */
- 
- #define NUMLOOKUP (OFF)
- /* whether to try and resolve IP addresses. Can be slow. */
- 
--#define DNSFILE "/users4/sret1/misc/analog/dnscache"
-+#define DNSFILE "/usr/local/share/analog/dnscache"
- /* where to store resolved addresses so we don't have to look them up next
-    time */
- 
+*** analhead.h.orig	Fri Mar 14 20:33:09 1997
+--- analhead.h	Sat May  3 02:37:26 1997
+***************
+*** 14,25 ****
+  /* the name of your organisation or WWW host. This is used for printing
+     at the top of the output */
+  
+! #define HOSTURL "http://www.statslab.cam.ac.uk/"
+  /* the URL of your host's home page, for linking to at the top of the
+     output; use "-" for no linking. */
+  
+! #define HTTPDIR "/usr/local/etc/httpd/"
+! #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 "-"
+  /* the URL of your host's home page, for linking to at the top of the
+     output; use "-" for no linking. */
+  
+! #define ANALOGDIR "/usr/local/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,40 ****
+  /* the name of the file where the domain definitions live; see README.html
+     for the format of this file */
+  
+! #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 IMAGEDIR "/images/"
+  /* URL of the directory where the images for the graphical reports live.
+     The URL can be absolute, or relative to the output page: e.g., just the
+     empty string "" for the same directory as the output page. Ends with /. */
+--- 29,39 ----
+  /* the name of the file where the domain definitions live; see README.html
+     for the format of this file */
+  
+! #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). */
+  
+! #define IMAGEDIR "/icons/"
+  /* URL of the directory where the images for the graphical reports live.
+     The URL can be absolute, or relative to the output page: e.g., just the
+     empty string "" for the same directory as the output page. Ends with /. */
+***************
+*** 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. */
+  
+! #define REFERRER_LOG "/var/log/httpd-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 "/var/logs/httpd-agent.log"
+  /* The name of the default browser log (= agent_log) similarly. */
+  
+! #define ERROR_LOG "/var/log/httpd-error.log"
+  /* The name of the default error_log similarly. */
+  
+  #define NUMLOOKUP (OFF)
diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac
index 6b8da452316b..604396f025a2 100644
--- a/www/analog/files/patch-ac
+++ b/www/analog/files/patch-ac
@@ -1,13 +1,21 @@
---- analhea2.h.orig	Sat Apr 19 18:47:26 1997
-+++ analhea2.h	Sat Apr 19 18:47:36 1997
-@@ -59,9 +59,9 @@
- #include <ctype.h>
- #ifndef NODIRENT
- #ifndef VMSDIRENT
--#include <dirent.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <dirent.h>
- #else
- #define VMS_FSPEC_MAX 256
- #include <descrip.h>
+*** analhea2.h.orig	Fri Mar 14 20:36:49 1997
+--- analhea2.h	Sat May  3 01:28:08 1997
+***************
+*** 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 */
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 0d2fd13b7be7..590306a02632 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -1,14 +1,33 @@
 bin/analog
-share/analog/Readme.html
-share/analog/domains.tab
-share/analog/primes.tab
-share/analog/images/analogo.gif
-share/analog/images/bar1.gif
-share/analog/images/bar16.gif
-share/analog/images/bar2.gif
-share/analog/images/bar32.gif
-share/analog/images/bar4.gif
-share/analog/images/bar8.gif
-share/analog/images/html2.gif
-@dirrm share/analog/images
-@dirrm share/analog
+share/doc/analog/Readme.html
+share/doc/analog/Licence
+share/doc/analog/analogform.html
+lib/analog/domains.tab
+lib/analog/primes.tab
+lib/analog/analog.cfg
+www/cgi-bin/analform.cgi
+www/icons/analogo.gif
+www/icons/bar1.gif
+www/icons/bar16.gif
+www/icons/bar2.gif
+www/icons/bar32.gif
+www/icons/bar4.gif
+www/icons/bar8.gif
+www/icons/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 share/doc/analog