From owner-svn-ports-head@FreeBSD.ORG  Sun May 31 20:05:26 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D515D9BD;
 Sun, 31 May 2015 20:05:26 +0000 (UTC) (envelope-from osa@FreeBSD.org)
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 A8A65178A;
 Sun, 31 May 2015 20:05:26 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4VK5QLQ052889;
 Sun, 31 May 2015 20:05:26 GMT (envelope-from osa@FreeBSD.org)
Received: (from osa@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4VK5QRX052887;
 Sun, 31 May 2015 20:05:26 GMT (envelope-from osa@FreeBSD.org)
Message-Id: <201505312005.t4VK5QRX052887@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: osa set sender to osa@FreeBSD.org
 using -f
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Sun, 31 May 2015 20:05:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r388163 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 May 2015 20:05:26 -0000

Author: osa
Date: Sun May 31 20:05:25 2015
New Revision: 388163
URL: https://svnweb.freebsd.org/changeset/ports/388163

Log:
  Unhide compiler and linker output.
  Use CFLAGS defined in port's Makefile.
  
  Bump PORTREVISION.

Modified:
  head/benchmarks/wrk/Makefile
  head/benchmarks/wrk/files/patch-Makefile

Modified: head/benchmarks/wrk/Makefile
==============================================================================
--- head/benchmarks/wrk/Makefile	Sun May 31 20:03:19 2015	(r388162)
+++ head/benchmarks/wrk/Makefile	Sun May 31 20:05:25 2015	(r388163)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wrk
 PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	benchmarks www
 DISTNAME=	${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}

Modified: head/benchmarks/wrk/files/patch-Makefile
==============================================================================
--- head/benchmarks/wrk/files/patch-Makefile	Sun May 31 20:03:19 2015	(r388162)
+++ head/benchmarks/wrk/files/patch-Makefile	Sun May 31 20:05:25 2015	(r388163)
@@ -1,6 +1,14 @@
---- Makefile.orig	2014-08-05 16:50:32.000000000 +0400
-+++ Makefile	2014-09-13 02:29:01.000000000 +0400
-@@ -24,28 +24,28 @@
+--- Makefile.orig	2015-03-24 13:03:52.000000000 +0300
++++ Makefile	2015-05-31 22:58:26.276469000 +0300
+@@ -1,5 +1,5 @@
+-CFLAGS  := -std=c99 -Wall -O2 -D_REENTRANT
+-LIBS    := -lpthread -lm -lcrypto -lssl
++CFLAGS  += -std=c99 -Wall -O2 -D_REENTRANT
++LIBS    := -pthread -lm -lcrypto -lssl
+ 
+ TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown)
+ 
+@@ -25,32 +25,32 @@
  OBJ  := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o
  
  LDIR     = deps/luajit/src
@@ -18,7 +26,8 @@
  
  $(BIN): $(OBJ)
  	@echo LINK $(BIN)
- 	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+-	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
  
 -$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR)
 +$(OBJ): config.h Makefile | $(ODIR)
@@ -29,7 +38,12 @@
  $(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 $<
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ $(LDIR)/libluajit.a:
+ 	@echo Building LuaJIT...