Attachment #191436 for bug #225342




# $FreeBSD$

PORTNAME=	wrk
PORTVERSION=	4.1.0
PORTREVISION=	1
CATEGORIES=	benchmarks www

MAINTAINER=	osa@FreeBSD.org

GH_ACCOUNT=	wg

USES=		gmake ssl
CFLAGS+=	-std=c99 -D_DECLARE_C99_LDBL_MATH -I${LOCALBASE}/include/luajit-2.1
CFLAGS+=	-std=c99 -D_DECLARE_C99_LDBL_MATH
MAKE_ENV+=	WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}

PLIST_FILES=	bin/wrk

Lines 1-2 Link Here

(-)w/benchmarks/wrk/distinfo (-2 / +3 lines)
1	SHA256 (wg-wrk-4.0.2_GH0.tar.gz) = a4a6ad6727733023771163e7250189a9a23e6253b5e5025191baa6092d5a26fb	1	TIMESTAMP = 1520792809
2	SIZE (wg-wrk-4.0.2_GH0.tar.gz) = 6146798	2	SHA256 (wg-wrk-4.1.0_GH0.tar.gz) = 6fa1020494de8c337913fd139d7aa1acb9a020de6f7eb9190753aa4b1e74271e
		3	SIZE (wg-wrk-4.1.0_GH0.tar.gz) = 6478125

Lines 3-9 Link Here

(-)w/databases/redis-devel/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= redis	4	PORTNAME= redis
5	DISTVERSION= 4.0.8	5	DISTVERSION= 4.0.8
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://download.redis.io/releases/	8	MASTER_SITES= http://download.redis.io/releases/
9	PKGNAMESUFFIX= -devel	9	PKGNAMESUFFIX= -devel

Lines 33-39 Link Here

(-)w/databases/redis-devel/files/extra-patch-src-Makefile.luajit (-1 / +1 lines)
33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a	33	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
34	endif	34	endif
35		35
36	+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0	36	+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
37	+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1	37	+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
38	+	38	+
39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)	39	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

Lines 3-8 Link Here

(-)w/databases/redis/Makefile (+1 lines)
3		3
4	PORTNAME= redis	4	PORTNAME= redis
5	DISTVERSION= 3.2.11	5	DISTVERSION= 3.2.11
		6	PORTREVISION= 1
6	CATEGORIES= databases	7	CATEGORIES= databases
7	MASTER_SITES= http://download.redis.io/releases/	8	MASTER_SITES= http://download.redis.io/releases/
8		9

Lines 24-30 Link Here

(-)w/databases/redis/files/extra-patch-src-Makefile.luajit (-1 / +1 lines)
24	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl	24	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
25	endif	25	endif
26		26
27	+FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.0	27	+FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.1
28	+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1	28	+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
29	+	29	+
30	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)	30	REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

Lines 3-9 Link Here

