diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2004-01-16 21:26:43 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2004-01-16 21:26:43 +0000 |
| commit | 91528b401052573f7f9f3d86ed468b9093f27b5b (patch) | |
| tree | 4d8bc0d8a469210ec280f98b7f53bf0623452624 /devel/ace+tao/files | |
| parent | add p5-DWH_File which allows for data and object persistence in deep and (diff) | |
- Update to 5.4.0
- Use %%TAO_VERSION%% in pkg-plist
- Fix CONFLICTS
PR: 61437
Submitted by: Sergey Matveychuk <sem@ciam.ru> (maintainer)
Approved by: erwin (mentor) (implicitly)
Diffstat (limited to 'devel/ace+tao/files')
| -rw-r--r-- | devel/ace+tao/files/patch-Concurrency_Service | 19 | ||||
| -rw-r--r-- | devel/ace+tao/files/patch-ab | 9 | ||||
| -rw-r--r-- | devel/ace+tao/files/patch-ac | 4 |
3 files changed, 7 insertions, 25 deletions
diff --git a/devel/ace+tao/files/patch-Concurrency_Service b/devel/ace+tao/files/patch-Concurrency_Service deleted file mode 100644 index ebd9af8e5630..000000000000 --- a/devel/ace+tao/files/patch-Concurrency_Service +++ /dev/null @@ -1,19 +0,0 @@ ---- TAO/orbsvcs/Concurrency_Service/Makefile.orig Thu Nov 20 05:16:49 2003 -+++ TAO/orbsvcs/Concurrency_Service/Makefile Wed Dec 24 20:46:35 2003 -@@ -17,6 +17,8 @@ - - BIN2 = Concurrency_Service - -+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -+ - #### If the TAO orbsvcs library wasn't built with sufficient components, - #### don't try to build here. - TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -@@ -30,7 +32,6 @@ - # Include macros and targets - #---------------------------------------------------------------------------- - --include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU - include $(ACE_ROOT)/include/makeinclude/macros.GNU - include $(TAO_ROOT)/rules.tao.GNU - include $(ACE_ROOT)/include/makeinclude/rules.common.GNU diff --git a/devel/ace+tao/files/patch-ab b/devel/ace+tao/files/patch-ab index c11b7b3bc4bf..1593e20fcff2 100644 --- a/devel/ace+tao/files/patch-ab +++ b/devel/ace+tao/files/patch-ab @@ -1,13 +1,14 @@ ---- TAO/Makefile.orig Fri Jun 13 22:12:42 2003 -+++ TAO/Makefile Fri Dec 5 10:34:27 2003 -@@ -23,10 +23,7 @@ +--- TAO/Makefile.orig Mon Jan 5 10:18:45 1970 ++++ TAO/Makefile Fri Jan 16 02:08:11 2004 +@@ -23,11 +23,7 @@ TAO_IDL \ tests \ orbsvcs \ - examples \ - performance-tests \ - utils \ -- docs/tutorials/Quoter +- docs/tutorials/Quoter \ +- CIAO + utils CLONE = Makefile \ diff --git a/devel/ace+tao/files/patch-ac b/devel/ace+tao/files/patch-ac index 7e01bb9f1967..195e4cb84cce 100644 --- a/devel/ace+tao/files/patch-ac +++ b/devel/ace+tao/files/patch-ac @@ -1,5 +1,5 @@ ---- TAO/orbsvcs/Makefile.orig Sat Dec 6 10:13:59 2003 -+++ TAO/orbsvcs/Makefile Sat Dec 6 10:14:28 2003 +--- TAO/orbsvcs/Makefile.orig Thu Jan 15 22:51:35 2004 ++++ TAO/orbsvcs/Makefile Thu Jan 15 22:52:27 2004 @@ -43,10 +43,9 @@ Trading_Service \ LoadBalancer \ |