<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c1739e3cd5decba67fc297471d0625b34badfbdf">https://github.com/macports/macports-ports/commit/c1739e3cd5decba67fc297471d0625b34badfbdf</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c1739e3 gr-cdma: patch to fix what is installed and where.
</span>c1739e3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c1739e3cd5decba67fc297471d0625b34badfbdf
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Feb 24 18:10:33 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gr-cdma: patch to fix what is installed and where.
</span>---
science/gr-cdma/Portfile | 12 ++++++
science/gr-cdma/files/patch-installs.diff | 69 +++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-cdma/Portfile b/science/gr-cdma/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f71af2..6531e69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-cdma/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-cdma/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup github 1.0
</span>
github.setup anastas gr-cdma 91067d780e907a1a8d9df53077460aac2ff09f15
version 20161220
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 99c26aa048e690a4b11e10423baba5c9921db5c7 \
sha256 18ba151aa085aeb9cdc8fc5329f51d1d4af012c1bc58a1a303fe0911809752a9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +38,17 @@ depends_lib-append port:boost
</span>
cmake.out_of_source yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch to fix what is installed and where
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-installs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 2nd part of patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PYTHON_HOME@|${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages/cdma|g" ${worksrcpath}/python/cdma_parameters.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # remove top-level library path, such that internal libraries are used
# instead of any already-installed ones.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-cdma/files/patch-installs.diff b/science/gr-cdma/files/patch-installs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..abe2af6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-cdma/files/patch-installs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,69 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c837d77..00d7ff8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/apps/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,9 +17,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the Free Software Foundation, Inc., 51 Franklin Street,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Boston, MA 02110-1301, USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include(GrPython)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GR_PYTHON_INSTALL(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROGRAMS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ amp_var_est_hier.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_rx.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_rx1.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_rx_hier.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_rx_hier1.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_tx.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_tx1.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_tx_hier.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_tx_hier1.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_txrx.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cdma_txrx1.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ chopper_correlator.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qt_cdma_txrx.grc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION share/gnuradio/examples/cdma
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9870dde..5e81ec2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +37,13 @@ GR_PYTHON_INSTALL(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION ${GR_PYTHON_DIR}/cdma
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fsm_files/awgn2o2_1.fsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fsm_files/awgn2o3_8ungerboecka.fsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fsm_files/awgn2o4_8_ungerboeckc.fsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${GR_PYTHON_DIR}/cdma/fsm_files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Handle the unit tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/python/cdma_parameters.py b/python/cdma_parameters.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5643461..20bb511 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/python/cdma_parameters.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/python/cdma_parameters.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@ class cdma_parameters:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "CDMA PARAMETERS : for adaptive coded modulation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-prefix="/home/anastas/gr-cdma/" # put the prefix of your gr-cdma trunk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++prefix="@PYTHON_HOME@" # put the prefix of your gr-cdma trunk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ length_tag_name = "cdma_packet_len"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ num_tag_name = "cdma_packet_num"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@ local_header_obj = cdma.packet_header2(bits_per_header,length_tag_name,num_tag_n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modulation_names=["uncoded QPSK", "rate 2/3 cc &8PSK", "rate 2/4 cc &16QAM"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ payload_mod = [digital.constellation_qpsk(),digital.constellation_8psk(),digital.constellation_16qam()]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pdir=prefix+"/python/fsm_files/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pdir=prefix+"/fsm_files/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fsm=[pdir+"awgn2o2_1.fsm", pdir+"awgn2o3_8ungerboecka.fsm",pdir+"awgn2o4_8_ungerboeckc.fsm"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uncoded_fsm=[trellis.fsm(2,2,[1,0,0,1]),trellis.fsm(3,3,[1,0,0,0,1,0,0,0,1]),trellis.fsm(4,4,[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1])]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>