[71879] trunk/dports/devel/libhsplasma

[ryandesign at macports.org]

Revision: 71879
          http://trac.macports.org/changeset/71879
Author:   ryandesign at macports.org
Date:     2010-09-25 19:07:05 -0700 (Sat, 25 Sep 2010)
Log Message:
-----------
libhsplasma update to 689, which now uses cmake, which gives us a universal variant for free

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-cp-parents

Modified: trunk/dports/devel/libhsplasma/Portfile
===================================================================
--- trunk/dports/devel/libhsplasma/Portfile	2010-09-25 23:43:59 UTC (rev 71878)
+++ trunk/dports/devel/libhsplasma/Portfile	2010-09-26 02:07:05 UTC (rev 71879)
@@ -2,10 +2,10 @@
 # $Id$
 
 PortSystem                  1.0
+PortGroup                   cmake 1.0
 
 name                        libhsplasma
-version                     0.0-659
-revision                    1
+version                     0.0-689
 categories                  devel
 platforms                   darwin
 maintainers                 ryandesign
@@ -21,52 +21,34 @@
 
 fetch.type                  hg
 hg.url                      http://uru.zrax.net/hg/libhsplasma
-hg.tag                      019918637533
+hg.tag                      1250ce53d31d
 
-depends_build               port:coreutils
-
 depends_lib                 port:zlib \
                             port:jpeg \
                             port:openssl \
                             port:python26
 
-patchfiles                  patch-cp-parents
+patchfiles                  patch-Python-CMakeLists.txt.diff
 
-universal_variant           no
+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
 
-configure.args              --no-debug \
-                            --with-pkgconfig \
-                            --with-python=${prefix}/Library/Frameworks/Python.framework/Versions/2.6 \
-                            --with-zlib=${prefix} \
-                            --with-jpeg=${prefix} \
-                            --with-ssl=${prefix}
+set pyhsplasma              ${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/PyHSPlasma.so
 
-# Prevent problems building when a previous version is installed.
-pre-configure {
-    if {[file exists ${prefix}/lib/libHSPlasma.dylib]} {
-        return -code error "deactivate your existing version of ${name} before attempting to build the new one"
-    }
-}
-
-build.args                  CXX=${configure.cxx}
-
-destroot.target             install-dev
-destroot.destdir            PREFIX=${destroot}${prefix}
-
 post-destroot {
-    eval reinplace "s|${destroot}||g" [glob ${destroot}${prefix}/lib/pkgconfig/*.pc]
+    xinstall -d ${destroot}[file dirname ${pyhsplasma}]
+    move ${destroot}${prefix}/lib/PyHSPlasma.dylib ${destroot}${pyhsplasma}
+    system "install_name_tool -id ${pyhsplasma} ${destroot}${pyhsplasma}"
 }
 
-variant debug description {Build with debugging symbols} {
-    configure.args-delete   --no-debug
+pre-activate {
+    # Oops, libhsplasma 0.0-659_1 and earlier installed this lib directly
+    if {[file exists ${pyhsplasma}]} {
+        delete ${pyhsplasma}
+    }
 }
 
-platform darwin 8 {
-    # configure script requires bash 3 but Tiger has bash 2
-    depends_build-append    port:bash
-    configure.cmd           ${prefix}/bin/bash ./configure
-}
-
 livecheck.type              regex
 livecheck.url               ${hg.url}
 livecheck.version           [lindex [split ${version} -] 1]

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-09-26 02:07:05 UTC (rev 71879)
@@ -0,0 +1,11 @@
+--- Python/CMakeLists.txt.orig	2010-09-25 04:03:03.000000000 -0500
++++ Python/CMakeLists.txt	2010-09-25 04:32:51.000000000 -0500
+@@ -436,7 +436,7 @@
+           ${PYTHON_SRCS}   ${PYTHON_HDRS}
+ )
+ 
+-target_link_libraries(PyHSPlasma HSPlasma)
++target_link_libraries(PyHSPlasma HSPlasma ${PYTHON_LIBRARIES})
+ 
+ set_target_properties(PyHSPlasma PROPERTIES
+                       PREFIX ""

Deleted: trunk/dports/devel/libhsplasma/files/patch-cp-parents
===================================================================
--- trunk/dports/devel/libhsplasma/files/patch-cp-parents	2010-09-25 23:43:59 UTC (rev 71878)
+++ trunk/dports/devel/libhsplasma/files/patch-cp-parents	2010-09-26 02:07:05 UTC (rev 71879)
@@ -1,22 +0,0 @@
---- core/Makefile.orig	2010-09-09 05:17:53.000000000 -0500
-+++ core/Makefile	2010-09-09 05:36:57.000000000 -0500
-@@ -590,7 +590,7 @@
- 
- install-dev: install
- 	mkdir -p $(PREFIX)/include/libhsplasma
--	cp --parents $(PLSHEADERS) $(PREFIX)/include/libhsplasma
-+	gcp --parents $(PLSHEADERS) $(PREFIX)/include/libhsplasma
- ifneq ($(USE_PKGCONFIG),no)
- 	echo 'prefix=$(PREFIX)' > libhsplasma.pc
- 	cat libhsplasma.pc.in >> libhsplasma.pc
---- net/Makefile.orig	2010-09-09 05:17:53.000000000 -0500
-+++ net/Makefile	2010-09-09 05:36:53.000000000 -0500
-@@ -55,7 +55,7 @@
- 
- install-dev: install
- 	mkdir -p $(PREFIX)/include/libhsplasmanet
--	cp --parents $(PLSHEADERS) $(PREFIX)/include/libhsplasmanet
-+	gcp --parents $(PLSHEADERS) $(PREFIX)/include/libhsplasmanet
- ifneq ($(USE_PKGCONFIG),no)
- 	echo 'prefix=$(PREFIX)' > libhsplasmanet.pc
- 	cat libhsplasmanet.pc.in >> libhsplasmanet.pc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100925/2232c7b3/attachment.html>