4 files changed, 54 insertions, 24 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 2c3d69578930..2f5a16ed08a1 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,4 +1,5 @@
 # New ports collection makefile for: analog
+# http://www.analog.cx/
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
@@ -6,7 +7,7 @@
 #
 
 PORTNAME=	analog
-PORTVERSION= 	4.04
+PORTVERSION=    4.1
 CATEGORIES=	www
 MASTER_SITES=   http://www.analog.cx/ \
 		http://brendanr.simplenet.com/analog/ \
diff --git a/www/analog/distinfo b/www/analog/distinfo
index a51f8c5edcaf..3690884e7064 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog-4.04.tar.gz) = 622dc3687d93be6e6477a558be3e134e
+MD5 (analog-4.1.tar.gz) = d417106fa657f23c40bfff3679d1eab5
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 689248551786..ea9c2ba1bc24 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,22 +1,29 @@
---- Makefile.orig	Tue Mar 21 12:58:01 2000
-+++ Makefile	Thu Mar 23 12:25:23 2000
-@@ -7,7 +7,11 @@
+--- Makefile.orig	Thu Mar 30 17:59:16 2000
++++ Makefile	Sat Apr 15 11:09:28 2000
+@@ -7,7 +7,7 @@
  #                    -Ae (HP/UX 10);       BS2000/OSD requires -XLLML -XLLMK;
  #                    NeXTSTEP apparently needs...
  #                    CEXTRAFLAGS = -O2 -pipe -no-precomp 
--DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
-+#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
+-DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ...
++#DEFS =             # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ...
+ #                    ... -DEBCDIC -DNOGMTIME -DNEED_STRCMP -DNEED_MEMMOVE ...
+ #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
+ #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
+@@ -15,6 +15,10 @@
+ #   DEFS = -DNEED_MEMMOVE -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
+ #                    DYNIX/ptx reportedly needs -D_SOCKET_VERSION=11
+ #                    All the options are explained at the bottom of this file.
 +DEFS =  -DANALOGDIR=\"$(PREFIX)/lib/analog/\" \
 +	-DLOGFILE=\"/var/log/httpd-access.log\" \
 +	-DIMAGEDIR=\"/images/\" \
 +	-DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\"
- #                    ... -DEBCDIC -DNOGMTIME -DNEED_STRCMP -DNEED_MEMMOVE ...
- #                    ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H
- #                    Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP
+ OS = UNIX          # Operating system: UNIX, DOS, WIN32, MAC, OS2, VMS
+ #                    RISCOS, BEOS, NEXTSTEP, BS2000
+ LIBS =       # extra libraries needed; Solaris 2 (SunOS 5) needs
 @@ -29,7 +33,7 @@
- 	input.o macinput.o macstuff.o output.o output2.o process.o settings.o \
- 	sort.o tree.o utils.o win32.o
- HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h
+ 	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)
  
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 89f01345b681..80c86d87345c 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -4,83 +4,106 @@ etc/analog.cfg-dist
 lib/analog/lang/am.lng
 lib/analog/lang/amdom.tab
 lib/analog/lang/ba.lng
+lib/analog/lang/br.lng
 lib/analog/lang/bra.lng
 lib/analog/lang/brh.lng
+lib/analog/lang/cat.lng
 lib/analog/lang/cata.lng
 lib/analog/lang/cath.lng
 lib/analog/lang/cns.lng
 lib/analog/lang/cnt.lng
+lib/analog/lang/cz.lng
 lib/analog/lang/cz1250.lng
 lib/analog/lang/cza.lng
-lib/analog/lang/czh.lng
+lib/analog/lang/de.lng
 lib/analog/lang/dea.lng
 lib/analog/lang/deadom.tab
+lib/analog/lang/dedom.tab
 lib/analog/lang/deform.html
 lib/analog/lang/deh.lng
 lib/analog/lang/dehdom.tab
+lib/analog/lang/dk.lng
 lib/analog/lang/dka.lng
 lib/analog/lang/dkh.lng
