Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Dec 1999 00:05:15 +0300 (MSK)
From:      Dmitry Sivachenko <dima@Chg.RU>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/15572: Update benchmars/polygraph to the current version
Message-ID:  <199912192105.AAA21572@netserv1.chg.ru>

next in thread | raw e-mail | index | archive | help

>Number:         15572
>Category:       ports
>Synopsis:       Update benchmars/polygraph to the current version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 19 13:10:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Sivachenko
>Release:        FreeBSD 3.2-RElease i386
>Organization:
>Environment:

	

>Description:

Update benchmarks/polygraph to 2.2.7.  patch-a{a,b} now obsolete due
to using of GNU configure;  patch-a{c,d} seems to be in the source tree.

>How-To-Repeat:

	

>Fix:
	

diff -Nur polygraph.old/Makefile polygraph/Makefile
--- polygraph.old/Makefile	Sun Dec 19 19:35:59 1999
+++ polygraph/Makefile	Sun Dec 19 22:55:56 1999
@@ -1,42 +1,43 @@
 # New ports collection makefile for:	polygraph
-# Version required:	1.2.0
+# Version required:	2.2.7
 # Date created:         3 March 1999
 # Whom:                 Dima Sivachenko <dima@chg.ru>
 #
 # $FreeBSD: ports/benchmarks/polygraph/Makefile,v 1.4 1999/08/25 04:45:47 obrien Exp $
 #
 
-DISTNAME=	polygraph-1.2.0-src
-PKGNAME=	polygraph-1.2.0
+DISTNAME=	polygraph-2.2.7-src
+PKGNAME=	polygraph-2.2.7
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://polygraph.ircache.net/sources/	\
 		http://www.chg.ru/~dima/
 
 MAINTAINER=	dima@Chg.RU
 
-WRKSRC=		${WRKDIR}/polygraph/src
+WRKSRC=		${WRKDIR}/polygraph
+
+GNU_CONFIGURE=	YES
 
 post-patch:
-		@ ${MV} ${WRKSRC}/exprep.pl ${WRKSRC}/exprep.pl.pre_sed
-		@ ${SED} -e 's#/usr/local/bin/perl#${PERL5}#' \
-		${WRKSRC}/exprep.pl.pre_sed > ${WRKSRC}/exprep.pl
-		@ ${MV} ${WRKSRC}/../tools/BB/bb.pl ${WRKSRC}/../tools/BB/bb.pl.pre_sed1
-		@ ${SED} -e 's#/usr/local/bin/perl#${PERL5}#' \
-		${WRKSRC}/../tools/BB/bb.pl.pre_sed1> ${WRKSRC}/../tools/BB/bb.pl.pre_sed
-		@ ${SED} -e 's#/usr/people/bakeoff/BB#${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/polygraph#' \
-		${WRKSRC}/../tools/BB/bb.pl.pre_sed> ${WRKSRC}/../tools/BB/bb.pl
+		@ ${MV} ${WRKSRC}/src/exprep.pl ${WRKSRC}/src/exprep.pl.pre_sed
+		@ ${SED} -e 's#/usr/bin/perl#${PERL5}#' \
+		${WRKSRC}/src/exprep.pl.pre_sed > ${WRKSRC}/src/exprep.pl
+		@ ${MV} ${WRKSRC}/tools/BB/bb.pl ${WRKSRC}/tools/BB/bb.pl.pre_sed
+		@ ${SED} -e 's#/usr/bin/perl#${PERL5}#' \
+			-e 's#/usr/people/bakeoff/BB#${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/polygraph#' \
+		${WRKSRC}/tools/BB/bb.pl.pre_sed> ${WRKSRC}/tools/BB/bb.pl
 
 do-install:
 
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/polyclt ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/polysrv ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/lr ${PREFIX}/bin
-		@ ${INSTALL_PROGRAM} ${WRKSRC}/lx ${PREFIX}/bin
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/exprep.pl ${PREFIX}/bin/exprep
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/../tools/BB/bb.pl ${PREFIX}/bin
+.for file in	polyclt polysrv lr lx distr_test pop_test rng_test aka piper polymon
+		@ ${INSTALL_PROGRAM} ${WRKSRC}/src/$(file) ${PREFIX}/bin
+.endfor
+		@ ${INSTALL_PROGRAM} ${WRKSRC}/src/udp2tcpd ${PREFIX}/sbin
+		@ ${INSTALL_SCRIPT} ${WRKSRC}/src/exprep.pl ${PREFIX}/bin/exprep
+		@ ${INSTALL_SCRIPT} ${WRKSRC}/tools/BB/bb.pl ${PREFIX}/bin
 		@ ${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/polygraph
 .for file in	Blob.pm Executer.pm Tools.pm Command.pm Logger.pm
-		@ ${INSTALL_SCRIPT} ${WRKSRC}/../tools/BB/$(file) \
+		@ ${INSTALL_SCRIPT} ${WRKSRC}/tools/BB/$(file) \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/polygraph
 .endfor
 
diff -Nur polygraph.old/files/md5 polygraph/files/md5
--- polygraph.old/files/md5	Sun Dec 19 19:35:58 1999
+++ polygraph/files/md5	Sun Dec 19 19:36:36 1999
@@ -1 +1 @@
-MD5 (polygraph-1.2.0-src.tar.gz) = 093634d5ba9d73d8db9047ea35e7f02c
+MD5 (polygraph-2.2.7-src.tar.gz) = 3c7451c35ccff4ef67ab2896030870e4
diff -Nur polygraph.old/patches/patch-aa polygraph/patches/patch-aa
--- polygraph.old/patches/patch-aa	Sun Dec 19 19:35:59 1999
+++ polygraph/patches/patch-aa	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
---- Makefile.old	Tue Apr 13 15:41:09 1999
-+++ Makefile	Tue Apr 13 15:42:04 1999
-@@ -10,7 +10,8 @@
- 
- DEFINES =
- 
--CFLAGS   = -Wall -Wwrite-strings -Woverloaded-virtual -g -O3 $(INCLUDE) $(DEFINES)
-+CFLAGS  ?= -g -O3
-+CFLAGS  += -Wall -Wwrite-strings -Woverloaded-virtual $(INCLUDE) $(DEFINES)
- CXXFLAGS = $(CFLAGS)
- CCFLAGS  = $(CFLAGS)
- 
diff -Nur polygraph.old/patches/patch-ab polygraph/patches/patch-ab
--- polygraph.old/patches/patch-ab	Sun Dec 19 19:35:59 1999
+++ polygraph/patches/patch-ab	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
---- xstd/Makefile.old	Tue Apr 13 15:43:57 1999
-+++ xstd/Makefile	Tue Apr 13 15:44:30 1999
-@@ -9,7 +9,8 @@
- 
- DEFINES =
- 
--CFLAGS   = -Wall -Wwrite-strings -Woverloaded-virtual -g -O3 $(INCLUDE) $(DEFINES)
-+CFLAGS  ?= -g -O3 
-+CFLAGS  += -Wall -Wwrite-strings -Woverloaded-virtual $(INCLUDE) $(DEFINES)
- CXXFLAGS = $(CFLAGS)
- CCFLAGS  = $(CFLAGS)
- 
diff -Nur polygraph.old/patches/patch-ac polygraph/patches/patch-ac
--- polygraph.old/patches/patch-ac	Sun Dec 19 19:35:59 1999
+++ polygraph/patches/patch-ac	Thu Jan  1 03:00:00 1970
@@ -1,20 +0,0 @@
---- Connection.cc.orig	Sat May  1 16:26:02 1999
-+++ Connection.cc	Sat May  1 16:26:53 1999
-@@ -148,7 +148,7 @@
- 	// XXX: make first IO check optional
- 	const Size sz =
- 		(theRd.theIOCnt++ + theWr.theIOCnt) || !theSock.errNo() ?
--		theSock.read(theRdBuf.space(), theRdBuf.spaceSize()) : -1;
-+		theSock.read(theRdBuf.space(), theRdBuf.spaceSize()) : (Size)-1;
- 	
- 	//cerr << here << "read " << sz << " : {" << theRdBuf.space() << "}" << endl;
- 
-@@ -178,7 +178,7 @@
- 	// XXX: make this check optional!
- 	const Size sz =
- 		(theRd.theIOCnt + theWr.theIOCnt++) || !theSock.errNo() ?
--		theSock.write(theWrBuf.content(), theWrBuf.contSize()) : -1;
-+		theSock.write(theWrBuf.content(), theWrBuf.contSize()) : (Size)-1;
- 	
- 	//cerr << here << "wrote " << sz << " : {" << theWrBuf.content() << "}" << endl;
- 
diff -Nur polygraph.old/patches/patch-ad polygraph/patches/patch-ad
--- polygraph.old/patches/patch-ad	Sun Dec 19 19:35:59 1999
+++ polygraph/patches/patch-ad	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- HttpDate.cc.orig	Sat May 22 12:14:41 1999
-+++ HttpDate.cc	Sat May 22 12:14:54 1999
-@@ -200,7 +200,7 @@
- }
- 
- ostream &HttpDatePrint(ostream &os, Time date) {
--	if (struct tm *t = gmtime(&date.tv_sec)) {
-+	if (struct tm *t = gmtime((const time_t *)&date.tv_sec)) {
- 		const char fill = os.fill('0');
- 		return os
- 			<< TheWeekDays[t->tm_wday] << ", "
diff -Nur polygraph.old/pkg/PLIST polygraph/pkg/PLIST
--- polygraph.old/pkg/PLIST	Sun Dec 19 19:35:59 1999
+++ polygraph/pkg/PLIST	Sun Dec 19 22:55:40 1999
@@ -2,6 +2,13 @@
 bin/polysrv
 bin/lr
 bin/lx
+bin/distr_test
+bin/pop_test
+bin/rng_test
+bin/aka
+bin/piper
+bin/polymon
+sbin/udp2tcpd
 bin/exprep
 bin/bb.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/polygraph/Blob.pm

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912192105.AAA21572>