[95281] trunk/dports/graphics/wxWidgets-devel

[jwa at macports.org]

Revision: 95281
          https://trac.macports.org/changeset/95281
Author:   jwa at macports.org
Date:     2012-07-08 06:48:54 -0700 (Sun, 08 Jul 2012)
Log Message:
-----------
as this is a -devel port, version bump to rc1 of 2.9.4, the proper release coming in the near future, modernise checksums, modify the patch file to enable universal build

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-devel/Portfile
    trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff

Modified: trunk/dports/graphics/wxWidgets-devel/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/Portfile	2012-07-08 12:05:15 UTC (rev 95280)
+++ trunk/dports/graphics/wxWidgets-devel/Portfile	2012-07-08 13:48:54 UTC (rev 95281)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -5,7 +6,7 @@
 
 name            wxWidgets-devel
 conflicts       wxgtk wxWidgets
-version         2.9.3
+version         2.9.4
 
 license         wxwidgets-3.1
 categories      graphics devel
@@ -21,17 +22,16 @@
 
 homepage        http://www.wxwidgets.org/
 distname        wxWidgets
-master_sites    sourceforge:project/wxwindows/${version} \
-                http://biolpc22.york.ac.uk/pub/${version}/
+master_sites    sourceforge:project/wxwindows/${version}-rc1 \
+                http://biolpc22.york.ac.uk/pub/${version}-rc1/
 
 use_bzip2       yes
 
 distfiles       ${distname}-${version}${extract.suffix}
 dist_subdir     ${distname}/${version}
 
-checksums           md5     6b6003713289ea4d3cd9b49c5db5b721 \
-                    sha1    e0a3463f419053ab1fd800eaed7319289746772a \
-                    rmd160  aac2761f5ea855320dcedd5ddd987029b2f65da9
+checksums           rmd160  b4770c9288a48db49a070f942d7be2c4f40d12e1 \
+                    sha256  d2b733b4ffcea6c2e8eb0046619f90404388615fb99591fa9e49797a7747b689
                     
 depends_lib     port:jpeg \
                 port:tiff \
@@ -75,7 +75,8 @@
                 --without-sdl \
                 --disable-sdltest \
                 --enable-unicode \
-                --enable-display
+                --enable-display \
+    --enable-xrc
 
 build.target
 

Modified: trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff	2012-07-08 12:05:15 UTC (rev 95280)
+++ trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff	2012-07-08 13:48:54 UTC (rev 95281)
@@ -1,19 +1,28 @@
-diff -x .svn -ru orig/configure patch/configure
 --- configure	2011-10-19 17:36:57.000000000 +0200
 +++ configure	2011-10-19 18:01:41.000000000 +0200
-@@ -18888,9 +18888,9 @@
- echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;}
-             fi
+@@ -19176,10 +19176,10 @@
+     fi
+ 
+     if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
+-        OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
++        OSX_ARCH_OPTS="@@MP_ARCH_FLAGS@@"
+     else         OSX_ARCH_OPTS="ppc,i386"
+         if test "$wxUSE_OSX_COCOA" = 1; then
+-            OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
++            OSX_ARCH_OPTS="@@MP_ARCH_FLAGS@@"
          fi
--                OSX_ARCH_OPTS="-arch ppc -arch i386"
-+                OSX_ARCH_OPTS="@@MP_ARCH_FLAGS@@"
- 	if test "$wxUSE_OSX_COCOA" = 1; then
--            OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64"
-+            OSX_ARCH_OPTS="$OSX_ARCH_OPTS"
-         fi
-         { echo "$as_me:$LINENO: checking for universal binary architectures" >&5
- echo $ECHO_N "checking for universal binary architectures... $ECHO_C" >&6; }
-@@ -35366,16 +35366,18 @@
+     fi
+ 
+@@ -19204,8 +19204,6 @@
+         disable_macosx_deps=yes
+     fi
+ 
+-    OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
+-
+     CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
+     CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
+     OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
+@@ -29071,16 +29069,18 @@
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
@@ -22,12 +31,11 @@
 -    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
 -    for dep in \${libnames} ; do
 -        ${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 '{}' \;\`
 +changes=''
 +for dep in \$libnames; do
 +    changes="\$changes -change \$4/\$dep \$3/\$dep"
-+done
+     done
 +for i in \$libnames; do
 +    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
  done
@@ -39,10 +47,9 @@
          fi
  
                                          HEADER_PAD_OPTION="-headerpad_max_install_names"
-diff -x .svn -ru orig/configure.in patch/configure.in
 --- configure.in	2011-10-19 17:36:57.000000000 +0200
 +++ configure.in	2011-10-19 17:38:38.000000000 +0200
-@@ -4004,16 +4004,18 @@
+@@ -3847,16 +3847,18 @@
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120708/3594440b/attachment.html>