Attachment #176785 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+=    5a8110f57ec55ff580260cf1fc6aa152a5a4c574: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 133-135 Link Here

(-)distinfo (+2 lines)
133	SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090	133	SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
134	SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462	134	SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
135	SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133	135	SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
		136	SHA256 (happyfish100-fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574_GH0.tar.gz) = c377481f8cb23aebba5879c5fd1f3508f0925114237de93f4b9eaf3e387e93fb
		137	SIZE (happyfish100-fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574_GH0.tar.gz) = 18018




--- ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/src/config.orig	2016-10-12 16:09:34.075804000 +0200
+++ ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/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

(-)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 175-180 Link Here
175	CLOJURE_DESC= 3rd party clojure module	176	CLOJURE_DESC= 3rd party clojure module
176	CT_DESC= 3rd party cert_transparency module (SSL req.)	177	CT_DESC= 3rd party cert_transparency module (SSL req.)
177	ECHO_DESC= 3rd party echo module	178	ECHO_DESC= 3rd party echo module
		179	FASTDFS_DESC= 3rd party fastdfs module
178	HEADERS_MORE_DESC= 3rd party headers_more module	180	HEADERS_MORE_DESC= 3rd party headers_more module
179	HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module	181	HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
180	HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module	182	HTTP_ACCESSKEY_DESC= 3rd party http_accesskey module
Lines 453-458 Link Here
453	.endif	455	.endif
454	.endif	456	.endif
455		457
		458	.if ${PORT_OPTIONS:MFASTDFS}
		459	NGINX_FASTDFS_VERSION= 1.18
		460	GH_ACCOUNT+= happyfish100:fastdfs
		461	GH_PROJECT+= fastdfs-nginx-module:fastdfs
		462	GH_TAGNAME+= 5a8110f57ec55ff580260cf1fc6aa152a5a4c574:fastdfs
		463
		464	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fastdfs-src-config
		465
		466	BUILD_DEPENDS+= ${LOCALBASE}/include/fastcommon/logger.h:devel/libfastcommon \
		467	${LOCALBASE}/include/fastdfs/fdfs_client.h:ftp/fastdfs
		468
		469	LIB_DEPENDS+= libfastcommon.so:devel/libfastcommon \
		470	libfdfsclient.so:ftp/fastdfs
		471
		472	CONFIGURE_ARGS+=--add-module=${WRKSRC_fastdfs}/src --with-cc-opt="-I ${LOCALBASE}/include/fastdfs \
		473	-I ${LOCALBASE}/include/fastcommon"
		474	.endif
		475
456	.if ${PORT_OPTIONS:MHEADERS_MORE}	476	.if ${PORT_OPTIONS:MHEADERS_MORE}
457	NGINX_HEADERS_MORE_VERSION= 84241e4	477	NGINX_HEADERS_MORE_VERSION= 84241e4
458	GH_ACCOUNT+= openresty:headers_more	478	GH_ACCOUNT+= openresty:headers_more
Lines 1173-1178 Link Here
1173	's!%%PREFIX%%!${LOCALBASE}!g' \	1193	's!%%PREFIX%%!${LOCALBASE}!g' \
1174	${WRKSRC_drizzle}/config	1194	${WRKSRC_drizzle}/config
1175	.endif	1195	.endif
		1196	.if ${PORT_OPTIONS:MFASTDFS}
		1197	@${REINPLACE_CMD} \
		1198	's!%%PREFIX%%!${PREFIX}!g; \
		1199	s!%%LOCALBASE%%!${LOCALBASE}!g' \
		1200	${WRKSRC_fastdfs}/src/config
		1201	.endif
1176	# Respect CFLAGS by remove needless --std=c99 flag	1202	# Respect CFLAGS by remove needless --std=c99 flag
1177	.if ${PORT_OPTIONS:MGRIDFS}	1203	.if ${PORT_OPTIONS:MGRIDFS}
1178	@${REINPLACE_CMD} \	1204	@${REINPLACE_CMD} \
Lines 1275-1280 Link Here
1275	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/	1301	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
1276	.endif	1302	.endif
1277		1303
		1304	.if ${PORT_OPTIONS:MFASTDFS}
		1305	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fdfs
		1306	${INSTALL_DATA} ${WRKSRC_fastdfs}/src/mod_fastdfs.conf ${STAGEDIR}${PREFIX}/etc/fdfs/mod_fastdfs.conf.sample
		1307	.endif
		1308
1278	# Install dynamic modules	1309	# Install dynamic modules
1279	.if !empty(PORT_OPTIONS:MDSO)	1310	.if !empty(PORT_OPTIONS:MDSO)
1280	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \	1311	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
Lines 1298-1303 Link Here
1298	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}	1329	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
1299	.endif	1330	.endif
1300		1331
		1332	.if ${PORT_OPTIONS:MFASTDFS}
		1333	${ECHO_CMD} @sample etc/fdfs/mod_fastdfs.conf.sample
		1334	.endif
		1335
1301	# Add dynamic modules to the plist	1336	# Add dynamic modules to the plist
1302	.if !empty(PORT_OPTIONS:MDSO)	1337	.if !empty(PORT_OPTIONS:MDSO)
1303	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S\|${PREFIX}/\|\|} \	1338	(cd ${STAGEDIR}${PREFIX} && ${FIND} ${MODULESDIR:S\|${PREFIX}/\|\|} \

Line 0 Link Here

(-)files/extra-patch-fastdfs-src-config (+23 lines)
	1	--- ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/src/config.orig 2016-10-12 16:09:34.075804000 +0200
	2	+++ ../fastdfs-nginx-module-5a8110f57ec55ff580260cf1fc6aa152a5a4c574/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