make_single &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 0c87bd4..3b15a3b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2012-08-22 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Avoid buggy GCC 4.6 AVX code generation
+
2012-07-18 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: 14.0.1, SECURITY_PATCH=51
* PRE_BUILD, installer.patch: added fix for
diff --git a/http/nginx/BUILD b/http/nginx/BUILD
index 8212b2b..540a54b 100755
--- a/http/nginx/BUILD
+++ b/http/nginx/BUILD
@@ -11,6 +11,9 @@ fi &&
if list_find "$NGINX_MODULES" "auth_ldap"; then
OPTS="--add-module=$SOURCE_DIRECTORY4 $OPTS"
fi &&
+if list_find "$NGINX_MODULES" "dav_ext"; then
+ OPTS="--add-module=$SOURCE_DIRECTORY5 $OPTS"
+fi &&
if [[ $NGINX_SYSLOG == n ]]; then
OPTS="--http-log-path=$INSTALL_ROOT/var/log/nginx/access.log \
diff --git a/http/nginx/CONFIGURE b/http/nginx/CONFIGURE
index b38722e..40abfe6 100755
--- a/http/nginx/CONFIGURE
+++ b/http/nginx/CONFIGURE
@@ -10,5 +10,12 @@ fi &&
config_query_option NGINX_OPTS "Build with mail support?" n \
"--with-mail" "" &&
+if list_find "$NGINX_MODULES" "dav_ext"; then
+ list_add "NGINX_OPTS" "--with-http_dav_module"
+else
+ config_query_option NGINX_OPTS "Enable HTTP WebDAV module?" n \
+ "--with-http_dav_module" ""
+fi &&
+
config_query_option NGINX_OPTS "Enable HTTP Real IP module?" n \
"--with-http_realip_module" ""
diff --git a/http/nginx/DEPENDS b/http/nginx/DEPENDS
index ae99755..5bcac0c 100755
--- a/http/nginx/DEPENDS
+++ b/http/nginx/DEPENDS
@@ -11,4 +11,8 @@ optional_depends perl \
if [[ $NGINX_SYSLOG == y ]]; then
depends SYSTEM-LOGGER
+fi &&
+
+if list_find "$NGINX_MODULES" "dav_ext"; then
+ depends expat
fi
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index 3ef5b16..118383d 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -44,6 +44,13 @@ if list_find "$NGINX_MODULES" "auth_ldap"; then
SOURCE4_HASH=sha512:01629d1a002088da0fd3beb6fa73448a5e5f87838320253bb33f5a44292deca7b7ef9c185a7749a11f564a51cfbe7339b398012ec7a49f4973061702c0cae4c1
SOURCE_DIRECTORY4="$SOURCE_DIRECTORY/${ID_AUTH_LDAP}"
fi
+if list_find "$NGINX_MODULES" "dav_ext"; then
+ ID_DAV_EXT=arut-nginx-dav-ext-module-0e07a3e
+ SOURCE5=${ID_DAV_EXT}.tar.gz
+ SOURCE5_URL[0]=https://github.com/arut/nginx-dav-ext-module/tarball/v0.0.2
+
SOURCE5_HASH=sha512:5580a58bb876e772c953e89c11cd7416f45c5528ee9dbbb8d77dd4e161342a4ded63015cf9350ac6a60369bd4b2ee9a45fb5e35923bc2092d263c9ee33e5c554
+SOURCE_DIRECTORY5="$SOURCE_DIRECTORY/${ID_DAV_EXT}"
+fi
WEB_SITE=http://nginx.org/
LICENSE[0]=BSD
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index c32fe80..f412678 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,11 @@
+2012-08-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, BUILD, PRE{PARE,_BUILD}: added dav_ext module
+ * CONFIGURE: generic dav module is required for dav_ext module
+ * DEPENDS: dav_ext module depends on libexpat
+
+2012-08-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added support for http_dav_module
+
2012-07-03 Vlad Glagolev <stealth AT sourcemage.org>
* CONFIGURE: added support for http_realip_module
diff --git a/http/nginx/PREPARE b/http/nginx/PREPARE
index e2c5dfb..32581ce 100755
--- a/http/nginx/PREPARE
+++ b/http/nginx/PREPARE
@@ -9,4 +9,5 @@ config_query_list NGINX_RELEASE "Select which release to
build:" \
config_query_multi NGINX_MODULES "What additional modules to build?" \
none \
push \
- auth_ldap
+ auth_ldap \
+ dav_ext
diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD
index 506db43..fb5c9fa 100755
--- a/http/nginx/PRE_BUILD
+++ b/http/nginx/PRE_BUILD
@@ -18,4 +18,7 @@ if list_find "$NGINX_MODULES" "push"; then
fi &&
if list_find "$NGINX_MODULES" "auth_ldap"; then
unpack_file 4
+fi &&
+if list_find "$NGINX_MODULES" "dav_ext"; then
+ unpack_file 5
fi
diff --git a/libs/openscenegraph/DEPENDS b/libs/openscenegraph/DEPENDS
index c2cf4c3..214989c 100755
--- a/libs/openscenegraph/DEPENDS
+++ b/libs/openscenegraph/DEPENDS
@@ -13,6 +13,7 @@ depends openthreads &&
depends tiff &&
depends unzip &&
depends zlib &&
+depends -sub LEGACY ffmpeg &&
optional_depends cairo '' '' 'for GTK+ plugins' &&
optional_depends gtk+2 '' '' 'for GTK+ plugins' &&
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index a664af9..f82206b 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,7 @@
+2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on legacy release of ffmpeg
+ * DEPENDS: changed ffmpeg sub dependency from legacy to LEGACY
+
2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.0.1