7 files changed, 128 insertions, 141 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 29425202a81d..9dc117ef4ebf 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	analog
-PORTVERSION=	4.16
-PORTREVISION=	1
+PORTVERSION=	5.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.analog.cx/ \
 		http://www.monash.edu.au/mirror/analog/ \
@@ -19,11 +18,9 @@ MASTER_SITES=	http://www.analog.cx/ \
 
 MAINTAINER=	mharo@FreeBSD.org
 
-MAKE_FLAGS=	-DPREFIX=${PREFIX} -f
 ALL_TARGET=	analog
 
 do-install:
-	${MKDIR} ${PREFIX}/share/doc/analog
 	${MKDIR} ${PREFIX}/share/analog/lang
 	${MKDIR} ${PREFIX}/www/data/images
 	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/data/images
@@ -34,6 +31,7 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg-dist
 .if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/analog
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog
 .endif
 
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 6673454465a2..a1534db6b5bd 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog-4.16.tar.gz) = e951152629b1b23ef09b17f32d9310c4
+MD5 (analog-5.0.tar.gz) = b3a3fab7eb63ea64456837ebe40dfdf4
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 34f3b8af5543..fa7eb10c8505 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,45 +1,30 @@
---- Makefile.orig	Tue Feb 13 07:09:08 2001
-+++ Makefile	Wed Apr 11 17:28:09 2001
-@@ -1,13 +1,13 @@
- # Makefile for analog 4.16
+--- src/Makefile.orig	Thu May  3 19:22:47 2001
++++ src/Makefile	Thu May  3 19:23:59 2001
+@@ -1,12 +1,12 @@
+ # Makefile for analog 5.0
  # Please read docs/Readme.html, or http://www.analog.cx/
 -CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
 +CC ?= gcc           # which compiler to use: eg cc, acc, gcc. NB Different
  #                    compilers need different CFLAGS, e.g., -O instead of -O2.
--CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
-+#CEXTRAFLAGS = -O2  # options, e.g. for optimisation or ANSI compilation.
- #                    HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ...
- #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK;
- #                    NeXTSTEP apparently needs...
- #                    CEXTRAFLAGS = -O2 -pipe -no-precomp 
--DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ...
-+#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ...
- #                    ... -DEBCDIC -DNOGMTIME -DNEED_STRCMP -DNEED_MEMMOVE ...
- #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DHAVE_ADDR_T ...
- #                    ... -DNEED_FLOATINGPOINT_H
-@@ -18,6 +18,10 @@
- #                    DYNIX/ptx reportedly needs -D_SOCKET_VERSION=11
- #                    MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE
- #                    All the options are explained at the bottom of this file.
-+DEFS =  -DANALOGDIR=\"$(PREFIX)/share/analog/\" \
+-CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
++#CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
+ #                 HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
+ #                 BS2000/OSD needs CFLAGS = -XLLML -XLLMK
+ #                 NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp 
+-DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
++#DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
+ #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
+ #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP -DHAVE_GD -DHAVE_PCRE ...
+ #                 ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ...
+@@ -19,6 +19,11 @@
+ #                 64-bit Solaris needs -DHAVE_ADDR_T
+ #                 DYNIX/ptx needs -D_SOCKET_VERSION=11
+ #                 MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE
++DEFS =	-DANALOGDIR=\"$(PREFIX)/share/analog/\" \
 +	-DLOGFILE=\"/var/log/httpd-access.log\" \
 +	-DIMAGEDIR=\"/images/\" \
 +	-DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\"
- OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS,
- #                    RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400
- LIBS =       # extra libraries needed; Solaris 2 (SunOS 5) needs
-@@ -33,12 +37,12 @@
- 	input.o macinput.o macstuff.o output.o output2.o pcre.o process.o \
- 	settings.o sort.o tree.o utils.o win32.o
- HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h pcre.h
--CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS)
-+CFLAGS += $(DEFS) -D$(OS)
- 
- $(PROGRAM): $(OBJS) $(HEADERS) Makefile
- 	$(CC) $(CEXTRAFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
- 	@echo '***'
--	@echo '***IMPORTANT: You must read the licence before using analog'
-+	@echo '***IMPORTANT: You must read the license before using analog'
- 	@echo '***'
- 
- # There doesn't seem to be a good way to write all these rules in a generic
++	
+ #
+ OS = UNIX         # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
+ #                   RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
diff --git a/www/analog/files/patch-ab b/www/analog/files/patch-ab
index db1b2da82ba2..10cae850af90 100644
--- a/www/analog/files/patch-ab
+++ b/www/analog/files/patch-ab
@@ -1,6 +1,6 @@
---- tree.c.orig	Fri Dec 17 13:15:19 1999
-+++ tree.c	Thu Dec 23 11:19:15 1999
-@@ -781,8 +781,16 @@
+--- src/tree.c.orig	Thu May  3 19:31:50 2001
++++ src/tree.c	Thu May  3 19:32:22 2001
+@@ -803,8 +803,16 @@
      }
      else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL)
        *name = "Unix:Linux";
diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac
index 81a7605e0e7e..16656ea0e87d 100644
--- a/www/analog/files/patch-ac
+++ b/www/analog/files/patch-ac
@@ -1,12 +1,12 @@
---- analog.cfg.orig	Tue Mar 21 12:58:01 2000
-+++ analog.cfg	Thu Mar 23 12:27:27 2000
-@@ -7,7 +7,8 @@
+--- analog.cfg.orig	Thu May  3 19:27:47 2001
++++ analog.cfg	Thu May  3 19:27:15 2001
+@@ -9,7 +9,8 @@
  # There is a much more extensive configuration file in examples/big.cfg
  #
- # If you need a LOGFORMAT command it must go here, above the LOGFILE command.
--# LOGFILE logfile.log
+ # If you need a LOGFORMAT command it must go here, above the LOGFILE commands.
+-LOGFILE logfile.log
 +LOGFORMAT COMBINED
 +LOGFILE /var/log/httpd-access.log
- # OUTFILE outfile.html
+ # LOGFILE /old/logs/access_log.*
+ # OUTFILE Report.html
  # HOSTNAME "[my organisation]"
- # REQINCLUDE pages
diff --git a/www/analog/pkg-descr b/www/analog/pkg-descr
index 9b3c871f1eea..66ec17af9dd1 100644
--- a/www/analog/pkg-descr
+++ b/www/analog/pkg-descr
@@ -3,6 +3,6 @@ old format from WWW servers. It is designed to be fast on long
 logfiles and to produce attractive statistics.
 
 It was written by Stephen Turner (sret1@cam.ac.uk). For more details,
-see the Readme.html in /usr/local/share/analog or the website.
+see the Readme.html in ${PREFIX}/share/doc/analog or the website.
 
 WWW: http://www.analog.cx/
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index e4c28251e2b8..445caf221a33 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -7,21 +7,19 @@ share/analog/lang/am.lng
 share/analog/lang/amdom.tab
 share/analog/lang/ba.lng
 share/analog/lang/bg.lng
+share/analog/lang/bgdesc.txt
 share/analog/lang/bgdom.tab
-share/analog/lang/bgh.lng
-share/analog/lang/bghdom.tab
+share/analog/lang/bgmik.lng
+share/analog/lang/bgmikdom.tab
+share/analog/lang/bgmkdesc.txt
 share/analog/lang/br.lng
 share/analog/lang/bra.lng
 share/analog/lang/bradom.tab
 share/analog/lang/brdom.tab
-share/analog/lang/brh.lng
-share/analog/lang/brhdom.tab
 share/analog/lang/cat.lng
 share/analog/lang/cata.lng
 share/analog/lang/catadom.tab
 share/analog/lang/catdom.tab
-share/analog/lang/cath.lng
-share/analog/lang/cathdom.tab
 share/analog/lang/cn.lng
 share/analog/lang/cz.lng
 share/analog/lang/cz1250.lng
@@ -31,31 +29,22 @@ share/analog/lang/dea.lng
 share/analog/lang/deadom.tab
 share/analog/lang/dedom.tab
 share/analog/lang/deform.html
-share/analog/lang/deh.lng
-share/analog/lang/dehdom.tab
 share/analog/lang/dk.lng
 share/analog/lang/dka.lng
-share/analog/lang/dkh.lng
 share/analog/lang/es.lng
 share/analog/lang/esa.lng
 share/analog/lang/esadom.tab
 share/analog/lang/esdom.tab
 share/analog/lang/esform.html
-share/analog/lang/esh.lng
-share/analog/lang/eshdom.tab
 share/analog/lang/fi.lng
 share/analog/lang/fia.lng
 share/analog/lang/fiadom.tab
 share/analog/lang/fidom.tab
-share/analog/lang/fih.lng
-share/analog/lang/fihdom.tab
 share/analog/lang/fr.lng
 share/analog/lang/fra.lng
 share/analog/lang/fradom.tab
 share/analog/lang/frdom.tab
 share/analog/lang/frform.html
-share/analog/lang/frh.lng
-share/analog/lang/frhdom.tab
 share/analog/lang/gr.lng
 share/analog/lang/gra.lng
 share/analog/lang/hr.lng
