Mercurial > mxe-octave

changeset 759:bf4bcb3370fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed coding style: make "-i" always the first argument of $(SED) (by Mark Brand)
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 16 Feb 2010 04:12:53 +0100
parents 1f5b2dfe8966
children 4dc8edb4c4dd
files src/atk.mk src/boost.mk src/bzip2.mk src/cairo.mk src/curl.mk src/devil.mk src/exiv2.mk src/fltk.mk src/fontconfig.mk src/freeglut.mk src/freetds.mk src/gcc.mk src/gd.mk src/geos.mk src/glib.mk src/gnutls.mk src/gtk.mk src/ilmbase.mk src/jpeg.mk src/lcms.mk src/libdnet.mk src/libgcrypt.mk src/libgeotiff.mk src/libgpg_error.mk src/libgsasl.mk src/libgsf.mk src/libiconv.mk src/libidn.mk src/libmad.mk src/libmikmod.mk src/libntlm.mk src/libpano13.mk src/librsvg.mk src/libsamplerate.mk src/libusb.mk src/libxml2.mk src/nsis.mk src/ogg.mk src/openexr.mk src/openssl.mk src/pango.mk src/pcre.mk src/pdcurses.mk src/pdflib_lite.mk src/postgresql.mk src/qt.mk src/readline.mk src/sdl.mk src/sdl_image.mk src/sdl_mixer.mk src/sdl_pango.mk src/smpeg.mk src/taglib.mk src/theora.mk src/vmime.mk src/w32api.mk src/winpcap.mk src/wxwidgets.mk
diffstat 58 files changed, 159 insertions(+), 159 deletions(-) [+]
line wrap: on
line diff
--- a/src/atk.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/atk.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,7 +21,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/atk/atkobject.c'
+    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/atk/atkobject.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/boost.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/boost.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -22,7 +22,7 @@
 define $(PKG)_BUILD
     echo 'using gcc : : $(TARGET)-g++ : ;' > '$(1)/user-config.jam'
     # make the build script generate .a library files instead of .lib
-    $(SED) 's,<target-os>windows : lib ;,<target-os>windows : a ;,' -i '$(1)/tools/build/v2/tools/types/lib.jam'
+    $(SED) -i 's,<target-os>windows : lib ;,<target-os>windows : a ;,' '$(1)/tools/build/v2/tools/types/lib.jam'
     # compile boost jam
     cd '$(1)/tools/jam/src' && ./build.sh
     cd '$(1)' && tools/jam/src/bin.*/bjam \
--- a/src/bzip2.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/bzip2.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,sys\\stat\.h,sys/stat.h,g' -i '$(1)/bzip2.c'
+    $(SED) -i 's,sys\\stat\.h,sys/stat.h,g' '$(1)/bzip2.c'
     $(MAKE) -C '$(1)' -j '$(JOBS)' libbz2.a \
         PREFIX='$(PREFIX)/$(TARGET)' \
         CC='$(TARGET)-gcc' \
--- a/src/cairo.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/cairo.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,8 +20,8 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,libpng12,libpng,g'                          -i '$(1)/configure'
-    $(SED) 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in'
+    $(SED) -i 's,libpng12,libpng,g'                          '$(1)/configure'
+    $(SED) -i 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' '$(1)/src/cairo.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/curl.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/curl.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,10 +19,10 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) '/^#endif/ i#define CURL_STATICLIB' -i '$(1)/include/curl/curlbuild.h.in'
-    $(SED) 's,GNUTLS_ENABLED = 1,GNUTLS_ENABLED=1,' -i '$(1)/configure'
+    $(SED) -i '/^#endif/ i#define CURL_STATICLIB' '$(1)/include/curl/curlbuild.h.in'
+    $(SED) -i 's,GNUTLS_ENABLED = 1,GNUTLS_ENABLED=1,' '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/devil.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/devil.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,9 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,__declspec(dllimport),,' -i '$(1)/include/IL/il.h'
+    $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/exiv2.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/exiv2.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,9 +21,9 @@
 
 define $(PKG)_BUILD
     # workaround for the missing snprintf() in the <cstdio> of GCC-4.4.0
-    $(SED) 's,#include <cstdio>,#include <stdio.h>,' -i '$(1)/xmpsdk/src/XMPMeta.cpp'
+    $(SED) -i 's,#include <cstdio>,#include <stdio.h>,' '$(1)/xmpsdk/src/XMPMeta.cpp'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/fltk.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/fltk.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,15 +19,15 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,\$$uname,MINGW,g' -i '$(1)/configure'
+    $(SED) -i 's,\$$uname,MINGW,g' '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads \
         LIBS='-lws2_32'
-    $(SED) 's,-fno-exceptions,,' -i '$(1)/makeinclude'
+    $(SED) -i 's,-fno-exceptions,,' '$(1)/makeinclude'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install DIRS=src LIBCOMMAND='$(TARGET)-ar cr'
 endef
--- a/src/fontconfig.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/fontconfig.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,10 +21,10 @@
 define $(PKG)_BUILD
     # ensure there is no (buggy) attempt to install the *.dll.a file
     # (remove this line of you want to link dynamically)
