10 files changed, 244 insertions, 1 deletions

diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile
index de051e8e57d8..2278b2f431ad 100644
--- a/x11-toolkits/gigi/Makefile
+++ b/x11-toolkits/gigi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gigi
 PORTVERSION=	0.8.0.1048
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-adam.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-adam.hpp
new file mode 100644
index 000000000000..660d2f05bce2
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-adam.hpp
@@ -0,0 +1,20 @@
+--- GG/adobe/adam.hpp.orig	2012-01-27 18:29:22.000000000 +0300
++++ GG/adobe/adam.hpp	2012-01-27 18:30:05.000000000 +0300
+@@ -528,7 +528,7 @@
+     relation_t(name_t n, line_position_t p, array_t e) :
+         name_m(n),
+         position_m(p),
+-        expression_m(move(e))
++        expression_m(::adobe::move(e))
+     { }
+     
+     friend void swap(relation_t& x, relation_t& y)
+@@ -541,7 +541,7 @@
+     relation_t(move_from<relation_t> x) :
+         name_m(x.source.name_m),
+         position_m(x.source.position_m),
+-        expression_m(move(x.source.expression_m))
++        expression_m(::adobe::move(x.source.expression_m))
+     { }
+     
+     relation_t& operator=(relation_t x) 
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-any_regular.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-any_regular.hpp
new file mode 100644
index 000000000000..9321609df66b
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-any_regular.hpp
@@ -0,0 +1,29 @@
+--- GG/adobe/any_regular.hpp.orig	2011-01-04 06:58:05.000000000 +0300
++++ GG/adobe/any_regular.hpp	2012-01-27 19:05:34.000000000 +0300
+@@ -220,7 +220,7 @@
+     
+     template <typename U>
+     explicit any_regular_model_local(U x, typename move_sink<U, T>::type = 0)
+-        : interface_type(vtable_s), object_m(move(x)) { }
++      : interface_type(vtable_s), object_m(::adobe::move(x)) { }
+         
+     static const any_regular_model_local& self(const interface_type& x)
+     { return static_cast<const any_regular_model_local&>(x); }
+@@ -238,7 +238,7 @@
+     { return ::new(storage) any_regular_model_local(self(x).object_m); }
+     
+     static interface_type* move_clone(interface_type& x, void* storage)
+-    { return ::new(storage) any_regular_model_local(move(self(x).object_m)); }
++  { return ::new(storage) any_regular_model_local(::adobe::move(self(x).object_m)); }
+     
+     static void assign(interface_type& x, const interface_type& y)
+     { self(x).object_m = self(y).object_m; }
+@@ -552,7 +552,7 @@
+     
+     template <typename T>
+     explicit any_regular_t(T x, typename move_sink<T>::type = 0) : data_ptr_m(&data_m[0])
+-    { ::new (storage()) typename traits<T>::model_type(move(x)); }
++  { ::new (storage()) typename traits<T>::model_type(::adobe::move(x)); }
+     
+     /*!@}*/
+     
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-array.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-array.hpp
new file mode 100644
index 000000000000..9b8cd0786803
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-array.hpp
@@ -0,0 +1,11 @@
+--- GG/adobe/array.hpp.orig	2012-01-27 18:25:14.000000000 +0300
++++ GG/adobe/array.hpp	2012-01-27 18:26:35.000000000 +0300
+@@ -33,7 +33,7 @@
+ { v.push_back(any_regular_t(move(x))); }
+ 
+ inline void push_back(array_t& v, any_regular_t x)
+-{ v.push_back(move(x)); }
++{ v.push_back(::adobe::move(x)); }
+ 
+ /**************************************************************************************************/
+ 
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-closed_hash.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-closed_hash.hpp
new file mode 100644
index 000000000000..a4e64fa1eceb
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-closed_hash.hpp
@@ -0,0 +1,44 @@
+--- GG/adobe/closed_hash.hpp.orig	2009-04-30 23:51:53.000000000 +0400
++++ GG/adobe/closed_hash.hpp	2012-01-27 19:00:48.000000000 +0300
+@@ -448,7 +448,7 @@
+     
+     template <typename I> // I models ForwardIterator
+     void move_insert(I first, I last)
+-    { while (first != last) { insert(move(*first)); ++first; } }
++  { while (first != last) { insert(::adobe::move(*first)); ++first; } }
+     
+     /*
+         NOTE (sparent): If there is not enough space for one element we will reserve the space
+@@ -480,12 +480,12 @@
+             {
+             iterator found = find(node, key_function()(x));
+             if (found != end()) {
+-                *found = move(x);
++              *found = ::adobe::move(x);
+                 return std::make_pair(found, false);
+             }
+             
+             iterator free(begin_free());
+-            insert_raw(free, move(x), state_misplaced);
++            insert_raw(free, ::adobe::move(x), state_misplaced);
+             unsafe::splice_node_range(node, free, free);
+             node = free;
+             }
+@@ -493,7 +493,7 @@
+         case state_misplaced:
+             {
+             iterator free(begin_free());
+-            insert_raw(free, move(*node), state_misplaced);
++            insert_raw(free, ::adobe::move(*node), state_misplaced);
+             
+             unsafe::set_next(boost::prior(node), free);
+             unsafe::set_next(free, boost::next(node));
+@@ -503,7 +503,7 @@
+             // fall through
+         default: // state_free
+             {
+-            insert_raw(node, move(x), state_home);
++            insert_raw(node, ::adobe::move(x), state_home);
+             unsafe::splice_node_range(end(), node, node);
+             }
+         }
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-move.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-move.hpp
new file mode 100644
index 000000000000..e83e7e5e9198
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-move.hpp
@@ -0,0 +1,20 @@
+--- GG/adobe/move.hpp.orig	2009-04-30 23:51:53.000000000 +0400
++++ GG/adobe/move.hpp	2012-01-27 18:58:44.000000000 +0300
+@@ -396,7 +396,7 @@
+ O move(I f, I l, O result)
+ {
+     while (f != l) {
+-        *result = move(*f);
++      *result = ::adobe::move(*f);
+         ++f; ++result;
+     }
+     return result;
+@@ -490,7 +490,7 @@
+ template <typename T, typename U> // T models Regular
+ inline void move_construct(T* p, U& x, typename move_sink<U, T>::type = 0)
+ {
+-    ::new(static_cast<void*>(p)) T(move(x));
++  ::new(static_cast<void*>(p)) T(::adobe::move(x));
+ }
+ 
+ /*************************************************************************************************/
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-string.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-string.hpp
new file mode 100644
index 000000000000..c69171f6ea9e
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-string.hpp
@@ -0,0 +1,62 @@
+--- GG/adobe/string.hpp.orig	2012-01-27 18:32:14.000000000 +0300
++++ GG/adobe/string.hpp	2012-01-27 18:34:30.000000000 +0300
+@@ -257,7 +257,7 @@
+     /*!
+         Move constructor.
+     */
+-    string_t(move_from<string_t> x) : storage_m(move(x.source.storage_m)) { }
++  string_t(move_from<string_t> x) : storage_m(::adobe::move(x.source.storage_m)) { }
+ 
+         /*!
+                 Constructs a string_t from a regular C string (including string literals).
+@@ -300,7 +300,7 @@
+                 Assignment operator.
+          */
+ 
+-        string_t& operator=(string_t s) { storage_m = move(s.storage_m); return *this; }
++  string_t& operator=(string_t s) { storage_m = ::adobe::move(s.storage_m); return *this; }
+ 
+         /*!
+                 Conversion operator to std::string.
+@@ -464,9 +464,9 @@
+         Anything that can be concatenated using string_t::operator+=
+         may also be concatenated to a string_t using operator+.
+  */
+-inline string_t operator+(string_t s1, const string_t& s2)     { return move(s1 += s2); }
+-inline string_t operator+(string_t s1, const std::string& s2)  { return move(s1 += s2); }
+-inline string_t operator+(string_t s1, const char* s2)         { return move(s1 += s2); }
++inline string_t operator+(string_t s1, const string_t& s2)     { return ::adobe::move(s1 += s2); }
++inline string_t operator+(string_t s1, const std::string& s2)  { return ::adobe::move(s1 += s2); }
++inline string_t operator+(string_t s1, const char* s2)         { return ::adobe::move(s1 += s2); }
+ 
+ /*************************************************************************************************/
+ 
+@@ -559,7 +559,7 @@
+     /*!
+         Move constructor.
+          */
+-    string16_t(move_from<string16_t> x) : storage_m(move(x.source.storage_m)) { }
++  string16_t(move_from<string16_t> x) : storage_m(::adobe::move(x.source.storage_m)) { }
+ 
+         /*!
+                 Constructs a string16_t from a null-terminated sequence of 16-bit elements.
+@@ -595,7 +595,7 @@
+                 Assignment operator.
+          */
+         string16_t& operator=(string16_t s)
+-                { storage_m = move(s.storage_m); return *this; }
++  { storage_m = ::adobe::move(s.storage_m); return *this; }
+         
+         /*!
+                 Returns const pointer to a null-terminated sequence of 16-bit elements, identical to
+@@ -734,8 +734,8 @@
+         may also be concatenated to a string16_t using operator+.
+  */
+ 
+-inline string16_t operator+(string16_t s1, const string16_t& s2)      { return move(s1 += s2); }
+-inline string16_t operator+(string16_t s1, const boost::uint16_t* s2) { return move(s1 += s2); }
++inline string16_t operator+(string16_t s1, const string16_t& s2)      { return ::adobe::move(s1 += s2); }
++inline string16_t operator+(string16_t s1, const boost::uint16_t* s2) { return ::adobe::move(s1 += s2); }
+ 
+ //!@}
+ 
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-utility-pair.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-utility-pair.hpp
new file mode 100644
index 000000000000..9d80ad9cd66f
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-utility-pair.hpp
@@ -0,0 +1,17 @@
+--- GG/adobe/utility/pair.hpp.orig	2009-04-17 07:55:09.000000000 +0400
++++ GG/adobe/utility/pair.hpp	2012-01-27 19:33:57.000000000 +0300
+@@ -79,11 +79,11 @@
+     
+     pair() : first(), second() { }
+     
+-    pair(move_from<pair> x) : first(move(x.source.first)), second(move(x.source.second)) { }
++  pair(move_from<pair> x) : first(::adobe::move(x.source.first)), second(::adobe::move(x.source.second)) { }
+     
+-    pair& operator=(pair x) { first = move(x.first); second = move(x.second); return *this; }
++  pair& operator=(pair x) { first = ::adobe::move(x.first); second = ::adobe::move(x.second); return *this; }
+     
+-    pair(T1 x, T2 y) : first(move(x)), second(move(y)) { }
++  pair(T1 x, T2 y) : first(::adobe::move(x)), second(::adobe::move(y)) { }
+     
+     template <typename U1, typename U2>
+     pair(const pair<U1, U2>& p) : first(p.first), second(p.second) { }
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp
new file mode 100644
index 000000000000..7da94c93f6ab
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp
@@ -0,0 +1,29 @@
+--- GG/adobe/vector.hpp.orig	2012-01-27 18:38:56.000000000 +0300
++++ GG/adobe/vector.hpp	2012-01-27 18:40:58.000000000 +0300
+@@ -343,7 +343,7 @@
+     size_type n(std::distance(f, l));
+     
+         if (remaining() < n) reserve((adobe::max)(size() + n, 2 * size()));
+-    set_finish(uninitialized_move(f, l, end()));
++        set_finish(::adobe::uninitialized_move(f, l, end()));
+ }
+     
+ template <typename T, typename A>
+@@ -430,7 +430,7 @@
+     if (capacity() < n) {
+         vector tmp;
+         tmp.header_m = allocate(get_allocator(), n);
+-        tmp.header_m->finish() = uninitialized_move(begin(), end(), tmp.end());
++        tmp.header_m->finish() = ::adobe::uninitialized_move(begin(), end(), tmp.end());
+         swap(tmp);
+     }
+ }
+@@ -469,7 +469,7 @@
+ template <typename T, typename A>
+ typename vector<T, A>::iterator vector<T, A>::erase(iterator f, iterator l)
+ {
+-    iterator i = move(l, end(), f);
++  iterator i = ::adobe::move(l, end(), f);
+     for (iterator b(i), e(end()); b != e; ++b) {
+         b->~value_type();
+     }
diff --git a/x11-toolkits/gigi/files/patch-src-EveLayout.cpp b/x11-toolkits/gigi/files/patch-src-EveLayout.cpp
new file mode 100644
index 000000000000..4831f2b7f985
--- /dev/null
+++ b/x11-toolkits/gigi/files/patch-src-EveLayout.cpp
@@ -0,0 +1,11 @@
+--- src/EveLayout.cpp.orig	2012-01-27 19:11:18.000000000 +0300
++++ src/EveLayout.cpp	2012-01-27 19:14:31.000000000 +0300
+@@ -1815,7 +1815,7 @@
+ #endif
+ 
+             m_evaluator.evaluate(view_params.m_parameters);
+-            adobe::dictionary_t parameters(move(m_evaluator.back().cast<adobe::dictionary_t>()));
++            adobe::dictionary_t parameters(::adobe::move(m_evaluator.back().cast<adobe::dictionary_t>()));
+             m_evaluator.pop_back();
+ 
+ #if INSTRUMENT_WINDOW_CREATION