From owner-svn-ports-all@FreeBSD.ORG Fri Sep 12 22:39:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1DC3CC76; Fri, 12 Sep 2014 22:39:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 096CE3B8; Fri, 12 Sep 2014 22:39:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CMdB51003441; Fri, 12 Sep 2014 22:39:11 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CMdBLY003438; Fri, 12 Sep 2014 22:39:11 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201409122239.s8CMdBLY003438@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Fri, 12 Sep 2014 22:39:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368069 - in head/benchmarks/wrk: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 22:39:12 -0000 Author: osa Date: Fri Sep 12 22:39:11 2014 New Revision: 368069 URL: http://svnweb.freebsd.org/changeset/ports/368069 QAT: https://qat.redports.org/buildarchive/r368069/ Log: Upgrade from 3.0.4 to 3.1.1. Modified: head/benchmarks/wrk/Makefile head/benchmarks/wrk/distinfo head/benchmarks/wrk/files/patch-Makefile Modified: head/benchmarks/wrk/Makefile ============================================================================== --- head/benchmarks/wrk/Makefile Fri Sep 12 21:47:57 2014 (r368068) +++ head/benchmarks/wrk/Makefile Fri Sep 12 22:39:11 2014 (r368069) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wrk -PORTVERSION= 3.0.4 +PORTVERSION= 3.1.1 CATEGORIES= benchmarks www MASTER_SITES= https://github.com/wg/wrk/archive/ DISTNAME= ${PORTVERSION} @@ -20,9 +20,6 @@ CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MA PLIST_FILES= bin/wrk -post-patch: - @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g;' ${WRKSRC}/Makefile - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/benchmarks/wrk/distinfo ============================================================================== --- head/benchmarks/wrk/distinfo Fri Sep 12 21:47:57 2014 (r368068) +++ head/benchmarks/wrk/distinfo Fri Sep 12 22:39:11 2014 (r368069) @@ -1,2 +1,2 @@ -SHA256 (wrk/3.0.4.tar.gz) = 9d0b58b6123dd61bf1b00c180e39e80ea92cc90e14c758e899e0e7772c647661 -SIZE (wrk/3.0.4.tar.gz) = 897909 +SHA256 (wrk/3.1.1.tar.gz) = 3a44bd7c9da2edb80d41105c99c113250330b54bb9c3f80008eb6b088e5842ba +SIZE (wrk/3.1.1.tar.gz) = 901059 Modified: head/benchmarks/wrk/files/patch-Makefile ============================================================================== --- head/benchmarks/wrk/files/patch-Makefile Fri Sep 12 21:47:57 2014 (r368068) +++ head/benchmarks/wrk/files/patch-Makefile Fri Sep 12 22:39:11 2014 (r368069) @@ -1,28 +1,22 @@ ---- Makefile.bak 2013-11-16 07:06:29.000000000 +0400 -+++ Makefile 2013-11-26 07:17:32.000000000 +0400 -@@ -1,5 +1,4 @@ --CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT --LIBS := -lpthread -lm -lcrypto -lssl -+LIBS := -pthread -lm -lcrypto -lssl - - TARGET := $(shell uname -s | tr [A-Z] [a-z] 2>/dev/null || echo unknown) - -@@ -23,10 +22,10 @@ - ODIR := obj +--- Makefile.orig 2014-08-05 16:50:32.000000000 +0400 ++++ Makefile 2014-09-13 02:29:01.000000000 +0400 +@@ -24,28 +24,28 @@ OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o --LDIR = deps/luajit/src + LDIR = deps/luajit/src -LIBS := -lluajit $(LIBS) --CFLAGS += -I $(LDIR) --LDFLAGS += -L $(LDIR) -+#LDIR = deps/luajit/src -+LIBS := -lluajit-5.1 $(LIBS) -+CFLAGS += -I %%PREFIX%%/include/luajit-2.0 -+LDFLAGS += -L %%PREFIX%%/lib + CFLAGS += -I$(LDIR) + LDFLAGS += -L$(LDIR) ++PREFIX := ${PREFIX} ++LIBS := -lluajit-5.1 $(LIBS) -L$(PREFIX)/lib all: $(BIN) -@@ -38,14 +37,14 @@ + clean: + $(RM) $(BIN) obj/* +- @$(MAKE) -C deps/luajit clean + + $(BIN): $(OBJ) @echo LINK $(BIN) @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) @@ -32,10 +26,10 @@ $(ODIR): @mkdir -p $@ - $(ODIR)/bytecode.o: scripts/wrk.lua + $(ODIR)/bytecode.o: src/wrk.lua @echo LUAJIT $< - @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' -+ @$(SHELL) -c 'cd $(LDIR) && %%PREFIX%%/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@' ++ @$(SHELL) -c 'cd $(LDIR) && ${PREFIX}/bin/luajit -b $(CURDIR)/$< $(CURDIR)/$@' $(ODIR)/%.o : %.c @echo CC $<