4 files changed, 34 insertions, 15 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index a146ff9d35ba..8574450bb815 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	analog
-PORTVERSION=	5.32
-PORTREVISION=	3
+PORTVERSION=	6.0
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.analog.cx/ \
@@ -52,7 +52,12 @@ do-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${EXAMPLESDIR}
+	${MKDIR} ${EXAMPLESDIR}/css
+	${INSTALL_DATA} ${WRKSRC}/examples/css/Readme.txt ${EXAMPLESDIR}/css
+	${INSTALL_DATA} ${WRKSRC}/examples/css/default.css ${EXAMPLESDIR}/css
+	${MKDIR} ${EXAMPLESDIR}/css/jreeves
+	${INSTALL_DATA} ${WRKSRC}/examples/css/jreeves/* ${EXAMPLESDIR}/css/jreeves
 .endif
 	${INSTALL_MAN} ${WRKSRC}/analog.man ${PREFIX}/man/man1/analog.1
 
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 9b4e20519efc..d76b838d2a19 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1,2 +1,2 @@
-MD5 (analog-5.32.tar.gz) = 077a2d43c8f5c2bddf37129ca63ec1f8
-SIZE (analog-5.32.tar.gz) = 1428349
+MD5 (analog-6.0.tar.gz) = 743d03a16eb8c8488205ae63cdb671cd
+SIZE (analog-6.0.tar.gz) = 1553316
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index c3033542875a..99e2b9ae29d3 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,7 +1,7 @@
---- src/Makefile.orig	Sun Mar 23 05:57:02 2003
-+++ src/Makefile	Thu Aug 21 10:26:26 2003
-@@ -2,15 +2,22 @@
- # Please read docs/Readme.html, or <A HREF="http://www.analog.cx/">http://www.analog.cx/</A>
+--- src/Makefile.orig	Sun Dec 19 05:51:30 2004
++++ src/Makefile	Sun Jan  9 12:50:26 2005
+@@ -2,16 +2,23 @@
+ # Please read docs/Readme.html, or http://www.analog.cx/
  # This is a general Unix-like Makefile: Makefiles for other OS's can be found
  #   in the "build" directory.
 -CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
@@ -11,22 +11,22 @@
 -CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
 +CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/gd
 +#CFLAGS = -O2    # options, e.g. for optimisation or ANSI compilation.
+ #                 Some OS's need -D_FILE_OFFSET_BITS=64 to support files > 2MB.
  #                 HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10)
  #                 BeOS needs CFLAGS = -O2 -Wl,-L/boot/home/config/lib
  #                 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 ...
 +DEFS = -DLOGFILE=\"/var/log/httpd-access.log\" \
 +       -DIMAGEDIR=\"/images/\" \
 +       -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
 +       -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
 +       -DCONFIGDIR=\"$(PREFIX)/share/analog/\" \
 +       -DHAVE_ZLIB
-+#DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
  #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
  #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
- #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_PCRE ...
-@@ -30,6 +37,12 @@
+ #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...
+@@ -31,6 +38,12 @@
  OS = UNIX         # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
  #                   RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
  LIBS = -lm  # extra libraries needed; most platforms (but not OS X or BeOS)
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 561f697cd7e2..8271d29f98e0 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -6,6 +6,7 @@ share/analog/lang/README.txt
 share/analog/lang/am.lng
 share/analog/lang/amdom.tab
 share/analog/lang/ba.lng
+share/analog/lang/baq.lng
 share/analog/lang/bg.lng
 share/analog/lang/bgdesc.txt
 share/analog/lang/bgdom.tab
@@ -23,6 +24,8 @@ share/analog/lang/cata.lng
 share/analog/lang/catadom.tab
 share/analog/lang/catdom.tab
 share/analog/lang/cn.lng
+share/analog/lang/cndesc.txt
+share/analog/lang/cndom.tab
 share/analog/lang/cz.lng
 share/analog/lang/cz1.lng
 share/analog/lang/cz1a.lng
@@ -166,11 +169,12 @@ share/analog/lang/yu.lng
 share/analog/lang/yua.lng
 share/analog/lang/yudom.tab
 %%PORTDOCS%%%%DOCSDIR%%/LicBSD.txt
-%%PORTDOCS%%%%DOCSDIR%%/Licapach.txt
+%%PORTDOCS%%%%DOCSDIR%%/Licbzip2.txt
 %%PORTDOCS%%%%DOCSDIR%%/Licence.txt
 %%PORTDOCS%%%%DOCSDIR%%/Licgd.txt
 %%PORTDOCS%%%%DOCSDIR%%/Licpcre.txt
 %%PORTDOCS%%%%DOCSDIR%%/Licpng.txt
+%%PORTDOCS%%%%DOCSDIR%%/Licunzip.txt
 %%PORTDOCS%%%%DOCSDIR%%/Liczlib.txt
 %%PORTDOCS%%%%DOCSDIR%%/Readme.html
 %%PORTDOCS%%%%DOCSDIR%%/acknow.html
@@ -227,10 +231,18 @@ share/analog/lang/yudom.tab
 %%PORTDOCS%%%%DOCSDIR%%/wasnew2.html
 %%PORTDOCS%%%%DOCSDIR%%/wasnew3.html
 %%PORTDOCS%%%%DOCSDIR%%/wasnew4.html
+%%PORTDOCS%%%%DOCSDIR%%/wasnew5.html
 %%PORTDOCS%%%%DOCSDIR%%/webworks.html
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/big.cfg
 %%PORTDOCS%%%%EXAMPLESDIR%%/bigbyrep.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/css/Readme.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/css/default.css
+%%PORTDOCS%%%%EXAMPLESDIR%%/css/jreeves/Readme.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/css/jreeves/blue.css
+%%PORTDOCS%%%%EXAMPLESDIR%%/css/jreeves/buff.css
+%%PORTDOCS%%%%EXAMPLESDIR%%/css/jreeves/gray.css
+%%PORTDOCS%%%%EXAMPLESDIR%%/css/jreeves/gray_expanded.css
 %%PORTDOCS%%%%EXAMPLESDIR%%/misclogs.cfg
 %%PORTDOCS%%%%EXAMPLESDIR%%/robotinc.cfg
 %%PORTDOCS%%%%EXAMPLESDIR%%/searchen.cfg
@@ -375,6 +387,8 @@ share/analog/lang/yudom.tab
 %%IMGDIR%%/sqg.png
 @dirrm share/analog/lang
 @dirrm share/analog
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/css/jreeves
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/css
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm share/doc/analog
-%%PORTDOCS%%@dirrm share/examples/analog
 @unexec rmdir %D/%%IMGDIR%% 2>/dev/null || true