@@ -66,38 +55,38 @@ share/analog/lang/huadom.tab
 share/analog/lang/hudom.tab
 share/analog/lang/is.lng
 share/analog/lang/isa.lng
-share/analog/lang/ish.lng
 share/analog/lang/it.lng
 share/analog/lang/ita.lng
 share/analog/lang/itadom.tab
 share/analog/lang/itdom.tab
 share/analog/lang/itform.html
-share/analog/lang/ith.lng
-share/analog/lang/ithdom.tab
+share/analog/lang/jp.cfg
 share/analog/lang/jp.lng
+share/analog/lang/jpdesc.txt
+share/analog/lang/jpdom.tab
 share/analog/lang/jpform.html
 share/analog/lang/kr.lng
 share/analog/lang/lt.lng
 share/analog/lang/lv.lng
-share/analog/lang/lva.lng
 share/analog/lang/nl.lng
-share/analog/lang/nla.lng
+share/analog/lang/nladesc.txt
+share/analog/lang/nladom.tab
+share/analog/lang/nldesc.txt
+share/analog/lang/nldom.tab
 share/analog/lang/no.lng
 share/analog/lang/no2.lng
 share/analog/lang/no2a.lng
-share/analog/lang/no2h.lng
 share/analog/lang/noa.lng
-share/analog/lang/noh.lng
 share/analog/lang/pl.lng
 share/analog/lang/pla.lng
 share/analog/lang/pladom.tab
 share/analog/lang/pldom.tab
 share/analog/lang/pt.lng
+share/analog/lang/ptdesc.txt
 share/analog/lang/pta.lng
+share/analog/lang/ptadesc.txt
 share/analog/lang/ptadom.tab
 share/analog/lang/ptdom.tab
-share/analog/lang/pth.lng
-share/analog/lang/pthdom.tab
 share/analog/lang/ro.lng
 share/analog/lang/rodom.tab
 share/analog/lang/ru.lng
@@ -107,11 +96,8 @@ share/analog/lang/se.lng
 share/analog/lang/sea.lng
 share/analog/lang/seadom.tab
 share/analog/lang/sealt.lng
-share/analog/lang/sealta.lng
-share/analog/lang/sealth.lng
+share/analog/lang/sealtdesc.txt
 share/analog/lang/sedom.tab
-share/analog/lang/seh.lng
-share/analog/lang/sehdom.tab
 share/analog/lang/si.lng
 share/analog/lang/si1250.lng
 share/analog/lang/sk.lng
@@ -121,72 +107,79 @@ share/analog/lang/tra.lng
 share/analog/lang/tw.lng
 share/analog/lang/twdom.tab
 share/analog/lang/ua.lng
+share/analog/lang/uadesc.txt
 share/analog/lang/uk.lng
-share/analog/lang/uka.lng
+share/analog/lang/uk12.lng
+share/analog/lang/ukdesc.txt
 share/analog/lang/ukdom.tab
 share/analog/lang/us.lng
-share/analog/lang/usa.lng
+share/analog/lang/us24.lng
+share/analog/lang/usdesc.txt
 share/analog/lang/usdom.tab
 share/analog/lang/usform.html
 share/analog/lang/yu.lng
 share/analog/lang/yua.lng
 share/analog/lang/yudom.tab
