[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[update] www/analog



update for www/analog, as announced by Stephen Turner few hours ago.
please test, and perhaps commit. :)



NOTES: 
  this port need custom installation in chrooted apache environment.
  i.e: copying ${PREFIX}/share/analog to /var/www/${PREFIX}/share/analog,
  also some libraries and binaries needed by perl. --jim




diff -uNr --exclude=CVS /usr/ports/www/analog/Makefile ./Makefile
--- /usr/ports/www/analog/Makefile	Wed Oct 30 10:28:41 2002
+++ ./Makefile	Sun Dec  1 01:59:03 2002
@@ -2,7 +2,7 @@
 
 COMMENT=	"extremely fast program for analysing WWW logfiles"
 
-DISTNAME=	analog-5.24
+DISTNAME=	analog-5.30
 CATEGORIES=	www
 
 MASTER_SITES=	http://www.analog.cx/ \
@@ -59,5 +59,6 @@
 	${INSTALL_DATA} ${WRKSRC}/lang/* ${ANALOGDIR}/lang
 	${INSTALL_DATA} ${WRKSRC}/anlgform.html ${ANALOGDIR}
 	${INSTALL_DATA} ${WRKSRC}/anlgform.pl ${ANALOGDIR}
+	${INSTALL_MAN} ${WRKSRC}/analog.man ${PREFIX}/man/man1/analog.1
 
 .include <bsd.port.mk>
diff -uNr --exclude=CVS /usr/ports/www/analog/distinfo ./distinfo
--- /usr/ports/www/analog/distinfo	Sun Oct  6 02:34:23 2002
+++ ./distinfo	Sun Dec  1 01:23:06 2002
@@ -1,3 +1,3 @@
-MD5 (analog-5.24.tar.gz) = ae535ae9e4c52fb0ad23d4b34fab7e71
-RMD160 (analog-5.24.tar.gz) = ba3dc66d2c010b0a4a54ea8493cd2df784662c03
-SHA1 (analog-5.24.tar.gz) = 13d2de6206b6a5d0bbd54a0dbb4c0c0d220aecdb
+MD5 (analog-5.30.tar.gz) = 7a0697815818d48952b8076c2ee886fa
+RMD160 (analog-5.30.tar.gz) = 2ff97836fb45b324282bea79564327733b6424f3
+SHA1 (analog-5.30.tar.gz) = 49b69b9c6779767ad6f7e888bf9b5c7b8b6e67c9
diff -uNr --exclude=CVS /usr/ports/www/analog/patches/patch-src_Makefile ./patches/patch-src_Makefile
--- /usr/ports/www/analog/patches/patch-src_Makefile	Sun Oct  6 02:34:25 2002
+++ ./patches/patch-src_Makefile	Sun Dec  1 01:30:49 2002
@@ -1,9 +1,10 @@
 $OpenBSD: patch-src_Makefile,v 1.2 2001/11/22 11:10:39 form Exp $
---- src/Makefile.orig	Thu Nov 22 17:06:08 2001
-+++ src/Makefile	Thu Nov 22 17:07:16 2001
-@@ -1,9 +1,9 @@
- # Makefile for analog 5.1
+--- src/Makefile.orig	Sat Nov 30 22:36:10 2002
++++ src/Makefile	Sun Dec  1 01:23:21 2002
+@@ -2,10 +2,10 @@
  # 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.
@@ -13,16 +14,16 @@
  #                 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
-@@ -56,7 +56,7 @@ HEADERS = anlghead.h anlghea2.h anlghea3
+@@ -66,7 +66,7 @@ HEADERS = anlghead.h anlghea2.h anlghea3
  ALLCFLAGS = $(CFLAGS) $(DEFS) -D$(OS)
  ALLOBJS = $(OBJS) $(SUBDIROBJS)
  
 -$(PROGRAM): $(OBJS) $(SUBDIRS) $(HEADERS) Makefile
 +$(PROGRAM): $(OBJS) $(SUBDIRS) $(HEADERS)
  	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
- 	@echo '***'
- 	@echo '***IMPORTANT: You must read the licence before using analog'
-@@ -76,61 +76,61 @@ pcre: ALWAYS
+ 	@echo "***"
+ 	@echo "***IMPORTANT: You must read the licence before using analog"
+@@ -86,61 +86,61 @@ pcre: ALWAYS
  zlib: ALWAYS
  	cd zlib && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)'
  
diff -uNr --exclude=CVS /usr/ports/www/analog/patches/patch-src_tree_c ./patches/patch-src_tree_c
--- /usr/ports/www/analog/patches/patch-src_tree_c	Thu Jan  1 07:00:00 1970
+++ ./patches/patch-src_tree_c	Sun Dec  1 01:30:38 2002
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- src/tree.c.orig	Sat Nov 30 22:36:11 2002
++++ src/tree.c	Sun Dec  1 01:30:23 2002
+@@ -891,8 +891,16 @@ void Pnextname(char **name, char **namee
+ 	*name = "Macintosh";
+     else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL)
+       *name = "Unix:Linux";
+-    else if (strstr(whole, "BSD") != NULL)
+-      *name = "Unix:BSD";
++    else if (strstr(whole, "FreeBSD") != NULL || strstr(whole, "freebsd") != NULL)
++      *name = "Unix:FreeBSD";
++    else if (strstr(whole, "OpenBSD") != NULL || strstr(whole, "openbsd") != NULL)
++      *name = "Unix:OpenBSD";
++    else if (strstr(whole, "NetBSD") != NULL || strstr(whole, "netbsd") != NULL)
++      *name = "Unix:NetBSD";
++    else if (strstr(whole, "BSD/OS") != NULL || strstr(whole, "bsd/os") != NULL)
++      *name = "Unix:BSD/OS";
++    else if (strstr(whole, "BSD") != NULL || strstr(whole, "bsd") != NULL)
++      *name = "Unix:Unknown BSD";
+     else if (strstr(whole, "SunOS") != NULL || strstr(whole, "sunos") != NULL)
+       *name = "Unix:SunOS";
+     else if (strstr(whole, "HP-UX") != NULL || strstr(whole, "HPUX") != NULL ||
diff -uNr --exclude=CVS /usr/ports/www/analog/pkg/INSTALL ./pkg/INSTALL
--- /usr/ports/www/analog/pkg/INSTALL	Sun Oct  6 02:34:26 2002
+++ ./pkg/INSTALL	Sun Dec  1 01:37:27 2002
@@ -3,15 +3,28 @@
 #
 # Pre/post-installation setup of analog
 
-IMAGES="analogo.gif bara1.gif bara16.gif bara2.gif bara32.gif bara4.gif \
-	bara8.gif barb1.gif barb16.gif barb2.gif barb32.gif barb4.gif \
-	barb8.gif barc1.gif barc16.gif barc2.gif barc32.gif barc4.gif \
-	barc8.gif bard1.gif bard16.gif bard2.gif bard32.gif bard4.gif \
-	bard8.gif bare1.gif bare16.gif bare2.gif bare32.gif bare4.gif \
-	bare8.gif barf1.gif barf16.gif barf2.gif barf32.gif barf4.gif \
-	barf8.gif barg1.gif barg16.gif barg2.gif barg32.gif barg4.gif \
-	barg8.gif barh1.gif barh16.gif barh2.gif barh32.gif barh4.gif \
-	barh8.gif html2.gif"
+IMAGES="analogo.gif analogo.png bara1.gif bara1.png bara16.gif bara16.png \
+	bara2.gif bara2.png bara32.gif bara32.png bara4.gif bara4.png \
+	bara8.gif bara8.png barb1.gif barb1.png barb16.gif barb16.png \
+	barb2.gif barb2.png barb32.gif barb32.png barb4.gif barb4.png \
+	barb8.gif barb8.png barc1.gif barc1.png barc16.gif barc16.png \
+	barc2.gif barc2.png barc32.gif barc32.png barc4.gif barc4.png \
+	barc8.gif barc8.png bard1.gif bard1.png bard16.gif bard16.png \
+	bard2.gif bard2.png bard32.gif bard32.png bard4.gif bard4.png \
+	bard8.gif bard8.png bare1.gif bare1.png bare16.gif bare16.png \
+	bare2.gif bare2.png bare32.gif bare32.png bare4.gif bare4.png \
+	bare8.gif bare8.png barf1.gif barf1.png barf16.gif barf16.png \
+	barf2.gif barf2.png barf32.gif barf32.png barf4.gif barf4.png \
+	barf8.gif barf8.png barg1.gif barg1.png barg16.gif barg16.png \
+	barg2.gif barg2.png barg32.gif barg32.png barg4.gif barg4.png \
+	barg8.gif barg8.png barh1.gif barh1.png barh16.gif barh16.png \
+	barh2.gif barh2.png barh32.gif barh32.png barh4.gif barh4.png \
+	barh8.gif barh8.png bari1.gif bari1.png bari16.gif bari16.png \
+	bari2.gif bari2.png bari32.gif bari32.png bari4.gif bari4.png \
+	bari8.gif bari8.png barj1.gif barj1.png barj16.gif barj16.png \
+	barj2.gif barj2.png barj32.gif barj32.png barj4.gif barj4.png \
+	barj8.gif barj8.png html2.gif html2.png sq0.png sq1.png sq2.png \
+	sq3.png sq4.png sq5.png sq6.png sq7.png sq8.png sq9.png sqg.png"
 
 # exit on errors, use a sane path and install prefix
 #
diff -uNr --exclude=CVS /usr/ports/www/analog/pkg/PLIST ./pkg/PLIST
--- /usr/ports/www/analog/pkg/PLIST	Sun Oct  6 02:34:26 2002
+++ ./pkg/PLIST	Sun Dec  1 02:27:33 2002
@@ -1,5 +1,6 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.18 2002/06/26 04:07:16 form Exp $
+_(_at_)_comment $OpenBSD$
 bin/analog
+man/man1/analog.1
 share/analog/anlgform.html
 share/analog/anlgform.pl
 share/analog/images/analogo.gif
@@ -192,9 +193,9 @@
 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
@@ -269,9 +270,18 @@
 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
@@ -357,7 +367,7 @@
 share/doc/analog/whatsnew.html
 share/examples/analog/big.cfg
 share/examples/analog/bigbyrep.cfg
-share/examples/analog/realmedia.cfg
+share/examples/analog/misclogs.cfg
 share/examples/analog/searchen.cfg
 share/examples/analog/statslab.cfg
 share/examples/analog/virtdoms.cfg