diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2014-10-21 16:53:38 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2014-10-21 16:53:38 +0000 |
| commit | 6c0cb7e99c6b37a63f1cfe83248e49c09bf10996 (patch) | |
| tree | d3cb23977dbe56f28c8c6b6db626c45e488487db /devel/py-omniorb-3/files | |
| parent | - Convert ports of graphics/ to new USES=python (diff) | |
In order to rescue the Salomé's ports, devel/omniNotify and
devel/py-omniorb are needed. But since omniNotify depends on
devel/omniORB-4.1, a version of py-omniorb depending on the same omniORB
is needed, to avoid conflicts.
- Repocopy devel/py-omniorb to devel/py-omniorb-3
- Downgrade it to 3.7
- Set CONFLICTS.
CR: D970
Notes
Notes:
svn path=/head/; revision=371327
Diffstat (limited to 'devel/py-omniorb-3/files')
| -rw-r--r-- | devel/py-omniorb-3/files/patch-omniidl_be-dir.mk | 19 | ||||
| -rw-r--r-- | devel/py-omniorb-3/files/patch-python-dir.mk | 19 |
2 files changed, 38 insertions, 0 deletions
diff --git a/devel/py-omniorb-3/files/patch-omniidl_be-dir.mk b/devel/py-omniorb-3/files/patch-omniidl_be-dir.mk new file mode 100644 index 000000000000..11ff45e961fd --- /dev/null +++ b/devel/py-omniorb-3/files/patch-omniidl_be-dir.mk @@ -0,0 +1,19 @@ +--- omniidl_be/dir.mk.orig Wed Feb 8 23:42:52 2006 ++++ omniidl_be/dir.mk Wed Feb 8 23:43:03 2006 +@@ -13,8 +13,6 @@ + for file in $^; do \ + $(ExportFileToDir) \ + done; \ +- cd $(PYLIBDIR); \ +- $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \ + ) + + ifdef INSTALLTARGET +@@ -23,7 +21,5 @@ + for file in $^; do \ + $(ExportFileToDir) \ + done; \ +- cd $(INSTALLPYLIBDIR); \ +- $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \ + ) + endif diff --git a/devel/py-omniorb-3/files/patch-python-dir.mk b/devel/py-omniorb-3/files/patch-python-dir.mk new file mode 100644 index 000000000000..a5f55572c35b --- /dev/null +++ b/devel/py-omniorb-3/files/patch-python-dir.mk @@ -0,0 +1,19 @@ +--- python/dir.mk.orig Wed Feb 8 23:42:23 2006 ++++ python/dir.mk Wed Feb 8 23:42:44 2006 +@@ -24,7 +24,7 @@ + $(ExportFileToDir) \ + done; \ + cd $(PYLIBDIR); \ +- $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \ ++ $(PYTHON) -c "import compileall; compileall.compile_dir('.',0)"; \ + ) + + ifdef INSTALLTARGET +@@ -34,6 +34,6 @@ + $(ExportFileToDir) \ + done; \ + cd $(INSTALLPYLIBDIR); \ +- $(PYTHON) -c "import compileall; compileall.compile_dir('.')"; \ ++ $(PYTHON) -c "import compileall; compileall.compile_dir('.',0)"; \ + ) + endif |