Attachment #176862 for bug #213979




	CLOJURE \
	CT \
	ECHO \
	FASTDFS \
	HEADERS_MORE \
	HTTP_ACCEPT_LANGUAGE \
	HTTP_ACCESSKEY \

CLOJURE_DESC=			3rd party clojure module
CT_DESC=			3rd party cert_transparency module (SSL req.)
ECHO_DESC=			3rd party echo module
FASTDFS_DESC=			3rd party fastdfs module
HEADERS_MORE_DESC=		3rd party headers_more module
HTTP_ACCEPT_LANGUAGE_DESC=	3rd party accept_language module
HTTP_ACCESSKEY_DESC=		3rd party http_accesskey module

.endif
.endif

.if ${PORT_OPTIONS:MFASTDFS}
NGINX_FASTDFS_VERSION=     1.18
GH_ACCOUNT+=    happyfish100:fastdfs
GH_PROJECT+=    fastdfs-nginx-module:fastdfs
GH_TAGNAME+=    5a8110f:fastdfs

EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config

BUILD_DEPENDS+=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
		${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs

LIB_DEPENDS+=	libfastcommon.so:devel/libfastcommon \
		libfdfsclient.so:ftp/fastdfs

CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
                -I ${LOCALBASE}/include/fastcommon"
.endif

.if ${PORT_OPTIONS:MHEADERS_MORE}
NGINX_HEADERS_MORE_VERSION=	84241e4
GH_ACCOUNT+=	openresty:headers_more

		's!%%PREFIX%%!${LOCALBASE}!g' \
		${WRKSRC_drizzle}/config
.endif
.if ${PORT_OPTIONS:MFASTDFS}
	@${REINPLACE_CMD} \
		's!%%PREFIX%%!${PREFIX}!g; \
		s!%%LOCALBASE%%!${LOCALBASE}!g' \
		${WRKSRC_fastdfs}/src/config
.endif
# Respect CFLAGS by remove needless --std=c99 flag
.if ${PORT_OPTIONS:MGRIDFS}
	@${REINPLACE_CMD} \

		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
.endif

.if ${PORT_OPTIONS:MFASTDFS}
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
.endif

# Install dynamic modules
.if !empty(PORT_OPTIONS:MDSO)
	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \

	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
.endif

.if ${PORT_OPTIONS:MFASTDFS}
	${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample
.endif

# Add dynamic modules to the plist
.if !empty(PORT_OPTIONS:MDSO)
	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \

Lines 135-137 Link Here

(-)nginx/distinfo (+2 lines)
135	SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090	135	SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
136	SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462	136	SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
137	SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133	137	SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
		138	SHA256 (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 58daa08a5ab9b9de5459817fc088230f4092fb818b87a2cb61b217952a5af54d
		139	SIZE (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 17980




--- ../fastdfs-nginx-module-5a8110f/src/config.orig	2016-10-12 16:09:34.075804000 +0200
+++ ../fastdfs-nginx-module-5a8110f/src/config	2016-10-12 16:10:43.916280000 +0200
@@ -3,16 +3,16 @@
 if test -n "${ngx_module_link}"; then
     ngx_module_type=HTTP
     ngx_module_name=$ngx_addon_name
-    ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
+    ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
     ngx_module_libs="-lfastcommon -lfdfsclient"
     ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
     ngx_module_deps=
-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
+    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
     . auto/module
 else
     HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
-    CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
+    CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
     CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
+    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
 fi




	CLOJURE \
	CT \
	ECHO \
	FASTDFS \
	HEADERS_MORE \
	HTTP_ACCEPT_LANGUAGE \
	HTTP_ACCESSKEY \

CLOJURE_DESC=			3rd party clojure module
CT_DESC=			3rd party cert_transparency module (SSL req.)
ECHO_DESC=			3rd party echo module
FASTDFS_DESC=			3rd party fastdfs module
HEADERS_MORE_DESC=		3rd party headers_more module
HTTP_ACCEPT_LANGUAGE_DESC=	3rd party accept_language module
HTTP_ACCESSKEY_DESC=		3rd party http_accesskey module

.endif
.endif

.if ${PORT_OPTIONS:MFASTDFS}
NGINX_FASTDFS_VERSION=     1.18
GH_ACCOUNT+=    happyfish100:fastdfs
GH_PROJECT+=    fastdfs-nginx-module:fastdfs
GH_TAGNAME+=    5a8110f:fastdfs

EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config

BUILD_DEPENDS+=	${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
		${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs

LIB_DEPENDS+=	libfastcommon.so:devel/libfastcommon \
		libfdfsclient.so:ftp/fastdfs

CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
                -I ${LOCALBASE}/include/fastcommon"
.endif

.if ${PORT_OPTIONS:MHEADERS_MORE}
NGINX_HEADERS_MORE_VERSION=	84241e4
GH_ACCOUNT+=	openresty:headers_more

		's!%%PREFIX%%!${LOCALBASE}!g' \
		${WRKSRC_drizzle}/config
.endif
.if ${PORT_OPTIONS:MFASTDFS}
	@${REINPLACE_CMD} \
		's!%%PREFIX%%!${PREFIX}!g; \
		s!%%LOCALBASE%%!${LOCALBASE}!g' \
		${WRKSRC_fastdfs}/src/config
.endif
# Respect CFLAGS by remove needless --std=c99 flag
.if ${PORT_OPTIONS:MGRIDFS}
	@${REINPLACE_CMD} \

		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
.endif

.if ${PORT_OPTIONS:MFASTDFS}
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
.endif

# Install dynamic modules
.if !empty(PORT_OPTIONS:MDSO)
	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \

	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
.endif

.if ${PORT_OPTIONS:MFASTDFS}
	${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample
.endif

# Add dynamic modules to the plist
.if !empty(PORT_OPTIONS:MDSO)
	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S|${PREFIX}/||} \

Lines 135-137 Link Here

(-)nginx-devel/distinfo (+2 lines)
135	SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090	135	SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
136	SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462	136	SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
137	SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133	137	SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
		138	SHA256 (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 58daa08a5ab9b9de5459817fc088230f4092fb818b87a2cb61b217952a5af54d
		139	SIZE (happyfish100-fastdfs-nginx-module-5a8110f_GH0.tar.gz) = 17980




--- ../fastdfs-nginx-module-5a8110f/src/config.orig	2016-10-12 16:09:34.075804000 +0200
+++ ../fastdfs-nginx-module-5a8110f/src/config	2016-10-12 16:10:43.916280000 +0200
@@ -3,16 +3,16 @@
 if test -n "${ngx_module_link}"; then
     ngx_module_type=HTTP
     ngx_module_name=$ngx_addon_name
-    ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
+    ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
     ngx_module_libs="-lfastcommon -lfdfsclient"
     ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
     ngx_module_deps=
-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
+    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
     . auto/module
 else
     HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
     NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
-    CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
+    CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
     CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
-    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
+    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
 fi

Return to bug 213979

Lines 67-72 Link Here

(-)nginx/Makefile (+35 lines)
67	CLOJURE \	67	CLOJURE \
68	CT \	68	CT \
69	ECHO \	69	ECHO \
		70	FASTDFS \
70	HEADERS_MORE \	71	HEADERS_MORE \
71	HTTP_ACCEPT_LANGUAGE \	72	HTTP_ACCEPT_LANGUAGE \
72	HTTP_ACCESSKEY \	73	HTTP_ACCESSKEY \
Lines 176-181 Link Here
176	CLOJURE_DESC= 3rd party clojure module	177	CLOJURE_DESC= 3rd party clojure module
177	CT_DESC= 3rd party cert_transparency module (SSL req.)	178	CT_DESC= 3rd party cert_transparency module (SSL req.)
178	ECHO_DESC= 3rd party echo module	179	ECHO_DESC= 3rd party echo module
		180	FASTDFS_DESC= 3rd party fastdfs module
179	HEADERS_MORE_DESC= 3rd party headers_more module	181	HEADERS_MORE_DESC= 3rd party headers_more module
180	HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module	182	HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
181	HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module	183	HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module
Lines 455-460 Link Here
455	.endif	457	.endif
456	.endif	458	.endif
457		459
		460	.if ${PORT_OPTIONS:MFASTDFS}
		461	NGINX_FASTDFS_VERSION= 1.18
		462	GH_ACCOUNT+= happyfish100:fastdfs
		463	GH_PROJECT+= fastdfs-nginx-module:fastdfs
		464	GH_TAGNAME+= 5a8110f:fastdfs
		465
		466	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config
		467
		468	BUILD_DEPENDS+= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
		469	${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
		470
		471	LIB_DEPENDS+= libfastcommon.so:devel/libfastcommon \
		472	libfdfsclient.so:ftp/fastdfs
		473
		474	CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
		475	-I ${LOCALBASE}/include/fastcommon"
		476	.endif
		477
458	.if ${PORT_OPTIONS:MHEADERS_MORE}	478	.if ${PORT_OPTIONS:MHEADERS_MORE}
459	NGINX_HEADERS_MORE_VERSION= 84241e4	479	NGINX_HEADERS_MORE_VERSION= 84241e4
460	GH_ACCOUNT+= openresty:headers_more	480	GH_ACCOUNT+= openresty:headers_more
Lines 1189-1194 Link Here
1189	's!%%PREFIX%%!${LOCALBASE}!g' \	1209	's!%%PREFIX%%!${LOCALBASE}!g' \
1190	${WRKSRC_drizzle}/config	1210	${WRKSRC_drizzle}/config
1191	.endif	1211	.endif
		1212	.if ${PORT_OPTIONS:MFASTDFS}
		1213	@${REINPLACE_CMD} \
		1214	's!%%PREFIX%%!${PREFIX}!g; \
		1215	s!%%LOCALBASE%%!${LOCALBASE}!g' \
		1216	${WRKSRC_fastdfs}/src/config
		1217	.endif
1192	# Respect CFLAGS by remove needless --std=c99 flag	1218	# Respect CFLAGS by remove needless --std=c99 flag
1193	.if ${PORT_OPTIONS:MGRIDFS}	1219	.if ${PORT_OPTIONS:MGRIDFS}
1194	@${REINPLACE_CMD} \	1220	@${REINPLACE_CMD} \
Lines 1291-1296 Link Here
1291	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/	1317	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
1292	.endif	1318	.endif
1293		1319
		1320	.if ${PORT_OPTIONS:MFASTDFS}
		1321	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
		1322	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
		1323	.endif
		1324
1294	# Install dynamic modules	1325	# Install dynamic modules
1295	.if !empty(PORT_OPTIONS:MDSO)	1326	.if !empty(PORT_OPTIONS:MDSO)
1296	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \	1327	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
Lines 1314-1319 Link Here
1314	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}	1345	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
1315	.endif	1346	.endif
1316		1347
		1348	.if ${PORT_OPTIONS:MFASTDFS}
		1349	${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample
		1350	.endif
		1351
1317	# Add dynamic modules to the plist	1352	# Add dynamic modules to the plist
1318	.if !empty(PORT_OPTIONS:MDSO)	1353	.if !empty(PORT_OPTIONS:MDSO)
1319	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S\|${PREFIX}/\|\|} \	1354	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S\|${PREFIX}/\|\|} \

Line 0 Link Here

(-)nginx/files/extra-patch-fastdfs-src-config (+23 lines)
	1	--- ../fastdfs-nginx-module-5a8110f/src/config.orig 2016-10-12 16:09:34.075804000 +0200
	2	+++ ../fastdfs-nginx-module-5a8110f/src/config 2016-10-12 16:10:43.916280000 +0200
	3	@@ -3,16 +3,16 @@
	4	if test -n "${ngx_module_link}"; then
	5	ngx_module_type=HTTP
	6	ngx_module_name=$ngx_addon_name
	7	- ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
	8	+ ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
	9	ngx_module_libs="-lfastcommon -lfdfsclient"
	10	ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
	11	ngx_module_deps=
	12	- CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
	13	+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
	14	. auto/module
	15	else
	16	HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
	17	NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
	18	- CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
	19	+ CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
	20	CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
	21	- CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
	22	+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
	23	fi

Lines 67-72 Link Here

(-)nginx-devel/Makefile (+35 lines)
67	CLOJURE \	67	CLOJURE \
68	CT \	68	CT \
69	ECHO \	69	ECHO \
		70	FASTDFS \
70	HEADERS_MORE \	71	HEADERS_MORE \
71	HTTP_ACCEPT_LANGUAGE \	72	HTTP_ACCEPT_LANGUAGE \
72	HTTP_ACCESSKEY \	73	HTTP_ACCESSKEY \
Lines 176-181 Link Here
176	CLOJURE_DESC= 3rd party clojure module	177	CLOJURE_DESC= 3rd party clojure module
177	CT_DESC= 3rd party cert_transparency module (SSL req.)	178	CT_DESC= 3rd party cert_transparency module (SSL req.)
178	ECHO_DESC= 3rd party echo module	179	ECHO_DESC= 3rd party echo module
		180	FASTDFS_DESC= 3rd party fastdfs module
179	HEADERS_MORE_DESC= 3rd party headers_more module	181	HEADERS_MORE_DESC= 3rd party headers_more module
180	HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module	182	HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
181	HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module	183	HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module
Lines 457-462 Link Here
457	.endif	459	.endif
458	.endif	460	.endif
459		461
		462	.if ${PORT_OPTIONS:MFASTDFS}
		463	NGINX_FASTDFS_VERSION= 1.18
		464	GH_ACCOUNT+= happyfish100:fastdfs
		465	GH_PROJECT+= fastdfs-nginx-module:fastdfs
		466	GH_TAGNAME+= 5a8110f:fastdfs
		467
		468	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config
		469
		470	BUILD_DEPENDS+= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
		471	${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
		472
		473	LIB_DEPENDS+= libfastcommon.so:devel/libfastcommon \
		474	libfdfsclient.so:ftp/fastdfs
		475
		476	CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
		477	-I ${LOCALBASE}/include/fastcommon"
		478	.endif
		479
460	.if ${PORT_OPTIONS:MHEADERS_MORE}	480	.if ${PORT_OPTIONS:MHEADERS_MORE}
461	NGINX_HEADERS_MORE_VERSION= 84241e4	481	NGINX_HEADERS_MORE_VERSION= 84241e4
462	GH_ACCOUNT+= openresty:headers_more	482	GH_ACCOUNT+= openresty:headers_more
Lines 1194-1199 Link Here
1194	's!%%PREFIX%%!${LOCALBASE}!g' \	1214	's!%%PREFIX%%!${LOCALBASE}!g' \
1195	${WRKSRC_drizzle}/config	1215	${WRKSRC_drizzle}/config
1196	.endif	1216	.endif
		1217	.if ${PORT_OPTIONS:MFASTDFS}
		1218	@${REINPLACE_CMD} \
		1219	's!%%PREFIX%%!${PREFIX}!g; \
		1220	s!%%LOCALBASE%%!${LOCALBASE}!g' \
		1221	${WRKSRC_fastdfs}/src/config
		1222	.endif
1197	# Respect CFLAGS by remove needless --std=c99 flag	1223	# Respect CFLAGS by remove needless --std=c99 flag
1198	.if ${PORT_OPTIONS:MGRIDFS}	1224	.if ${PORT_OPTIONS:MGRIDFS}
1199	@${REINPLACE_CMD} \	1225	@${REINPLACE_CMD} \
Lines 1296-1301 Link Here
1296	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/	1322	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
1297	.endif	1323	.endif
1298		1324
		1325	.if ${PORT_OPTIONS:MFASTDFS}
		1326	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
		1327	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
		1328	.endif
		1329
1299	# Install dynamic modules	1330	# Install dynamic modules
1300	.if !empty(PORT_OPTIONS:MDSO)	1331	.if !empty(PORT_OPTIONS:MDSO)
1301	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \	1332	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
Lines 1319-1324 Link Here
1319	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}	1350	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
1320	.endif	1351	.endif
1321		1352
		1353	.if ${PORT_OPTIONS:MFASTDFS}
		1354	${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample
		1355	.endif
		1356
1322	# Add dynamic modules to the plist	1357	# Add dynamic modules to the plist
1323	.if !empty(PORT_OPTIONS:MDSO)	1358	.if !empty(PORT_OPTIONS:MDSO)
1324	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S\|${PREFIX}/\|\|} \	1359	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S\|${PREFIX}/\|\|} \

Line 0 Link Here

(-)nginx-devel/files/extra-patch-fastdfs-src-config (+23 lines)
	1	--- ../fastdfs-nginx-module-5a8110f/src/config.orig 2016-10-12 16:09:34.075804000 +0200
	2	+++ ../fastdfs-nginx-module-5a8110f/src/config 2016-10-12 16:10:43.916280000 +0200
	3	@@ -3,16 +3,16 @@
	4	if test -n "${ngx_module_link}"; then
	5	ngx_module_type=HTTP
	6	ngx_module_name=$ngx_addon_name
	7	- ngx_module_incs="/usr/include/fastdfs /usr/include/fastcommon/"
	8	+ ngx_module_incs="%%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
	9	ngx_module_libs="-lfastcommon -lfdfsclient"
	10	ngx_module_srcs="$ngx_addon_dir/ngx_http_fastdfs_module.c"
	11	ngx_module_deps=
	12	- CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
	13	+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
	14	. auto/module
	15	else
	16	HTTP_MODULES="$HTTP_MODULES ngx_http_fastdfs_module"
	17	NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_fastdfs_module.c"
	18	- CORE_INCS="$CORE_INCS /usr/include/fastdfs /usr/include/fastcommon/"
	19	+ CORE_INCS="$CORE_INCS %%LOCALBASE%%/include/fastdfs %%LOCALBASE%%/include/fastcommon/"
	20	CORE_LIBS="$CORE_LIBS -lfastcommon -lfdfsclient"
	21	- CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"/etc/fdfs/mod_fastdfs.conf\"'"
	22	+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DFDFS_OUTPUT_CHUNK_SIZE='256*1024' -DFDFS_MOD_CONF_FILENAME='\"%%PREFIX%%/etc/fdfs/mod_fastdfs.conf\"'"
	23	fi