3 files changed, 50 insertions, 45 deletions

diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile
index cd46d137c3f9..3cd7aeeb7ad8 100644
--- a/x11-toolkits/c++-gtk-utils/Makefile
+++ b/x11-toolkits/c++-gtk-utils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	c++-gtk-utils
-PORTVERSION=	2.0.7
+PORTVERSION=	2.0.8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/cxx-gtk-utils/cxx-gtk-utils/${PORTVERSION}/
 DISTNAME=	c%2B%2B-gtk-utils-${PORTVERSION}
diff --git a/x11-toolkits/c++-gtk-utils/distinfo b/x11-toolkits/c++-gtk-utils/distinfo
index 15aed67b8567..e7c6afc53aff 100644
--- a/x11-toolkits/c++-gtk-utils/distinfo
+++ b/x11-toolkits/c++-gtk-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (c%2B%2B-gtk-utils-2.0.7.tar.gz) = 896d90d5db68bc2dcb45a1df5789fd6d9181dc242eb88e03e0932ba7e34eab14
-SIZE (c%2B%2B-gtk-utils-2.0.7.tar.gz) = 2051641
+SHA256 (c%2B%2B-gtk-utils-2.0.8.tar.gz) = 75b5199ce15ac54e7f8cfb7edb04517edf20f4a47fe90163573f5093c0f9c2d2
+SIZE (c%2B%2B-gtk-utils-2.0.8.tar.gz) = 2091617
diff --git a/x11-toolkits/c++-gtk-utils/pkg-plist b/x11-toolkits/c++-gtk-utils/pkg-plist
index eea3082d8dab..e090d5f8ae0a 100644
--- a/x11-toolkits/c++-gtk-utils/pkg-plist
+++ b/x11-toolkits/c++-gtk-utils/pkg-plist
@@ -1,42 +1,48 @@
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/application.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/async_queue.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/async_result.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/callback.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/cgu_config.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/convert.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/do_if.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/emitter.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/fdstream.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/fdstream.tpp
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/file_print_manager.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/future.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/future.tpp
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/gerror_handle.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/gobj_handle.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/gstream.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/gstream.tpp
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/gvar_handle.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/intrusive_ptr.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/io_watch.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/mem_fun.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/mutex.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/notifier.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/param.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/pipes.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/prog_present.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/reassembler.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/rw_lock.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/shared_handle.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/shared_ptr.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/intrusive_ptr.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/text_print_manager.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/thread.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/shared_handle.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/reassembler.h
+include/c++-gtk-utils-2-2.0/c++-gtk-utils/timeout.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/widget.h
 include/c++-gtk-utils-2-2.0/c++-gtk-utils/window.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/async_queue.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/gerror_handle.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/file_print_manager.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/text_print_manager.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/timeout.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/callback.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/prog_present.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/param.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/mem_fun.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/emitter.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/convert.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/future.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/future.tpp
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/gstream.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/gstream.tpp
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/rw_lock.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/gvar_handle.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/do_if.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/application.h
-include/c++-gtk-utils-2-2.0/c++-gtk-utils/cgu_config.h
-lib/libcxx-gtk-utils-2-2.0.so.0
-lib/libcxx-gtk-utils-2-2.0.so
-lib/libcxx-gtk-utils-2-2.0.la
 lib/libcxx-gtk-utils-2-2.0.a
+lib/libcxx-gtk-utils-2-2.0.la
+lib/libcxx-gtk-utils-2-2.0.so
+lib/libcxx-gtk-utils-2-2.0.so.0
 libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
+%%DOCSDIR%%/2.0/BUGS
+%%DOCSDIR%%/2.0/COPYING
+%%DOCSDIR%%/2.0/NEWS
+%%DOCSDIR%%/2.0/PORTING-TO-2.0
+%%DOCSDIR%%/2.0/README
 %%DOCSDIR%%/2.0/html/GTK.html
 %%DOCSDIR%%/2.0/html/GtkBuilder.html
 %%DOCSDIR%%/2.0/html/Linkage.html
