Changeset 79389

Timestamp:

06/12/11 06:15:01 (4 years ago)

Author:

pixilla@…

Message:

graphics/wxWidgets-devel: Fix incorrect install name. Closes #26410 #27744

Location:

trunk/dports/graphics/wxWidgets-devel

Files:

• Portfile (modified) (3 diffs)
• files/patch-configure-change_install_names.diff (added)
• files/patch-textctrl.diff (deleted)

trunk/dports/graphics/wxWidgets-devel/Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
+PortGroup               archcheck 1.0
 
 name                    wxWidgets-devel
+conflicts               wxgtk wxWidgets
 version                 2.9.1
-revision                1
+revision        2
 categories              graphics devel
 platforms               darwin
@@ -19 +21 @@
 homepage                http://www.wxwidgets.org/
 distname                wxWidgets
-master_sites            http://biolpc22.york.ac.uk/pub/CVS_HEAD/v2/files/ \
-    http://biolpc22.york.ac.uk/pub/${version}/ \
-    ftp://ftp.wxwidgets.org/pub/${version}
+master_sites    sourceforge:wxwindows \
+                            http://biolpc22.york.ac.uk/pub/${version}/
+
 use_bzip2               yes
 
 distfiles               ${distname}-${version}${extract.suffix}
 dist_subdir             ${distname}/${version}
+checksums           md5     81c20d7b2ba31becb18e467dbe09be8f \
+                    sha1    3ffe0614acce46448f5c14942176fb2daa6efd00 \
+                    rmd160  106f5b0238e31e12bbede7f1c2cf0e0134076e29
+                    
+depends_lib             port:jpeg \
+                            port:tiff \
+                            port:libpng \
+                            port:zlib \
+                            port:libiconv \
+                            port:expat \
+                            path:lib/pkgconfig/sdl.pc:libsdl \
+                            port:libsdl_mixer
 
-checksums               ${distname}-${version}${extract.suffix} \
-    md5     81c20d7b2ba31becb18e467dbe09be8f \
-    ${distname}-${version}${extract.suffix} \
-    sha1    3ffe0614acce46448f5c14942176fb2daa6efd00 \
-    ${distname}-${version}${extract.suffix} \
-    rmd160  106f5b0238e31e12bbede7f1c2cf0e0134076e29
 
-depends_lib             port:jpeg \
-    port:tiff \
-    port:libpng \
-    port:zlib \
-    port:libiconv \
-    port:expat \
-    path:lib/pkgconfig/sdl.pc:libsdl \
-    port:libsdl_mixer
+archcheck.files lib/libjpeg.dylib \
+                lib/libtiff.dylib \
+                lib/libpng.dylib \
+                lib/libz.dylib \
+                lib/libiconv.dylib \
+                lib/libexpat.dylib
 
-#set worksrcdir build
-set worksrcdir          ${distname}-${version}/build
+set worksrcdir  ${distname}-${version}/build
 
-extract.only            ${distname}-${version}${extract.suffix}
+extract.only    ${distname}-${version}${extract.suffix}
 
-set sub                 wx-devel
-configure.cmd           ../configure
+patch.dir       ${worksrcpath}/..
+patchfiles      patch-configure-change_install_names.diff
+configure.cmd   ../configure
 configure.ldflags       -L${build.dir}/lib -L${prefix}/lib
-configure.args          --mandir=${prefix}/share/man \
-    --libdir=${prefix}/lib/${sub} \
-    --bindir=${prefix}/lib/${sub}/bin \
-    --includedir=${prefix}/include/${sub} \
-    --datadir=${prefix}/share/${sub} \
-    --with-libiconv-prefix=${prefix} \
-    --with-libjpeg \
-    --with-libtiff \
-    --with-libpng \
-    --with-zlib \
-    --with-sdl \
-    --with-opengl \
-    --with-mac \
-    --disable-sdltest \
-    --enable-unicode \
-    --enable-display \
-    --enable-monolithic \
-    --with-macosx-version-min=${macosx_deployment_target}
-if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
-    # default carbon won't work on 64-bit
-    configure.args-delete --with-mac
-    configure.args-append --with-osx_cocoa
-#    patchfiles-append     patch-textctrl.diff
-}
-
-set installtype         release
-#set contrib            "gizmos stc ogl"
+configure.args  --mandir=${prefix}/share/man \
+                            --with-libiconv-prefix=${prefix} \
+                            --with-libjpeg \
+                            --with-libtiff \
+                            --with-libpng \
+                            --with-zlib \
+                            --with-opengl \
+                            --with-cocoa \
+                            --enable-unicode \
+                            --enable-display \
+                            --enable-monolithic
 
 build.target
 
-#post-build {
-#    foreach c { ${contrib} } {
-#       system "cd ${build.dir} && make -C contrib/src/${c}"
-#    }
-#}
+universal_variant       no
+use_parallel_build      yes
+
+supported_archs x86_64 ppc64 i386 ppc
+configure.ccache = no
+configure.cppflags-append -arch ${configure.build_arch}
 
 post-destroot {
-#    foreach c { ${contrib} } {
-#       system "cd ${destroot.dir} && make -C contrib/src/${c} install ${destroot.destdir}"
-#    }
-    xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
-#    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}
-#    if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
-#        reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_cocoa-unicode-${installtype}-2.9
-#    } else {
-#        reinplace "s|-L${build.dir}/lib||" ${destroot}${prefix}/lib/${sub}/wx/config/osx_carbon-unicode-${installtype}-2.9
-#    }
+    set confscript ${prefix}/lib/wx/config/osx_cocoa-unicode-2.9
+    ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
 }
 
@@ -111 +89 @@
 variant debug description {add debug info to libraries} {
     configure.args-append       --enable-debug
-    set installtype debug
 }
 
 livecheck.type          regex
-livecheck.url           http://biolpc22.york.ac.uk/pub/
-livecheck.regex         (2.\[0-9\]+.\[0-9a-z.-\]+)/
+livecheck.url           ${homepage}/downloads/
+livecheck.regex         Current Stable Release.*(2\\.\[0-9\]\\.\[0-9\]+)