From f24eab01de7dd70b5d5d357b65e47e60609d7428 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Wed, 26 Oct 2005 07:27:17 +0000 Subject: [PATCH] Fix build for freebsd7-ia64. Bump PORTREVISION. Notice from: kris via pointyhat Patch from: Igor Sysoev (author) --- www/nginx-devel/Makefile | 1 + .../files/patch-src-os-unix-ngx_atomic.h | 22 +++++++++++++++++++ www/nginx/Makefile | 1 + .../files/patch-src-os-unix-ngx_atomic.h | 22 +++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 www/nginx-devel/files/patch-src-os-unix-ngx_atomic.h create mode 100644 www/nginx/files/patch-src-os-unix-ngx_atomic.h diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 323e928b40ce..8c32e1b4fd5b 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= nginx PORTVERSION= 0.3.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://sysoev.ru/nginx/ MASTER_SITES+= ${MASTER_SITE_LOCAL} diff --git a/www/nginx-devel/files/patch-src-os-unix-ngx_atomic.h b/www/nginx-devel/files/patch-src-os-unix-ngx_atomic.h new file mode 100644 index 000000000000..6dc60f5f5515 --- /dev/null +++ b/www/nginx-devel/files/patch-src-os-unix-ngx_atomic.h @@ -0,0 +1,22 @@ +--- src/os/unix/ngx_atomic.h.orig Wed Oct 26 11:17:58 2005 ++++ src/os/unix/ngx_atomic.h Wed Oct 26 11:18:36 2005 +@@ -154,7 +154,7 @@ + ngx_atomic_cmp_set(ngx_atomic_t *lock, ngx_atomic_uint_t old, + ngx_atomic_uint_t set) + { +- if (*lock == old { ++ if (*lock == old) { + *lock = set; + return 1; + } +@@ -174,8 +174,9 @@ + return old; + } + +-#endif ++#define ngx_memory_barrier() + ++#endif + + void ngx_spinlock(ngx_atomic_t *lock, ngx_uint_t spin); + diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 323e928b40ce..8c32e1b4fd5b 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -7,6 +7,7 @@ PORTNAME= nginx PORTVERSION= 0.3.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://sysoev.ru/nginx/ MASTER_SITES+= ${MASTER_SITE_LOCAL} diff --git a/www/nginx/files/patch-src-os-unix-ngx_atomic.h b/www/nginx/files/patch-src-os-unix-ngx_atomic.h new file mode 100644 index 000000000000..6dc60f5f5515 --- /dev/null +++ b/www/nginx/files/patch-src-os-unix-ngx_atomic.h @@ -0,0 +1,22 @@ +--- src/os/unix/ngx_atomic.h.orig Wed Oct 26 11:17:58 2005 ++++ src/os/unix/ngx_atomic.h Wed Oct 26 11:18:36 2005 +@@ -154,7 +154,7 @@ + ngx_atomic_cmp_set(ngx_atomic_t *lock, ngx_atomic_uint_t old, + ngx_atomic_uint_t set) + { +- if (*lock == old { ++ if (*lock == old) { + *lock = set; + return 1; + } +@@ -174,8 +174,9 @@ + return old; + } + +-#endif ++#define ngx_memory_barrier() + ++#endif + + void ngx_spinlock(ngx_atomic_t *lock, ngx_uint_t spin); +