Re: [OOPS] kse

[Sergey A. Osokin]

On Thu, Feb 26, 2004 at 04:39:22PM +0200, Igor Khasilev wrote:
> On Thu, 26 Feb 2004, Sergey A. Osokin wrote:
> 
> > В портах старая версия polygraph, я готовлю update до свежей 2.8.0.
> > Сегодня-завтра попытаюсь отправить adrian патч на текущий порт,
> > как только будет approve - закоммичу в порты.
> 
> О! Вот за это спасибо! Появилась в руках 5.2 а полиграф на ней не
> компилируется.

Патч на текущую версию порта прилагаю, плюс в каталог files порта
следует положить ещё два патча.
Прошу потестировать.

-- 

Regards,                 /"\  ascii ribbon campaign
Sergey "ozz" Osokin,     \ /    against html mail
http://ozz.pp.ru/         X         and news
                         / \

Index: ports/benchmarks/polygraph/Makefile
===================================================================
RCS file: /home/pcvs/ports/benchmarks/polygraph/Makefile,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile
--- ports/benchmarks/polygraph/Makefile 12 Feb 2004 00:38:58 -0000      1.13
+++ ports/benchmarks/polygraph/Makefile 26 Feb 2004 13:43:08 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      polygraph
-PORTVERSION=   2.7.6
+PORTVERSION=   2.8.0
 CATEGORIES=    benchmarks www
 MASTER_SITES=  http://www.web-polygraph.org/downloads/srcs/
 DISTNAME=      ${PORTNAME}-${PORTVERSION}-src
@@ -15,14 +15,9 @@
 MAINTAINER=    [EMAIL PROTECTED]
 COMMENT=       A benchmarking tool for Web proxies
 
-
 IS_INTERACTIVE=        yes
 
 GNU_CONFIGURE= YES
 WRKSRC=                ${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-
-BROKEN=                "Does not compile"
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: ports/benchmarks/polygraph/distinfo
===================================================================
RCS file: /home/pcvs/ports/benchmarks/polygraph/distinfo,v
retrieving revision 1.5
diff -u -u -r1.5 distinfo
--- ports/benchmarks/polygraph/distinfo 3 Aug 2002 10:41:53 -0000       1.5
+++ ports/benchmarks/polygraph/distinfo 26 Feb 2004 13:43:13 -0000
@@ -1 +1,2 @@
-MD5 (polygraph-2.7.6-src.tgz) = e23cbb26939217d3ad295bce64a2096d
+MD5 (polygraph-2.8.0-src.tgz) = e006ecd99637aa78c47d6b9b13774eaa
+SIZE (polygraph-2.8.0-src.tgz) = 710102

--- src/loganalyzers/SideInfo.cc.orig   Thu Feb 26 16:55:36 2004
+++ src/loganalyzers/SideInfo.cc        Thu Feb 26 16:56:05 2004
@@ -1166,9 +1166,9 @@
                        XmlTag descr("description");
 
                        XmlTextTag<XmlParagraph> p1;
-                       p1.buf() << "The 'Errors' table shows detected errors. For each
-                               error type, the number of errors and their 
contribution towards
-                               total error count are shown.";
+                       p1.buf() << "The 'Errors' table shows detected errors. For 
each "
+                               "error type, the number of errors and their 
contribution towards "
+                               "total error count are shown.";
                        descr << p1;
 
                        blob << descr;

--- src/xparser/SynSym.h.orig   Thu Feb 26 18:21:19 2004
+++ src/xparser/SynSym.h        Thu Feb 26 18:21:49 2004
@@ -54,8 +54,8 @@
                String theType;
 };
 
-#define SymCast(Type, var) ((Type&)((var).cast(Type##::TheType)))
-#define ConstSymCast(Type, var) ((const Type&)((var).cast(Type##::TheType)))
+#define SymCast(Type, var) ((Type&)((var).cast(Type::TheType)))
+#define ConstSymCast(Type, var) ((const Type&)((var).cast(Type::TheType)))
 
 inline ostream &operator <<(ostream &os, const SynSym &sym) { return sym.print(os); }