2 files changed, 87 insertions, 4 deletions

diff --git a/devel/ace+tao/Makefile b/devel/ace+tao/Makefile
index 5127eee88464..6366389060b0 100644
--- a/devel/ace+tao/Makefile
+++ b/devel/ace+tao/Makefile
@@ -10,7 +10,7 @@ PORTVERSION?=	${ACE_VERSION}+${TAO_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	http://deuce.doc.wustl.edu/old_distribution/ \
 		http://www.navicon.dk/mirrors/ace/deuce.doc.wustl.edu/old_distribution/
-DISTNAME?=	ACE-${ACE_VERSION}+TAO-${TAO_VERSION}
+DISTNAME=	ACE-${ACE_VERSION}+TAO-${TAO_VERSION}
 
 MAINTAINER=	sem@ciam.ru
 COMMENT?=	The Adaptive Communication Environment (ACE) with The ACE ORB (TAO)
@@ -27,7 +27,7 @@ INSTALLS_SHLIB=	yes
 
 TESTS=		"@comment "
 .if defined(WITH_TESTS)
-USE_PERL5=	yes
+USE_PERL5_BUILD=	yes
 ACE_TESTS_COOKIE=	${WRKDIR}/.ace_tests_done
 TAO_TESTS_COOKIE=	${WRKDIR}/.tao_tests_done
 TESTS=		""
@@ -150,8 +150,13 @@ do-install:
 
 	@${ECHO_MSG} "Installing libraries into ${PREFIX}/lib"; \
 	cd ${ACE_ROOT}/ace; \
-	${FIND} . -maxdepth 1 -name "lib*.so" -not -name "*Test*" \
-		-exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
+	for f in `${FIND} . -maxdepth 1 -name "lib*.so.${ACE_VERSION}" -o \
+		-name "lib*.so.${TAO_VERSION}" -not -name "*Test*"`; do \
+			${INSTALL_DATA} $${f} ${PREFIX}/lib; \
+			${LN} -fs ${PREFIX}/lib/$${f} \
+				`${ECHO_CMD} ${PREFIX}/lib/$${f} | \
+				 ${SED} -e 's/.${ACE_VERSION}//;s/.${TAO_VERSION}//'`; \
+	done
 
 	@${ECHO_MSG} "Installing executables into ${PREFIX}/bin"; \
 	${INSTALL_PROGRAM} ${ACE_ROOT}/bin/gperf ${PREFIX}/bin
diff --git a/devel/ace+tao/pkg-plist b/devel/ace+tao/pkg-plist
index ebab13396f1b..a4bc32ca1671 100644
--- a/devel/ace+tao/pkg-plist
+++ b/devel/ace+tao/pkg-plist
@@ -4604,77 +4604,155 @@ include/ace/svc_export.h
 %%TAO%%include/tao/xt_resource.h
 %%TAO%%include/tao/xt_resource.i
 lib/libACE.so
+lib/libACE.so.5.3.6
 lib/libACEXML.so
+lib/libACEXML.so.5.3.6
 lib/libACEXML_Parser.so
+lib/libACEXML_Parser.so.5.3.6
 lib/libACEXML_XML_Svc_Conf_Parser.so
+lib/libACEXML_XML_Svc_Conf_Parser.so.5.3.6
 lib/libACE_RMCast.so
+lib/libACE_RMCast.so.5.3.6
 lib/libACE_SSL.so
+lib/libACE_SSL.so.5.3.6
+%%TESTS%%lib/libDLL_Test.so
+%%TESTS%%lib/libDLL_Test.so.5.3.6
 lib/libDump_Restore.so
+lib/libDump_Restore.so.5.3.6
 %%TESTS%%lib/libFramework_Component_DLL.so
+%%TESTS%%lib/libFramework_Component_DLL.so.5.3.6
 lib/libGateway.so
+lib/libGateway.so.5.3.6
 lib/libKokyu.so
+lib/libKokyu.so.5.3.6
 lib/libPeer.so
+lib/libPeer.so.5.3.6
 %%TESTS%%lib/libService_Config_DLL.so
+%%TESTS%%lib/libService_Config_DLL.so.5.3.6
+%%TESTS%%lib/libTest_Output.so
+%%TESTS%%lib/libTest_Output.so.5.3.6
 lib/libnetsvcs.so
+lib/libnetsvcs.so.5.3.6
 lib/libwebsvcs.so
+lib/libwebsvcs.so.5.3.6
+lib/libClient_Test.so
+lib/libClient_Test.so.5.3.6
 %%TAO%%%%TESTS%%lib/libCollocation_Diamond.so
+%%TAO%%%%TESTS%%lib/libCollocation_Diamond.so.1.3.6
 %%TAO%%%%TESTS%%lib/libIBM1047_ISO8859.so
+%%TAO%%%%TESTS%%lib/libIBM1047_ISO8859.so.1.3.6
 %%TAO%%lib/libTAO.so
+%%TAO%%lib/libTAO.so.1.3.6
 %%TAO%%lib/libTAO_AV.so
+%%TAO%%lib/libTAO_AV.so.1.3.6
 %%TAO%%lib/libTAO_BiDirGIOP.so
+%%TAO%%lib/libTAO_BiDirGIOP.so.1.3.6
 %%TAO%%lib/libTAO_CosConcurrency.so
+%%TAO%%lib/libTAO_CosConcurrency.so.1.3.6
 %%TAO%%lib/libTAO_CosEvent.so
+%%TAO%%lib/libTAO_CosEvent.so.1.3.6
 %%TAO%%lib/libTAO_CosLifeCycle.so
+%%TAO%%lib/libTAO_CosLifeCycle.so.1.3.6
 %%TAO%%lib/libTAO_CosLoadBalancing.so
+%%TAO%%lib/libTAO_CosLoadBalancing.so.1.3.6
 %%TAO%%lib/libTAO_CosNaming.so
+%%TAO%%lib/libTAO_CosNaming.so.1.3.6
 %%TAO%%lib/libTAO_CosNotification.so
+%%TAO%%lib/libTAO_CosNotification.so.1.3.6
 %%TAO%%lib/libTAO_CosProperty.so
+%%TAO%%lib/libTAO_CosProperty.so.1.3.6
 %%TAO%%lib/libTAO_CosTime.so
+%%TAO%%lib/libTAO_CosTime.so.1.3.6
 %%TAO%%lib/libTAO_CosTrading.so
+%%TAO%%lib/libTAO_CosTrading.so.1.3.6
 %%TAO%%lib/libTAO_Domain.so
+%%TAO%%lib/libTAO_Domain.so.1.3.6
 %%TAO%%lib/libTAO_DsEventLogAdmin.so
+%%TAO%%lib/libTAO_DsEventLogAdmin.so.1.3.6
 %%TAO%%lib/libTAO_DsLogAdmin.so
+%%TAO%%lib/libTAO_DsLogAdmin.so.1.3.6
 %%TAO%%lib/libTAO_DsNotifyLogAdmin.so
+%%TAO%%lib/libTAO_DsNotifyLogAdmin.so.1.3.6
 %%TAO%%lib/libTAO_DynamicAny.so
+%%TAO%%lib/libTAO_DynamicAny.so.1.3.6
 %%TAO%%lib/libTAO_DynamicInterface.so
+%%TAO%%lib/libTAO_DynamicInterface.so.1.3.6
 %%TAO%%lib/libTAO_ETCL.so
+%%TAO%%lib/libTAO_ETCL.so.1.3.6
 %%TAO%%lib/libTAO_FTORB.so
+%%TAO%%lib/libTAO_FTORB.so.1.3.6
 %%TAO%%lib/libTAO_FaultTolerance.so
+%%TAO%%lib/libTAO_FaultTolerance.so.1.3.6
 %%TAO%%lib/libTAO_IDL_BE_DLL.so
+%%TAO%%lib/libTAO_IDL_BE_DLL.so.5.3.6
 %%TAO%%lib/libTAO_IDL_FE_DLL.so
+%%TAO%%lib/libTAO_IDL_FE_DLL.so.5.3.6
 %%TAO%%lib/libTAO_IFRService.so
+%%TAO%%lib/libTAO_IFRService.so.1.3.6
 %%TAO%%lib/libTAO_IFR_BE_DLL.so
+%%TAO%%lib/libTAO_IFR_BE_DLL.so.1.3.6
 %%TAO%%lib/libTAO_IFR_Client.so
+%%TAO%%lib/libTAO_IFR_Client.so.1.3.6
 %%TAO%%lib/libTAO_IORInterceptor.so
+%%TAO%%lib/libTAO_IORInterceptor.so.1.3.6
 %%TAO%%lib/libTAO_IORManip.so
+%%TAO%%lib/libTAO_IORManip.so.1.3.6
 %%TAO%%lib/libTAO_IORTable.so
+%%TAO%%lib/libTAO_IORTable.so.1.3.6
 %%TAO%%lib/libTAO_Messaging.so
+%%TAO%%lib/libTAO_Messaging.so.1.3.6
 %%TAO%%lib/libTAO_ObjRefTemplate.so
+%%TAO%%lib/libTAO_ObjRefTemplate.so.1.3.6
 %%TAO%%lib/libTAO_PSDL.so
+%%TAO%%lib/libTAO_PSDL.so.1.3.6
 %%TAO%%lib/libTAO_PSDL_DataStore.so
+%%TAO%%lib/libTAO_PSDL_DataStore.so.1.3.6
 %%TAO%%lib/libTAO_PortableGroup.so
+%%TAO%%lib/libTAO_PortableGroup.so.1.3.6
 %%TAO%%lib/libTAO_PortableServer.so
+%%TAO%%lib/libTAO_PortableServer.so.1.3.6
 %%TAO%%lib/libTAO_RTCORBA.so
+%%TAO%%lib/libTAO_RTCORBA.so.1.3.6
 %%TAO%%lib/libTAO_RTCORBAEvent.so
+%%TAO%%lib/libTAO_RTCORBAEvent.so.1.3.6
 %%TAO%%lib/libTAO_RTCosScheduling.so
+%%TAO%%lib/libTAO_RTCosScheduling.so.1.3.6
 %%TAO%%lib/libTAO_RTEvent.so
+%%TAO%%lib/libTAO_RTEvent.so.1.3.6
 %%TAO%%lib/libTAO_RTEventLogAdmin.so
+%%TAO%%lib/libTAO_RTEventLogAdmin.so.1.3.6
 %%TAO%%lib/libTAO_RTKokyuEvent.so
+%%TAO%%lib/libTAO_RTKokyuEvent.so.1.3.6
 %%TAO%%lib/libTAO_RTOLDEvent.so
+%%TAO%%lib/libTAO_RTOLDEvent.so.1.3.6
 %%TAO%%lib/libTAO_RTPortableServer.so
+%%TAO%%lib/libTAO_RTPortableServer.so.1.3.6
 %%TAO%%lib/libTAO_RTSched.so
+%%TAO%%lib/libTAO_RTSched.so.1.3.6
 %%TAO%%lib/libTAO_RTSchedEvent.so
+%%TAO%%lib/libTAO_RTSchedEvent.so.1.3.6
 %%TAO%%lib/libTAO_RTScheduler.so
+%%TAO%%lib/libTAO_RTScheduler.so.1.3.6
 %%TAO%%lib/libTAO_RT_Notification.so
+%%TAO%%lib/libTAO_RT_Notification.so.1.3.6
 %%TAO%%lib/libTAO_SSLIOP.so
+%%TAO%%lib/libTAO_SSLIOP.so.1.3.6
 %%TAO%%lib/libTAO_Security.so
+%%TAO%%lib/libTAO_Security.so.1.3.6
 %%TAO%%lib/libTAO_SmartProxies.so
+%%TAO%%lib/libTAO_SmartProxies.so.1.3.6
 %%TAO%%lib/libTAO_Strategies.so
+%%TAO%%lib/libTAO_Strategies.so.1.3.6
 %%TAO%%lib/libTAO_Svc_Utils.so
+%%TAO%%lib/libTAO_Svc_Utils.so.1.3.6
 %%TAO%%lib/libTAO_TypeCodeFactory.so
+%%TAO%%lib/libTAO_TypeCodeFactory.so.1.3.6
 %%TAO%%lib/libTAO_Utils.so
+%%TAO%%lib/libTAO_Utils.so.1.3.6
 %%TAO%%lib/libTAO_Valuetype.so
+%%TAO%%lib/libTAO_Valuetype.so.1.3.6
 %%TAO%%%%TESTS%%lib/libUCS4_UTF16.so
+%%TAO%%%%TESTS%%lib/libUCS4_UTF16.so.1.3.6
 %%PORTDOCS%%%%DOCSDIR%%/ACE/tutorials/001/00SetEnv
 %%PORTDOCS%%%%DOCSDIR%%/ACE/tutorials/001/001.dsp
 %%PORTDOCS%%%%DOCSDIR%%/ACE/tutorials/001/Makefile