Upgrade Analog to 5.32 (includes fixes)

PR:		52100
Submitted by:	    Kevin Golding <kevin@caomhin.demon.co.uk>

6 files changed, 36 insertions, 25 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 0145633f4fb8..0a255671b14b 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	analog
-PORTVERSION=	5.24
-PORTREVISION=	1
+PORTVERSION=	5.32
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.analog.cx/ \
-		http://www.monash.edu.au/mirror/analog/ \
+		http://analog.planetmirror.com/ \
 		http://analog.gsp.com/ \
-		http://analog.barringtons.com/ \
-		http://www.pomfret.net/mirror/analog/ \
+		http://isr.ath.cx/analog/ \
+		http://analog.mirrors.ecodigit.com.br/ \
 		http://analog.org/loganalysis/ \
-		http://www.skreamsoft.com/analogmirror/ \
-		http://sunsite.org.uk/packages/analog/ \
+		http://analog.techsell.ru/ \
+		http://sunsite.sut.ac.jp/pub/archives/WWW/analog/ \
+		ftp://ftp.polytechnic.edu.na/pub/analog/ \
+		http://analog.netsoc.ucd.ie/ \
 		http://analog.tzone.it/
 
 MAINTAINER=	mharo@FreeBSD.org
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 1af964aca155..8efdc5226427 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog-5.24.tar.gz) = ae535ae9e4c52fb0ad23d4b34fab7e71
+MD5 (analog-5.32.tar.gz) = 077a2d43c8f5c2bddf37129ca63ec1f8
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 05625d435fde..299b723ddba4 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,8 +1,9 @@
---- src/Makefile.orig	Wed Jan  9 21:16:22 2002
-+++ src/Makefile	Wed Jan  9 21:18:38 2002
-@@ -1,14 +1,20 @@
- # Makefile for analog 5.1
+--- src/Makefile.orig	Sun Mar 23 13:57:02 2003
++++ src/Makefile	Sun May 11 09:24:47 2003
+@@ -2,15 +2,21 @@
  # 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
 +CC ?= gcc           # which compiler to use: eg cc, acc, gcc. NB Different
  #                    compilers need different CFLAGS, e.g., -O instead of -O2.
@@ -22,9 +23,9 @@
 +       -DCONFIGDIR=\"$(PREFIX)/share/analog/\"
 +#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 ...
-@@ -25,6 +31,12 @@
+ #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
+ #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_PCRE ...
+@@ -30,6 +36,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)
@@ -36,4 +37,4 @@
 +
  #               need -lm LAST
  #             if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz
- #             if you defined HAVE_PCRE above you also need -lpcre
+ #             if you defined HAVE_ZLIB above you also need -lz
diff --git a/www/analog/files/patch-ab b/www/analog/files/patch-ab
index c0171907bf11..3fc9222c85d4 100644
--- a/www/analog/files/patch-ab
+++ b/www/analog/files/patch-ab
@@ -1,7 +1,7 @@
---- src/tree.c.orig	Wed Jan  9 21:20:12 2002
-+++ src/tree.c	Wed Jan  9 21:20:24 2002
-@@ -886,8 +886,16 @@
-     }
+--- src/tree.c.orig	Sun Mar 23 13:57:02 2003
++++ src/tree.c	Sun May 11 10:25:45 2003
+@@ -895,8 +895,16 @@
+ 	*name = "Macintosh";
      else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL)
        *name = "Unix:Linux";
 -    else if (strstr(whole, "BSD") != NULL)
diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac
index 53f7575c0e71..04e03afbd66f 100644
--- a/www/analog/files/patch-ac
+++ b/www/analog/files/patch-ac
@@ -1,5 +1,5 @@
---- analog.cfg.orig	Wed Jan  9 21:21:05 2002
-+++ analog.cfg	Wed Jan  9 21:21:22 2002
+--- analog.cfg.orig	Sun Mar 23 13:56:53 2003
++++ analog.cfg	Sun May 11 09:25:33 2003
 @@ -10,7 +10,8 @@
  #
  # If you need a LOGFORMAT command (most people don't -- try it without first!),
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 0f7d2bb1cc16..1d90e71105be 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -57,9 +57,9 @@ share/analog/lang/gra.lng
 share/analog/lang/hr.lng
 share/analog/lang/hu.cfg
 share/analog/lang/hu.lng
-share/analog/lang/hua.lng
-share/analog/lang/huadom.tab
 share/analog/lang/hudom.tab
+share/analog/lang/id.lng
+share/analog/lang/ida.lng
 share/analog/lang/is.lng
 share/analog/lang/isa.lng
 share/analog/lang/it.lng
@@ -134,9 +134,18 @@ share/analog/lang/sedom.tab
 share/analog/lang/si.lng
 share/analog/lang/si1.lng
 share/analog/lang/sk.lng
+share/analog/lang/sk1.lng
+share/analog/lang/sk1a.lng
+share/analog/lang/sk1adesc.txt
+share/analog/lang/sk1adom.tab
+share/analog/lang/sk1desc.txt
+share/analog/lang/sk1dom.tab
 share/analog/lang/ska.lng
+share/analog/lang/skadesc.txt
+share/analog/lang/skadom.tab
+share/analog/lang/skdesc.txt
+share/analog/lang/skdom.tab
 share/analog/lang/tr.lng
-share/analog/lang/tra.lng
 share/analog/lang/tw.lng
 share/analog/lang/twdesc.txt
 share/analog/lang/twdom.tab