[108770] users/mojca/wxports/graphics
mojca at macports.org
mojca at macports.org
Thu Aug 1 10:06:29 PDT 2013
Revision: 108770
https://trac.macports.org/changeset/108770
Author: mojca at macports.org
Date: 2013-08-01 10:06:29 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
mojca/wxwidgets: add wx-config scripts to libexec, remove sdl, remove conflicting files (might need extra work become functional)
Modified Paths:
--------------
users/mojca/wxports/graphics/wxWidgets28/Portfile
users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28
users/mojca/wxports/graphics/wxWidgets30/Portfile
users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30
Modified: users/mojca/wxports/graphics/wxWidgets28/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets28/Portfile 2013-08-01 09:44:34 UTC (rev 108769)
+++ users/mojca/wxports/graphics/wxWidgets28/Portfile 2013-08-01 17:06:29 UTC (rev 108770)
@@ -7,10 +7,11 @@
name wxWidgets28
# What is the wxWidgets-python conflict?
-conflicts wxgtk wxWidgets-python wxWidgets30
+conflicts wxgtk wxWidgets-python
epoch 3
version 2.8.12
revision 3
+set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics devel
license LGPL-2+
@@ -42,9 +43,7 @@
port:libpng \
port:zlib \
port:libiconv \
- port:expat \
- path:lib/pkgconfig/sdl.pc:libsdl \
- port:libsdl_mixer
+ port:expat
depends_run port:wxWidgets_select
@@ -56,9 +55,7 @@
lib/libpng.dylib \
lib/libz.dylib \
lib/libiconv.dylib \
- lib/libexpat.dylib \
- lib/libSDL.dylib \
- lib/libSDL_mixer.dylib
+ lib/libexpat.dylib
set worksrcdir ${distname}-${version}/build
@@ -74,12 +71,13 @@
configure.cmd ../configure
configure.ldflags -L${build.dir}/lib -L${prefix}/lib
configure.args --mandir=${prefix}/share/man \
+ --datadir=${prefix}/share/${distname}/${branch} \
--with-libiconv-prefix=${prefix} \
--with-libjpeg \
--with-libtiff \
--with-libpng \
--with-zlib \
- --with-sdl \
+ --without-sdl \
--with-opengl \
--with-mac \
--disable-sdltest \
@@ -132,17 +130,19 @@
system "cd ${build.dir} && make -C contrib/src/${c} install ${destroot.destdir}"
}
- xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
+ set destdocdir ${destroot}${prefix}/share/doc/${distname}/${branch}
+ set destlibexecdir ${destroot}${prefix}/libexec/${distname}/${branch}
+ xinstall -d -m 755 ${destdocdir}
+ xinstall -d -m 755 ${destlibexecdir}
xinstall -m 644 -W ${workpath}/${distname}-${version} \
install-mac.txt install-mgl.txt install-motif.txt \
INSTALL-OS2.txt install-x11.txt readme-cocoa.txt \
readme-gtk.txt readme-mac.txt \
readme-mgl.txt readme-motif.txt readme-x11.txt \
- ${destroot}${prefix}/share/doc/${name}
- # TODO: ${installtype is not yet supported in the port select, it uses 'release' only; this should be fixed}
+ ${destdocdir}
set confscript ${prefix}/lib/wx/config/mac-unicode-${installtype}-2.8
reinplace "s|-L${build.dir}/lib||" ${destroot}${confscript}
- #ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
+ ln -sf ${confscript} ${destlibexecdir}/wx-config
}
variant aui description {add support for AUI docking library} {
Modified: users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28
===================================================================
--- users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28 2013-08-01 09:44:34 UTC (rev 108769)
+++ users/mojca/wxports/graphics/wxWidgets28/files/wxWidgets28 2013-08-01 17:06:29 UTC (rev 108770)
@@ -1,2 +1,2 @@
-lib/wx/config/mac-unicode-release-2.8
+libexec/wxWidgets/2.8/wx-config
bin/wxrc-2.8
Modified: users/mojca/wxports/graphics/wxWidgets30/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets30/Portfile 2013-08-01 09:44:34 UTC (rev 108769)
+++ users/mojca/wxports/graphics/wxWidgets30/Portfile 2013-08-01 17:06:29 UTC (rev 108770)
@@ -5,9 +5,10 @@
PortGroup select 1.0
name wxWidgets30
-conflicts wxgtk wxWidgets28
+conflicts wxgtk
version 2.9.5
epoch 20130717
+set branch [join [lrange [split ${version} .] 0 1] .]
license wxwidgets-3.1
categories graphics devel
@@ -33,7 +34,7 @@
checksums rmd160 f5c91099b2cf3e39eadbcf99df0dd9a97017d47f \
sha256 b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02
-
+
depends_lib port:jpeg \
port:tiff \
port:libpng \
@@ -46,6 +47,7 @@
select.group wxWidgets
select.file ${filespath}/${name}
+# TODO: why 10.6 and not 10.5?
if {${os.major} < 10} {
pre-fetch {
ui_error "${name} requires Mac OS X 10.6 or later."
@@ -63,7 +65,10 @@
configure.cmd ../configure
configure.ldflags -L${build.dir}/lib -L${prefix}/lib
+# TODO: localedir doesn't seem to work
configure.args --mandir=${prefix}/share/man \
+ --datadir=${prefix}/share/${distname}/${branch} \
+ --localedir=${prefix}/share/locale \
--with-libiconv-prefix=${prefix} \
--with-libjpeg \
--with-libtiff \
@@ -94,10 +99,13 @@
# TODO: available via port select, but there might be a more elegant way to do this
delete ${destroot}${prefix}/bin/wxrc
delete ${destroot}${prefix}/bin/wx-config
+
+ set destlibexecdir ${destroot}${prefix}/libexec/${distname}/${branch}
+ xinstall -d -m 755 ${destlibexecdir}
+ set confscript ${prefix}/lib/wx/config/osx_cocoa-unicode-2.9
+ ln -sf ${confscript} ${destlibexecdir}/wx-config
}
-default_variants +sdl
-
variant monolithic description {build only one library} {
configure.args-append --enable-monolithic
}
@@ -106,20 +114,13 @@
configure.args-append --enable-debug
}
-variant sdl description {Use SDL for audio on Unix} {
- depends_lib-append path:lib/pkgconfig/sdl.pc:libsdl
- depends_lib-append port:libsdl_mixer
- configure.args-delete --without-sdl
- configure.args-append --with-sdl
-}
-
-variant stdlib description {add support for various standard library features} {
+variant stdlib description {add support for various standard library features} {
configure.args-append --enable-stl \
--enable-std_containers \
--enable-std_iostreams \
--enable-std_string \
--enable-std_string_conv_in_wxstring
-}
+}
variant aui description {add support for AUI docking library} {
configure.args-append --enable-aui
Modified: users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30
===================================================================
--- users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30 2013-08-01 09:44:34 UTC (rev 108769)
+++ users/mojca/wxports/graphics/wxWidgets30/files/wxWidgets30 2013-08-01 17:06:29 UTC (rev 108770)
@@ -1,2 +1,2 @@
-lib/wx/config/osx_cocoa-unicode-2.9
+libexec/wxWidgets/2.9/wx-config
bin/wxrc-2.9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130801/a731c0c1/attachment.html>
More information about the macports-changes
mailing list