Revision

140034

Author

takeshi@macports.org

Date

2015-09-07 07:43:21 -0700 (Mon, 07 Sep 2015)

Log Message

plplot510, gnudatalanguage: change install base of plplot510 to avoid conflict with plplot

Modified Paths

• trunk/dports/math/gnudatalanguage/Portfile
• trunk/dports/science/plplot510/Portfile

Diff

--- trunk/dports/math/gnudatalanguage/Portfile	2015-09-07 14:42:19 UTC (rev 140033)
+++ trunk/dports/math/gnudatalanguage/Portfile	2015-09-07 14:43:21 UTC (rev 140034)
@@ -8,7 +8,7 @@
 
 name                        gnudatalanguage
 version                     0.9.5
-revision                    7
+revision                    8
 epoch                       1
 
 compilers.choose            cc cxx
@@ -95,7 +95,7 @@
                         -DNETCDF=ON \
                         -DNETCDFDIR=${prefix} \
                         -DOPENMP=OFF \
-                        -DPLPLOTDIR=${prefix} \
+                        -DPLPLOTDIR=${prefix}/lib/plplot510 \
                         -DPSLIB=ON \
                         -DPSLIBDIR=${prefix} \
                         -DPYTHON=OFF \

--- trunk/dports/science/plplot510/Portfile	2015-09-07 14:42:19 UTC (rev 140033)
+++ trunk/dports/science/plplot510/Portfile	2015-09-07 14:43:21 UTC (rev 140034)
@@ -68,7 +68,7 @@
 configure.dir           ${workpath}/build
 configure.cmd           cmake
 configure.env           HOME=${workpath}
-configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}
+configure.pre_args      -DCMAKE_INSTALL_PREFIX=${prefix}/lib/${name}
 configure.args          -DCMAKE_VERBOSE_MAKEFILE=ON \
                         -DCMAKE_C_COMPILER=${configure.cc} \
                         -DCMAKE_C_FLAGS=\"${cflags}\" \