+lib/analog/lang/es.lng
 lib/analog/lang/esa.lng
 lib/analog/lang/esadom.tab
+lib/analog/lang/esdom.tab
 lib/analog/lang/esh.lng
 lib/analog/lang/eshdom.tab
+lib/analog/lang/fi.lng
 lib/analog/lang/fia.lng
 lib/analog/lang/fih.lng
+lib/analog/lang/fr.lng
 lib/analog/lang/fra.lng
 lib/analog/lang/fradom.tab
+lib/analog/lang/frdom.tab
 lib/analog/lang/frform.html
 lib/analog/lang/frh.lng
 lib/analog/lang/frhdom.tab
+lib/analog/lang/gr.lng
 lib/analog/lang/gra.lng
-lib/analog/lang/grh.lng
 lib/analog/lang/hua.lng
 lib/analog/lang/huh.lng
 lib/analog/lang/is.lng
 lib/analog/lang/isa.lng
 lib/analog/lang/ish.lng
+lib/analog/lang/it.lng
 lib/analog/lang/ita.lng
 lib/analog/lang/itadom.tab
+lib/analog/lang/itdom.tab
 lib/analog/lang/ith.lng
 lib/analog/lang/ithdom.tab
 lib/analog/lang/jp.lng
 lib/analog/lang/jpform.html
 lib/analog/lang/kr.lng
 lib/analog/lang/lt.lng
+lib/analog/lang/lv.lng
 lib/analog/lang/lva.lng
-lib/analog/lang/lvh.lng
 lib/analog/lang/nl.lng
+lib/analog/lang/nla.lng
+lib/analog/lang/no.lng
+lib/analog/lang/no2.lng
 lib/analog/lang/no2a.lng
 lib/analog/lang/no2h.lng
 lib/analog/lang/noa.lng
 lib/analog/lang/noh.lng
+lib/analog/lang/pl.lng
 lib/analog/lang/pla.lng
 lib/analog/lang/pladom.tab
-lib/analog/lang/plh.lng
-lib/analog/lang/plhdom.tab
+lib/analog/lang/pldom.tab
+lib/analog/lang/pt.lng
 lib/analog/lang/pta.lng
 lib/analog/lang/pth.lng
 lib/analog/lang/ro.lng
+lib/analog/lang/ru.lng
 lib/analog/lang/rua.lng
-lib/analog/lang/ruh.lng
-lib/analog/lang/ruhdom.tab
+lib/analog/lang/rudom.tab
+lib/analog/lang/se.lng
 lib/analog/lang/sea.lng
 lib/analog/lang/seadom.tab
+lib/analog/lang/sealt.lng
+lib/analog/lang/sealta.lng
+lib/analog/lang/sealth.lng
+lib/analog/lang/sedom.tab
 lib/analog/lang/seh.lng
 lib/analog/lang/sehdom.tab
 lib/analog/lang/si.lng
 lib/analog/lang/si1250.lng
+lib/analog/lang/sk.lng
 lib/analog/lang/ska.lng
-lib/analog/lang/skh.lng
+lib/analog/lang/tr.lng
 lib/analog/lang/tra.lng
-lib/analog/lang/trh.lng
 lib/analog/lang/ua.lng
 lib/analog/lang/uk.lng
+lib/analog/lang/uka.lng
 lib/analog/lang/ukdom.tab
 lib/analog/lang/us.lng
+lib/analog/lang/usa.lng
 lib/analog/lang/usform.html
+lib/analog/lang/yu.lng
 lib/analog/lang/yua.lng
 lib/analog/lang/yudom.tab
-lib/analog/lang/yuh.lng
 share/doc/analog/Licence.txt
 share/doc/analog/Readme.html
 share/doc/analog/acknow.html
@@ -123,7 +146,6 @@ share/doc/analog/quickref.html
 share/doc/analog/reports.html
 share/doc/analog/start.html
 share/doc/analog/startmac.html
-share/doc/analog/startos2.html
 share/doc/analog/startpc.html
 share/doc/analog/startux.html
 share/doc/analog/syntax.html