@@ -50,6 +56,8 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/application_8h_source.html
 %%DOCSDIR%%/2.0/html/async__queue_8h.html
 %%DOCSDIR%%/2.0/html/async__queue_8h_source.html
+%%DOCSDIR%%/2.0/html/async__result_8h.html
+%%DOCSDIR%%/2.0/html/async__result_8h_source.html
 %%DOCSDIR%%/2.0/html/bc_s.png
 %%DOCSDIR%%/2.0/html/callback_8h.html
 %%DOCSDIR%%/2.0/html/callback_8h_source.html
@@ -63,6 +71,8 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1AsyncQueueDispatch-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1AsyncQueueDispatch.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1AsyncQueuePopError-members.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1AsyncResult-members.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1AsyncResult.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1CFree-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1CFree.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Callback_1_1Callback0-members.html
@@ -140,10 +150,10 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1FilePrintManager.png
 %%DOCSDIR%%/2.0/html/classCgu_1_1GFree-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1GFree.html
-%%DOCSDIR%%/2.0/html/classCgu_1_1GSliceFree.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1GSliceDestroy-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1GSliceDestroy.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1GSliceFree-members.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1GSliceFree.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1GSliceFreeSize-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1GSliceFreeSize.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1GerrorFree-members.html
@@ -174,7 +184,6 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1Notifier-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Notifier.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Param-members.html
-%%DOCSDIR%%/2.0/html/classes.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1PipeFifo-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1PipeFifo.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Releaser-members.html
@@ -186,12 +195,12 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedHandle-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedHandle.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedHandleError-members.html
-%%DOCSDIR%%/2.0/html/classCgu_1_1SharedPtr.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedLockHandle-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedLockHandle.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedLockPtr-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedLockPtr.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedPtr-members.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1SharedPtr.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1SharedPtrError-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1StandardArrayDelete-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1StandardArrayDelete.html
@@ -208,8 +217,8 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1Future-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1Future.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1Future.png
-%%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1GrecmutexLock.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1GrecmutexLock-members.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1GrecmutexLock.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1JoinableHandle-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1JoinableHandle.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1Mutex-members.html
@@ -226,7 +235,6 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RWLock_1_1ReaderTrackLock.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RWLock_1_1WriterLock-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RWLock_1_1WriterLock.html
-%%DOCSDIR%%/2.0/html/classCgu_1_1WinBase.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RWLock_1_1WriterTrackLock-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RWLock_1_1WriterTrackLock.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RecMutex-members.html
@@ -235,7 +243,6 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RecMutex_1_1Lock.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RecMutex_1_1TrackLock-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1RecMutex_1_1TrackLock.html
-%%DOCSDIR%%/2.0/html/classCgu_1_1WinBase.png
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1Thread-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Thread_1_1Thread.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Utf8_1_1ConversionError-members.html
@@ -245,8 +252,10 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1Utf8_1_1Reassembler-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Utf8_1_1Reassembler.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Utf8_1_1ReverseIterator-members.html
-%%DOCSDIR%%/2.0/html/classCgu_1_1WinBase-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1Utf8_1_1ReverseIterator.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1WinBase-members.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1WinBase.html
+%%DOCSDIR%%/2.0/html/classCgu_1_1WinBase.png
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__fdinbuf-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__fdinbuf.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__fdistream-members.html
@@ -256,7 +265,6 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__fdoutbuf-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__fdoutbuf.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__giostream-members.html
-%%DOCSDIR%%/2.0/html/classstd_1_1hash.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__giostream.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__gistream-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__gistream.html
@@ -264,6 +272,8 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__gostream.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__gstreambuf-members.html
 %%DOCSDIR%%/2.0/html/classCgu_1_1basic__gstreambuf.html
