Changeset 79390

Timestamp:

06/12/11 10:00:33 (4 years ago)

Author:

and.damore@…

Message:

wxwidgets-devel files patched repeateadly in r79389, fixed

File:

• trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff (modified) (1 diff)

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

@@ -55 +55 @@
  
          dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
---- configure.orig      2011-01-13 02:34:25.000000000 -0800
-+++ configure   2011-01-13 02:33:45.000000000 -0800
-@@ -34968,16 +34968,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\$'\`
--for i in \${libnames} ; do
--    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
--    for dep in \${libnames} ; do
--        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${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
-+for i in \$libnames; do
-+    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
-+done
-+${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
- 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} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
-         fi
- 
-                                         HEADER_PAD_OPTION="-headerpad_max_install_names"
---- 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 @@
-             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\$'\`
--for i in \${libnames} ; do
--    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
--    for dep in \${libnames} ; do
--        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
--    done
-+libnames=\`find \$4  -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
-+changes=''
-+for dep in \$libnames; do
-+    changes="\$changes -change \$4/\$dep \$3/\$dep"
- done
-+for i in \$libnames; do
-+    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
-+done
-+${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
- 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} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
-         fi
- 
-         dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
---- configure.orig      2011-01-13 02:34:25.000000000 -0800
-+++ configure   2011-01-13 02:33:45.000000000 -0800
-@@ -34968,16 +34968,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\$'\`
--for i in \${libnames} ; do
--    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
--    for dep in \${libnames} ; do
--        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${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
-+for i in \$libnames; do
-+    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
-+done
-+${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
- 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} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
-         fi
- 
-                                         HEADER_PAD_OPTION="-headerpad_max_install_names"
---- 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 @@
-             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\$'\`
--for i in \${libnames} ; do
--    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
--    for dep in \${libnames} ; do
--        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
--    done
-+libnames=\`find \$4  -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
-+changes=''
-+for dep in \$libnames; do
-+    changes="\$changes -change \$4/\$dep \$3/\$dep"
- done
-+for i in \$libnames; do
-+    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
-+done
-+${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
- 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} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
-         fi
- 
-         dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error: