Index: head/benchmarks/wrk/Makefile =================================================================== --- head/benchmarks/wrk/Makefile (revision 388162) +++ head/benchmarks/wrk/Makefile (revision 388163) @@ -1,37 +1,37 @@ # Created by: Sergey A. Osokin # $FreeBSD$ PORTNAME= wrk PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= benchmarks www DISTNAME= ${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= osa@FreeBSD.org COMMENT= Modern HTTP benchmarking tool LICENSE= APACHE20 LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit USE_GITHUB= yes GH_ACCOUNT= wg USES= gmake USE_OPENSSL= yes CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH PLIST_FILES= bin/wrk .include # Port requires 64 bit atomics .if ${ARCH} == i386 && empty(MACHINE_CPU:Mi586) CFLAGS+= -march=i586 .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Index: head/benchmarks/wrk/files/patch-Makefile =================================================================== --- head/benchmarks/wrk/files/patch-Makefile (revision 388162) +++ head/benchmarks/wrk/files/patch-Makefile (revision 388163) @@ -1,35 +1,49 @@ ---- 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 -LIBS := -lluajit $(LIBS) CFLAGS += -I$(LDIR) LDFLAGS += -L$(LDIR) +PREFIX := ${PREFIX} +LIBS := -lluajit-5.1 $(LIBS) -L$(PREFIX)/lib all: $(BIN) clean: $(RM) $(BIN) obj/* - @$(MAKE) -C deps/luajit clean $(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) $(ODIR): @mkdir -p $@ $(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...