+%%DOCSDIR%%/2.0/html/classes.html
+%%DOCSDIR%%/2.0/html/classstd_1_1hash.html
 %%DOCSDIR%%/2.0/html/closed.png
 %%DOCSDIR%%/2.0/html/convert_8h.html
 %%DOCSDIR%%/2.0/html/convert_8h_source.html
@@ -335,7 +345,6 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/gerror__handle_8h.html
 %%DOCSDIR%%/2.0/html/gerror__handle_8h_source.html
 %%DOCSDIR%%/2.0/html/globals.html
-%%DOCSDIR%%/2.0/html/gstream_8h.html
 %%DOCSDIR%%/2.0/html/globals_defs.html
 %%DOCSDIR%%/2.0/html/gobj__handle_8h.html
 %%DOCSDIR%%/2.0/html/gobj__handle_8h_source.html
@@ -345,6 +354,7 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/group__io__watch.html
 %%DOCSDIR%%/2.0/html/group__prog__present.html
 %%DOCSDIR%%/2.0/html/group__timeout.html
+%%DOCSDIR%%/2.0/html/gstream_8h.html
 %%DOCSDIR%%/2.0/html/gstream_8h_source.html
 %%DOCSDIR%%/2.0/html/gvar__handle_8h.html
 %%DOCSDIR%%/2.0/html/gvar__handle_8h_source.html
@@ -366,8 +376,8 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/namespaceCgu_1_1SharedHandleAllocFail.html
 %%DOCSDIR%%/2.0/html/namespaceCgu_1_1SharedPtrAllocFail.html
 %%DOCSDIR%%/2.0/html/namespaceCgu_1_1Thread.html
-%%DOCSDIR%%/2.0/html/namespacemembers.html
 %%DOCSDIR%%/2.0/html/namespaceCgu_1_1Utf8.html
+%%DOCSDIR%%/2.0/html/namespacemembers.html
 %%DOCSDIR%%/2.0/html/namespacemembers_enum.html
 %%DOCSDIR%%/2.0/html/namespacemembers_eval.html
 %%DOCSDIR%%/2.0/html/namespacemembers_func.html
@@ -384,7 +394,6 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/pipes_8h.html
 %%DOCSDIR%%/2.0/html/pipes_8h_source.html
 %%DOCSDIR%%/2.0/html/prog__present_8h.html
-%%DOCSDIR%%/2.0/html/tab_a.png
 %%DOCSDIR%%/2.0/html/prog__present_8h_source.html
 %%DOCSDIR%%/2.0/html/reassembler_8h.html
 %%DOCSDIR%%/2.0/html/reassembler_8h_source.html
@@ -428,6 +437,7 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/structCgu_1_1Thread_1_1RWLockError.html
 %%DOCSDIR%%/2.0/html/structCgu_1_1Thread_1_1RecMutexError-members.html
 %%DOCSDIR%%/2.0/html/structCgu_1_1Thread_1_1RecMutexError.html
+%%DOCSDIR%%/2.0/html/tab_a.png
 %%DOCSDIR%%/2.0/html/tab_b.png
 %%DOCSDIR%%/2.0/html/tab_h.png
 %%DOCSDIR%%/2.0/html/tab_s.png
@@ -442,11 +452,6 @@ libdata/pkgconfig/c++-gtk-utils-2-2.0.pc
 %%DOCSDIR%%/2.0/html/widget_8h_source.html
 %%DOCSDIR%%/2.0/html/window_8h.html
 %%DOCSDIR%%/2.0/html/window_8h_source.html
-%%DOCSDIR%%/2.0/README
-%%DOCSDIR%%/2.0/BUGS
-%%DOCSDIR%%/2.0/COPYING
-%%DOCSDIR%%/2.0/NEWS
-%%DOCSDIR%%/2.0/PORTING-TO-2.0
 @dirrm %%DOCSDIR%%/2.0/html
 @dirrm %%DOCSDIR%%/2.0
 @dirrm %%DOCSDIR%%