(-)w/devel/love/Makefile (-1 / +5 lines)
3		3
4	PORTNAME= love	4	PORTNAME= love
5	PORTVERSION= 0.10.2	5	PORTVERSION= 0.10.2
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= devel games	7	CATEGORIES= devel games
8	MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \	8	MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \
9	http://mirror.amdmi3.ru/distfiles/	9	http://mirror.amdmi3.ru/distfiles/
Lines 45-50 LUAJIT_CONFIGURE_OFF= --with-lua=lua \ Link Here
45	--with-luaversion="${LUA_VER}"	45	--with-luaversion="${LUA_VER}"
46	LUAJIT_CONFIGURE_ENV_OFF=LUA_EXECUTABLE="${LUA_CMD}"	46	LUAJIT_CONFIGURE_ENV_OFF=LUA_EXECUTABLE="${LUA_CMD}"
47		47
		48	post-patch:
		49	@${REINPLACE_CMD} -e 's\| luaL_reg\| luaL_Reg\|' \
		50	${WRKSRC}/src/libraries/luasocket/libluasocket/*
		51
48	post-patch-LUAJIT-off:	52	post-patch-LUAJIT-off:
49	@${REINPLACE_CMD} -e 's\|$${with_lua}$${with_luaversion}\|$${with_lua}-$${with_luaversion}\|g' \	53	@${REINPLACE_CMD} -e 's\|$${with_lua}$${with_luaversion}\|$${with_lua}-$${with_luaversion}\|g' \
50	${WRKSRC}/configure	54	${WRKSRC}/configure

Lines 2-7 Link Here

(-)w/devel/lua-luarocks/Makefile (-1 / +2 lines)
2		2
3	PORTNAME= luarocks	3	PORTNAME= luarocks
4	PORTVERSION= 2.4.3	4	PORTVERSION= 2.4.3
		5	PORTREVISION= 1
5	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
6	CATEGORIES= devel	7	CATEGORIES= devel
7	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
Lines 34-40 LUAJIT_RUN_DEPENDS= luajit:lang/luajit Link Here
34	LUAJIT_CONFIGURE_ON= --lua-suffix=jit	35	LUAJIT_CONFIGURE_ON= --lua-suffix=jit
35	LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \	36	LUAJIT_PLIST_SUB= LUA_VER=${LUA_VER} \
36	LUA_MODSHAREDIR=share/lua/${LUA_VER}	37	LUA_MODSHAREDIR=share/lua/${LUA_VER}
37	LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \	38	LUAJIT_VARS= LUA_INCDIR=${LOCALBASE}/include/luajit-2.1 \
38	LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-	39	LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-
39	LUAJIT_USES_OFF= lua	40	LUAJIT_USES_OFF= lua
40		41

Lines 3-9 Link Here

(-)w/games/naev/Makefile (-1 / +5 lines)
3		3
4	PORTNAME= naev	4	PORTNAME= naev
5	PORTVERSION= 0.7.0	5	PORTVERSION= 0.7.0
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
9		9
Lines 73-76 USE_SDL+= mixer Link Here
73	. endif	73	. endif
74	.endif	74	.endif
75		75
		76	post-patch:
		77	@${REINPLACE_CMD} -e 's\|const luaL_reg\|const luaL_Reg\|' \
		78	${WRKSRC}/src/*.c
		79
76	.include <bsd.port.post.mk>	80	.include <bsd.port.post.mk>




# $FreeBSD$

PORTNAME=	luajit
DISTVERSION=	2.1.0-beta3
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	http://luajit.org/download/
DISTNAME=	LuaJIT-${DISTVERSION}

USE_LDCONFIG=	yes
MAKE_ARGS=	CC=${CC}

PLIST_SUB+=	VERSION=${DISTVERSION} LIBVERSION=${DISTVERSION:C/-.*//}
BROKEN_powerpc64=	Not ported to powerpc64 upstream

OPTIONS_DEFINE=		PTHREAD
OPTIONS_DEFAULT=	PTHREAD

PTHREAD_DESC=		Enable pthread support
PTHREAD_LDFLAGS=	-lm -pthread

.include <bsd.port.options.mk>

.if ${ARCH:Mpowerpc*} || ${ARCH:Mmips*} || ${ARCH:Msparc*}

post-install:
	${LN} -sf ${PORTNAME}-${DISTVERSION} \
		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)w/lang/luajit/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1493823315	1	TIMESTAMP = 1516470480
2	SHA256 (LuaJIT-2.0.5.tar.gz) = 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979	2	SHA256 (LuaJIT-2.1.0-beta3.tar.gz) = 1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3
3	SIZE (LuaJIT-2.0.5.tar.gz) = 849845	3	SIZE (LuaJIT-2.1.0-beta3.tar.gz) = 1025180

Lines 22-29 Link Here

(-)w/lang/luajit/files/patch-src_Makefile (-2 / +2 lines)
22	# x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute	22	# x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
23	# the binaries to a different machine you could also use: -march=native	23	# the binaries to a different machine you could also use: -march=native
24	#	24	#
25	-CCOPT_x86= -march=i686	25	-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
26	+#CCOPT_x86= -march=i686	26	+#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
27	CCOPT_x64=	27	CCOPT_x64=
28	CCOPT_arm=	28	CCOPT_arm=
29	CCOPT_ppc=	29	CCOPT_ppc=

Lines 1-25 Link Here

(-)w/lang/luajit/pkg-plist (-7 / +13 lines)
1	bin/luajit	1	bin/luajit
2	bin/luajit-%%VERSION%%	2	bin/luajit-%%VERSION%%
3	include/luajit-2.0/lauxlib.h	3	include/luajit-2.1/lauxlib.h
4	include/luajit-2.0/lua.h	4	include/luajit-2.1/lua.h
5	include/luajit-2.0/lua.hpp	5	include/luajit-2.1/lua.hpp
6	include/luajit-2.0/luaconf.h	6	include/luajit-2.1/luaconf.h
7	include/luajit-2.0/luajit.h	7	include/luajit-2.1/luajit.h
8	include/luajit-2.0/lualib.h	8	include/luajit-2.1/lualib.h
9	lib/libluajit-5.1.a	9	lib/libluajit-5.1.a
10	lib/libluajit-5.1.so	10	lib/libluajit-5.1.so
11	lib/libluajit-5.1.so.2	11	lib/libluajit-5.1.so.2
12	lib/libluajit-5.1.so.%%VERSION%%	12	lib/libluajit-5.1.so.%%LIBVERSION%%
13	libdata/pkgconfig/luajit.pc	13	libdata/pkgconfig/luajit.pc
14	share/luajit-%%VERSION%%/jit/bc.lua	14	share/luajit-%%VERSION%%/jit/bc.lua
15	share/luajit-%%VERSION%%/jit/bcsave.lua	15	share/luajit-%%VERSION%%/jit/bcsave.lua
16	share/luajit-%%VERSION%%/jit/dis_arm.lua	16	share/luajit-%%VERSION%%/jit/dis_arm.lua
		17	share/luajit-%%VERSION%%/jit/dis_arm64.lua
		18	share/luajit-%%VERSION%%/jit/dis_arm64be.lua
17	share/luajit-%%VERSION%%/jit/dis_mips.lua	19	share/luajit-%%VERSION%%/jit/dis_mips.lua
		20	share/luajit-%%VERSION%%/jit/dis_mips64.lua
		21	share/luajit-%%VERSION%%/jit/dis_mips64el.lua
18	share/luajit-%%VERSION%%/jit/dis_mipsel.lua	22	share/luajit-%%VERSION%%/jit/dis_mipsel.lua
19	share/luajit-%%VERSION%%/jit/dis_ppc.lua	23	share/luajit-%%VERSION%%/jit/dis_ppc.lua
20	share/luajit-%%VERSION%%/jit/dis_x64.lua	24	share/luajit-%%VERSION%%/jit/dis_x64.lua
21	share/luajit-%%VERSION%%/jit/dis_x86.lua	25	share/luajit-%%VERSION%%/jit/dis_x86.lua
22	share/luajit-%%VERSION%%/jit/dump.lua	26	share/luajit-%%VERSION%%/jit/dump.lua
		27	share/luajit-%%VERSION%%/jit/p.lua
23	share/luajit-%%VERSION%%/jit/v.lua	28	share/luajit-%%VERSION%%/jit/v.lua
24	share/luajit-%%VERSION%%/jit/vmdef.lua	29	share/luajit-%%VERSION%%/jit/vmdef.lua
		30	share/luajit-%%VERSION%%/jit/zone.lua
25	man/man1/luajit.1.gz	31	man/man1/luajit.1.gz

Lines 3-8 Link Here

(-)w/www/nginx-devel/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= nginx	4	PORTNAME= nginx
5	PORTVERSION= 1.13.9	5	PORTVERSION= 1.13.9
		6	PORTREVISION= 1
6	CATEGORIES= www	7	CATEGORIES= www
7	MASTER_SITES= http://nginx.org/download/	8	MASTER_SITES= http://nginx.org/download/
8	MASTER_SITES+= LOCAL/osa	9	MASTER_SITES+= LOCAL/osa
Lines 853-859 CONFIGURE_ARGS+=--add-module=${WRKSRC_let} Link Here
853		854
854	.if ${PORT_OPTIONS:MLUA}	855	.if ${PORT_OPTIONS:MLUA}
855	LIB_DEPENDS+= libluajit-5.1.so:lang/luajit	856	LIB_DEPENDS+= libluajit-5.1.so:lang/luajit
856	CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"	857	CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.1"
857	CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"	858	CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
858	NGINX_LUA_VERSION= 0.10.11	859	NGINX_LUA_VERSION= 0.10.11
859	GH_ACCOUNT+= openresty:lua	860	GH_ACCOUNT+= openresty:lua

Lines 14-20 Link Here

(-)w/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure (-1 / +1 lines)
14	test_paths= ;; #(	14	test_paths= ;; #(
15	yes) :	15	yes) :
16	- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(	16	- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(
17	+ test_paths="%%PREFIX%%/include/luajit-2.0" ;; #(	17	+ test_paths="%%PREFIX%%/include/luajit-2.1" ;; #(
18	*) :	18	*) :
19	test_paths="${with_lua}" ;;	19	test_paths="${with_lua}" ;;
20	esac	20	esac

Lines 3-9 Link Here

