[113830] trunk/dports/kde/kstars

[Nicolas Pavillon]

Sorry, I forgot to correct these ones after my first tests. It should be corrected in r113898 and r113899. 

Cheers,

Nicolas


> On Nov 24, 2013, at 09:39, nicos at macports.org wrote:
> 
>> Revision
>> 113830
>> Author
>> nicos at macports.org
>> Date
>> 2013-11-24 07:39:10 -0800 (Sun, 24 Nov 2013)
>> Log Message
>> 
>> kstars: fix build on Mavericks by using Eigen3
>> Modified Paths
>> 
>> 	• trunk/dports/kde/kstars/Portfile
>> Added Paths
>> 
>> 	• trunk/dports/kde/kstars/files/patch-Eigen3.diff
>> Diff
>> 
>> Modified: trunk/dports/kde/kstars/Portfile (113829 => 113830)
>> 
>> --- trunk/dports/kde/kstars/Portfile	2013-11-24 15:37:01 UTC (rev 113829)
>> +++ trunk/dports/kde/kstars/Portfile	2013-11-24 15:39:10 UTC (rev 113830)
>> 
>> @@ -30,9 +30,19 @@
>> 
>> 
>> 
>> depends_lib-append  port:kdelibs4 \
>> 
>>                     port:oxygen-icons \
>> 
>> -                    port:eigen \
>> 
>>                     port:cfitsio
>> 
>> 
>> 
>> +platform darwin { 
>> +    if {${os.major} < 13} { 
>> +	#Use standard dependency
>> +        depends_lib-append  port:eigen
>> +    } else {
>> +        #Use Eigen3 in compatibility mode as Eigen2 does not build on Mavericks
>> +        depends_lib-append  port:eigen3
>> +        patchfiles          patch-Eigen3.diff
>> +    }
>> +}
> 
> So now, in the admittedly very uncommon case of not being on Darwin, there’s no eigen dependency at all.
> 
> 
>> --- trunk/dports/kde/kstars/files/patch-Eigen3.diff	                        (rev 0)
>> +++ trunk/dports/kde/kstars/files/patch-Eigen3.diff	2013-11-24 15:39:10 UTC (rev 113830)
>> 
>> @@ -0,0 +1,15 @@
>> 
>> +--- CMakeLists.txt.orig	2013-11-24 23:21:08.000000000 +0900
>> ++++ CMakeLists.txt	2013-11-24 23:21:28.000000000 +0900
>> +@@ -15,7 +15,11 @@
>> + # some configure checks needed for kstars
>> + include(CheckIncludeFiles)
>> + 
>> +-find_package(Eigen2 2.0.3)
>> ++
>> ++set (EIGEN2_FOUND TRUE)
>> ++set (EIGEN2_INCLUDE_DIR /opt/local/include/eigen3)
>> ++SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API" )
>> ++#find_package(Eigen2 2.0.3)
>> + macro_log_feature(EIGEN2_FOUND "Eigen2" "Required to build KStars." "
>> http://eigen.tuxfamily.org
>> " TRUE "2.0.3" “")
> 
> 
> This will fail if the MacPorts prefix is not /opt/local. You should arrange to use the ${prefix} variable instead.
> 
>