[72185] trunk/dports/devel/libhsplasma

[ryandesign at macports.org]

Revision: 72185
          http://trac.macports.org/changeset/72185
Author:   ryandesign at macports.org
Date:     2010-10-06 00:20:40 -0700 (Wed, 06 Oct 2010)
Log Message:
-----------
libhsplasma: update to 704

Modified Paths:
--------------
    trunk/dports/devel/libhsplasma/Portfile

Added Paths:
-----------
    trunk/dports/devel/libhsplasma/files/patch-Python-CMakeLists.txt.diff

Removed Paths:
-------------
    trunk/dports/devel/libhsplasma/files/patch-commdebug.diff

Modified: trunk/dports/devel/libhsplasma/Portfile
===================================================================
--- trunk/dports/devel/libhsplasma/Portfile	2010-10-06 05:06:04 UTC (rev 72184)
+++ trunk/dports/devel/libhsplasma/Portfile	2010-10-06 07:20:40 UTC (rev 72185)
@@ -5,7 +5,7 @@
 PortGroup                   cmake 1.0
 
 name                        libhsplasma
-version                     0.0-700
+version                     0.0-704
 categories                  devel
 platforms                   darwin
 maintainers                 ryandesign
@@ -21,16 +21,20 @@
 
 fetch.type                  hg
 hg.url                      http://uru.zrax.net/hg/libhsplasma
-hg.tag                      80c5b2a2776c
+hg.tag                      6b48fe991d5e
 
 depends_lib                 port:zlib \
                             port:jpeg \
                             port:openssl \
                             port:python26
 
-patchfiles                  patch-commdebug.diff \
+patchfiles                  patch-Python-CMakeLists.txt.diff \
                             patch-endian.diff
 
+post-patch {
+    reinplace "s|@PYTHON@|${prefix}/bin/python2.6|g" ${worksrcpath}/Python/CMakeLists.txt
+}
+
 configure.args-append       -DDISABLE_PYTHON:BOOL=OFF \
                             -DPYTHON_INCLUDE_DIR:PATH=${frameworks_dir}/Python.framework/Versions/2.6/Headers \
                             -DPYTHON_LIBRARY:FILEPATH=${prefix}/lib/libpython2.6.dylib
@@ -38,8 +42,6 @@
 set pyhsplasma              ${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/PyHSPlasma.so
 
 post-destroot {
-    xinstall -d ${destroot}[file dirname ${pyhsplasma}]
-    move ${destroot}${prefix}/lib/PyHSPlasma.dylib ${destroot}${pyhsplasma}
     system "install_name_tool -id ${pyhsplasma} ${destroot}${pyhsplasma}"
 }
 

Added: trunk/dports/devel/libhsplasma/files/patch-Python-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libhsplasma/files/patch-Python-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/devel/libhsplasma/files/patch-Python-CMakeLists.txt.diff	2010-10-06 07:20:40 UTC (rev 72185)
@@ -0,0 +1,15 @@
+--- Python/CMakeLists.txt.orig	2010-10-05 22:37:28.000000000 -0500
++++ Python/CMakeLists.txt	2010-10-05 23:02:22.000000000 -0500
+@@ -451,10 +451,10 @@
+     )
+ endif()
+ 
+-EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
++EXECUTE_PROCESS(COMMAND @PYTHON@ -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
+                 OUTPUT_VARIABLE _PYTHON_VERSION
+ )
+-EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write(sys.prefix)"
++EXECUTE_PROCESS(COMMAND @PYTHON@ -c "import sys; sys.stdout.write(sys.prefix)"
+                 OUTPUT_VARIABLE _PYTHON_PREFIX
+ )
+ 

Deleted: trunk/dports/devel/libhsplasma/files/patch-commdebug.diff
===================================================================
--- trunk/dports/devel/libhsplasma/files/patch-commdebug.diff	2010-10-06 05:06:04 UTC (rev 72184)
+++ trunk/dports/devel/libhsplasma/files/patch-commdebug.diff	2010-10-06 07:20:40 UTC (rev 72185)
@@ -1,29 +0,0 @@
---- net/crypt/pnRC4.cpp.orig	2010-09-26 23:16:46.000000000 -0500
-+++ net/crypt/pnRC4.cpp	2010-09-27 03:54:16.000000000 -0500
-@@ -115,7 +115,7 @@
-         }
- 
- #ifdef COMMDEBUG
--        plDebug::Debug("     <- Int%d: %lu", size * 8, data);
-+        plDebug::Debug("     <- Int%d: %lu", size * 8, data.fUint);
- #endif
-     } else {
-         if (size == 1)
-@@ -162,7 +162,7 @@
-         }
- 
- #ifdef COMMDEBUG
--        plDebug::Debug("     -> Int%d: %lu", size * 8, data);
-+        plDebug::Debug("     -> Int%d: %lu", size * 8, data.fUint);
- #endif
-     } else {
-         if (size == 1) {
-@@ -177,7 +177,7 @@
-         }
- 
- #ifdef COMMDEBUG
--        plString ln = plString::Format("     <- Int%d[%d]: ", size * 8, count);
-+        plString ln = plString::Format("     -> Int%d[%d]: ", size * 8, count);
-         size_t lnbufSize = count * ((size * 2) + 1);
-         char* lnbuf = new char[lnbufSize + 1];
-         for (size_t i=0; i<count; i++) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101006/a7667cd5/attachment.html>