Changeset 80802

Timestamp:

07/17/11 11:59:23 (4 years ago)

Author:

jwa@…

Message:

version bump to 2.9.2, changing monolithic to build non-monolithic by default, fix livecheck

Location:

trunk/dports/graphics/wxWidgets-devel

Files:

• Portfile (modified) (5 diffs)
• files/patch-configure-change_install_names.diff (modified) (4 diffs)

trunk/dports/graphics/wxWidgets-devel/Portfile

@@ -6 +6 @@
 name                    wxWidgets-devel
 conflicts               wxgtk wxWidgets
-version                 2.9.1
-revision        2
+version                 2.9.2
+
 categories              graphics devel
 platforms               darwin
@@ -28 +28 @@
 distfiles               ${distname}-${version}${extract.suffix}
 dist_subdir             ${distname}/${version}
-checksums           md5     81c20d7b2ba31becb18e467dbe09be8f \
-                    sha1    3ffe0614acce46448f5c14942176fb2daa6efd00 \
-                    rmd160  106f5b0238e31e12bbede7f1c2cf0e0134076e29
+
+checksums           md5     d6cec5bd331ba90b74c1e2fcb0563620 \
+                    sha1    1487a8ed4f48cc1bd0c4d37de9385c8edd1a024b \
+                    rmd160  f6d85672f02d8888bd779f5bcde5e902f0f6339b
                     
 depends_lib             port:jpeg \
@@ -66 +67 @@
                             --with-cocoa \
                             --enable-unicode \
-                            --enable-display \
-                            --enable-monolithic
+                            --enable-display
 
 build.target
@@ -83 +83 @@
 }
 
-variant nonmonolithic description {build libraries separately} {
-    configure.args-delete       --enable-monolithic
+variant monolithic description {build only one library} {
+    configure.args-append       --enable-monolithic
 }
 
@@ -93 +93 @@
 livecheck.type          regex
 livecheck.url           ${homepage}/downloads/
-livecheck.regex         Current Stable Release.*(2\\.\[0-9\]\\.\[0-9\]+)
+livecheck.regex         Latest Development Release.*(2\\.\[0-9\]\\.\[0-9\]+)

trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff

@@ -1 +1 @@
 --- configure.orig      2011-01-13 02:34:25.000000000 -0800
 +++ configure   2011-01-13 02:33:45.000000000 -0800
-@@ -34968,16 +34968,18 @@
+@@ -35366,16 +35366,18 @@
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
--libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+-libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
 -for i in \${libnames} ; do
--    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+-    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
 -    for dep in \${libnames} ; do
--        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+-        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
 -    done
 +libnames=\`find -E \$4  -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
@@ -22 +22 @@
  EOF
              chmod +x change-install-names
--            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
+-            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
 +            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
          fi
@@ -29 +29 @@
 --- configure.in.orig   2011-01-13 02:34:15.000000000 -0800
 +++ configure.in        2011-01-13 02:32:44.000000000 -0800
-@@ -3989,16 +3989,18 @@
+@@ -4004,16 +4004,18 @@
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
--libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
+-libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
 -for i in \${libnames} ; do
--    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+-    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
 -    for dep in \${libnames} ; do
--        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+-        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
 -    done
 +libnames=\`find \$4  -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
@@ -50 +50 @@
  EOF
              chmod +x change-install-names
--            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
+-            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
 +            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
          fi