Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31514

Modified Files:
        stellarium.info 
Log Message:
Added stellarium-x11 variant. Plain stellarium uses qt4-mac.

Index: stellarium.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/stellarium.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stellarium.info     3 Apr 2009 00:04:30 -0000       1.5
+++ stellarium.info     3 Apr 2009 02:04:00 -0000       1.6
@@ -1,12 +1,21 @@
-Package: stellarium
+Info2: <<
+Package: stellarium%type_pkg[-x11]
 Version: 0.10.2
-Revision: 1
+Revision: 2
+Type: -x11 (boolean)
 Description: Real time 3D sky renderer
 Maintainer: Daniel Johnson <[email protected]>
 Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
 Source-MD5: c544fff9e75e9317055075b658ae5924
-PatchFile: %n.patch
+PatchFile: %{ni}.patch
 PatchFile-MD5: fe6e6c4a88c682d83b8bdf785f48ada5
+PatchScript: <<
+       #!/bin/bash -ev
+       %{default_script}
+       if [ %type_raw[-x11] = -x11 ]; then
+               perl -pi -e 's,-dylib_file,-L/usr/X11R6/lib -L%p/lib 
-dylib_file,' CMakeLists.txt
+       fi
+<<
 BuildDepends: <<
        boost1.35.nopython,
        cmake,
@@ -14,34 +23,59 @@
        freetype219,
        gettext-tools,
        libgettext3-dev,
+       ( %type_raw[-x11] = -x11 ) libgl-dev,
        libiconv-dev,
        libjpeg,
        libpng3,
-       qt4-mac (>= 4.5.0-3),
-       system-openssl-dev
+       ( %type_raw[-x11] = . ) qt4-mac (>= 4.5.0-3),
+       ( %type_raw[-x11] = -x11 ) qt4-x11 (>= 4.5.0-3),
+       system-openssl-dev,
+       ( %type_raw[-x11] = -x11 ) x11-dev
 <<
 Depends: <<
        freetype219-shlibs,
        libgettext3-shlibs,
+       ( %type_raw[-x11] = -x11 ) libgl-shlibs,
        libiconv,
        libjpeg-shlibs,
        libpng3-shlibs,
-       qt4-mac-core-shlibs (>= 4.5.0-3),
-       qt4-mac-gui-shlibs (>= 4.5.0-3)
+       ( %type_raw[-x11] = . ) qt4-mac-core-shlibs (>= 4.5.0-3),
+       ( %type_raw[-x11] = . ) qt4-mac-gui-shlibs (>= 4.5.0-3),
+       ( %type_raw[-x11] = -x11 ) qt4-x11-core-shlibs (>= 4.5.0-3),
+       ( %type_raw[-x11] = -x11 ) qt4-x11-gui-shlibs (>= 4.5.0-3),
+       ( %type_raw[-x11] = -x11 ) x11-shlibs
 <<
+Conflicts: stellarium, stellarium-x11
+Replaces: stellarium, stellarium-x11
 GCC: 4.0
 CompileScript: <<
        #!/bin/bash -ev
        mkdir -p build/unix
        cd build/unix
-       cmake -DCMAKE_INSTALL_PREFIX:PATH=%p \
-               -DCMAKE_PREFIX_PATH:PATH=%p \
-               -DQT_QMAKE_EXECUTABLE:FILEPATH=%p/lib/qt4-mac/bin/qmake \
-               -DFreeType2_INCLUDE_DIR:PATH=%p/include/freetype2 \
-               -DFreeType2_LIBRARIES:FILEPATH=%p/lib/libfreetype.dylib \
-               -DOPENSSL_INCLUDE_DIR:PATH=%p/lib/system-openssl/include \
-               
-DOPENSSL_LIBRARIES:FILEPATH=%p/lib/system-openssl/lib/libssl.dylib \
-               ../..
+       
+       if [ %type_raw[-x11] = -x11 ]; then
+               cmake -DCMAKE_INSTALL_PREFIX:PATH=%p \
+                       -DCMAKE_PREFIX_PATH:PATH=%p \
+                       -DQT_QMAKE_EXECUTABLE:FILEPATH=%p/lib/qt4-x11/bin/qmake 
\
+                       -DFreeType2_INCLUDE_DIR:PATH=%p/include/freetype2 \
+                       -DFreeType2_LIBRARIES:FILEPATH=%p/lib/libfreetype.dylib 
\
+                       
-DOPENSSL_INCLUDE_DIR:PATH=%p/lib/system-openssl/include \
+                       
-DOPENSSL_LIBRARIES:FILEPATH=%p/lib/system-openssl/lib/libssl.dylib \
+                       -DOPENGL_gl_LIBRARY:FILEPATH=/usr/X11R6/lib/libGL.dylib 
\
+                       
-DOPENGL_glu_LIBRARY:FILEPATH=/usr/X11R6/lib/libGLU.dylib \
+                       -DOPENGL_INCLUDE_DIR:PATH=/usr/X11R6/include \
+                       ../..
+       else
+               cmake -DCMAKE_INSTALL_PREFIX:PATH=%p \
+                       -DCMAKE_PREFIX_PATH:PATH=%p \
+                       -DQT_QMAKE_EXECUTABLE:FILEPATH=%p/lib/qt4-mac/bin/qmake 
\
+                       -DFreeType2_INCLUDE_DIR:PATH=%p/include/freetype2 \
+                       -DFreeType2_LIBRARIES:FILEPATH=%p/lib/libfreetype.dylib 
\
+                       
-DOPENSSL_INCLUDE_DIR:PATH=%p/lib/system-openssl/include \
+                       
-DOPENSSL_LIBRARIES:FILEPATH=%p/lib/system-openssl/lib/libssl.dylib \
+                       ../..
+       fi
+       
        make
 <<
 InstallScript: <<
@@ -79,3 +113,4 @@
 DocFiles: AUTHORS ChangeLog COPYING README
 License: GPL
 Homepage: http://stellarium.sourceforge.net/
+<<


------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to