-    $(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/src/Makefile.in'
+    $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/src/Makefile.in'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
-    $(SED) 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' -i '$(1)/fontconfig.pc.in'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
+    $(SED) -i 's,^\(Libs:.*\),\1 @EXPAT_LIBS@ @FREETYPE_LIBS@,' '$(1)/fontconfig.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/freeglut.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/freeglut.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,10 +21,10 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,Windows\.h,windows.h,'   -i '$(1)/src/freeglut_internal.h'
-    $(SED) 's,WindowsX\.h,windowsx.h,' -i '$(1)/src/freeglut_internal.h'
-    $(SED) 's,MMSystem\.h,mmsystem.h,' -i '$(1)/src/freeglut_internal.h'
-    $(SED) 's,Windows\.h,windows.h,'   -i '$(1)/include/GL/freeglut_std.h'
+    $(SED) -i 's,Windows\.h,windows.h,'   '$(1)/src/freeglut_internal.h'
+    $(SED) -i 's,WindowsX\.h,windowsx.h,' '$(1)/src/freeglut_internal.h'
+    $(SED) -i 's,MMSystem\.h,mmsystem.h,' '$(1)/src/freeglut_internal.h'
+    $(SED) -i 's,Windows\.h,windows.h,'   '$(1)/include/GL/freeglut_std.h'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/freetds.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/freetds.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -22,10 +22,10 @@
 
 define $(PKG)_BUILD
     # package uses winsock2.h, so it should link to ws2_32 instead of wsock32
-    $(SED) 's,wsock32,ws2_32,g' -i '$(1)'/configure
+    $(SED) -i 's,wsock32,ws2_32,g' '$(1)'/configure
 
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
 
     # beware --with-gnutls broken detection
     cd '$(1)' && ./configure \
--- a/src/gcc.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/gcc.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -41,7 +41,7 @@
     # apply TDM-GCC patches
     cd '$(1)' && \
         for p in '$(1)'/gcc-tdm/*.patch; do \
-            $(SED) 's,\r$$,,' -i "$$p" || exit 1; \
+            $(SED) -i 's,\r$$,,' "$$p" || exit 1; \
             patch -p1 -u < "$$p" || exit 1; \
         done
     # unpack support libraries
@@ -60,8 +60,8 @@
     $(MAKE) -C '$(1)/build' -j 1 install
     # unpack and build pthreads (needed by libgomp)
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,gcc-pthreads)
-    $(SED) '35i\#define PTW32_STATIC_LIB' -i '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h'
-    $(SED) 's,#include "config.h",,'      -i '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h'
+    $(SED) -i '35i\#define PTW32_STATIC_LIB' '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h'
+    $(SED) -i 's,#include "config.h",,'      '$(1)/$(gcc-pthreads_SUBDIR)/pthread.h'
     $(MAKE) -C '$(1)/$(gcc-pthreads_SUBDIR)' -j 1 GC-static CROSS='$(TARGET)-'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
     $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a'
@@ -70,7 +70,7 @@
     $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/sched.h'     '$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -m664 '$(1)/$(gcc-pthreads_SUBDIR)/semaphore.h' '$(PREFIX)/$(TARGET)/include/'
     # build libgomp
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/libgomp/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/libgomp/configure'
     mkdir '$(1)/build/$(TARGET)/libgomp'
     cd    '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \
         $(gcc_CONFIGURE_OPTIONS) \
--- a/src/gd.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/gd.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -23,8 +23,8 @@
     touch '$(1)/aclocal.m4'
     touch '$(1)/config.hin'
     touch '$(1)/Makefile.in'
-    $(SED) 's,-I@includedir@,-I@includedir@ -DNONDLL,' -i '$(1)/config/gdlib-config.in'
-    $(SED) 's,-lX11 ,,g' -i '$(1)/configure'
+    $(SED) -i 's,-I@includedir@,-I@includedir@ -DNONDLL,' '$(1)/config/gdlib-config.in'
+    $(SED) -i 's,-lX11 ,,g' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/geos.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/geos.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,11 +20,11 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,-lgeos,-lgeos -lstdc++,' -i '$(1)/tools/geos-config.in'
-    $(SED) 's,-L\$${libdir}$$,-L$${libdir} -lgeos -lstdc++,' -i '$(1)/tools/geos-config.in'
-    $(SED) 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' -i '$(1)/configure.in'
+    $(SED) -i 's,-lgeos,-lgeos -lstdc++,' '$(1)/tools/geos-config.in'
+    $(SED) -i 's,-L\$${libdir}$$,-L$${libdir} -lgeos -lstdc++,' '$(1)/tools/geos-config.in'
+    $(SED) -i 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' '$(1)/configure.in'
     touch '$(1)/aclocal.m4'
-    $(SED) 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' -i '$(1)/configure'
+    $(SED) -i 's,\$$WARNFLAGS -ansi,\$$WARNFLAGS,' '$(1)/configure'
     touch '$(1)/Makefile.in'
     touch '$(1)/source/headers/config.h.in'
     touch '$(1)/source/headers/geos/platform.h.in'
--- a/src/glib.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/glib.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -32,9 +32,9 @@
     $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)'
 
     # native build for glib-genmarshal, without pkg-config, gettext and zlib
-    $(SED) 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,'     -i '$(1).native/configure'
-    $(SED) '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' -i '$(1).native/configure'
-    $(SED) 's,found_zlib=no,found_zlib=yes,'                     -i '$(1).native/configure'
+    $(SED) -i 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,'     '$(1).native/configure'
+    $(SED) -i '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' '$(1).native/configure'
+    $(SED) -i 's,found_zlib=no,found_zlib=yes,'                     '$(1).native/configure'
     cd '$(1).native' && ./configure \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
@@ -46,7 +46,7 @@
         --with-libiconv=gnu \
         CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \
         LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs'
-    $(SED) 's,#define G_ATOMIC.*,,' -i '$(1).native/config.h'
+    $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h'
     $(MAKE) -C '$(1).native/glib'    -j '$(JOBS)'
     $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)'
     $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
@@ -55,9 +55,9 @@
     cd '$(1)' && aclocal
     cd '$(1)' && $(LIBTOOLIZE) --force
     cd '$(1)' && autoconf
-    $(SED) 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in'
+    $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/gnutls.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/gnutls.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -22,7 +22,7 @@
 
 define $(PKG)_BUILD
     echo '/* DEACTIVATED */' > '$(1)/gl/gai_strerror.c'
-    $(SED) 's, sed , $(SED) ,g' -i '$(1)/gl/tests/Makefile.in'
+    $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/gtk.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/gtk.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,21 +21,21 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk/win32/gdkmain-win32.c'
-    $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gdk-pixbuf/gdk-pixbuf-io.c'
-    $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/gtk/gtkmain.c'
-    $(SED) 's,__declspec(dllimport),,' -i '$(1)/gdk/gdktypes.h'
-    $(SED) 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' -i '$(1)/gtk+-2.0.pc.in'
-    $(SED) 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' -i '$(1)/gtk/Makefile.in'
-    $(SED) 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' -i '$(1)/modules/other/gail/libgail-util/Makefile.in'
-    $(SED) 's,\(BUILT_SOURCES.*=.*\)test-inline-pixbufs.h,\1,' -i '$(1)/demos/Makefile.in'
-    $(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
-    $(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
-    $(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
-    $(SED) 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' -i '$(1)/configure'
-    $(SED) 's/-Wl,-luuid/-luuid/' -i '$(1)/configure'
+    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/gdk/win32/gdkmain-win32.c'
+    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/gdk-pixbuf/gdk-pixbuf-io.c'
+    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/gtk/gtkmain.c'
+    $(SED) -i 's,__declspec(dllimport),,' '$(1)/gdk/gdktypes.h'
+    $(SED) -i 's,^\(Libs:.*\)@GTK_EXTRA_LIBS@,\1@GTK_DEP_LIBS@,' '$(1)/gtk+-2.0.pc.in'
+    $(SED) -i 's,^\(gtkbuiltincache\.h:\),_disabled_\1,' '$(1)/gtk/Makefile.in'
+    $(SED) -i 's,^\(install-data-local:.*\) install-libtool-import-lib,\1,' '$(1)/modules/other/gail/libgail-util/Makefile.in'
+    $(SED) -i 's,\(BUILT_SOURCES.*=.*\)test-inline-pixbufs.h,\1,' '$(1)/demos/Makefile.in'
+    $(SED) -i 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' '$(1)/configure'
+    $(SED) -i 's,enable_static=no,enable_static=yes,' '$(1)/configure'
+    $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure'
+    $(SED) -i 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' '$(1)/configure'
+    $(SED) -i 's/-Wl,-luuid/-luuid/' '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/ilmbase.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/ilmbase.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,11 +21,11 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     # build the win32 thread sources instead of the posix thread sources
-    $(SED) 's,IlmThreadPosix\.,IlmThreadWin32\.,'                   -i '$(1)/IlmThread/Makefile.in'
-    $(SED) 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32\.,' -i '$(1)/IlmThread/Makefile.in'
-    $(SED) 's,IlmThreadMutexPosix\.,IlmThreadMutexWin32\.,'         -i '$(1)/IlmThread/Makefile.in'
+    $(SED) -i 's,IlmThreadPosix\.,IlmThreadWin32\.,'                   '$(1)/IlmThread/Makefile.in'
+    $(SED) -i 's,IlmThreadSemaphorePosix\.,IlmThreadSemaphoreWin32\.,' '$(1)/IlmThread/Makefile.in'
+    $(SED) -i 's,IlmThreadMutexPosix\.,IlmThreadMutexWin32\.,'         '$(1)/IlmThread/Makefile.in'
     echo '/* disabled */' > '$(1)/IlmThread/IlmThreadSemaphorePosixCompat.cpp'
     # Because of the previous changes, '--disable-threading' will not disable
     # threading. It will just disable the unwanted check for pthread.
--- a/src/jpeg.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/jpeg.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 
 define $(PKG)_BUILD
     # avoid redefinition of INT32
-    $(SED) 's,typedef long INT32;,#include <basetsd.h>,' -i '$(1)/jmorecfg.h'
+    $(SED) -i 's,typedef long INT32;,#include <basetsd.h>,' '$(1)/jmorecfg.h'
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
--- a/src/lcms.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/lcms.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,7 +21,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
--- a/src/libdnet.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libdnet.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,15 +19,15 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,CYGWIN=no,CYGWIN=yes,g'                     -i '$(1)/configure'
-    $(SED) 's,cat /proc/sys/kernel/ostype,,g'             -i '$(1)/configure'
-    $(SED) 's,test -d /usr/include/mingw,true,'           -i '$(1)/configure'
-    $(SED) 's,Iphlpapi,iphlpapi,g'                        -i '$(1)/configure'
-    $(SED) 's,packet32\.h,Packet32.h,g'                   -i '$(1)/configure'
-    $(SED) 's,packet\.lib,libpacket.a,'                   -i '$(1)/configure'
-    $(SED) 's,-lpacket,-lpacket -lws2_32,g'               -i '$(1)/configure'
-    $(SED) 's,/usr/include,$(PREFIX)/$(TARGET)/include,g' -i '$(1)/configure'
-    $(SED) 's,#include <Ntddndis.h>,#include <ddk/ntddndis.h>,' -i '$(1)/src/eth-win32.c'
+    $(SED) -i 's,CYGWIN=no,CYGWIN=yes,g'                     '$(1)/configure'
+    $(SED) -i 's,cat /proc/sys/kernel/ostype,,g'             '$(1)/configure'
+    $(SED) -i 's,test -d /usr/include/mingw,true,'           '$(1)/configure'
+    $(SED) -i 's,Iphlpapi,iphlpapi,g'                        '$(1)/configure'
+    $(SED) -i 's,packet32\.h,Packet32.h,g'                   '$(1)/configure'
+    $(SED) -i 's,packet\.lib,libpacket.a,'                   '$(1)/configure'
+    $(SED) -i 's,-lpacket,-lpacket -lws2_32,g'               '$(1)/configure'
+    $(SED) -i 's,/usr/include,$(PREFIX)/$(TARGET)/include,g' '$(1)/configure'
+    $(SED) -i 's,#include <Ntddndis.h>,#include <ddk/ntddndis.h>,' '$(1)/src/eth-win32.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libgcrypt.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libgcrypt.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libgeotiff.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libgeotiff.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,/usr/local,@prefix@,' -i '$(1)/bin/Makefile.in'
+    $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in'
     touch '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
--- a/src/libgpg_error.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libgpg_error.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libgsasl.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libgsasl.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,7 +21,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && touch src/libgsasl-7.def && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libgsf.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libgsf.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,^\(Requires:.*\),\1 gio-2.0,' -i '$(1)'/libgsf-1.pc.in
+    $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in
     echo 'Libs.private: -lz -lbz2'          >> '$(1)'/libgsf-1.pc.in
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
--- a/src/libiconv.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libiconv.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's, sed , $(SED) ,g' -i '$(1)/windows/windres-options'
+    $(SED) -i 's, sed , $(SED) ,g' '$(1)/windows/windres-options'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
--- a/src/libidn.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libidn.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,7 +21,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libmad.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libmad.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,7 +19,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) '/-fforce-mem/d' -i '$(1)'/configure
+    $(SED) -i '/-fforce-mem/d' '$(1)'/configure
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libmikmod.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libmikmod.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,8 +19,8 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,-Dunix,,' -i '$(1)/libmikmod/Makefile.in'
-    $(SED) 's,`uname`,MinGW,g' -i '$(1)/configure'
+    $(SED) -i 's,-Dunix,,' '$(1)/libmikmod/Makefile.in'
+    $(SED) -i 's,`uname`,MinGW,g' '$(1)/configure'
     cd '$(1)' && \
         CC='$(TARGET)-gcc' \
         NM='$(TARGET)-nm' \
--- a/src/libntlm.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libntlm.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -21,7 +21,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libpano13.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libpano13.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,10 +20,10 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,WINDOWSX\.H,windowsx.h,'                                                  -i '$(1)/sys_win.h'
-    $(SED) 's,\$${WINDRES-windres},$(TARGET)-windres,'                                  -i '$(1)/build/win32/compile-resource'
-    $(SED) 's,m4 -DBUILDNUMBER=\$$buildnumber,$(SED) "s/BUILDNUMBER/\$$buildnumber/g",' -i '$(1)/build/win32/compile-resource'
-    $(SED) 's,mv.*libpano13\.dll.*,,'                                                   -i '$(1)/Makefile.in'
+    $(SED) -i 's,WINDOWSX\.H,windowsx.h,'                                                  '$(1)/sys_win.h'
+    $(SED) -i 's,\$${WINDRES-windres},$(TARGET)-windres,'                                  '$(1)/build/win32/compile-resource'
+    $(SED) -i 's,m4 -DBUILDNUMBER=\$$buildnumber,$(SED) "s/BUILDNUMBER/\$$buildnumber/g",' '$(1)/build/win32/compile-resource'
+    $(SED) -i 's,mv.*libpano13\.dll.*,,'                                                   '$(1)/Makefile.in'
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
--- a/src/librsvg.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/librsvg.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,8 +20,8 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' -i '$(1)'/Makefile.in
-    $(SED) 's,^\(Requires:.*\),\1 libgsf-1 pangocairo,' -i '$(1)'/librsvg-2.0.pc.in
+    $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/Makefile.in
+    $(SED) -i 's,^\(Requires:.*\),\1 libgsf-1 pangocairo,' '$(1)'/librsvg-2.0.pc.in
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libsamplerate.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libsamplerate.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -22,7 +22,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    #$(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    #$(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/libusb.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libusb.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 
 define $(PKG)_BUILD
     # convert DOS line endings
-    $(SED) 's,\r$$,,' -i '$(1)/Makefile'
+    $(SED) -i 's,\r$$,,' '$(1)/Makefile'
 
     # don't actually build the library (DLL file),
     # just create the DLL import stubs
--- a/src/libxml2.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/libxml2.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,`uname`,MinGW,g' -i '$(1)/xml2-config.in'
+    $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/nsis.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/nsis.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,this->SetIcon(wxICON(nsisicon));,,' -i '$(1)/Contrib/NSIS Menu/nsismenu/nsismenu.cpp'
+    $(SED) -i 's,this->SetIcon(wxICON(nsisicon));,,' '$(1)/Contrib/NSIS Menu/nsismenu/nsismenu.cpp'
     cd '$(1)' && scons \
         PREFIX='$(PREFIX)' \
         `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \
--- a/src/ogg.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/ogg.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/openexr.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/openexr.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -30,7 +30,7 @@
     $(MAKE) -C '$(1)/$(ilmbase_SUBDIR)' -j '$(JOBS)' install \
         bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/openssl.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/openssl.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -23,13 +23,13 @@
 define $(PKG)_BUILD
     # workarounds according to
     # http://wagner.pp.ru/~vitus/articles/openssl-mingw.html
-    $(SED) 's,^$$IsMK1MF=1.*,,' -i '$(1)'/Configure
-    $(SED) 's,static type _hide_##name,type _hide_##name,' -i '$(1)'/e_os2.h
+    $(SED) -i 's,^$$IsMK1MF=1.*,,' '$(1)'/Configure
+    $(SED) -i 's,static type _hide_##name,type _hide_##name,' '$(1)'/e_os2.h
 
     # use winsock2 instead of winsock
-    $(SED) 's,wsock32,ws2_32,g' -i '$(1)'/Configure
+    $(SED) -i 's,wsock32,ws2_32,g' '$(1)'/Configure
     find '$(1)' -type f -exec \
-        $(SED) 's,winsock\.h,winsock2.h,g' -i {} \;
+        $(SED) -i 's,winsock\.h,winsock2.h,g' {} \;
 
     cd '$(1)' && CC='$(TARGET)-gcc' ./Configure \
         mingw \
--- a/src/pango.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/pango.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,13 +20,13 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,DllMain,static _disabled_DllMain,' -i '$(1)/pango/pango-utils.c'
-    $(SED) 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' -i '$(1)/configure'
-    $(SED) 's,enable_static=no,enable_static=yes,' -i '$(1)/configure'
-    $(SED) 's,enable_shared=yes,enable_shared=no,' -i '$(1)/configure'
-    $(SED) 's,^install-data-local:.*,install-data-local:,' -i '$(1)/modules/Makefile.in'
+    $(SED) -i 's,DllMain,static _disabled_DllMain,' '$(1)/pango/pango-utils.c'
+    $(SED) -i 's,"[^"]*must build as DLL[^"]*","(disabled warning)",' '$(1)/configure'
+    $(SED) -i 's,enable_static=no,enable_static=yes,' '$(1)/configure'
+    $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure'
+    $(SED) -i 's,^install-data-local:.*,install-data-local:,' '$(1)/modules/Makefile.in'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/pcre.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/pcre.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,10 +19,10 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,__declspec(dllimport),,' -i '$(1)/pcre.h.in'
-    $(SED) 's,__declspec(dllimport),,' -i '$(1)/pcreposix.h'
+    $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcre.h.in'
+    $(SED) -i 's,__declspec(dllimport),,' '$(1)/pcreposix.h'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/pdcurses.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/pdcurses.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,7 +19,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,copy,cp,' -i '$(1)/win32/mingwin32.mak'
+    $(SED) -i 's,copy,cp,' '$(1)/win32/mingwin32.mak'
     $(MAKE) -C '$(1)' -j '$(JOBS)' libs -f '$(1)/win32/mingwin32.mak' \
         CC='$(TARGET)-gcc' \
         LIBEXE='$(TARGET)-ar' \
--- a/src/pdflib_lite.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/pdflib_lite.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,7 +19,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,ac_sys_system=`uname -s`,ac_sys_system=MinGW,' -i '$(1)/configure'
+    $(SED) -i 's,ac_sys_system=`uname -s`,ac_sys_system=MinGW,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
@@ -34,7 +34,7 @@
         --enable-cxx \
         --enable-large-files \
         CFLAGS='-D_IOB_ENTRIES=20'
-    $(SED) 's,-DPDF_PLATFORM=[^ ]* ,,' -i '$(1)/config/mkcommon.inc'
+    $(SED) -i 's,-DPDF_PLATFORM=[^ ]* ,,' '$(1)/config/mkcommon.inc'
     $(MAKE) -C '$(1)/libs' -j '$(JOBS)'
     $(MAKE) -C '$(1)/libs' -j 1 install
 endef
--- a/src/postgresql.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/postgresql.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -23,12 +23,12 @@
 
 define $(PKG)_BUILD
     # The static OpenSSL libraries are in unix (not win32) naming style.
-    $(SED) 's,SSLEAY32,SSL,' -i '$(1)'/configure
-    $(SED) 's,ssleay32,ssl,' -i '$(1)'/configure
-    $(SED) 's,EAY32,CRYPTO,' -i '$(1)'/configure
-    $(SED) 's,eay32,crypto,' -i '$(1)'/configure
-    $(SED) 's,ssleay32,ssl,' -i '$(1)'/src/interfaces/libpq/Makefile
-    $(SED) 's,eay32,crypto,' -i '$(1)'/src/interfaces/libpq/Makefile
+    $(SED) -i 's,SSLEAY32,SSL,' '$(1)'/configure
+    $(SED) -i 's,ssleay32,ssl,' '$(1)'/configure
+    $(SED) -i 's,EAY32,CRYPTO,' '$(1)'/configure
+    $(SED) -i 's,eay32,crypto,' '$(1)'/configure
+    $(SED) -i 's,ssleay32,ssl,' '$(1)'/src/interfaces/libpq/Makefile
+    $(SED) -i 's,eay32,crypto,' '$(1)'/src/interfaces/libpq/Makefile
     # Since we build only client libary, use bogus tzdata to satisfy configure.
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
@@ -59,7 +59,7 @@
     # Build a native pg_config.
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,postgresql)
     mv '$(1)/$(postgresql_SUBDIR)' '$(1).native'
-    $(SED) 's,-DVAL_,-D_DISABLED_VAL_,g' -i '$(1).native'/src/bin/pg_config/Makefile
+    $(SED) -i 's,-DVAL_,-D_DISABLED_VAL_,g' '$(1).native'/src/bin/pg_config/Makefile
     cd '$(1).native' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
--- a/src/qt.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/qt.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -25,8 +25,8 @@
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt)
     mv '$(1)/$(qt_SUBDIR)' '$(1).native'
 
-    $(SED) 's,PLATFORM_X11=yes,PLATFORM_X11=no,'           -i '$(1)'.native/configure
-    $(SED) 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' -i '$(1)'.native/configure
+    $(SED) -i 's,PLATFORM_X11=yes,PLATFORM_X11=no,'           '$(1)'.native/configure
+    $(SED) -i 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' '$(1)'.native/configure
     cd '$(1)'.native && ./configure \
         -opensource \
         -confirm-license \
@@ -48,8 +48,8 @@
     $(MAKE) -C '$(1)'.native -j '$(JOBS)' sub-uic
 
     # rebuild qmake to use "-unix" as default and to use the correct "ar" command
-    $(SED) 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' -i '$(1)'.native/qmake/option.cpp
-    $(SED) 's,"ar -M,"$(TARGET)-ar -M,' -i '$(1)'.native/qmake/generators/win32/mingw_make.cpp
+    $(SED) -i 's,\(Option::TARG_MODE Option::target_mode = Option::TARG_\)[A-Z_]*,\1UNIX_MODE,' '$(1)'.native/qmake/option.cpp
+    $(SED) -i 's,"ar -M,"$(TARGET)-ar -M,' '$(1)'.native/qmake/generators/win32/mingw_make.cpp
     $(MAKE) -C '$(1)'.native/qmake -j '$(JOBS)'
 
     # install the native tools manually
@@ -73,18 +73,18 @@
 
     # Adjust the mkspec values that contain the TARGET platform prefix.
     # The patch planted strings HOSTPLATFORMPREFIX and HOSTPLATFORMINCLUDE.
-    $(SED) 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g'                  -i '$(1)'/mkspecs/win32-g++/qmake.conf
-    $(SED) 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' -i '$(1)'/mkspecs/win32-g++/qmake.conf
+    $(SED) -i 's,HOSTPLATFORMPREFIX-,$(TARGET)-,g'                  '$(1)'/mkspecs/win32-g++/qmake.conf
+    $(SED) -i 's,HOSTPLATFORMINCLUDE,$(PREFIX)/$(TARGET)/include,g' '$(1)'/mkspecs/win32-g++/qmake.conf
 
     # Make sure qmake doesn't use compilation paths meant for unix
     find '$(1)'/src -name '*.pr[oi]' -exec \
-        $(SED) 's,\(^\|[^_/]\)unix,\1linux,g' -i {} \;
+        $(SED) -i 's,\(^\|[^_/]\)unix,\1linux,g' {} \;
 
     # Make qmake use compilation paths meant for MinGW or Windows in general
     find '$(1)'/src -name '*.pr[oi]' -exec \
-        $(SED) 's,\(^\|[^_/]\)win32-g++\([^-]\|$$\),\1unix\2,g' -i {} \;
+        $(SED) -i 's,\(^\|[^_/]\)win32-g++\([^-]\|$$\),\1unix\2,g' {} \;
     find '$(1)'/src -name '*.pr[oi]' -exec \
-        $(SED) 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' -i {} \;
+        $(SED) -i 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' {} \;
 
     # Configure Qt for MinGW target
     # We prefer static mingw-cross-env system libs for static build:
--- a/src/readline.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/readline.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,8 +20,8 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,^ *case SIGQUIT:.*,,' -i '$(1)/signals.c'
-    $(SED) 's,^ *case SIGTSTP:.*,,' -i '$(1)/signals.c'
+    $(SED) -i 's,^ *case SIGQUIT:.*,,' '$(1)/signals.c'
+    $(SED) -i 's,^ *case SIGTSTP:.*,,' '$(1)/signals.c'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/sdl.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/sdl.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,-mwindows,-lwinmm -mwindows,' -i '$(1)/configure'
+    $(SED) -i 's,-mwindows,-lwinmm -mwindows,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/sdl_image.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/sdl_image.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,^\(Requires:.*\),\1 libpng,' -i '$(1)/SDL_image.pc.in'
+    $(SED) -i 's,^\(Requires:.*\),\1 libpng,' '$(1)/SDL_image.pc.in'
     echo 'Libs.private: -ltiff -ljpeg -lz' >> '$(1)/SDL_image.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
--- a/src/sdl_mixer.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/sdl_mixer.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,13 +20,13 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,^\(Requires:.*\),\1 vorbisfile,' -i '$(1)/SDL_mixer.pc.in'
+    $(SED) -i 's,^\(Requires:.*\),\1 vorbisfile,' '$(1)/SDL_mixer.pc.in'
     echo \
         'Libs.private:' \
         "`$(PREFIX)/$(TARGET)/bin/libmikmod-config --libs`" \
         "`$(PREFIX)/$(TARGET)/bin/smpeg-config     --libs`" \
         >> '$(1)/SDL_mixer.pc.in'
-    $(SED) 's,for path in /usr/local; do,for path in; do,' -i '$(1)/configure'
+    $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/sdl_pango.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/sdl_pango.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,7 +19,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,^\(Requires:.*\),\1 pangoft2,' -i '$(1)/SDL_Pango.pc.in'
+    $(SED) -i 's,^\(Requires:.*\),\1 pangoft2,' '$(1)/SDL_Pango.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/smpeg.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/smpeg.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,7 +19,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,\(-lsmpeg\),\1 -lstdc++,' -i '$(1)/smpeg-config.in'
+    $(SED) -i 's,\(-lsmpeg\),\1 -lstdc++,' '$(1)/smpeg-config.in'
     cd '$(1)' && ./configure \
         AR='$(TARGET)-ar' \
         NM='$(TARGET)-nm' \
--- a/src/taglib.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/taglib.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,9 +20,9 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) '/#define TAGLIB_EXPORT_H/a#define TAGLIB_STATIC' -i '$(1)/taglib/taglib_export.h'
+    $(SED) -i '/#define TAGLIB_EXPORT_H/a#define TAGLIB_STATIC' '$(1)/taglib/taglib_export.h'
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/theora.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/theora.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,7 +20,7 @@
 
 define $(PKG)_BUILD
     # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
--- a/src/vmime.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/vmime.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -23,17 +23,17 @@
     # we need scons to generate configure.in, Makefile.am etc.
     # ansi and pedantic are too strict for mingw.
     # http://sourceforge.net/tracker/index.php?func=detail&aid=2373234&group_id=2435&atid=102435
-    $(SED) "s/'-ansi', //;"                        -i '$(1)/SConstruct'
-    $(SED) "s/'-pedantic', //;"                    -i '$(1)/SConstruct'
-    $(SED) 's/pkg-config/$(TARGET)-pkg-config/g;'  -i '$(1)/SConstruct'
+    $(SED) -i "s/'-ansi', //;"                        '$(1)/SConstruct'
+    $(SED) -i "s/'-pedantic', //;"                    '$(1)/SConstruct'
+    $(SED) -i 's/pkg-config/$(TARGET)-pkg-config/g;'  '$(1)/SConstruct'
 
     cd '$(1)' && scons autotools \
          prefix='$(PREFIX)/$(TARGET)' \
          target='$(TARGET)' \
          sendmail_path=/sbin/sendmail
 
-    $(SED) 's,libtoolize ,$(LIBTOOLIZE) ,' -i '$(1)'/bootstrap
-    $(SED) 's,/bin/bash,/usr/bin/env bash,' -i '$(1)'/bootstrap
+    $(SED) -i 's,libtoolize ,$(LIBTOOLIZE) ,' '$(1)'/bootstrap
+    $(SED) -i 's,/bin/bash,/usr/bin/env bash,' '$(1)'/bootstrap
     cd '$(1)' && ./bootstrap
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
@@ -45,7 +45,7 @@
 
     # Disable VMIME_HAVE_MLANG_H
     # We have the header, but there is no implementation for IMultiLanguage in MinGW
-    $(SED) 's,^#define VMIME_HAVE_MLANG_H 1$$,,' -i '$(1)/vmime/config.hpp'
+    $(SED) -i 's,^#define VMIME_HAVE_MLANG_H 1$$,,' '$(1)/vmime/config.hpp'
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' install
--- a/src/w32api.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/w32api.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -20,11 +20,11 @@
 
 define $(PKG)_BUILD
     # fix incompatibilities with gettext
-    $(SED) 's,\(SUBLANG_BENGALI_INDIA\t\)0x01,\10x00,'    -i '$(1)/include/winnt.h'
-    $(SED) 's,\(SUBLANG_PUNJABI_INDIA\t\)0x01,\10x00,'    -i '$(1)/include/winnt.h'
-    $(SED) 's,\(SUBLANG_ROMANIAN_ROMANIA\t\)0x01,\10x00,' -i '$(1)/include/winnt.h'
+    $(SED) -i 's,\(SUBLANG_BENGALI_INDIA\t\)0x01,\10x00,'    '$(1)/include/winnt.h'
+    $(SED) -i 's,\(SUBLANG_PUNJABI_INDIA\t\)0x01,\10x00,'    '$(1)/include/winnt.h'
+    $(SED) -i 's,\(SUBLANG_ROMANIAN_ROMANIA\t\)0x01,\10x00,' '$(1)/include/winnt.h'
     # fix incompatibilities with jpeg
-    $(SED) 's,typedef unsigned char boolean;,,'           -i '$(1)/include/rpcndr.h'
+    $(SED) -i 's,typedef unsigned char boolean;,,'           '$(1)/include/rpcndr.h'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)'
     cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)'
 endef
--- a/src/winpcap.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/winpcap.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,11 +19,11 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) '/#include/ s,\\,/,g'                             -i '$(1)/packetNtx/Dll/Packet32.c'
-    $(SED) 's,#include <packet32\.h>,#include <Packet32.h>,' -i '$(1)/packetNtx/Dll/Packet32.c'
-    $(SED) 's,#include <StrSafe\.h>,#include <strsafe.h>,'   -i '$(1)/packetNtx/Dll/Packet32.c'
-    $(SED) 's,#include <Iphlpapi\.h>,#include <iphlpapi.h>,' -i '$(1)/packetNtx/Dll/Packet32.c'
-    $(SED) 's,#include <IPIfCons\.h>,#include <ipifcons.h>,' -i '$(1)/packetNtx/Dll/Packet32.c'
+    $(SED) -i '/#include/ s,\\,/,g'                             '$(1)/packetNtx/Dll/Packet32.c'
+    $(SED) -i 's,#include <packet32\.h>,#include <Packet32.h>,' '$(1)/packetNtx/Dll/Packet32.c'
+    $(SED) -i 's,#include <StrSafe\.h>,#include <strsafe.h>,'   '$(1)/packetNtx/Dll/Packet32.c'
+    $(SED) -i 's,#include <Iphlpapi\.h>,#include <iphlpapi.h>,' '$(1)/packetNtx/Dll/Packet32.c'
+    $(SED) -i 's,#include <IPIfCons\.h>,#include <ipifcons.h>,' '$(1)/packetNtx/Dll/Packet32.c'
     cd '$(1)' && $(TARGET)-gcc -ICommon -IpacketNtx/Dll -O -c '$(1)/packetNtx/Dll/Packet32.c'
     $(TARGET)-ar rc '$(1)/libpacket.a' '$(1)/Packet32.o'
     $(TARGET)-ranlib '$(1)/libpacket.a'
@@ -32,10 +32,10 @@
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
     $(INSTALL) -m644 '$(1)/libpacket.a' '$(PREFIX)/$(TARGET)/lib/'
     mv '$(1)/wpcap/libpcap/Win32/Include/ip6_misc.h' '$(1)/wpcap/libpcap/Win32/Include/IP6_misc.h'
-    $(SED) 's,#include <packet32\.h>,#include <Packet32.h>,' -i '$(1)/wpcap/Win32-Extensions/Win32-Extensions.c'
-    $(SED) 's,(char\*)tUstr +=,tUstr +=,' -i '$(1)/wpcap/libpcap/inet.c'
-    $(SED) 's,-DHAVE_AIRPCAP_API,,'    -i '$(1)/wpcap/PRJ/GNUmakefile'
-    $(SED) 's,/common,/Common,'        -i '$(1)/wpcap/PRJ/GNUmakefile'
+    $(SED) -i 's,#include <packet32\.h>,#include <Packet32.h>,' '$(1)/wpcap/Win32-Extensions/Win32-Extensions.c'
+    $(SED) -i 's,(char\*)tUstr +=,tUstr +=,' '$(1)/wpcap/libpcap/inet.c'
+    $(SED) -i 's,-DHAVE_AIRPCAP_API,,'    '$(1)/wpcap/PRJ/GNUmakefile'
+    $(SED) -i 's,/common,/Common,'        '$(1)/wpcap/PRJ/GNUmakefile'
     echo -e 'libwpcap.a: $${OBJS}'     >> '$(1)/wpcap/PRJ/GNUmakefile'
     echo -e '\t$${AR} rc $$@ $${OBJS}' >> '$(1)/wpcap/PRJ/GNUmakefile'
     echo -e '\t$${RANLIB} $$@'         >> '$(1)/wpcap/PRJ/GNUmakefile'
--- a/src/wxwidgets.mk	Tue Feb 16 04:07:12 2010 +0100
+++ b/src/wxwidgets.mk	Tue Feb 16 04:12:53 2010 +0100
@@ -19,8 +19,8 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,png_check_sig,png_sig_cmp,g'                       -i '$(1)/configure'
-    $(SED) 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' -i '$(1)/configure'
+    $(SED) -i 's,png_check_sig,png_sig_cmp,g'                       '$(1)/configure'
+    $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
@@ -63,8 +63,8 @@
 
     # build the wxWidgets variant without unicode support
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets)
-    $(SED) 's,png_check_sig,png_sig_cmp,g'                       -i '$(1)/$(wxwidgets_SUBDIR)/configure'
-    $(SED) 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' -i '$(1)/$(wxwidgets_SUBDIR)/configure'
+    $(SED) -i 's,png_check_sig,png_sig_cmp,g'                       '$(1)/$(wxwidgets_SUBDIR)/configure'
+    $(SED) -i 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' '$(1)/$(wxwidgets_SUBDIR)/configure'
     cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \