svn commit: r307636 - in head/www: nginx nginx-devel nginx-devel/files nginx/files
Sergey A. Osokin
osa at FreeBSD.org
Thu Nov 22 03:47:21 UTC 2012
Author: osa
Date: Thu Nov 22 03:47:20 2012
New Revision: 307636
URL: http://svnweb.freebsd.org/changeset/ports/307636
Log:
Use more canonical names for patches.
No functionaly changes.
Don't bump PORTREVISION.
Feature safe: yes
Added:
head/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config
- copied unchanged from r305996, head/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config
head/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config
- copied unchanged from r305996, head/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config
head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config
- copied unchanged from r305998, head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
head/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c
- copied unchanged from r305996, head/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c
head/www/nginx-devel/files/extra-patch-ngx_postgres-config
- copied unchanged from r305996, head/www/nginx-devel/files/extra-patch-ngx_postgres::config
head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
- copied unchanged from r305996, head/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
head/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module-config
- copied unchanged from r306878, head/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config
head/www/nginx/files/extra-patch-calio-iconv-nginx-module-config
- copied unchanged from r306878, head/www/nginx/files/extra-patch-calio-iconv-nginx-module::config
head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config
- copied unchanged from r306878, head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
head/www/nginx/files/extra-patch-ngx_postgres-config
- copied unchanged from r306878, head/www/nginx/files/extra-patch-ngx_postgres::config
head/www/nginx/files/extra-patch-passenger-build-nginx.rb
- copied unchanged from r306878, head/www/nginx/files/extra-patch-passenger::build::nginx.rb
Deleted:
head/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config
head/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config
head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config
head/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c
head/www/nginx-devel/files/extra-patch-ngx_postgres::config
head/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
head/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config
head/www/nginx/files/extra-patch-calio-iconv-nginx-module::config
head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config
head/www/nginx/files/extra-patch-ngx_postgres::config
head/www/nginx/files/extra-patch-passenger::build::nginx.rb
Modified:
head/www/nginx-devel/Makefile
head/www/nginx/Makefile
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Thu Nov 22 03:28:24 2012 (r307635)
+++ head/www/nginx-devel/Makefile Thu Nov 22 03:47:20 2012 (r307636)
@@ -560,7 +560,7 @@ FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
DISTFILES+= chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config
.endif
.if ${PORT_OPTIONS:MENCRYPTSESSION}
@@ -622,7 +622,7 @@ NGINX_NAXSI_VERSION= 0.46-1
MASTER_SITES+= http://naxsi.googlecode.com/files/:naxsi
DISTFILES+= naxsi-${NGINX_NAXSI_VERSION}.tgz:naxsi
CONFIGURE_ARGS+=--add-module=${WRKDIR}/naxsi-${NGINX_NAXSI_VERSION}/naxsi_src
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-naxsi_src::naxsi_runtime.c
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-naxsi_src-naxsi_runtime.c
.endif
.if ${PORT_OPTIONS:MHTTP_REWRITE} || defined(USE_HTTP_REWRITE)
@@ -639,7 +639,7 @@ PASSENGER_VERSION= 3.0.17
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-build-nginx.rb
.if empty(PORT_OPTIONS:MDEBUG)
CONFIGURE_ENV+= OPTIMIZE="yes"
CFLAGS+= -DNDEBUG
@@ -652,7 +652,7 @@ NGINX_POSTGRES_VERSION= 0.9
MASTER_SITES+= http://labs.frickle.com/files/:postgres
DISTFILES+= ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config
.endif
.if ${PORT_OPTIONS:MRDS_CSV}
@@ -699,7 +699,7 @@ FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
DISTFILES+= agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module-config
.endif
.if ${PORT_OPTIONS:MSFLOW}
@@ -853,7 +853,7 @@ FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_VERSION}/:iconv
DISTFILES+= calio-iconv-nginx-module-v${NGINX_ICONV_VERSION}-${GIT_ICONV_VERSION}.tar.gz:iconv
CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
.endif
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
Copied: head/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config (from r305996, head/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module-config Thu Nov 22 03:47:20 2012 (r307636, copy of r305996, head/www/nginx-devel/files/extra-patch-agentzh-set-misc-nginx-module::config)
@@ -0,0 +1,13 @@
+--- ../agentzh-set-misc-nginx-module-658c235/config.orig 2011-12-09 10:27:53.861265188 +0300
++++ ../agentzh-set-misc-nginx-module-658c235/config 2011-12-09 10:28:07.107259301 +0300
+@@ -1,10 +1,3 @@
+-if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
+- echo "found ngx_devel_kit for ngx_set_misc; looks good."
+-else
+- echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2
+- exit 1
+-fi
+-
+ ngx_addon_name=ngx_http_set_misc_module
+ HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module"
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c $ngx_addon_dir/src/ngx_http_set_hex.c $ngx_addon_dir/src/ngx_http_set_base64.c $ngx_addon_dir/src/ngx_http_set_random.c"
Copied: head/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config (from r305996, head/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module-config Thu Nov 22 03:47:20 2012 (r307636, copy of r305996, head/www/nginx-devel/files/extra-patch-calio-iconv-nginx-module::config)
@@ -0,0 +1,19 @@
+--- ../calio-iconv-nginx-module-abdac17/config.orig 2012-01-12 12:01:07.000000000 +0400
++++ ../calio-iconv-nginx-module-abdac17/config 2011-10-11 03:30:35.000000000 +0400
+@@ -39,12 +39,12 @@
+ fi
+
+ if [ $ngx_found = no ]; then
+- ngx_feature="libiconv in /usr/local/"
+- ngx_feature_path="/usr/local/include"
++ ngx_feature="libiconv in %%PREFIX%%/"
++ ngx_feature_path="%%PREFIX%%/include"
+ if [ $NGX_RPATH = YES ]; then
+- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -liconv"
++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -liconv"
+ else
+- ngx_feature_libs="-L/usr/local/lib -liconv"
++ ngx_feature_libs="-L%%PREFIX%%/lib -liconv"
+ fi
+ . auto/feature
+ fi
Copied: head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config (from r305998, head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module-config Thu Nov 22 03:47:20 2012 (r307636, copy of r305998, head/www/nginx-devel/files/extra-patch-chaoslawful-drizzle-nginx-module::config)
@@ -0,0 +1,19 @@
+--- ../chaoslawful-drizzle-nginx-module-59e12ad/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../chaoslawful-drizzle-nginx-module-59e12ad/config 2011-12-30 10:28:20.000000000 +0400
+@@ -22,12 +22,12 @@
+
+ if [ $ngx_found = no ]; then
+ # FreeBSD, OpenBSD
+- ngx_feature="libdrizzle library in /usr/local/"
+- ngx_feature_path="/usr/local/include/libdrizzle-1.0"
++ ngx_feature="libdrizzle library in %%PREFIX%%"
++ ngx_feature_path="%%PREFIX%%/include/libdrizzle"
+ if [ $NGX_RPATH = YES ]; then
+- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle"
+ else
+- ngx_feature_libs="-L/usr/local/lib -ldrizzle"
++ ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle"
+ fi
+ . auto/feature
+ fi
Copied: head/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c (from r305996, head/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-naxsi_src-naxsi_runtime.c Thu Nov 22 03:47:20 2012 (r307636, copy of r305996, head/www/nginx-devel/files/extra-patch-naxsi_src::naxsi_runtime.c)
@@ -0,0 +1,16 @@
+--- ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c.orig 2012-06-06 16:26:30.000000000 +0400
++++ ../naxsi-0.46-1/naxsi_src/naxsi_runtime.c 2012-06-06 16:29:58.000000000 +0400
+@@ -116,7 +116,12 @@
+ tmp_idx = 0;
+ len = str->len;
+ while
+-#if defined nginx_version && (nginx_version > 1001011)
++#if defined nginx_version && (nginx_version >= 1003001)
++ (tmp_idx < len &&
++ (match = pcre_exec(rl->br->rx->regex->code, 0,
++ (const char *) str->data, str->len, tmp_idx, 0,
++ captures, 6)) >= 0)
++#elif (nginx_version > 1001011) && (nginx_version < 1003001)
+ (tmp_idx < len &&
+ (match = pcre_exec(rl->br->rx->regex->pcre, 0,
+ (const char *) str->data, str->len, tmp_idx, 0,
Copied: head/www/nginx-devel/files/extra-patch-ngx_postgres-config (from r305996, head/www/nginx-devel/files/extra-patch-ngx_postgres::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-ngx_postgres-config Thu Nov 22 03:47:20 2012 (r307636, copy of r305996, head/www/nginx-devel/files/extra-patch-ngx_postgres::config)
@@ -0,0 +1,19 @@
+--- ../ngx_postgres-0.9/config.orig 2011-12-29 11:17:24.000000000 +0400
++++ ../ngx_postgres-0.9/config 2011-12-29 11:18:47.000000000 +0400
+@@ -48,12 +48,12 @@
+
+ if [ $ngx_found = no ]; then
+ # FreeBSD
+- ngx_feature="libpq library in /usr/local/"
+- ngx_feature_path="/usr/local/include"
++ ngx_feature="libpq library in %%PREFIX%%/"
++ ngx_feature_path="%%PREFIX%%/include"
+ if [ $NGX_RPATH = YES ]; then
+- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpq"
++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lpq"
+ else
+- ngx_feature_libs="-L/usr/local/lib -lpq"
++ ngx_feature_libs="-L%%PREFIX%%/lib -lpq"
+ fi
+ . auto/feature
+ fi
Copied: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb (from r305996, head/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Thu Nov 22 03:47:20 2012 (r307636, copy of r305996, head/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb)
@@ -0,0 +1,34 @@
+--- ../passenger-3.0.17/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.17/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
+@@ -23,10 +23,7 @@
+
+ desc "Build Nginx helper agent"
+ task :nginx => [
+- AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent',
+- AGENT_OUTPUT_DIR + 'PassengerWatchdog',
+- AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
+- :native_support
++ AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent'
+ ]
+
+ dependencies = [
+@@ -51,18 +48,7 @@
+ LIBCOMMON,
+ ]
+ file AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' => dependencies do
+- output_dir = "#{AGENT_OUTPUT_DIR}nginx"
+- sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
+- create_executable "#{output_dir}/PassengerHelperAgent",
+- 'ext/nginx/HelperAgent.cpp',
+- "-Iext -Iext/common " <<
+- "#{PlatformInfo.portability_cflags} " <<
+- "#{EXTRA_CXXFLAGS} " <<
+- "#{LIBCOMMON} " <<
+- "#{LIBBOOST_OXT} " <<
+- "#{PlatformInfo.portability_ldflags} " <<
+- "#{AGENT_LDFLAGS} " <<
+- "#{EXTRA_LDFLAGS}"
++ true
+ end
+
+ task :clean => 'nginx:clean'
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Thu Nov 22 03:28:24 2012 (r307635)
+++ head/www/nginx/Makefile Thu Nov 22 03:47:20 2012 (r307636)
@@ -562,7 +562,7 @@ FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/chaoslawful/drizzle-nginx-module/tarball/v${NGINX_DRIZZLE_VERSION}/:drizzle
DISTFILES+= chaoslawful-drizzle-nginx-module-v${NGINX_DRIZZLE_VERSION}-${GIT_DRIZZLE_VERSION}.tar.gz:drizzle
CONFIGURE_ARGS+=--add-module=${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-chaoslawful-drizzle-nginx-module-config
.endif
.if ${PORT_OPTIONS:MENCRYPTSESSION}
@@ -641,7 +641,7 @@ PASSENGER_VERSION= 3.0.17
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-passenger-build-nginx.rb
.if empty(PORT_OPTIONS:MDEBUG)
CONFIGURE_ENV+= OPTIMIZE="yes"
CFLAGS+= -DNDEBUG
@@ -654,7 +654,7 @@ NGINX_POSTGRES_VERSION= 0.9
MASTER_SITES+= http://labs.frickle.com/files/:postgres
DISTFILES+= ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres
CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_postgres-${NGINX_POSTGRES_VERSION}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_postgres-config
.endif
.if ${PORT_OPTIONS:MRDS_CSV}
@@ -701,7 +701,7 @@ FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc
DISTFILES+= agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc
CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module-config
.endif
.if ${PORT_OPTIONS:MSFLOW}
@@ -847,7 +847,7 @@ FETCH_ARGS= -pRr
MASTER_SITES+= https://github.com/calio/iconv-nginx-module/tarball/v${NGINX_ICONV_VERSION}/:iconv
DISTFILES+= calio-iconv-nginx-module-v${NGINX_ICONV_VERSION}-${GIT_ICONV_VERSION}.tar.gz:iconv
CONFIGURE_ARGS+=--add-module=${WRKDIR}/calio-iconv-nginx-module-${GIT_ICONV_VERSION:S/^0-g//}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module::config
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
.endif
PLIST_SUB+= NGINX_TMPDIR=${NGINX_TMPDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
Copied: head/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module-config (from r306878, head/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module-config Thu Nov 22 03:47:20 2012 (r307636, copy of r306878, head/www/nginx/files/extra-patch-agentzh-set-misc-nginx-module::config)
@@ -0,0 +1,13 @@
+--- ../agentzh-set-misc-nginx-module-658c235/config.orig 2011-12-09 10:27:53.861265188 +0300
++++ ../agentzh-set-misc-nginx-module-658c235/config 2011-12-09 10:28:07.107259301 +0300
+@@ -1,10 +1,3 @@
+-if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then
+- echo "found ngx_devel_kit for ngx_set_misc; looks good."
+-else
+- echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2
+- exit 1
+-fi
+-
+ ngx_addon_name=ngx_http_set_misc_module
+ HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module"
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c $ngx_addon_dir/src/ngx_http_set_hex.c $ngx_addon_dir/src/ngx_http_set_base64.c $ngx_addon_dir/src/ngx_http_set_random.c"
Copied: head/www/nginx/files/extra-patch-calio-iconv-nginx-module-config (from r306878, head/www/nginx/files/extra-patch-calio-iconv-nginx-module::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-calio-iconv-nginx-module-config Thu Nov 22 03:47:20 2012 (r307636, copy of r306878, head/www/nginx/files/extra-patch-calio-iconv-nginx-module::config)
@@ -0,0 +1,19 @@
+--- ../calio-iconv-nginx-module-abdac17/config.orig 2012-01-12 12:01:07.000000000 +0400
++++ ../calio-iconv-nginx-module-abdac17/config 2011-10-11 03:30:35.000000000 +0400
+@@ -39,12 +39,12 @@
+ fi
+
+ if [ $ngx_found = no ]; then
+- ngx_feature="libiconv in /usr/local/"
+- ngx_feature_path="/usr/local/include"
++ ngx_feature="libiconv in %%PREFIX%%/"
++ ngx_feature_path="%%PREFIX%%/include"
+ if [ $NGX_RPATH = YES ]; then
+- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -liconv"
++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -liconv"
+ else
+- ngx_feature_libs="-L/usr/local/lib -liconv"
++ ngx_feature_libs="-L%%PREFIX%%/lib -liconv"
+ fi
+ . auto/feature
+ fi
Copied: head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config (from r306878, head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module-config Thu Nov 22 03:47:20 2012 (r307636, copy of r306878, head/www/nginx/files/extra-patch-chaoslawful-drizzle-nginx-module::config)
@@ -0,0 +1,19 @@
+--- ../chaoslawful-drizzle-nginx-module-59e12ad/config.orig 2011-12-30 10:26:53.000000000 +0400
++++ ../chaoslawful-drizzle-nginx-module-59e12ad/config 2011-12-30 10:28:20.000000000 +0400
+@@ -22,12 +22,12 @@
+
+ if [ $ngx_found = no ]; then
+ # FreeBSD, OpenBSD
+- ngx_feature="libdrizzle library in /usr/local/"
+- ngx_feature_path="/usr/local/include/libdrizzle-1.0"
++ ngx_feature="libdrizzle library in %%PREFIX%%"
++ ngx_feature_path="%%PREFIX%%/include/libdrizzle"
+ if [ $NGX_RPATH = YES ]; then
+- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -ldrizzle"
++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -ldrizzle"
+ else
+- ngx_feature_libs="-L/usr/local/lib -ldrizzle"
++ ngx_feature_libs="-L%%PREFIX%%/lib -ldrizzle"
+ fi
+ . auto/feature
+ fi
Copied: head/www/nginx/files/extra-patch-ngx_postgres-config (from r306878, head/www/nginx/files/extra-patch-ngx_postgres::config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-ngx_postgres-config Thu Nov 22 03:47:20 2012 (r307636, copy of r306878, head/www/nginx/files/extra-patch-ngx_postgres::config)
@@ -0,0 +1,19 @@
+--- ../ngx_postgres-0.9/config.orig 2011-12-29 11:17:24.000000000 +0400
++++ ../ngx_postgres-0.9/config 2011-12-29 11:18:47.000000000 +0400
+@@ -48,12 +48,12 @@
+
+ if [ $ngx_found = no ]; then
+ # FreeBSD
+- ngx_feature="libpq library in /usr/local/"
+- ngx_feature_path="/usr/local/include"
++ ngx_feature="libpq library in %%PREFIX%%/"
++ ngx_feature_path="%%PREFIX%%/include"
+ if [ $NGX_RPATH = YES ]; then
+- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpq"
++ ngx_feature_libs="-R%%PREFIX%%/lib -L%%PREFIX%%/lib -lpq"
+ else
+- ngx_feature_libs="-L/usr/local/lib -lpq"
++ ngx_feature_libs="-L%%PREFIX%%/lib -lpq"
+ fi
+ . auto/feature
+ fi
Copied: head/www/nginx/files/extra-patch-passenger-build-nginx.rb (from r306878, head/www/nginx/files/extra-patch-passenger::build::nginx.rb)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-passenger-build-nginx.rb Thu Nov 22 03:47:20 2012 (r307636, copy of r306878, head/www/nginx/files/extra-patch-passenger::build::nginx.rb)
@@ -0,0 +1,34 @@
+--- ../passenger-3.0.17/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.17/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300
+@@ -23,10 +23,7 @@
+
+ desc "Build Nginx helper agent"
+ task :nginx => [
+- AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent',
+- AGENT_OUTPUT_DIR + 'PassengerWatchdog',
+- AGENT_OUTPUT_DIR + 'PassengerLoggingAgent',
+- :native_support
++ AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent'
+ ]
+
+ dependencies = [
+@@ -51,18 +48,7 @@
+ LIBCOMMON,
+ ]
+ file AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' => dependencies do
+- output_dir = "#{AGENT_OUTPUT_DIR}nginx"
+- sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
+- create_executable "#{output_dir}/PassengerHelperAgent",
+- 'ext/nginx/HelperAgent.cpp',
+- "-Iext -Iext/common " <<
+- "#{PlatformInfo.portability_cflags} " <<
+- "#{EXTRA_CXXFLAGS} " <<
+- "#{LIBCOMMON} " <<
+- "#{LIBBOOST_OXT} " <<
+- "#{PlatformInfo.portability_ldflags} " <<
+- "#{AGENT_LDFLAGS} " <<
+- "#{EXTRA_LDFLAGS}"
++ true
+ end
+
+ task :clean => 'nginx:clean'
More information about the svn-ports-all
mailing list