[114134] trunk/dports/science/plplot/Portfile
takeshi at macports.org
takeshi at macports.org
Fri Nov 29 22:35:18 PST 2013
Revision: 114134
https://trac.macports.org/changeset/114134
Author: takeshi at macports.org
Date: 2013-11-29 22:35:18 -0800 (Fri, 29 Nov 2013)
Log Message:
-----------
plplot: exclude tk with -x11 not to link x11 libraries, closing #37035
Modified Paths:
--------------
trunk/dports/science/plplot/Portfile
Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile 2013-11-30 03:48:44 UTC (rev 114133)
+++ trunk/dports/science/plplot/Portfile 2013-11-30 06:35:18 UTC (rev 114134)
@@ -35,10 +35,8 @@
port:libiconv \
port:libLASi \
port:libpng \
- path:lib/pkgconfig/pango.pc:pango \
port:swig-tcl \
port:tcl \
- port:tk \
port:zlib
post-patch {
@@ -76,8 +74,6 @@
-DCMAKE_LIBRARY_PATH=${prefix}/lib \
-DTCL_INCLUDE_PATH=${prefix}/include \
-DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
- -DTK_INCLUDE_PATH=${prefix}/include \
- -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
-DFREETYPE_INCLUDE_DIR=${prefix}/include/freetype2 \
-DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
-DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
@@ -92,7 +88,7 @@
-DPLD_pdfcairo=ON \
-DPLD_pngcairo=ON \
-DPLD_svgcairo=ON \
- -DPLD_tk=ON \
+ -DPLD_tk=OFF \
-DPLD_wxwidgets=OFF \
-DPLD_wxpng=OFF \
-DPLD_xcairo=OFF \
@@ -126,7 +122,7 @@
-DENABLE_python=OFF \
-DENABLE_qt=OFF \
-DENABLE_tcl=ON \
- -DENABLE_tk=ON \
+ -DENABLE_tk=OFF \
-DENABLE_wxwidgets=OFF \
-DBUILD_TEST=OFF \
-DHAVE_AGG=OFF \
@@ -191,56 +187,65 @@
# * CMAKE_Fortran_COMPILER is used later in build.
# * To avoid -arch ${build_arch} to be passed configure.ld_archflags is unset.
-if {[variant_isset gcc43] || [variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48]} {
- configure.ld_archflags ""
- configure.args-delete -DENABLE_f77=OFF \
- -DENABLE_f95=OFF
- configure.args-append -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
- -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
-} elseif {[variant_isset g95]} {
- configure.ld_archflags ""
- configure.args-delete -DENABLE_f77=OFF \
- -DENABLE_f95=OFF
- configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\" \
- -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
+set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set g95_conflicts {}
+
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+
+ set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
+
+ foreach over ${gcc_versions} {
+ if {${ver} == ${over}} {
+ continue
+ }
+
+ set over_no_dot [join [split ${over} "."] ""]
+ append variant_line " conflicts gcc${over_no_dot}"
+ }
+ append variant_line { {}}
+
+ eval $variant_line
+
+ append g95_conflicts " conflicts gcc${ver_no_dot}"
}
-variant gcc43 conflicts g95 gcc44 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.3} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc43
- configure.fc ${prefix}/bin/gfortran-mp-4.3
+
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
+
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+
+ if {[variant_isset gcc${ver_no_dot}]} {
+ depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+ depends_build-append port:gcc${ver_no_dot}
+
+ configure.fc ${prefix}/bin/gfortran-mp-${ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+ configure.ld_archflags ""
+ configure.args-delete -DENABLE_f77=OFF \
+ -DENABLE_f95=OFF
+ configure.args-append -DCMAKE_Fortran_COMPILER=\"${configure.fc}\" \
+ -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
+ }
}
-variant gcc44 conflicts g95 gcc43 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.4} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc44
- configure.fc ${prefix}/bin/gfortran-mp-4.4
-}
-variant gcc45 conflicts g95 gcc43 gcc44 gcc46 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.5} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc45
- configure.fc ${prefix}/bin/gfortran-mp-4.5
-}
-variant gcc46 conflicts g95 gcc43 gcc44 gcc45 gcc47 gcc48 universal description {Add support for fortran using gfortran-mp-4.6} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc46
- configure.fc ${prefix}/bin/gfortran-mp-4.6
-}
-variant gcc47 conflicts g95 gcc43 gcc44 gcc45 gcc46 gcc48 universal description {Add support for fortran using gfortran-mp-4.7} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc47
- configure.fc ${prefix}/bin/gfortran-mp-4.7
-}
-variant gcc48 conflicts g95 gcc43 gcc44 gcc45 gcc46 gcc47 universal description {Add support for fortran using gfortran-mp-4.8} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc48
- configure.fc ${prefix}/bin/gfortran-mp-4.8
-}
-variant g95 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 universal description {Add support for fortran using g95} {
- depends_lib-append port:g95
- configure.fc ${prefix}/bin/g95
+
+if {[variant_isset g95]} {
+ depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+ depends_build-append port:g95
+
+ configure.fc ${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
+ configure.f90 ${prefix}/bin/g95
# Ad hoc fix to enable build of f95 binding by disabling some features
if {${os.major}<10} {
patchfiles-append patch-sfstubsf95.f90.diff
}
+ configure.ld_archflags ""
+ configure.args-delete -DENABLE_f77=OFF \
+ -DENABLE_f95=OFF
+ configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET=\"\" \
+ -DCMAKE_Fortran_FLAGS=\"${configure.fflags} -fno-second-underscore\"
}
variant octave description {Add support for Octave} {
@@ -358,12 +363,19 @@
variant x11 {
+ depends_lib-append path:lib/pkgconfig/pango.pc:pango \
+ port:tk
configure.args-append -DPLD_xcairo=ON \
-DPLD_xwin=ON \
- -DPLD_xfig=ON
+ -DPLD_xfig=ON \
+ -DPLD_tk=ON \
+ -DENABLE_tk=ON \
+ -DTK_INCLUDE_PATH=${prefix}/include \
+ -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
configure.args-delete -DPLD_xcairo=OFF \
-DPLD_xwin=OFF \
- -DPLD_xfig=OFF
+ -DPLD_xfig=OFF \
+ -DENABLE_tk=OFF
}
livecheck.type regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131129/d70300f7/attachment-0001.html>
More information about the macports-changes
mailing list