13 files changed, 821 insertions, 332 deletions

diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index bf0a7b87ee57..ef41bdf930d9 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ace
-PORTVERSION=	5.5.2
-PORTREVISION=	3
+PORTVERSION=	6.0.8
 CATEGORIES=	devel
 MASTER_SITES=	ftp://download.dre.vanderbilt.edu/previous_versions/ \
 		http://download.dre.vanderbilt.edu/previous_versions/
@@ -16,61 +15,115 @@ DISTNAME=	ACE-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Adaptive Communication Environment for C++
 
+OPTIONS=	OPENSSL "Build with OpenSSL support " on \
+		TRIO "Build with trio support" off \
+		X11 "Build with X11 support" off \
+		FLTK "Build with FLTK support" off \
+		TK "Build with Tcl/Tk support" off \
+		QT "Build with Qt support" off \
+
 CONFLICTS=	ace+tao-5*
 
-USE_AUTOTOOLS=	libtool
+NOT_FOR_ARCHS=	sparc64
+
+WRKSRC=		${WRKDIR}/ACE_wrappers
+
 USE_BZIP2=	yes
+USE_GNOME=	pkgconfig
+USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
+MAKE_ENV=	LD_LIBRARY_PATH="${WRKSRC}/lib" ACE_ROOT="${WRKSRC}" \
+		CROSS-COMPILE=1
+MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--program-transform-name s,^,ace-,
-USE_GNOME=	pkgconfig
-
-WRKSRC=		${WRKDIR}/ACE_wrappers
-BUILD_WRKSRC=	${WRKSRC}/objdir
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-NOT_FOR_ARCHS=	sparc64
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		ace-gperf.1
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
-EXTRA_PATCHES+=	${FILESDIR}/extra-ace-OS_NS_netdb.inl
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 800000
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ace-OS_NS_Thread.h
+.if !defined(WITHOUT_OPENSSL)
+USE_OPENSSL=	yes
+MAKE_ENV+=	ssl=1
+PLIST_SUB+=	OPENSSL=""
+.else
+PLIST_SUB+=	OPENSSL="@comment "
 .endif
 
-post-extract:
-	@${MKDIR} ${BUILD_WRKSRC}
+.if defined(WITH_TRIO)
+BUILD_DEPENDS+=	trio>=0:${PORTSDIR}/devel/trio
+MAKE_ENV+=	trio=1
+.endif
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g'
-.if (${OSVERSION} < 800000) || ${OSVERSION} >= 800024
-	@${REINPLACE_CMD} -e 's|cpu_set_t|cpuset_t|g' ${WRKSRC}/ace/OS_NS_Thread.cpp \
-		${WRKSRC}/ace/OS_NS_Thread.h
+.if defined(WITH_X11)
+USE_XORG=	xt
+MAKE_ENV+=	xt=1
+PLIST_SUB+=	X11=""
+.else
+PLIST_SUB+=	X11="@comment "
+.endif
+
+.if defined(WITH_FLTK)
+LIB_DEPENDS+=	fltk:${PORTSDIR}/x11-toolkits/fltk
+MAKE_ENV+=	fl=1
+PLIST_SUB+=	FLTK=""
+.else
+PLIST_SUB+=	FLTK="@comment "
 .endif
 
+.if defined(WITH_TK)
+USE_TK_BUILD=	yes
+USE_TK=		yes
+MAKE_ENV+=	tk=1
+PLIST_SUB+=	TK=""
+.else
+PLIST_SUB+=	TK="@comment "
+.endif
+
+.if defined(WITH_QT)
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui moc_build
+MAKE_ENV+=	qt=1 qt4=1 QTDIR="${QT_PREFIX}"
+CPPFLAGS+=	-I${QT_INCDIR}
+LDFLAGS+=	-L${QT_LIBDIR}
+PLIST_SUB+=	QT=""
+.else
+PLIST_SUB+=	QT="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|/$$libdir/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/bin/ace_install_pkgconfig.pl
+	@${REINPLACE_CMD} -e \
+		's|bin/moc)|bin/moc-qt4)|g ; \
+		 s|bin/moc,|bin/moc-qt4,|'g ${WRKSRC}/ace/QtReactor/GNUmakefile.ACE_Qt4Reactor_moc
+
 do-configure:
