5 files changed, 9 insertions, 13 deletions
diff --git a/source-builder/config/freetype-1.cfg b/source-builder/config/freetype-1.cfg
index 7b930ce..37f1438 100644
--- a/source-builder/config/freetype-1.cfg
+++ b/source-builder/config/freetype-1.cfg
@@ -41,7 +41,10 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
   %{host_build_flags}
 
-   ../${source_dir_freetype}/configure \
+  %ifos freebsd
+  GNUMAKE=%{__make} \
+  %endif
+  ../${source_dir_freetype}/configure \
     --host=%{_host} \
     --prefix=%{_prefix} \
     --bindir=%{_bindir} \
diff --git a/source-builder/config/libpng-1.cfg b/source-builder/config/libpng-1.cfg
index 6e4ccd5..6821089 100644
--- a/source-builder/config/libpng-1.cfg
+++ b/source-builder/config/libpng-1.cfg
@@ -12,7 +12,7 @@ Name:      libpng-v%{libpng_version}-%{_host}-%{release}
 Summary:   libpng is the official PNG reference library
 Version:   %{libpng_version}
 Release:   %{release}
-URL:     http://www.libpng.org/
+URL:       http://www.libpng.org/
 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
 #
diff --git a/source-builder/config/libtiff-1.cfg b/source-builder/config/libtiff-1.cfg
index b0030e0..f445bf0 100644
--- a/source-builder/config/libtiff-1.cfg
+++ b/source-builder/config/libtiff-1.cfg
@@ -42,7 +42,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
   %{host_build_flags}
 
-  CFLAGS= CXXFLAGS= ../${source_dir_tiff}/configure \
+  ../${source_dir_tiff}/configure \
     --host=%{_host} \
     --prefix=%{_prefix} \
     --bindir=%{_bindir} \
diff --git a/source-builder/config/microwindows-1.cfg b/source-builder/config/microwindows-1.cfg
index a4f5cea..189a3a8 100644
--- a/source-builder/config/microwindows-1.cfg
+++ b/source-builder/config/microwindows-1.cfg
@@ -18,11 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 #
 # microwindows Source
 #
-%source set microwindows git://github.com/alex-sever-h/microwin.git
-%patch add microwindows %{rtems_git_tools}/microwindows/microwindows-0.93-dev.diff
-%hash md5 microwindows-0.93-dev.diff 5b06e77d9ee42c8ff0032bba07d01c1a
-%patch add microwindows %{rtems_git_tools}/microwindows/microwindows-0.93-dev-without-keyboard.diff
-%hash md5 microwindows-0.93-dev-without-keyboard.diff a675f55750754e1cd82a17496f0e8fab
+%source set microwindows ftp://microwindows.censoft.com/pub/microwindows/microwindows-src-%{microwindows_version}.tar.gz
 
 #
 # Prepare the source code.
@@ -38,7 +34,6 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
 #
 # Build the source code.
-# The configure should be run in the source dir
 #
 %build
   build_top=$(pwd)
@@ -53,7 +48,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
   export RTEMS_MAKEFILE_PATH=%{rtems_bsp_prefix}
 
-  make -f Makefile.rtems CONFIG=`pwd`/Configs/config.rtems -k all
+  %{__make} -f Makefile.rtems CONFIG=`pwd`/Configs/config.rtems -k all
 
   cd ${build_top}
 
diff --git a/source-builder/config/t1lib-1.cfg b/source-builder/config/t1lib-1.cfg
index b11e1eb..d2a47a2 100644
--- a/source-builder/config/t1lib-1.cfg
+++ b/source-builder/config/t1lib-1.cfg
@@ -12,15 +12,13 @@ Name:      t1lib-v%{t1lib_version}-%{_host}-%{release}
 Summary:   t1lib is the official PNG reference library
 Version:   %{t1lib_version}
 Release:   %{release}
-URL:     http://www.t1lib.org/
+URL:       http://www.t1lib.org/
 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 
 #
 # t1lib Source
 #
 %source set t1lib ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/t1lib-%{t1lib_version}.tar.gz
-%patch add t1lib https://raw.githubusercontent.com/yangqiao/rtems-tools/graphics/tools/4.11/t1lib/t1lib-5.1.2.diff
-%hash md5 t1lib-5.1.2.diff 98eeed85780227adf8525deab3679877
 
 #
 # Prepare the source code.