-share/doc/analog/Licence.txt
-share/doc/analog/Readme.html
-share/doc/analog/acknow.html
-share/doc/analog/alias.html
-share/doc/analog/analogo.gif
-share/doc/analog/anlgdocs.css
-share/doc/analog/args.html
-share/doc/analog/bara8.gif
-share/doc/analog/barb1.gif
-share/doc/analog/barb32.gif
-share/doc/analog/barb8.gif
-share/doc/analog/barc8.gif
-share/doc/analog/bard8.gif
-share/doc/analog/bare8.gif
-share/doc/analog/barf8.gif
-share/doc/analog/barg8.gif
-share/doc/analog/barh8.gif
-share/doc/analog/basiccmd.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/favicon.ico
-share/doc/analog/form.html
-share/doc/analog/helpers.html
-share/doc/analog/hierreps.html
-share/doc/analog/include.html
-share/doc/analog/indx.html
-share/doc/analog/logfile.html
-share/doc/analog/logfmt.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/quickref.html
-share/doc/analog/reports.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/wasnew3.html
-share/doc/analog/webworks.html
-share/doc/analog/whatsnew.html
-share/doc/analog/whole.html
+%%PORTDOCS%%share/doc/analog/Licence.txt
+%%PORTDOCS%%share/doc/analog/Licgd.txt
+%%PORTDOCS%%share/doc/analog/Licpcre.txt
+%%PORTDOCS%%share/doc/analog/Licpng.txt
+%%PORTDOCS%%share/doc/analog/Liczlib.txt
+%%PORTDOCS%%share/doc/analog/Readme.html
+%%PORTDOCS%%share/doc/analog/acknow.html
+%%PORTDOCS%%share/doc/analog/alias.html
+%%PORTDOCS%%share/doc/analog/analogo.gif
+%%PORTDOCS%%share/doc/analog/anlgdocs.css
+%%PORTDOCS%%share/doc/analog/args.html
+%%PORTDOCS%%share/doc/analog/bara8.gif
+%%PORTDOCS%%share/doc/analog/barb1.gif
+%%PORTDOCS%%share/doc/analog/barb32.gif
+%%PORTDOCS%%share/doc/analog/barb8.gif
+%%PORTDOCS%%share/doc/analog/barc8.gif
+%%PORTDOCS%%share/doc/analog/bard8.gif
+%%PORTDOCS%%share/doc/analog/bare8.gif
+%%PORTDOCS%%share/doc/analog/barf8.gif
+%%PORTDOCS%%share/doc/analog/barg8.gif
+%%PORTDOCS%%share/doc/analog/barh8.gif
+%%PORTDOCS%%share/doc/analog/basiccmd.html
+%%PORTDOCS%%share/doc/analog/cache.html
+%%PORTDOCS%%share/doc/analog/compout.html
+%%PORTDOCS%%share/doc/analog/custom.html
+%%PORTDOCS%%share/doc/analog/debug.html
+%%PORTDOCS%%share/doc/analog/defns.html
+%%PORTDOCS%%share/doc/analog/dns.html
+%%PORTDOCS%%share/doc/analog/domfile.html
+%%PORTDOCS%%share/doc/analog/errors.html
+%%PORTDOCS%%share/doc/analog/faq.html
+%%PORTDOCS%%share/doc/analog/favicon.ico
+%%PORTDOCS%%share/doc/analog/form.html
+%%PORTDOCS%%share/doc/analog/helpers.html
+%%PORTDOCS%%share/doc/analog/hierreps.html
+%%PORTDOCS%%share/doc/analog/include.html
+%%PORTDOCS%%share/doc/analog/indx.html
+%%PORTDOCS%%share/doc/analog/logfile.html
+%%PORTDOCS%%share/doc/analog/logfmt.html
+%%PORTDOCS%%share/doc/analog/lowmem.html
+%%PORTDOCS%%share/doc/analog/mailing.html
+%%PORTDOCS%%share/doc/analog/map.html
+%%PORTDOCS%%share/doc/analog/meaning.html
+%%PORTDOCS%%share/doc/analog/othreps.html
+%%PORTDOCS%%share/doc/analog/output.html
+%%PORTDOCS%%share/doc/analog/quickref.html
+%%PORTDOCS%%share/doc/analog/reports.html
+%%PORTDOCS%%share/doc/analog/start.html
+%%PORTDOCS%%share/doc/analog/startmac.html
+%%PORTDOCS%%share/doc/analog/startpc.html
+%%PORTDOCS%%share/doc/analog/startux.html
+%%PORTDOCS%%share/doc/analog/syntax.html
+%%PORTDOCS%%share/doc/analog/timereps.html
+%%PORTDOCS%%share/doc/analog/update.html
+%%PORTDOCS%%share/doc/analog/wasnew1.html
+%%PORTDOCS%%share/doc/analog/wasnew2.html
+%%PORTDOCS%%share/doc/analog/wasnew3.html
+%%PORTDOCS%%share/doc/analog/wasnew4.html
+%%PORTDOCS%%share/doc/analog/webworks.html
+%%PORTDOCS%%share/doc/analog/whatsnew.html
 www/data/images/analogo.gif
 www/data/images/bara1.gif
 www/data/images/bara16.gif
@@ -237,9 +230,20 @@ www/data/images/barh32.gif
 www/data/images/barh4.gif
 www/data/images/barh8.gif
 www/data/images/html2.gif
+www/data/images/sq0.png
+www/data/images/sq1.png
+www/data/images/sq2.png
+www/data/images/sq3.png
+www/data/images/sq4.png
+www/data/images/sq5.png
+www/data/images/sq6.png
+www/data/images/sq7.png
+www/data/images/sq8.png
+www/data/images/sq9.png
+www/data/images/sqg.png
 @dirrm share/analog/lang
 @dirrm share/analog
-@dirrm share/doc/analog
+%%PORTDOCS%%@dirrm share/doc/analog
 @unexec rmdir %D/www/data/images 2>/dev/null || true
 @unexec rmdir %D/www/data 2>/dev/null || true
 @unexec rmdir %D/www 2>/dev/null || true