-	@(cd ${BUILD_WRKSRC} && \
-		if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
-	    CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-	    INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
-	    INSTALL_DATA="${INSTALL_DATA}" \
-	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-	    ${CONFIGURE_ENV} ../${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
-			 ${ECHO_CMD} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
-			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
-			 ${FALSE}; \
-		fi)
+	@cd ${WRKSRC}/ace \
+		&& ${ECHO_CMD} "#include <ace/config-${OPSYS:L}.h>" >> config.h
+	@cd ${WRKSRC}/include/makeinclude \
+		&& ${ECHO_CMD} "include \$$(ACE_ROOT)/include/makeinclude/platform_${OPSYS:L}.GNU" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "CC=	${CC}" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "CXX=	${CXX}" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "CPPFLAGS=	${CPPFLAGS}" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "LDFLAGS=	${LDFLAGS}" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "DCFLAGS=" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "OCFLAGS=	${CFLAGS}" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "INSTALL_PREFIX=	${PREFIX}" >> platform_macros.GNU
 
 post-install:
-	@for f in `${GREP} "${PORTVERSION}.*\.so$$" ${PLIST}`; do \
-		n=`echo $${f}|sed -e 's/-${PORTVERSION}//'`; \
-		${LN} -fs ${PREFIX}/$$f ${PREFIX}/$${n}.5; \
+	@for f in `${LS} -d \
+		${PREFIX}/lib/libACE*.so.${PORTVERSION} \
+		${PREFIX}/lib/libJAWS.so.${PORTVERSION} \
+		${PREFIX}/lib/libKokyu.so.${PORTVERSION} \
+		| ${XARGS} ${BASENAME}`; do \
+		n=`echo $${f}|sed -e 's/.so.${PORTVERSION}/.so/'`; \
+		${LN} -sf $${n}.${PORTVERSION} ${PREFIX}/lib/$${n}.6; \
 	done
 
 .include <bsd.port.post.mk>
diff --git a/devel/ace/distinfo b/devel/ace/distinfo
index fb1eb9bd17c3..80835ebc7932 100644
--- a/devel/ace/distinfo
+++ b/devel/ace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ACE-5.5.2.tar.bz2) = 80e1e17477ddaf48ebeaf439ca2571bed0c46abd85c04e678aebc3ce99a567b1
-SIZE (ACE-5.5.2.tar.bz2) = 7495797
+SHA256 (ACE-6.0.8.tar.bz2) = 2f7bae738b62f0162965fecb0f49b7fdf61de987c1d08d238b328e1d0d1ab683
+SIZE (ACE-6.0.8.tar.bz2) = 7903887
diff --git a/devel/ace/files/extra-ace-OS_NS_netdb.inl b/devel/ace/files/extra-ace-OS_NS_netdb.inl
deleted file mode 100644
index b8908a208c75..000000000000
--- a/devel/ace/files/extra-ace-OS_NS_netdb.inl
+++ /dev/null
@@ -1,47 +0,0 @@
---- ace/OS_NS_netdb.inl.orig	Sun Apr 23 23:34:14 2006
-+++ ace/OS_NS_netdb.inl	Sun Apr 23 23:39:33 2006
-@@ -101,7 +101,7 @@
-       *h_errnop = h_errno;
-       return (struct hostent *) 0;
-     }
--# elif defined (__GLIBC__)
-+# elif defined (__GLIBC__) || defined (__FreeBSD__)
-   // GNU C library has a different signature
-   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
- 
-@@ -211,7 +211,7 @@
-       *h_errnop = h_errno;
-       return (struct hostent *) 0;
-     }
--# elif defined (__GLIBC__)
-+# elif defined (__GLIBC__) || defined (__FreeBSD__)
-   // GNU C library has a different signature
-   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
- 
-@@ -360,7 +360,7 @@
-     return result;
-   else
-     return 0;
--# elif defined (__GLIBC__)
-+# elif defined (__GLIBC__) || defined (__FreeBSD__)
-   // GNU C library has a different signature
-   if (::getprotobyname_r (name,
-                           result,
-@@ -427,7 +427,7 @@
-     return result;
-   else
-     return 0;
--# elif defined (__GLIBC__)
-+# elif defined (__GLIBC__) || (__FreeBSD__)
-   // GNU C library has a different signature
-   if (::getprotobynumber_r (proto,
-                             result,
-@@ -499,7 +499,7 @@
-     return result;
-   else
-     return (struct servent *) 0;
--# elif defined (__GLIBC__)
-+# elif defined (__GLIBC__) || defined (__FreeBSD__)
-   // GNU C library has a different signature
-   ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA));
- 
diff --git a/devel/ace/files/extra-patch-ace-OS_NS_Thread.h b/devel/ace/files/extra-patch-ace-OS_NS_Thread.h
deleted file mode 100644
index df23d8732792..000000000000
--- a/devel/ace/files/extra-patch-ace-OS_NS_Thread.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ace/OS_NS_Thread.h.orig	2006-05-30 17:15:25.000000000 +0400
-+++ ace/OS_NS_Thread.h	2009-04-10 17:59:13.000000000 +0400
-@@ -38,6 +38,8 @@
- # include "ace/ACE_export.h"
- # include "ace/Object_Manager_Base.h"
- 
-+# include <sys/cpuset.h>
-+
- # if defined (ACE_EXPORT_MACRO)
- #   undef ACE_EXPORT_MACRO
- # endif
diff --git a/devel/ace/files/patch-ace-Makefile.in b/devel/ace/files/patch-ace-Makefile.in
deleted file mode 100644
index 26a58cd1c9fe..000000000000
--- a/devel/ace/files/patch-ace-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- ace/Makefile.in.orig	Mon Oct 15 22:02:49 2007
-+++ ace/Makefile.in	Mon Oct 15 23:57:10 2007
-@@ -402,6 +402,7 @@
- @BUILD_ACE_FOR_TAO_FALSE@  Null_Mutex.h \
- @BUILD_ACE_FOR_TAO_FALSE@  Null_Semaphore.h \
- @BUILD_ACE_FOR_TAO_FALSE@  OS.h \
-+@BUILD_ACE_FOR_TAO_FALSE@  OS.inl \
- @BUILD_ACE_FOR_TAO_FALSE@  OS_Dirent.h \
- @BUILD_ACE_FOR_TAO_FALSE@  OS_Errno.h \
- @BUILD_ACE_FOR_TAO_FALSE@  OS_Errno.inl \
-@@ -485,6 +486,7 @@
- @BUILD_ACE_FOR_TAO_FALSE@  Object_Manager.h \
- @BUILD_ACE_FOR_TAO_FALSE@  Object_Manager.inl \
- @BUILD_ACE_FOR_TAO_FALSE@  Object_Manager_Base.h \
-+@BUILD_ACE_FOR_TAO_FALSE@  Obstack.h \
- @BUILD_ACE_FOR_TAO_FALSE@  Obstack_T.cpp \
- @BUILD_ACE_FOR_TAO_FALSE@  Obstack_T.h \
- @BUILD_ACE_FOR_TAO_FALSE@  Obstack_T.inl \
-@@ -662,6 +664,7 @@
- @BUILD_ACE_FOR_TAO_FALSE@  Svc_Conf_Tokens.h \
- @BUILD_ACE_FOR_TAO_FALSE@  Svc_Handler.cpp \
- @BUILD_ACE_FOR_TAO_FALSE@  Svc_Handler.h \
-+@BUILD_ACE_FOR_TAO_FALSE@  Swap.cpp \
- @BUILD_ACE_FOR_TAO_FALSE@  Swap.h \
- @BUILD_ACE_FOR_TAO_FALSE@  Swap.inl \
- @BUILD_ACE_FOR_TAO_FALSE@  Synch.h \
diff --git a/devel/ace/files/patch-ace-os_include-os_pthread.h b/devel/ace/files/patch-ace-os_include-os_pthread.h
index 5de3c446ecda..108067151e46 100644
--- a/devel/ace/files/patch-ace-os_include-os_pthread.h
+++ b/devel/ace/files/patch-ace-os_include-os_pthread.h
@@ -1,14 +1,14 @@
---- ace/os_include/os_pthread.h.orig	Tue May 30 16:15:53 2006
-+++ ace/os_include/os_pthread.h	Sun Jan 28 13:50:01 2007
-@@ -339,7 +339,11 @@
- #    undef THR_DAEMON
+--- ace/os_include/os_pthread.h.orig	2010-11-27 02:39:33.000000000 +0900
++++ ace/os_include/os_pthread.h	2011-11-27 05:58:00.000000000 +0900
+@@ -283,7 +283,11 @@
+ #  undef THR_DAEMON
  
- #    define THR_BOUND               0x00000001
-+# if defined (__FreeBSD__)
-+#    define THR_NEW_LWP             0x00000000
+ #  define THR_BOUND               0x00000001
++# if defined(__FreeBSD__)
++#  define THR_NEW_LWP             0x00000000
 +# else
- #    define THR_NEW_LWP             0x00000002
+ #  define THR_NEW_LWP             0x00000002
 +# endif
- #    define THR_DETACHED            0x00000040
- #    define THR_SUSPENDED           0x00000080
- #    define THR_DAEMON              0x00000100
+ #  define THR_DAEMON              0x00000010
+ #  define THR_DETACHED            0x00000040
+ #  define THR_SUSPENDED           0x00000080
diff --git a/devel/ace/files/patch-ace-ssl-ssl_context.cpp b/devel/ace/files/patch-ace-ssl-ssl_context.cpp
deleted file mode 100644
index 1029129bac59..000000000000
--- a/devel/ace/files/patch-ace-ssl-ssl_context.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ace/SSL/SSL_Context.cpp.orig	2012-01-10 18:04:45.000000000 +0100
-+++ ace/SSL/SSL_Context.cpp	2012-01-10 18:17:42.000000000 +0100
-@@ -231,7 +231,11 @@
-   if (this->context_ != 0)
-     return -1;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x1000000f
-   SSL_METHOD *method = 0;
-+#else
-+  const SSL_METHOD *method = 0;
-+#endif
- 
-   switch (mode)
-     {
diff --git a/devel/ace/files/patch-ace__OS_NS_Thread.h b/devel/ace/files/patch-ace__OS_NS_Thread.h
new file mode 100644
index 000000000000..3d7801505413
--- /dev/null
+++ b/devel/ace/files/patch-ace__OS_NS_Thread.h
@@ -0,0 +1,15 @@
+--- ace/OS_NS_Thread.h.orig	2011-04-07 20:48:50.000000000 +0900
++++ ace/OS_NS_Thread.h	2011-11-27 05:38:21.000000000 +0900
+@@ -38,6 +38,12 @@
+ # include "ace/ACE_export.h"
+ # include "ace/Object_Manager_Base.h"
+ 
++# include <sys/param.h>
++#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 700110 && __FreeBSD_version < 800000) || __FreeBSD_version >= 800024))
++# include <sys/cpuset.h>
++# define cpu_set_t cpuset_t
++#endif
++
+ # if defined (ACE_EXPORT_MACRO)
+ #   undef ACE_EXPORT_MACRO
+ # endif
diff --git a/devel/ace/files/patch-ace__OS_NS_netdb.inl b/devel/ace/files/patch-ace__OS_NS_netdb.inl
new file mode 100644
index 000000000000..c3fad947196a
--- /dev/null
+++ b/devel/ace/files/patch-ace__OS_NS_netdb.inl
@@ -0,0 +1,56 @@
+--- ace/OS_NS_netdb.inl.orig	2011-03-21 21:54:52.000000000 +0900
++++ ace/OS_NS_netdb.inl	2011-11-27 07:46:06.000000000 +0900
+@@ -6,6 +6,8 @@
+ #include "ace/OS_NS_string.h"
+ #include "ace/OS_NS_errno.h"
+ 
++#include <sys/param.h>
++
+ #if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
+ # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+ #   define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \
+@@ -119,7 +121,7 @@
+       *h_errnop = h_errno;
+       return (struct hostent *) 0;
+     }
+-#   elif defined (__GLIBC__)
++#   elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
+   // GNU C library has a different signature
+   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
+ 
+@@ -304,7 +306,7 @@
+       *h_errnop = h_errno;
+       return (struct hostent *) 0;
+     }
+-#   elif defined (__GLIBC__)
++#   elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
+   // GNU C library has a different signature
+   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
+ 
+@@ -517,7 +519,7 @@
+   else
+     return 0;
+   //FUZZ: enable check_for_lack_ACE_OS
+-# elif defined (__GLIBC__)
++# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
+   // GNU C library has a different signature
+   //FUZZ: disable check_for_lack_ACE_OS
+   if (::getprotobyname_r (name,
+@@ -598,7 +600,7 @@
+   //FUZZ: enable check_for_lack_ACE_OS
+   else
+     return 0;
+-# elif defined (__GLIBC__)
++# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
+   // GNU C library has a different signature
+   //FUZZ: disable check_for_lack_ACE_OS
+   if (::getprotobynumber_r (proto,
+@@ -684,7 +686,7 @@
+   //FUZZ: enable check_for_lack_ACE_OS
+   else
+     return (struct servent *) 0;
+-# elif defined (__GLIBC__)
++# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
+   // GNU C library has a different signature
+   ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA));
+ 
diff --git a/devel/ace/files/patch-ace__OS_NS_signal.h b/devel/ace/files/patch-ace__OS_NS_signal.h
new file mode 100644
index 000000000000..8cb903bce94b
--- /dev/null
+++ b/devel/ace/files/patch-ace__OS_NS_signal.h
@@ -0,0 +1,16 @@
+--- ace/OS_NS_signal.h.orig	2011-03-04 23:59:09.000000000 +0900
++++ ace/OS_NS_signal.h	2011-11-27 07:50:01.000000000 +0900
+@@ -33,10 +33,10 @@
+ #endif
+ #define ACE_EXPORT_MACRO ACE_Export
+ 
+-#if defined (__Lynx__) || defined (__OpenBSD__)
+-// LynxOS and OpenBSD define pthread_sigmask() in pthread.h
++#if defined (__Lynx__) || defined (__OpenBSD__) || defined (__FreeBSD__)
++// LynxOS, OpenBSD and FreeBSD define pthread_sigmask() in pthread.h
+ # include "ace/os_include/os_pthread.h"
+-#endif /* __Lynx__ || OpenBSD */
++#endif /* __Lynx__ || OpenBSD || FreeBSD */
+ 
+ /*
+  * We inline and undef some functions that may be implemented
diff --git a/devel/ace/files/patch-configure b/devel/ace/files/patch-configure
deleted file mode 100644
index 4c37898972c4..000000000000
--- a/devel/ace/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sun Jan 28 13:32:29 2007
-+++ configure	Sun Jan 28 13:44:58 2007
-@@ -10434,6 +10434,7 @@
-      esac
-      ;;
-    *freebsd*)
-+     ace_cv_new_throws_bad_alloc_exception=no
-      ;;
-    *hpux*)
-      # In case anything here or in the config depends on OS
diff --git a/devel/ace/files/patch-tests b/devel/ace/files/patch-tests
deleted file mode 100644
index 279157ac586d..000000000000
--- a/devel/ace/files/patch-tests
+++ /dev/null
@@ -1,25 +0,0 @@
-
---- tests/Proactor_Test.cpp.orig	2006-04-20 00:41:47.000000000 -0700
-+++ tests/Proactor_Test.cpp	2008-12-01 11:00:05.000000000 -0800
-@@ -253,7 +253,7 @@
-       break;
- #  endif /* sun */
- 
--#  if !defined(__Lynx__)
-+#  if !defined(__Lynx__) && !defined (__FreeBSD__)
-     case CB:
-       ACE_NEW_RETURN (proactor_impl,
-                       ACE_POSIX_CB_Proactor (max_op),
---- tests/Proactor_Test_IPV6.cpp.orig	2006-04-20 00:41:47.000000000 -0700
-+++ tests/Proactor_Test_IPV6.cpp	2008-12-01 17:40:59.000000000 -0800
-@@ -253,7 +253,7 @@
-       break;
- #  endif /* sun */
- 
--#  if !defined(__Lynx__)
-+#  if !defined(__Lynx__) && !defined(__FreeBSD__)
-     case CB:
-       ACE_NEW_RETURN (proactor_impl,
-                       ACE_POSIX_CB_Proactor (max_op),
-
-
diff --git a/devel/ace/pkg-plist b/devel/ace/pkg-plist
index 35e053cce6a4..abbd9a09fed5 100644
--- a/devel/ace/pkg-plist
+++ b/devel/ace/pkg-plist
@@ -1,11 +1,10 @@
-bin/ace-gperf
 include/ACEXML/apps/svcconf/Svcconf.h
 include/ACEXML/apps/svcconf/Svcconf_Handler.h
-include/ACEXML/apps/svcconf/Svcconf_Handler.i
+include/ACEXML/apps/svcconf/Svcconf_Handler.inl
 include/ACEXML/common/ACEXML_Export.h
 include/ACEXML/common/Attributes.h
 include/ACEXML/common/AttributesImpl.h
-include/ACEXML/common/AttributesImpl.i
+include/ACEXML/common/AttributesImpl.inl
 include/ACEXML/common/Attributes_Def_Builder.h
 include/ACEXML/common/CharStream.h
 include/ACEXML/common/ContentHandler.h
@@ -15,21 +14,19 @@ include/ACEXML/common/DefaultHandler.h
 include/ACEXML/common/Element_Def_Builder.h
 include/ACEXML/common/Encoding.h
 include/ACEXML/common/EntityResolver.h
-include/ACEXML/common/Env.h
-include/ACEXML/common/Env.i
 include/ACEXML/common/ErrorHandler.h
 include/ACEXML/common/Exception.h
-include/ACEXML/common/Exception.i
+include/ACEXML/common/Exception.inl
 include/ACEXML/common/FileCharStream.h
 include/ACEXML/common/HttpCharStream.h
 include/ACEXML/common/InputSource.h
 include/ACEXML/common/Locator.h
 include/ACEXML/common/LocatorImpl.h
-include/ACEXML/common/LocatorImpl.i
+include/ACEXML/common/LocatorImpl.inl
 include/ACEXML/common/Mem_Map_Stream.h
 include/ACEXML/common/NamespaceSupport.h
 include/ACEXML/common/SAXExceptions.h
-include/ACEXML/common/SAXExceptions.i
+include/ACEXML/common/SAXExceptions.inl
 include/ACEXML/common/StrCharStream.h
 include/ACEXML/common/StreamFactory.h
 include/ACEXML/common/Transcode.h
@@ -38,44 +35,58 @@ include/ACEXML/common/URL_Addr.inl
 include/ACEXML/common/Validator.h
 include/ACEXML/common/XMLFilter.h
 include/ACEXML/common/XMLFilterImpl.h
-include/ACEXML/common/XMLFilterImpl.i
+include/ACEXML/common/XMLFilterImpl.inl
 include/ACEXML/common/XMLReader.h
 include/ACEXML/common/XML_Codecs.h
-include/ACEXML/common/XML_Macros.h
 include/ACEXML/common/XML_Types.h
 include/ACEXML/common/XML_Util.h
 include/ACEXML/common/ZipCharStream.h
 include/ACEXML/parser/parser/Entity_Manager.h
-include/ACEXML/parser/parser/Entity_Manager.i
+include/ACEXML/parser/parser/Entity_Manager.inl
 include/ACEXML/parser/parser/Parser.h
-include/ACEXML/parser/parser/Parser.i
+include/ACEXML/parser/parser/Parser.inl
 include/ACEXML/parser/parser/ParserContext.h
 include/ACEXML/parser/parser/ParserContext.inl
 include/ACEXML/parser/parser/ParserInternals.h
 include/ACEXML/parser/parser/Parser_export.h
+include/JAWS/server/HTTP_Config.h
+include/JAWS/server/HTTP_Handler.h
+include/JAWS/server/HTTP_Helpers.h
+include/JAWS/server/HTTP_Request.h
+include/JAWS/server/HTTP_Response.h
+include/JAWS/server/HTTP_Server.h
+include/JAWS/server/JAWS_Concurrency.h
+include/JAWS/server/JAWS_IO.h
+include/JAWS/server/JAWS_Pipeline.h
+include/JAWS/server/Parse_Headers.h
+include/Kokyu/DSRT_CV_Dispatcher_Impl_T.cpp
+include/Kokyu/DSRT_CV_Dispatcher_Impl_T.h
 include/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp
 include/Kokyu/DSRT_Direct_Dispatcher_Impl_T.h
 include/Kokyu/DSRT_Dispatch_Item_T.cpp
 include/Kokyu/DSRT_Dispatch_Item_T.h
-include/Kokyu/DSRT_Dispatch_Item_T.i
+include/Kokyu/DSRT_Dispatch_Item_T.inl
 include/Kokyu/DSRT_Dispatcher_Impl_T.cpp
 include/Kokyu/DSRT_Dispatcher_Impl_T.h
-include/Kokyu/DSRT_Dispatcher_Impl_T.i
+include/Kokyu/DSRT_Dispatcher_Impl_T.inl
 include/Kokyu/DSRT_Sched_Queue_T.cpp
 include/Kokyu/DSRT_Sched_Queue_T.h
 include/Kokyu/Default_Dispatcher_Impl.h
-include/Kokyu/Default_Dispatcher_Impl.i
+include/Kokyu/Default_Dispatcher_Impl.inl
+include/Kokyu/Dispatch_Deferrer.h
 include/Kokyu/Dispatcher_Impl.h
-include/Kokyu/Dispatcher_Impl.i
+include/Kokyu/Dispatcher_Impl.inl
 include/Kokyu/Dispatcher_Task.h
-include/Kokyu/Dispatcher_Task.i
+include/Kokyu/Dispatcher_Task.inl
 include/Kokyu/Kokyu.h
-include/Kokyu/Kokyu.i
+include/Kokyu/Kokyu.inl
 include/Kokyu/Kokyu_defs.h
-include/Kokyu/Kokyu_defs.i
+include/Kokyu/Kokyu_defs.inl
 include/Kokyu/Kokyu_dsrt.cpp
 include/Kokyu/Kokyu_dsrt.h
-include/Kokyu/Kokyu_dsrt.i
+include/Kokyu/Kokyu_dsrt.inl
+include/Kokyu/kokyu_config.h
+include/Kokyu/kokyu_export.h
 include/ace/ACE.h
 include/ace/ACE.inl
 include/ace/ACE_export.h
@@ -94,6 +105,8 @@ include/ace/ATM_QoS.h
 include/ace/ATM_QoS.inl
 include/ace/ATM_Stream.h
 include/ace/ATM_Stream.inl
+include/ace/Abstract_Timer_Queue.cpp
+include/ace/Abstract_Timer_Queue.h
 include/ace/Acceptor.cpp
 include/ace/Acceptor.h
 include/ace/Activation_Queue.h
@@ -109,7 +122,6 @@ include/ace/Arg_Shifter.cpp
 include/ace/Arg_Shifter.h
 include/ace/Argv_Type_Converter.h
 include/ace/Argv_Type_Converter.inl
-include/ace/Array.h
 include/ace/Array_Base.cpp
 include/ace/Array_Base.h
 include/ace/Array_Base.inl
@@ -127,6 +139,10 @@ include/ace/Asynch_IO_Impl.inl
 include/ace/Asynch_Pseudo_Task.h
 include/ace/Atomic_Op.h
 include/ace/Atomic_Op.inl
+include/ace/Atomic_Op_GCC_T.cpp
+include/ace/Atomic_Op_GCC_T.h
+include/ace/Atomic_Op_GCC_T.inl
+include/ace/Atomic_Op_Sparc.h
 include/ace/Atomic_Op_T.cpp
 include/ace/Atomic_Op_T.h
 include/ace/Atomic_Op_T.inl
@@ -161,6 +177,7 @@ include/ace/CDR_Size.h
 include/ace/CDR_Size.inl
 include/ace/CDR_Stream.h
 include/ace/CDR_Stream.inl
+include/ace/CE_Screen_Output.h
 include/ace/CORBA_macros.h
 include/ace/Cache_Map_Manager_T.cpp
 include/ace/Cache_Map_Manager_T.h
@@ -182,6 +199,7 @@ include/ace/Codecs.h
 include/ace/Codeset_IBM1047.h
 include/ace/Codeset_Registry.h
 include/ace/Codeset_Registry.inl
+include/ace/Codeset_Symbols.h
 include/ace/Condition_Recursive_Thread_Mutex.h
 include/ace/Condition_T.cpp
 include/ace/Condition_T.h
@@ -189,6 +207,7 @@ include/ace/Condition_T.inl
 include/ace/Condition_Thread_Mutex.h
 include/ace/Condition_Thread_Mutex.inl
 include/ace/Configuration.h
+include/ace/Configuration.inl
 include/ace/Configuration_Import_Export.h
 include/ace/Connection_Recycling_Strategy.h
 include/ace/Connector.cpp
@@ -200,6 +219,9 @@ include/ace/Containers_T.h
 include/ace/Containers_T.inl
 include/ace/Copy_Disabled.h
 include/ace/Countdown_Time.h
+include/ace/Countdown_Time_T.cpp
+include/ace/Countdown_Time_T.h
+include/ace/Countdown_Time_T.inl
 include/ace/DEV.h
 include/ace/DEV.inl
 include/ace/DEV_Addr.h
@@ -224,11 +246,20 @@ include/ace/Dump_T.cpp
 include/ace/Dump_T.h
 include/ace/Dynamic.h
 include/ace/Dynamic.inl
+include/ace/Dynamic_Message_Strategy.h
+include/ace/Dynamic_Message_Strategy.inl
 include/ace/Dynamic_Service.cpp
 include/ace/Dynamic_Service.h
 include/ace/Dynamic_Service.inl
 include/ace/Dynamic_Service_Base.h
 include/ace/Dynamic_Service_Dependency.h
+include/ace/ETCL/ETCL_Constraint.h
+include/ace/ETCL/ETCL_Constraint.inl
+include/ace/ETCL/ETCL_Constraint_Visitor.h
+include/ace/ETCL/ETCL_Interpreter.h
+include/ace/ETCL/ETCL_y.h
+include/ace/ETCL/ace_etcl_export.h
+include/ace/ETCL/etcl_parser_export.h
 include/ace/Encoding_Converter.h
 include/ace/Encoding_Converter_Factory.h
 include/ace/Env_Value_T.cpp
@@ -238,10 +269,11 @@ include/ace/Event.h
 include/ace/Event.inl
 include/ace/Event_Handler.h
 include/ace/Event_Handler.inl
+include/ace/Event_Handler_Handle_Timeout_Upcall.h
+include/ace/Event_Handler_Handle_Timeout_Upcall.inl
 include/ace/Event_Handler_T.cpp
 include/ace/Event_Handler_T.h
 include/ace/Event_Handler_T.inl
-include/ace/Exception_Macros.h
 include/ace/FIFO.h
 include/ace/FIFO.inl
 include/ace/FIFO_Recv.h
@@ -263,6 +295,8 @@ include/ace/FILE_IO.inl
 include/ace/File_Lock.h
 include/ace/File_Lock.inl
 include/ace/Filecache.h
+%%FLTK%%include/ace/FlReactor/ACE_FlReactor_export.h
+%%FLTK%%include/ace/FlReactor/FlReactor.h
 include/ace/Flag_Manip.h
 include/ace/Flag_Manip.inl
 include/ace/Framework_Component.h
@@ -288,6 +322,24 @@ include/ace/Global_Macros.h
 include/ace/Guard_T.cpp
 include/ace/Guard_T.h
 include/ace/Guard_T.inl
+include/ace/HTBP/HTBP_Addr.h
+include/ace/HTBP/HTBP_Channel.h
+include/ace/HTBP/HTBP_Channel.inl
+include/ace/HTBP/HTBP_Environment.h
+include/ace/HTBP/HTBP_Export.h
+include/ace/HTBP/HTBP_Filter.h
+include/ace/HTBP/HTBP_Filter.inl
+include/ace/HTBP/HTBP_Filter_Factory.h
+include/ace/HTBP/HTBP_ID_Requestor.h
+include/ace/HTBP/HTBP_Inside_Squid_Filter.h
+include/ace/HTBP/HTBP_Inside_Squid_Filter.inl
+include/ace/HTBP/HTBP_Macros.h
+include/ace/HTBP/HTBP_Notifier.h
+include/ace/HTBP/HTBP_Outside_Squid_Filter.h
+include/ace/HTBP/HTBP_Outside_Squid_Filter.inl
+include/ace/HTBP/HTBP_Session.h
+include/ace/HTBP/HTBP_Session.inl
+include/ace/HTBP/HTBP_Stream.h
 include/ace/Handle_Gobbler.h
 include/ace/Handle_Gobbler.inl
 include/ace/Handle_Ops.h
@@ -303,6 +355,9 @@ include/ace/Hash_Map_Manager_T.inl
 include/ace/Hash_Map_With_Allocator_T.cpp
 include/ace/Hash_Map_With_Allocator_T.h
 include/ace/Hash_Map_With_Allocator_T.inl
+include/ace/Hash_Multi_Map_Manager_T.cpp
+include/ace/Hash_Multi_Map_Manager_T.h
+include/ace/Hash_Multi_Map_Manager_T.inl
 include/ace/Hashable.h
 include/ace/Hashable.inl
 include/ace/High_Res_Timer.h
@@ -310,6 +365,88 @@ include/ace/High_Res_Timer.inl
 include/ace/ICMP_Socket.h
 include/ace/INET_Addr.h
 include/ace/INET_Addr.inl
+include/ace/INet/AuthenticationBase.h
+include/ace/INet/AuthenticationBase.inl
+include/ace/INet/BidirStreamBuffer.cpp
+include/ace/INet/BidirStreamBuffer.h
+include/ace/INet/BufferedStreamBuffer.cpp
+include/ace/INet/BufferedStreamBuffer.h
+include/ace/INet/ClientRequestHandler.h
+include/ace/INet/ClientRequestHandler.inl
+include/ace/INet/ConnectionCache.h
+include/ace/INet/ConnectionCache.inl
+include/ace/INet/FTP_ClientRequestHandler.h
+include/ace/INet/FTP_ClientRequestHandler.inl
+include/ace/INet/FTP_IOStream.h
+include/ace/INet/FTP_IOStream.inl
+include/ace/INet/FTP_Request.h
+include/ace/INet/FTP_Request.inl
+include/ace/INet/FTP_Response.h
+include/ace/INet/FTP_Response.inl
+include/ace/INet/FTP_Session.cpp
+include/ace/INet/FTP_Session.h
+include/ace/INet/FTP_URL.h
+include/ace/INet/FTP_URL.inl
+%%OPENSSL%%include/ace/INet/HTTPS_Context.h
+%%OPENSSL%%include/ace/INet/HTTPS_Context.inl
+%%OPENSSL%%include/ace/INet/HTTPS_Session.cpp
+%%OPENSSL%%include/ace/INet/HTTPS_Session.h
+%%OPENSSL%%include/ace/INet/HTTPS_SessionFactory.h
+%%OPENSSL%%include/ace/INet/HTTPS_URL.h
+%%OPENSSL%%include/ace/INet/HTTPS_URL.inl
+include/ace/INet/HTTP_BasicAuthentication.h
+include/ace/INet/HTTP_BasicAuthentication.inl
+include/ace/INet/HTTP_ClientRequestHandler.h
+include/ace/INet/HTTP_ClientRequestHandler.inl
+include/ace/INet/HTTP_Header.h
+include/ace/INet/HTTP_Header.inl
+include/ace/INet/HTTP_IOStream.h
+include/ace/INet/HTTP_IOStream.inl
+include/ace/INet/HTTP_Request.h
+include/ace/INet/HTTP_Request.inl
+include/ace/INet/HTTP_Response.h
+include/ace/INet/HTTP_Response.inl
+include/ace/INet/HTTP_Session.cpp
+include/ace/INet/HTTP_Session.h
+include/ace/INet/HTTP_SessionBase.h
+include/ace/INet/HTTP_SessionBase.inl
+include/ace/INet/HTTP_Status.h
+include/ace/INet/HTTP_Status.inl
+include/ace/INet/HTTP_StreamPolicy.cpp
+include/ace/INet/HTTP_StreamPolicy.h
+include/ace/INet/HTTP_StreamPolicyBase.cpp
+include/ace/INet/HTTP_StreamPolicyBase.h
+include/ace/INet/HTTP_URL.h
+include/ace/INet/HTTP_URL.inl
+include/ace/INet/HeaderBase.h
+include/ace/INet/HeaderBase.inl
+include/ace/INet/INet_Export.h
+include/ace/INet/INet_Log.h
+%%OPENSSL%%include/ace/INet/INet_SSL_Export.h
+include/ace/INet/IOS_util.h
+include/ace/INet/Request.h
+include/ace/INet/RequestHandler.h
+include/ace/INet/Response.h
+%%OPENSSL%%include/ace/INet/SSLSock_IOStream.cpp
+%%OPENSSL%%include/ace/INet/SSLSock_IOStream.h
+%%OPENSSL%%include/ace/INet/SSL_CallbackManager.h
+%%OPENSSL%%include/ace/INet/SSL_CallbackManager.inl
+%%OPENSSL%%include/ace/INet/SSL_CertificateCallback.h
+%%OPENSSL%%include/ace/INet/SSL_CertificateCallback.inl
+%%OPENSSL%%include/ace/INet/SSL_PasswordCallback.h
+%%OPENSSL%%include/ace/INet/SSL_Proxy_Connector.h
+%%OPENSSL%%include/ace/INet/SSL_X509Cert.h
+%%OPENSSL%%include/ace/INet/SSL_X509Cert.inl
+include/ace/INet/Sock_IOStream.cpp
+include/ace/INet/Sock_IOStream.h
+include/ace/INet/StreamHandler.cpp
+include/ace/INet/StreamHandler.h
+include/ace/INet/StreamInterceptor.cpp
+include/ace/INet/StreamInterceptor.h
+include/ace/INet/String_IOStream.cpp
+include/ace/INet/String_IOStream.h
+include/ace/INet/URLBase.h
+include/ace/INet/URLBase.inl
 include/ace/IOStream.h
 include/ace/IOStream_T.cpp
 include/ace/IOStream_T.h
@@ -322,6 +459,9 @@ include/ace/IPC_SAP.h
 include/ace/IPC_SAP.inl
 include/ace/If_Then_Else.h
 include/ace/Init_ACE.h
+include/ace/Intrusive_Auto_Ptr.cpp
+include/ace/Intrusive_Auto_Ptr.h
+include/ace/Intrusive_Auto_Ptr.inl
 include/ace/Intrusive_List.cpp
 include/ace/Intrusive_List.h
 include/ace/Intrusive_List.inl
@@ -354,6 +494,7 @@ include/ace/Lock_Adapter_T.cpp
 include/ace/Lock_Adapter_T.h
 include/ace/Lock_Adapter_T.inl
 include/ace/Log_Msg.h
+include/ace/Log_Msg.inl
 include/ace/Log_Msg_Backend.h
 include/ace/Log_Msg_Callback.h
 include/ace/Log_Msg_IPC.h
@@ -406,14 +547,51 @@ include/ace/Message_Block_T.h
 include/ace/Message_Block_T.inl
 include/ace/Message_Queue.h
 include/ace/Message_Queue.inl
+include/ace/Message_Queue_NT.h
+include/ace/Message_Queue_NT.inl
 include/ace/Message_Queue_T.cpp
 include/ace/Message_Queue_T.h
-include/ace/Method_Object.h
+include/ace/Message_Queue_Vx.h
+include/ace/Message_Queue_Vx.inl
 include/ace/Method_Request.h
+include/ace/Metrics_Cache.h
+include/ace/Metrics_Cache_T.cpp
+include/ace/Metrics_Cache_T.h
+include/ace/Metrics_Cache_T.inl
 include/ace/Min_Max.h
 include/ace/Module.cpp
 include/ace/Module.h
 include/ace/Module.inl
+include/ace/Monitor_Admin.h
+include/ace/Monitor_Admin_Manager.h
+include/ace/Monitor_Base.h
+include/ace/Monitor_Base.inl
+include/ace/Monitor_Control/Auto_Update_Starter.h
+include/ace/Monitor_Control/BSD_Network_Interface_Monitor.h
+include/ace/Monitor_Control/Bytes_Received_Monitor.h
+include/ace/Monitor_Control/Bytes_Sent_Monitor.h
+include/ace/Monitor_Control/CPU_Load_Monitor.h
+include/ace/Monitor_Control/Constraint_Interpreter.h
+include/ace/Monitor_Control/Constraint_Visitor.h
+include/ace/Monitor_Control/FreeBSD_Network_Interface_Monitor.h
+include/ace/Monitor_Control/Linux_Network_Interface_Monitor.h
+include/ace/Monitor_Control/Memory_Usage_Monitor.h
+include/ace/Monitor_Control/Monitor_Control.h
+include/ace/Monitor_Control/Monitor_Control_export.h
+include/ace/Monitor_Control/Monitor_Control_utils.h
+include/ace/Monitor_Control/Monitor_Group.h
+include/ace/Monitor_Control/Monitor_Query.h
+include/ace/Monitor_Control/Null_Network_Interface_Monitor.h
+include/ace/Monitor_Control/Num_Threads_Monitor.h
+include/ace/Monitor_Control/Packets_Received_Monitor.h
+include/ace/Monitor_Control/Packets_Sent_Monitor.h
+include/ace/Monitor_Control/Solaris_Network_Interface_Monitor.h
+include/ace/Monitor_Control/Windows_Monitor.h
+include/ace/Monitor_Control/Windows_Multi_Instance_Monitor.h
+include/ace/Monitor_Control_Action.h
+include/ace/Monitor_Control_Types.h
+include/ace/Monitor_Point_Registry.h
+include/ace/Monitor_Size.h
 include/ace/Msg_WFMO_Reactor.h
 include/ace/Msg_WFMO_Reactor.inl
 include/ace/Multihomed_INET_Addr.h
@@ -426,19 +604,21 @@ include/ace/Name_Proxy.h
 include/ace/Name_Request_Reply.h
 include/ace/Name_Space.h
 include/ace/Naming_Context.h
+include/ace/Naming_Context.inl
 include/ace/Netlink_Addr.h
 include/ace/Netlink_Addr.inl
 include/ace/Node.cpp
 include/ace/Node.h
+include/ace/Notification_Queue.h
+include/ace/Notification_Queue.inl
 include/ace/Notification_Strategy.h
 include/ace/Notification_Strategy.inl
 include/ace/Null_Barrier.h
 include/ace/Null_Condition.h
 include/ace/Null_Mutex.h
 include/ace/Null_Semaphore.h
+include/ace/Numeric_Limits.h
 include/ace/OS.h
-include/ace/OS.inl
-include/ace/OS_Dirent.h
 include/ace/OS_Errno.h
 include/ace/OS_Errno.inl
 include/ace/OS_Log_Msg_Attributes.h
@@ -510,8 +690,9 @@ include/ace/OS_NS_unistd.h
 include/ace/OS_NS_unistd.inl
 include/ace/OS_NS_wchar.h
 include/ace/OS_NS_wchar.inl
+include/ace/OS_NS_wctype.h
+include/ace/OS_NS_wctype.inl
 include/ace/OS_QoS.h
-include/ace/OS_String.h
 include/ace/OS_TLI.h
 include/ace/OS_TLI.inl
 include/ace/OS_Thread_Adapter.h
@@ -533,7 +714,6 @@ include/ace/POSIX_Proactor.h
 include/ace/POSIX_Proactor.inl
 include/ace/Pagefile_Memory_Pool.h
 include/ace/Pagefile_Memory_Pool.inl
-include/ace/Pair.h
 include/ace/Pair_T.cpp
 include/ace/Pair_T.h
 include/ace/Pair_T.inl
@@ -556,9 +736,24 @@ include/ace/Process_Semaphore.h
 include/ace/Process_Semaphore.inl
 include/ace/Profile_Timer.h
 include/ace/Profile_Timer.inl
+%%QT%%include/ace/QtReactor/ACE_QtReactor_export.h
+%%QT%%include/ace/QtReactor/QtReactor.h
 include/ace/RB_Tree.cpp
 include/ace/RB_Tree.h
 include/ace/RB_Tree.inl
+include/ace/RMCast/Acknowledge.h
+include/ace/RMCast/Bits.h
+include/ace/RMCast/Flow.h
+include/ace/RMCast/Fragment.h
+include/ace/RMCast/Link.h
+include/ace/RMCast/Parameters.h
+include/ace/RMCast/Protocol.h
+include/ace/RMCast/RMCast_Export.h
+include/ace/RMCast/Reassemble.h
+include/ace/RMCast/Retransmit.h
+include/ace/RMCast/Simulator.h
+include/ace/RMCast/Socket.h
+include/ace/RMCast/Stack.h
 include/ace/RW_Mutex.h
 include/ace/RW_Mutex.inl
 include/ace/RW_Process_Mutex.h
@@ -579,8 +774,9 @@ include/ace/Recursive_Thread_Mutex.h
 include/ace/Recursive_Thread_Mutex.inl
 include/ace/Recyclable.h
 include/ace/Recyclable.inl
-include/ace/Refcountable.h
-include/ace/Refcountable.inl
+include/ace/Refcountable_T.cpp
+include/ace/Refcountable_T.h
+include/ace/Refcountable_T.inl
 include/ace/Refcounted_Auto_Ptr.cpp
 include/ace/Refcounted_Auto_Ptr.h
 include/ace/Refcounted_Auto_Ptr.inl
@@ -627,20 +823,22 @@ include/ace/SPIPE_Connector.h
 include/ace/SPIPE_Connector.inl
 include/ace/SPIPE_Stream.h
 include/ace/SPIPE_Stream.inl
-include/ace/SSL/SSL_Asynch_BIO.h
-include/ace/SSL/SSL_Asynch_Stream.h
-include/ace/SSL/SSL_Context.h
-include/ace/SSL/SSL_Context.inl
-include/ace/SSL/SSL_Export.h
-include/ace/SSL/SSL_SOCK.h
-include/ace/SSL/SSL_SOCK.i
-include/ace/SSL/SSL_SOCK_Acceptor.h
-include/ace/SSL/SSL_SOCK_Acceptor.i
-include/ace/SSL/SSL_SOCK_Connector.h
-include/ace/SSL/SSL_SOCK_Connector.i
-include/ace/SSL/SSL_SOCK_Stream.h
-include/ace/SSL/SSL_SOCK_Stream.i
-include/ace/SSL/sslconf.h
+%%OPENSSL%%include/ace/SSL/SSL_Asynch_BIO.h
+%%OPENSSL%%include/ace/SSL/SSL_Asynch_Stream.h
+%%OPENSSL%%include/ace/SSL/SSL_Asynch_Stream.inl
+%%OPENSSL%%include/ace/SSL/SSL_Context.h
+%%OPENSSL%%include/ace/SSL/SSL_Context.inl
+%%OPENSSL%%include/ace/SSL/SSL_Export.h
+%%OPENSSL%%include/ace/SSL/SSL_Initializer.h
+%%OPENSSL%%include/ace/SSL/SSL_SOCK.h
+%%OPENSSL%%include/ace/SSL/SSL_SOCK.inl
+%%OPENSSL%%include/ace/SSL/SSL_SOCK_Acceptor.h
+%%OPENSSL%%include/ace/SSL/SSL_SOCK_Acceptor.inl
+%%OPENSSL%%include/ace/SSL/SSL_SOCK_Connector.h
+%%OPENSSL%%include/ace/SSL/SSL_SOCK_Connector.inl
+%%OPENSSL%%include/ace/SSL/SSL_SOCK_Stream.h
+%%OPENSSL%%include/ace/SSL/SSL_SOCK_Stream.inl
+%%OPENSSL%%include/ace/SSL/sslconf.h
 include/ace/SString.h
 include/ace/SString.inl
 include/ace/SStringfwd.h
@@ -660,6 +858,7 @@ include/ace/Sample_History.inl
 include/ace/Sbrk_Memory_Pool.h
 include/ace/Sched_Params.h
 include/ace/Sched_Params.inl
+include/ace/Select_Reactor.h
 include/ace/Select_Reactor_Base.h
 include/ace/Select_Reactor_Base.inl
 include/ace/Select_Reactor_T.cpp
@@ -686,16 +885,19 @@ include/ace/Shared_Memory_SV.h
 include/ace/Shared_Memory_SV.inl
 include/ace/Shared_Object.h
 include/ace/Shared_Object.inl
+include/ace/Sig_Adapter.h
+include/ace/Sig_Handler.h
+include/ace/Sig_Handler.inl
 include/ace/Signal.h
 include/ace/Signal.inl
 include/ace/Singleton.cpp
 include/ace/Singleton.h
 include/ace/Singleton.inl
 include/ace/Sock_Connect.h
+include/ace/Stack_Trace.h
 include/ace/Static_Object_Lock.h
 include/ace/Stats.h
 include/ace/Stats.inl
-include/ace/Strategies.h
 include/ace/Strategies_T.cpp
 include/ace/Strategies_T.h
 include/ace/Strategies_T.inl
@@ -710,16 +912,13 @@ include/ace/String_Base.inl
 include/ace/String_Base_Const.h
 include/ace/Svc_Conf.h
 include/ace/Svc_Conf_Lexer.h
+include/ace/Svc_Conf_Param.h
+include/ace/Svc_Conf_Token_Table.h
 include/ace/Svc_Conf_Tokens.h
 include/ace/Svc_Handler.cpp
 include/ace/Svc_Handler.h
-include/ace/Swap.cpp
-include/ace/Swap.h
-include/ace/Swap.inl
 include/ace/Synch.h
 include/ace/Synch_Options.h
-include/ace/Synch_T.cpp
-include/ace/Synch_T.h
 include/ace/Synch_Traits.h
 include/ace/System_Time.h
 include/ace/TLI.h
@@ -729,6 +928,15 @@ include/ace/TLI_Connector.h
 include/ace/TLI_Connector.inl
 include/ace/TLI_Stream.h
 include/ace/TLI_Stream.inl
+include/ace/TMCast/Export.hpp
+include/ace/TMCast/FaultDetector.hpp
+include/ace/TMCast/Group.hpp
+include/ace/TMCast/GroupFwd.hpp
+include/ace/TMCast/LinkListener.hpp
+include/ace/TMCast/MTQueue.hpp
+include/ace/TMCast/Messaging.hpp
+include/ace/TMCast/Protocol.hpp
+include/ace/TMCast/TransactionController.hpp
 include/ace/TP_Reactor.h
 include/ace/TP_Reactor.inl
 include/ace/TSS_Adapter.h
@@ -760,7 +968,12 @@ include/ace/Thread_Mutex.h
 include/ace/Thread_Mutex.inl
 include/ace/Thread_Semaphore.h
 include/ace/Thread_Semaphore.inl
-include/ace/Time_Request_Reply.h
+include/ace/Throughput_Stats.h
+include/ace/Time_Policy.h
+include/ace/Time_Policy.inl
+include/ace/Time_Policy_T.cpp
+include/ace/Time_Policy_T.h
+include/ace/Time_Policy_T.inl
 include/ace/Time_Value.h
 include/ace/Time_Value.inl
 include/ace/Timeprobe.h
@@ -780,6 +993,9 @@ include/ace/Timer_Queue.h
 include/ace/Timer_Queue_Adapters.cpp
 include/ace/Timer_Queue_Adapters.h
 include/ace/Timer_Queue_Adapters.inl
+include/ace/Timer_Queue_Iterator.cpp
+include/ace/Timer_Queue_Iterator.h
+include/ace/Timer_Queue_Iterator.inl
 include/ace/Timer_Queue_T.cpp
 include/ace/Timer_Queue_T.h
 include/ace/Timer_Queue_T.inl
@@ -787,6 +1003,8 @@ include/ace/Timer_Queuefwd.h
 include/ace/Timer_Wheel.h
 include/ace/Timer_Wheel_T.cpp
 include/ace/Timer_Wheel_T.h
+%%TK%%include/ace/TkReactor/ACE_TkReactor_export.h
+%%TK%%include/ace/TkReactor/TkReactor.h
 include/ace/Token.h
 include/ace/Token.inl
 include/ace/Token_Collection.h
@@ -796,6 +1014,8 @@ include/ace/Token_Manager.h
 include/ace/Token_Manager.inl
 include/ace/Token_Request_Reply.h
 include/ace/Token_Request_Reply.inl
+include/ace/Tokenizer_T.cpp
+include/ace/Tokenizer_T.h
 include/ace/Trace.h
 include/ace/Truncate.h
 include/ace/Typed_SV_Message.cpp
@@ -825,6 +1045,9 @@ include/ace/Unbounded_Queue.inl
 include/ace/Unbounded_Set.cpp
 include/ace/Unbounded_Set.h
 include/ace/Unbounded_Set.inl
+include/ace/Unbounded_Set_Ex.cpp
+include/ace/Unbounded_Set_Ex.h
+include/ace/Unbounded_Set_Ex.inl
 include/ace/Value_Ptr.h
 include/ace/Vector_T.cpp
 include/ace/Vector_T.h
@@ -838,22 +1061,73 @@ include/ace/WIN32_Proactor.h
 include/ace/XML_Svc_Conf.h
 include/ace/XTI_ATM_Mcast.h
 include/ace/XTI_ATM_Mcast.inl
+%%X11%%include/ace/XtReactor/ACE_XtReactor_export.h
+%%X11%%include/ace/XtReactor/XtReactor.h
 include/ace/ace_wchar.h
 include/ace/ace_wchar.inl
+include/ace/checked_iterator.h
 include/ace/config-WinCE.h
+include/ace/config-aix-5.x.h
+include/ace/config-aix-7.h
 include/ace/config-all.h
-include/ace/config-borland-common.h
+include/ace/config-android.h
+include/ace/config-cygwin32.h
+include/ace/config-freebsd.h
+include/ace/config-g++-common.h
+include/ace/config-hpux-11.00.h
+include/ace/config-icc-common.h
+include/ace/config-integritySCA.h
+include/ace/config-kfreebsd.h
+include/ace/config-linux.h
 include/ace/config-lite.h
+include/ace/config-lynxos.h
+include/ace/config-macosx-iOS-hardware.h
+include/ace/config-macosx-iOS-simulator.h
+include/ace/config-macosx-leopard.h
+include/ace/config-macosx-lion.h
+include/ace/config-macosx-panther.h
+include/ace/config-macosx-snowleopard.h
+include/ace/config-macosx-tiger.h
+include/ace/config-macosx.h
 include/ace/config-macros.h
-include/ace/config-minimal.h
-include/ace/config-win32-borland.h
+include/ace/config-netbsd.h
+include/ace/config-openbsd.h
+include/ace/config-openvms.h
+include/ace/config-pharlap.h
+include/ace/config-posix-nonetworking.h
+include/ace/config-posix.h
+include/ace/config-qnx.h
+include/ace/config-rtems.h
+include/ace/config-suncc-common.h
+include/ace/config-sunos5.10.h
+include/ace/config-sunos5.11.h
+include/ace/config-sunos5.4-g++.h
+include/ace/config-sunos5.4-sunc++-4.x.h
+include/ace/config-sunos5.5.h
+include/ace/config-sunos5.6.h
+include/ace/config-sunos5.7.h
+include/ace/config-sunos5.8.h
+include/ace/config-sunos5.9.h
+include/ace/config-tandem-nsk-mips-v2.h
+include/ace/config-tandem-nsk-mips-v3.h
+include/ace/config-vxworks.h
+include/ace/config-vxworks6.4.h
+include/ace/config-vxworks6.5.h
+include/ace/config-vxworks6.6.h
+include/ace/config-vxworks6.7.h
+include/ace/config-vxworks6.8.h
+include/ace/config-win32-cegcc.h
 include/ace/config-win32-common.h
-include/ace/config-win32-ghs.h
+include/ace/config-win32-dmc.h
+include/ace/config-win32-interix.h
+include/ace/config-win32-mingw.h
+include/ace/config-win32-msvc-10.h
 include/ace/config-win32-msvc-7.h
 include/ace/config-win32-msvc-8.h
+include/ace/config-win32-msvc-9.h
 include/ace/config-win32-msvc.h
-include/ace/config-win32-visualage.h
 include/ace/config-win32.h
+include/ace/config-windows.h
 include/ace/config.h
 include/ace/iosfwd.h
 include/ace/os_include/arpa/os_inet.h
@@ -862,6 +1136,7 @@ include/ace/os_include/netinet/os_in.h
 include/ace/os_include/netinet/os_tcp.h
 include/ace/os_include/os_aio.h
 include/ace/os_include/os_assert.h
+include/ace/os_include/os_byteswap.h
 include/ace/os_include/os_complex.h
 include/ace/os_include/os_cpio.h
 include/ace/os_include/os_ctype.h
@@ -877,8 +1152,11 @@ include/ace/os_include/os_ftw.h
 include/ace/os_include/os_glob.h
 include/ace/os_include/os_grp.h
 include/ace/os_include/os_iconv.h
+include/ace/os_include/os_ifaddrs.h
+include/ace/os_include/os_intrin.h
 include/ace/os_include/os_inttypes.h
 include/ace/os_include/os_iso646.h
+include/ace/os_include/os_kstat.h
 include/ace/os_include/os_langinfo.h
 include/ace/os_include/os_libgen.h
 include/ace/os_include/os_limits.h
@@ -889,6 +1167,8 @@ include/ace/os_include/os_mqueue.h
 include/ace/os_include/os_ndbm.h
 include/ace/os_include/os_netdb.h
 include/ace/os_include/os_nl_types.h
+include/ace/os_include/os_pdh.h
+include/ace/os_include/os_pdhmsg.h
 include/ace/os_include/os_poll.h
 include/ace/os_include/os_pthread.h
 include/ace/os_include/os_pwd.h
@@ -914,6 +1194,7 @@ include/ace/os_include/os_termios.h
 include/ace/os_include/os_tgmath.h
 include/ace/os_include/os_time.h
 include/ace/os_include/os_trace.h
+include/ace/os_include/os_typeinfo.h
 include/ace/os_include/os_ucontext.h
 include/ace/os_include/os_ulimit.h
 include/ace/os_include/os_unistd.h
@@ -935,6 +1216,7 @@ include/ace/os_include/sys/os_socket.h
 include/ace/os_include/sys/os_stat.h
 include/ace/os_include/sys/os_statvfs.h
 include/ace/os_include/sys/os_sysctl.h
+include/ace/os_include/sys/os_sysinfo.h
 include/ace/os_include/sys/os_time.h
 include/ace/os_include/sys/os_timeb.h
 include/ace/os_include/sys/os_times.h
@@ -947,120 +1229,320 @@ include/ace/post.h
 include/ace/pre.h
 include/ace/streams.h
 include/ace/svc_export.h
-include/protocols/ace/HTBP/HTBP_Addr.h
-include/protocols/ace/HTBP/HTBP_Channel.h
-include/protocols/ace/HTBP/HTBP_Channel.inl
-include/protocols/ace/HTBP/HTBP_Environment.h
-include/protocols/ace/HTBP/HTBP_Export.h
-include/protocols/ace/HTBP/HTBP_Filter.h
-include/protocols/ace/HTBP/HTBP_Filter.inl
-include/protocols/ace/HTBP/HTBP_Filter_Factory.h
-include/protocols/ace/HTBP/HTBP_ID_Requestor.h
-include/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
-include/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
-include/protocols/ace/HTBP/HTBP_Macros.h
-include/protocols/ace/HTBP/HTBP_Notifier.h
-include/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
-include/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
-include/protocols/ace/HTBP/HTBP_Session.h
-include/protocols/ace/HTBP/HTBP_Session.inl
-include/protocols/ace/HTBP/HTBP_Stream.h
-include/protocols/ace/RMCast/Acknowledge.h
-include/protocols/ace/RMCast/Bits.h
-include/protocols/ace/RMCast/Flow.h
-include/protocols/ace/RMCast/Fragment.h
-include/protocols/ace/RMCast/Link.h
-include/protocols/ace/RMCast/Parameters.h
-include/protocols/ace/RMCast/Protocol.h
-include/protocols/ace/RMCast/RMCast_Export.h
-include/protocols/ace/RMCast/Reassemble.h
-include/protocols/ace/RMCast/Retransmit.h
-include/protocols/ace/RMCast/Simulator.h
-include/protocols/ace/RMCast/Socket.h
-include/protocols/ace/RMCast/Stack.h
-include/protocols/ace/TMCast/Export.hpp
-include/protocols/ace/TMCast/FaultDetector.hpp
-include/protocols/ace/TMCast/Group.hpp
-include/protocols/ace/TMCast/GroupFwd.hpp
-include/protocols/ace/TMCast/LinkListener.hpp
-include/protocols/ace/TMCast/MTQueue.hpp
-include/protocols/ace/TMCast/Messaging.hpp
-include/protocols/ace/TMCast/Protocol.hpp
-include/protocols/ace/TMCast/TransactionController.hpp
-lib/libACE.so.5
-lib/libACE-5.5.2.so
-lib/libACE.a
-lib/libACE.la
 lib/libACE.so
-@exec ln -fs %F %F.5
-lib/libACEXML.so.5
-lib/libACEXML-5.5.2.so
-lib/libACEXML.a
-lib/libACEXML.la
+lib/libACE.so.6
+lib/libACE.so.%%VERSION%%
 lib/libACEXML.so
-@exec ln -fs %F %F.5
-lib/libACEXML_Parser.so.5
-lib/libACEXML_Parser-5.5.2.so
-@exec ln -fs %F %F.5
-lib/libACEXML_Parser.a
-lib/libACEXML_Parser.la
+lib/libACEXML.so.6
+lib/libACEXML.so.%%VERSION%%
 lib/libACEXML_Parser.so
-lib/libACEXML_XML_Svc_Conf_Parser.so.5
-lib/libACEXML_XML_Svc_Conf_Parser-5.5.2.so
-lib/libACEXML_XML_Svc_Conf_Parser.a
-lib/libACEXML_XML_Svc_Conf_Parser.la
+lib/libACEXML_Parser.so.6
+lib/libACEXML_Parser.so.%%VERSION%%
 lib/libACEXML_XML_Svc_Conf_Parser.so
-@exec ln -fs %F %F.5
-lib/libACE_HTBP.so.5
-lib/libACE_HTBP-5.5.2.so
-lib/libACE_HTBP.a
-lib/libACE_HTBP.la
+lib/libACEXML_XML_Svc_Conf_Parser.so.6
+lib/libACEXML_XML_Svc_Conf_Parser.so.%%VERSION%%
+lib/libACE_ETCL.so
+lib/libACE_ETCL.so.6
+lib/libACE_ETCL.so.%%VERSION%%
+lib/libACE_ETCL_Parser.so
+lib/libACE_ETCL_Parser.so.6
+lib/libACE_ETCL_Parser.so.%%VERSION%%
+%%FLTK%%lib/libACE_FlReactor.so
+%%FLTK%%lib/libACE_FlReactor.so.6
+%%FLTK%%lib/libACE_FlReactor.so.%%VERSION%%
 lib/libACE_HTBP.so
-@exec ln -fs %F %F.5
-lib/libACE_RMCast.so.5
-lib/libACE_RMCast-5.5.2.so
-lib/libACE_RMCast.a
-lib/libACE_RMCast.la
+lib/libACE_HTBP.so.6
+lib/libACE_HTBP.so.%%VERSION%%
+lib/libACE_INet.so
+lib/libACE_INet.so.6
+lib/libACE_INet.so.%%VERSION%%
+%%OPENSSL%%lib/libACE_INet_SSL.so
+%%OPENSSL%%lib/libACE_INet_SSL.so.6
+%%OPENSSL%%lib/libACE_INet_SSL.so.%%VERSION%%
+lib/libACE_Monitor_Control.so
+lib/libACE_Monitor_Control.so.6
+lib/libACE_Monitor_Control.so.%%VERSION%%
+%%QT%%lib/libACE_QtReactor.so
+%%QT%%lib/libACE_QtReactor.so.6
+%%QT%%lib/libACE_QtReactor.so.%%VERSION%%
 lib/libACE_RMCast.so
-@exec ln -fs %F %F.5
-lib/libACE_SSL.so.5
-lib/libACE_SSL-5.5.2.so
-lib/libACE_SSL.a
-lib/libACE_SSL.la
-lib/libACE_SSL.so
-@exec ln -fs %F %F.5
-lib/libACE_TMCast.so.5
-lib/libACE_TMCast-5.5.2.so
-lib/libACE_TMCast.a
-lib/libACE_TMCast.la
+lib/libACE_RMCast.so.6
+lib/libACE_RMCast.so.%%VERSION%%
+%%OPENSSL%%lib/libACE_SSL.so
+%%OPENSSL%%lib/libACE_SSL.so.6
+%%OPENSSL%%lib/libACE_SSL.so.%%VERSION%%
 lib/libACE_TMCast.so
-@exec ln -fs %F %F.5
-lib/libKokyu.a
-lib/libKokyu.la
+lib/libACE_TMCast.so.6
+lib/libACE_TMCast.so.%%VERSION%%
+%%TK%%lib/libACE_TkReactor.so
+%%TK%%lib/libACE_TkReactor.so.6
+%%TK%%lib/libACE_TkReactor.so.%%VERSION%%
+%%X11%%lib/libACE_XtReactor.so
+%%X11%%lib/libACE_XtReactor.so.6
+%%X11%%lib/libACE_XtReactor.so.%%VERSION%%
+lib/libJAWS.so
+lib/libJAWS.so.6
+lib/libJAWS.so.%%VERSION%%
 lib/libKokyu.so
-lib/libKokyu.so.5
+lib/libKokyu.so.6
+lib/libKokyu.so.%%VERSION%%
 libdata/pkgconfig/ACE.pc
 libdata/pkgconfig/ACEXML.pc
 libdata/pkgconfig/ACEXML_Parser.pc
+libdata/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc
+libdata/pkgconfig/ACE_ETCL.pc
+libdata/pkgconfig/ACE_ETCL_Parser.pc
+%%FLTK%%libdata/pkgconfig/ACE_FlReactor.pc
 libdata/pkgconfig/ACE_HTBP.pc
+libdata/pkgconfig/ACE_INet.pc
+%%OPENSSL%%libdata/pkgconfig/ACE_INet_SSL.pc
+%%QT%%libdata/pkgconfig/ACE_QtReactor.pc
 libdata/pkgconfig/ACE_RMCast.pc
-libdata/pkgconfig/ACE_SSL.pc
+%%OPENSSL%%libdata/pkgconfig/ACE_SSL.pc
 libdata/pkgconfig/ACE_TMCast.pc
+%%TK%%libdata/pkgconfig/ACE_TkReactor.pc
+%%X11%%libdata/pkgconfig/ACE_XtReactor.pc
 libdata/pkgconfig/Kokyu.pc
-@dirrm include/protocols/ace/TMCast
-@dirrm include/protocols/ace/RMCast
-@dirrm include/protocols/ace/HTBP
-@dirrm include/protocols/ace
-@dirrm include/protocols
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/COPYING
+%%DATADIR%%/NEWS
+%%DATADIR%%/PROBLEM-REPORT-FORM
+%%DATADIR%%/README
+%%DATADIR%%/THANKS
+%%DATADIR%%/VERSION
+%%DATADIR%%/ace-devel.sh
+%%DATADIR%%/bin/DependencyGenerator/GNUDependencyWriter.pm
+%%DATADIR%%/bin/DependencyGenerator/GNUIDLDependencyWriter.pm
+%%DATADIR%%/bin/DependencyGenerator/GNUIDLObjectGenerator.pm
+%%DATADIR%%/bin/DependencyGenerator/GNUObjectGenerator.pm
+%%DATADIR%%/bin/MakeProjectCreator/README
+%%DATADIR%%/bin/MakeProjectCreator/config/MPC.cfg
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_athena.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_athena3d.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_bzip2.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_etcl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_etcl_parser.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_fl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_flreactor.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_for_tao.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_fox.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_foxreactor.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_gl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_gtk.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_idl_dependencies.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_mc.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_mfc.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_motif.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_openssl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_output.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt4.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_qt4reactor.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_tk.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_tkreactor.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_unicode.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_x11.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_xt.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_xtreactor.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_zlib.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ace_zzip.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/acedefaults.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/aceexe.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/acelib.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/acemfcexe.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/acenosubsets.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/acexml.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/avoids_ace_for_tao.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/conv_lib.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/core.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/crosscompile.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/default.rel
+%%DATADIR%%/bin/MakeProjectCreator/config/em3.features
+%%DATADIR%%/bin/MakeProjectCreator/config/global.features
+%%DATADIR%%/bin/MakeProjectCreator/config/gnuace.features
+%%DATADIR%%/bin/MakeProjectCreator/config/htbp.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/inet.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/inetssl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/install.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/install_bin.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/install_data.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/install_headers.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/install_lib.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ipv6.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/kokyu.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/labviewrt_dll.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/man.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/mc_test_utils.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/minizip.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/nmake.features
+%%DATADIR%%/bin/MakeProjectCreator/config/pkgconfig.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/qos.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/rmcast.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/script.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ssl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ssl_for_tao.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/ssl_full.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/stl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/support_ostream.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/svc_conf_files.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/test_files.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/threads.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/tmcast.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/vc10.features
+%%DATADIR%%/bin/MakeProjectCreator/config/vc10nmake.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/vc11.features
+%%DATADIR%%/bin/MakeProjectCreator/config/vc11nmake.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/vc71.features
+%%DATADIR%%/bin/MakeProjectCreator/config/vc8.features
+%%DATADIR%%/bin/MakeProjectCreator/config/vc8nmake.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/vc9.features
+%%DATADIR%%/bin/MakeProjectCreator/config/vc9nmake.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/vc_warnings.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/vcfullmacros.mpt
+%%DATADIR%%/bin/MakeProjectCreator/config/vcl.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/vcpartialmacros.mpt
+%%DATADIR%%/bin/MakeProjectCreator/config/versioned_namespace.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/wb26.features
+%%DATADIR%%/bin/MakeProjectCreator/config/wfmo.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/winregistry.mpb
+%%DATADIR%%/bin/MakeProjectCreator/config/wxwindows.mpb
+%%DATADIR%%/bin/MakeProjectCreator/docs/templates/gnu.txt
+%%DATADIR%%/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm
+%%DATADIR%%/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm
+%%DATADIR%%/bin/MakeProjectCreator/modules/GNUAutobuildProjectCreator.pm
+%%DATADIR%%/bin/MakeProjectCreator/modules/GNUAutobuildWorkspaceCreator.pm
+%%DATADIR%%/bin/MakeProjectCreator/modules/VXTestProjectCreator.pm
+%%DATADIR%%/bin/MakeProjectCreator/modules/VXTestWorkspaceCreator.pm
+%%DATADIR%%/bin/MakeProjectCreator/templates/gnu.mpd
+%%DATADIR%%/bin/MakeProjectCreator/templates/gnudll.mpt
+%%DATADIR%%/bin/MakeProjectCreator/templates/gnuexe.mpt
+%%DATADIR%%/bin/MakeProjectCreator/templates/vxtest.mpd
+%%DATADIR%%/bin/add_rel_link.sh
+%%DATADIR%%/bin/depgen.pl
+%%DATADIR%%/bin/mpc.pl
+%%DATADIR%%/bin/mwc.pl
+%%DATADIR%%/docs/ACE-FMM.html
+%%DATADIR%%/docs/ACE-SSL.html
+%%DATADIR%%/docs/ACE-bug-process.html
+%%DATADIR%%/docs/ACE-categories.html
+%%DATADIR%%/docs/ACE-development-process.html
+%%DATADIR%%/docs/ACE-guidelines.html
+%%DATADIR%%/docs/ACE-lessons.html
+%%DATADIR%%/docs/ACE-porting.html
+%%DATADIR%%/docs/ACE-subsets.html
+%%DATADIR%%/docs/CE-status.txt
+%%DATADIR%%/docs/Download.html
+%%DATADIR%%/docs/FAQ
+%%DATADIR%%/docs/README.tutorials
+%%DATADIR%%/docs/Symbol_Versioning.html
+%%DATADIR%%/docs/ace_guidelines.vsmacros
+%%DATADIR%%/docs/bczar/bczar.html
+%%DATADIR%%/docs/bczar/privileges.html
+%%DATADIR%%/docs/exceptions.html
+%%DATADIR%%/docs/index.html
+%%DATADIR%%/docs/msvc_notes.txt
+%%DATADIR%%/docs/run_test.txt
+%%DATADIR%%/docs/svn/config
+%%DATADIR%%/docs/svn/svn-prefs.reg
+%%DATADIR%%/docs/usage-bugzilla.html
+%%DATADIR%%/docs/wchar.txt
+%%DATADIR%%/include/makeinclude/all_in_one.GNU
+%%DATADIR%%/include/makeinclude/component_check.GNU
+%%DATADIR%%/include/makeinclude/macros.GNU
+%%DATADIR%%/include/makeinclude/platform_aix.GNU
+%%DATADIR%%/include/makeinclude/platform_aix_g++.GNU
+%%DATADIR%%/include/makeinclude/platform_aix_ibm.GNU
+%%DATADIR%%/include/makeinclude/platform_android.GNU
+%%DATADIR%%/include/makeinclude/platform_cegcc.GNU
+%%DATADIR%%/include/makeinclude/platform_clang_common.GNU
+%%DATADIR%%/include/makeinclude/platform_cygwin32.GNU
+%%DATADIR%%/include/makeinclude/platform_freebsd.GNU
+%%DATADIR%%/include/makeinclude/platform_g++_common.GNU
+%%DATADIR%%/include/makeinclude/platform_gnuwin32_common.GNU
+%%DATADIR%%/include/makeinclude/platform_hpux_aCC.GNU
+%%DATADIR%%/include/makeinclude/platform_hpux_gcc.GNU
+%%DATADIR%%/include/makeinclude/platform_integrity_ghs.GNU
+%%DATADIR%%/include/makeinclude/platform_linux.GNU
+%%DATADIR%%/include/makeinclude/platform_linux_clang.GNU
+%%DATADIR%%/include/makeinclude/platform_linux_common.GNU
+%%DATADIR%%/include/makeinclude/platform_linux_icc.GNU
+%%DATADIR%%/include/makeinclude/platform_linux_pgi.GNU
+%%DATADIR%%/include/makeinclude/platform_linux_suncc.GNU
+%%DATADIR%%/include/makeinclude/platform_lynxos.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_common.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_iOS.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_icc.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_leopard.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_lion.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_panther.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_snowleopard.GNU
+%%DATADIR%%/include/makeinclude/platform_macosx_tiger.GNU
+%%DATADIR%%/include/makeinclude/platform_macros.GNU
+%%DATADIR%%/include/makeinclude/platform_mingw32.GNU
+%%DATADIR%%/include/makeinclude/platform_netbsd.GNU
+%%DATADIR%%/include/makeinclude/platform_openbsd.GNU
+%%DATADIR%%/include/makeinclude/platform_openvms.GNU
+%%DATADIR%%/include/makeinclude/platform_qnx_gcc.GNU
+%%DATADIR%%/include/makeinclude/platform_rtems.x_g++.GNU
+%%DATADIR%%/include/makeinclude/platform_sunos5_common.GNU
+%%DATADIR%%/include/makeinclude/platform_sunos5_g++.GNU
+%%DATADIR%%/include/makeinclude/platform_sunos5_sunc++.GNU
+%%DATADIR%%/include/makeinclude/platform_tandem.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks6.2.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks6.3.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks6.4.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks6.5.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks6.6.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks6.7.GNU
+%%DATADIR%%/include/makeinclude/platform_vxworks6.8.GNU
+%%DATADIR%%/include/makeinclude/platform_win32_dmc.GNU
+%%DATADIR%%/include/makeinclude/platform_win32_icc.GNU
+%%DATADIR%%/include/makeinclude/platform_win32_interix.GNU
+%%DATADIR%%/include/makeinclude/platform_win32_msvc.GNU
+%%DATADIR%%/include/makeinclude/rules.bin.GNU
+%%DATADIR%%/include/makeinclude/rules.common.GNU
+%%DATADIR%%/include/makeinclude/rules.lib.GNU
+%%DATADIR%%/include/makeinclude/rules.local.GNU
+%%DATADIR%%/include/makeinclude/rules.nested.GNU
+%%DATADIR%%/include/makeinclude/rules.nolocal.GNU
+%%DATADIR%%/include/makeinclude/rules.nonested.GNU
+%%DATADIR%%/include/makeinclude/wrapper_macros.GNU
+@dirrm %%DATADIR%%/include/makeinclude
+@dirrm %%DATADIR%%/include
+@dirrm %%DATADIR%%/docs/svn
+@dirrm %%DATADIR%%/docs/bczar
+@dirrm %%DATADIR%%/docs
+@dirrm %%DATADIR%%/bin/MakeProjectCreator/templates
+@dirrm %%DATADIR%%/bin/MakeProjectCreator/modules
+@dirrm %%DATADIR%%/bin/MakeProjectCreator/docs/templates
+@dirrm %%DATADIR%%/bin/MakeProjectCreator/docs
+@dirrm %%DATADIR%%/bin/MakeProjectCreator/config
+@dirrm %%DATADIR%%/bin/MakeProjectCreator
+@dirrm %%DATADIR%%/bin/DependencyGenerator
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%
 @dirrm include/ace/os_include/sys
 @dirrm include/ace/os_include/netinet
 @dirrm include/ace/os_include/net
 @dirrm include/ace/os_include/arpa
 @dirrm include/ace/os_include
-@dirrm include/ace/SSL
-@dirrmtry include/ace/QoS
+%%X11%%@dirrm include/ace/XtReactor
+%%TK%%@dirrm include/ace/TkReactor
+@dirrm include/ace/TMCast
+@dirrm include/ace/RMCast
+%%QT%%@dirrm include/ace/QtReactor
+%%OPENSSL%%@dirrm include/ace/SSL
+@dirrm include/ace/Monitor_Control
+@dirrm include/ace/INet
+@dirrm include/ace/HTBP
+%%FLTK%%@dirrm include/ace/FlReactor
+@dirrm include/ace/ETCL
 @dirrm include/ace
 @dirrm include/Kokyu
+@dirrm include/JAWS/server
+@dirrm include/JAWS
 @dirrm include/ACEXML/parser/parser
 @dirrm include/ACEXML/parser
 @dirrm include/ACEXML/common