From 610c942f9f308e7c81d54f843aead71178975b33 Mon Sep 17 00:00:00 2001 From: Michael Scheidell Date: Sun, 24 Jun 2012 11:06:14 +0000 Subject: - Update to 4.3.2 - Unmark BROKEN - OPTIONSNG'ify - Add LICENSE & LICENSE_FILE - Add USE_GCC (CLANG build BROKEN, would like an assist on this) - Add OPENSSL and ZLIB options - Add MAN1 & MAN7 PR: ports/168892 Submitted by: koobs Approved by: maintainer (timeout, 15 days) --- benchmarks/polygraph/Makefile | 60 ++++++++++++++++------ benchmarks/polygraph/distinfo | 4 +- .../polygraph/files/patch-workloads-Makefile.in | 11 ---- .../files/patch-workloads-include-Makefile.in | 11 ---- benchmarks/polygraph/pkg-plist | 51 +++++++++--------- 5 files changed, 72 insertions(+), 65 deletions(-) delete mode 100644 benchmarks/polygraph/files/patch-workloads-Makefile.in delete mode 100644 benchmarks/polygraph/files/patch-workloads-include-Makefile.in (limited to 'benchmarks') diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile index e3e318255ea3..f36dd15b07b0 100644 --- a/benchmarks/polygraph/Makefile +++ b/benchmarks/polygraph/Makefile @@ -6,39 +6,67 @@ # PORTNAME= polygraph -PORTVERSION= 3.0.6 -PORTREVISION= 3 +PORTVERSION= 4.3.2 CATEGORIES= benchmarks www MASTER_SITES= http://www.web-polygraph.org/downloads/srcs/ \ - http://people.bsdgroup.de/~as/freebsd/distfiles/ + http://people.bsdgroup.de/~as/freebsd/distfiles/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src EXTRACT_SUFX= .tgz MAINTAINER= as@bsdgroup.de COMMENT= A benchmarking tool for Web proxies -GNU_CONFIGURE= YES -CPPFLAGS+= -Wno-deprecated -CONFIGURE_ARGS+=--datadir=${DATADIR} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +LICENSE= AL2 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_GCC= 4.2+ +GNU_CONFIGURE= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFLICTS= ltrace-0* -OPTIONS= GNUPLOT "gnuplot if you want full report functionality" ON \ - PERL "install Perl for polygraph tools" OFF +OPTIONS_DEFINE= GNUPLOT OPENSSL PERL ZLIB + +GNUPLOT_DESC= GNUPlot for full reporting functionality +OPENSSL_DESC= Enable SSL/HTTPS support +PERL_DESC= Install Perl for PolyGraph tools +ZLIB_DESC= Enable HTTP compression support -.include +OPTIONS_DEFAULT= OPENSSL ZLIB -.if ${OSVERSION} >= 900009 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800503) -BROKEN= does not build +.include + +.if ${PORT_OPTIONS:MGNUPLOT} +RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot .endif -.if !defined(WITHOUT_GNUPLOT) -RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot +.if ${PORT_OPTIONS:MOPENSSL} +USE_OPENSSL= yes +CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} +.else +CONFIGURE_ARGS+= --without-ssl .endif -.if !defined(WITHOUT_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5_RUN= yes .endif -.include +.if ${PORT_OPTIONS:MZLIB} +CONFIGURE_ARGS+= --with-zlib=/usr +.else +CONFIGURE_ARGS+= --without-zlib +.endif + +MAN1= polygraph-aka.1 polygraph-beepmon.1 polygraph-cdb.1 \ + polygraph-client.1 polygraph-cmp-lx.1 polygraph-distr-test.1 \ + polygraph-dns-cfg.1 polygraph-lr.1 polygraph-ltrace.1 \ + polygraph-lx.1 polygraph-pgl-test.1 polygraph-pgl2acl.1 \ + polygraph-pgl2eng.1 polygraph-pgl2ips.1 polygraph-pgl2ldif.1 \ + polygraph-pmix2-ips.1 polygraph-pmix3-ips.1 polygraph-polymon.1 \ + polygraph-polyprobe.1 polygraph-polyrrd.1 polygraph-pop-test.1 \ + polygraph-reporter.1 polygraph-rng-test.1 polygraph-server.1 \ + polygraph-udp2tcpd.1 polygraph-webaxe4-ips.1 + +MAN7= polygraph.7 + +.include diff --git a/benchmarks/polygraph/distinfo b/benchmarks/polygraph/distinfo index e1e6b45e2405..495f93f66323 100644 --- a/benchmarks/polygraph/distinfo +++ b/benchmarks/polygraph/distinfo @@ -1,2 +1,2 @@ -SHA256 (polygraph-3.0.6-src.tgz) = 71c19c5c6d5472c9a3d254dc71353d365d7bc04f58b640e5c0c890d7e53043a2 -SIZE (polygraph-3.0.6-src.tgz) = 1064674 +SHA256 (polygraph-4.3.2-src.tgz) = b0104448ff3c2f29cebeb5ad5ee6e6f670438d8b78fa095fd54f3b16d99569bb +SIZE (polygraph-4.3.2-src.tgz) = 1497797 diff --git a/benchmarks/polygraph/files/patch-workloads-Makefile.in b/benchmarks/polygraph/files/patch-workloads-Makefile.in deleted file mode 100644 index 7730c87b518e..000000000000 --- a/benchmarks/polygraph/files/patch-workloads-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- workloads/Makefile.in.orig Thu Sep 13 05:21:49 2007 -+++ workloads/Makefile.in Thu Sep 13 05:26:27 2007 -@@ -175,7 +175,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - SUBDIRS = include --workloads_pkgdir = ${prefix}/workloads -+workloads_pkgdir = ${datadir}/workloads - dist_workloads_pkg_DATA = \ - datacomm-1.pg \ - downtime-2.pg \ diff --git a/benchmarks/polygraph/files/patch-workloads-include-Makefile.in b/benchmarks/polygraph/files/patch-workloads-include-Makefile.in deleted file mode 100644 index c8b99735e547..000000000000 --- a/benchmarks/polygraph/files/patch-workloads-include-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- workloads/include/Makefile.in.orig Thu Sep 13 05:26:52 2007 -+++ workloads/include/Makefile.in Thu Sep 13 05:27:24 2007 -@@ -165,7 +165,7 @@ - std_include = @std_include@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --winclude_pkgdir = ${prefix}/workloads/include -+winclude_pkgdir = ${datadir}/workloads/include - dist_winclude_pkg_DATA = \ - benches.pg \ - contents.pg \ diff --git a/benchmarks/polygraph/pkg-plist b/benchmarks/polygraph/pkg-plist index 4ecf14a08af3..8d29025cdadb 100644 --- a/benchmarks/polygraph/pkg-plist +++ b/benchmarks/polygraph/pkg-plist @@ -1,28 +1,29 @@ -bin/aka -bin/beepmon.pl -bin/cdb -bin/distr_test -bin/dns_cfg -bin/lr -bin/ltrace -bin/lx -bin/pgl2acl -bin/pgl2eng -bin/pgl2ldif -bin/pgl_test -bin/pmix2-ips.pl -bin/pmix3-ips.pl -bin/polyclt -bin/polymon -bin/polyprobe -bin/polyrrd -bin/polysrv -bin/pop_test -bin/reporter -bin/rng_test -bin/tcp2xmld -bin/udp2tcpd -bin/webaxe4-ips.pl +bin/polygraph-pgl-test +bin/polygraph-pgl2eng +bin/polygraph-pgl2acl +bin/polygraph-cdb +bin/polygraph-server +bin/polygraph-client +bin/polygraph-pgl2ldif +bin/polygraph-lx +bin/polygraph-lr +bin/polygraph-ltrace +bin/polygraph-reporter +bin/polygraph-aka +bin/polygraph-pop-test +bin/polygraph-distr-test +bin/polygraph-rng-test +bin/polygraph-dns-cfg +bin/polygraph-pgl2ips +bin/polygraph-polyprobe +bin/polygraph-polymon +bin/polygraph-polyrrd +bin/polygraph-udp2tcpd +bin/polygraph-beepmon +bin/polygraph-pmix2-ips +bin/polygraph-pmix3-ips +bin/polygraph-webaxe4-ips +bin/polygraph-cmp-lx %%DATADIR%%/workloads/datacomm-1.pg %%DATADIR%%/workloads/downtime-2.pg %%DATADIR%%/workloads/include/benches.pg -- cgit v1.2.3