(-)w/www/nginx/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= nginx	4	PORTNAME= nginx
5	PORTVERSION= 1.12.2	5	PORTVERSION= 1.12.2
6	PORTREVISION?= 10	6	PORTREVISION?= 11
7	PORTEPOCH= 2	7	PORTEPOCH= 2
8	CATEGORIES= www	8	CATEGORIES= www
9	MASTER_SITES= http://nginx.org/download/	9	MASTER_SITES= http://nginx.org/download/
Lines 862-868 CONFIGURE_ARGS+=--add-module=${WRKSRC_let} Link Here
862		862
863	.if ${PORT_OPTIONS:MLUA}	863	.if ${PORT_OPTIONS:MLUA}
864	LIB_DEPENDS+= libluajit-5.1.so:lang/luajit	864	LIB_DEPENDS+= libluajit-5.1.so:lang/luajit
865	CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"	865	CONFIGURE_ENV+= "LUAJIT_INC=${LOCALBASE}/include/luajit-2.1"
866	CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"	866	CONFIGURE_ENV+= "LUAJIT_LIB=${LOCALBASE}/lib"
867	NGINX_LUA_VERSION= 0.10.11	867	NGINX_LUA_VERSION= 0.10.11
868	GH_ACCOUNT+= openresty:lua	868	GH_ACCOUNT+= openresty:lua

Lines 14-20 Link Here

(-)w/www/nginx/files/extra-patch-nginx-modsecurity-configure (-1 / +1 lines)
14	test_paths= ;; #(	14	test_paths= ;; #(
15	yes) :	15	yes) :
16	- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(	16	- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(
17	+ test_paths="%%PREFIX%%/include/luajit-2.0" ;; #(	17	+ test_paths="%%PREFIX%%/include/luajit-2.1" ;; #(
18	*) :	18	*) :
19	test_paths="${with_lua}" ;;	19	test_paths="${with_lua}" ;;
20	esac	20	esac

Return to bug 225342

Lines 2-9 Link Here

(-)w/benchmarks/wrk/Makefile (-4 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= wrk	4	PORTNAME= wrk
5	PORTVERSION= 4.0.2	5	PORTVERSION= 4.1.0
6	PORTREVISION= 1
7	CATEGORIES= benchmarks www	6	CATEGORIES= benchmarks www
8		7
9	MAINTAINER= osa@FreeBSD.org	8	MAINTAINER= osa@FreeBSD.org
Lines 17-24 USE_GITHUB= yes Link Here
17	GH_ACCOUNT= wg	16	GH_ACCOUNT= wg
18		17
19	USES= gmake ssl	18	USES= gmake ssl
20	LLD_UNSAFE= yes	19	CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH -I${LOCALBASE}/include/luajit-2.1
21	CFLAGS+= -std=c99 -D_DECLARE_C99_LDBL_MATH
22	MAKE_ENV+= WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}	20	MAKE_ENV+= WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
23		21
24	PLIST_FILES= bin/wrk	22	PLIST_FILES= bin/wrk

Lines 2-9 Link Here

(-)w/lang/luajit/Makefile (-4 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= luajit	4	PORTNAME= luajit
5	DISTVERSION= 2.0.5	5	DISTVERSION= 2.1.0-beta3
6	PORTREVISION= 1
7	CATEGORIES= lang	6	CATEGORIES= lang
8	MASTER_SITES= http://luajit.org/download/	7	MASTER_SITES= http://luajit.org/download/
9	DISTNAME= LuaJIT-${DISTVERSION}	8	DISTNAME= LuaJIT-${DISTVERSION}
Lines 16-24 USES= gmake Link Here
16	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
17	MAKE_ARGS= CC=${CC}	16	MAKE_ARGS= CC=${CC}
18		17
19	PLIST_SUB+= VERSION=${DISTVERSION}	18	PLIST_SUB+= VERSION=${DISTVERSION} LIBVERSION=${DISTVERSION:C/-.*//}
20	BROKEN_powerpc64= Not ported to powerpc64 upstream	19	BROKEN_powerpc64= Not ported to powerpc64 upstream
21		20
		21	OPTIONS_DEFINE= PTHREAD
		22	OPTIONS_DEFAULT= PTHREAD
		23
		24	PTHREAD_DESC= Enable pthread support
		25	PTHREAD_LDFLAGS= -lm -pthread
		26
22	.include <bsd.port.options.mk>	27	.include <bsd.port.options.mk>
23		28
24	.if ${ARCH:Mpowerpc} \|\| ${ARCH:Mmips} \|\| ${ARCH:Msparc*}	29	.if ${ARCH:Mpowerpc} \|\| ${ARCH:Mmips} \|\| ${ARCH:Msparc*}
Lines 28-33 USE_GCC=yes Link Here
28	post-install:	33	post-install:
29	${LN} -sf ${PORTNAME}-${DISTVERSION} \	34	${LN} -sf ${PORTNAME}-${DISTVERSION} \
30	${STAGEDIR}${PREFIX}/bin/${PORTNAME}	35	${STAGEDIR}${PREFIX}/bin/${PORTNAME}
31	@${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	36	${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
32		37
33	.include <bsd.port.mk>	38	.include <bsd.port.mk>