- Update e17 ports to 20070223 snapshot

- Bump portrevisions on all imlib2-dependend ports as the library soversion
  was bumped [1]
- Disable fade-in effects in x11-fm/evidence permanently, since evas doesn't
  support it anymore. [2]

The patch was tested in the tinderbox.

Approved by:	portmgr (marcus) [1],
		Anders Troback <freebsd@troback.com> (maintainer) [2]

12 files changed, 16 insertions, 791 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index ce95cd0bc9fe..26fa92e73d1f 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	imlib2
-PORTVERSION=	20060926
-PORTREVISION=	2
+PORTVERSION=	20070223
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
+MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The next generation graphic library for enlightenment package
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 2bf8dcfdc996..2b610209b6cb 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2-20060926.tar.bz2) = 506262e1d17b1e402ade868010ddf465
-SHA256 (imlib2-20060926.tar.bz2) = 137f78b1de8c3c834ff836974ac05b14feb8707ee7af5458553a2b330396a86e
-SIZE (imlib2-20060926.tar.bz2) = 841866
+MD5 (imlib2-20070223.tar.bz2) = 4da363aaaa1cd6b96bff741ac62cac29
+SHA256 (imlib2-20070223.tar.bz2) = f35e8ec8f291accb931ccc0470708898fc725f82a1de7d80f300f715f6995c53
+SIZE (imlib2-20070223.tar.bz2) = 845387
diff --git a/graphics/imlib2/files/patch-configure b/graphics/imlib2/files/patch-configure
deleted file mode 100644
index dfd4c5038d45..000000000000
--- a/graphics/imlib2/files/patch-configure
+++ /dev/null
@@ -1,561 +0,0 @@
---- configure.orig	Fri Feb  9 11:03:42 2007
-+++ configure	Fri Feb  9 11:05:44 2007
-@@ -21387,175 +20666,7 @@
- freetype_cflags=`$FREETYPE_CONFIG --cflags`
- freetype_libs=`$FREETYPE_CONFIG --libs`
- 
--if test "${ac_cv_header_X11_X_h+set}" = set; then
--  { echo "$as_me:$LINENO: checking for X11/X.h" >&5
--echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_X11_X_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
--else
--  # Is the header compilable?
--{ echo "$as_me:$LINENO: checking X11/X.h usability" >&5
--echo $ECHO_N "checking X11/X.h usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <X11/X.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ echo "$as_me:$LINENO: checking X11/X.h presence" >&5
--echo $ECHO_N "checking X11/X.h presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <X11/X.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: X11/X.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: X11/X.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: X11/X.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/X.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: X11/X.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/X.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: X11/X.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: X11/X.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: X11/X.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: X11/X.h: in the future, the compiler will take precedence" >&2;}
--
--    ;;
--esac
--{ echo "$as_me:$LINENO: checking for X11/X.h" >&5
--echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_X11_X_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_header_X11_X_h=$ac_header_preproc
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
--echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
--
--fi
--if test $ac_cv_header_X11_X_h = yes; then
--   have_x="yes"
--else
--   have_x="no"
--fi
--
--
--
--if test "x$have_x" = "xno"; then
--   # If --without-x was passed, this will be "disabled" instead of "no" --
--   # so always treat "no" as an error
--   { { echo "$as_me:$LINENO: error: no X support found.  Use --x-includes and --x-libraries to specify the X
--path on your system, or --without-x to disable X support." >&5
--echo "$as_me: error: no X support found.  Use --x-includes and --x-libraries to specify the X
--path on your system, or --without-x to disable X support." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
--if test "x$have_x" = "xyes"; then
--  { echo "$as_me:$LINENO: checking for X" >&5
-+{ echo "$as_me:$LINENO: checking for X" >&5
- echo $ECHO_N "checking for X... $ECHO_C" >&6; }
- 
- 
-@@ -21677,17 +20788,10 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-@@ -21710,7 +20814,7 @@
-   # See if we find them without any special options.
-   # Don't add to $LIBS permanently.
-   ac_save_LIBS=$LIBS
--  LIBS="-lXt $LIBS"
-+  LIBS="-lX11 $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -21739,27 +20843,11 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
-@@ -21772,7 +20860,7 @@
- do
-   # Don't even attempt the hair of trying to link an X program!
-   for ac_extension in a so sl; do
--    if test -r "$ac_dir/libXt.$ac_extension"; then
-+    if test -r "$ac_dir/libX11.$ac_extension"; then
-       ac_x_libraries=$ac_dir
-       break 2
-     fi
-@@ -21780,7 +20868,7 @@
- done
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
- 
-@@ -21817,7 +20905,153 @@
- echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
- fi
- 
--if test "$no_x" = yes; then
-+if test "x$have_x" != "xdisabled"; then
-+  if test "${ac_cv_header_X11_X_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for X11/X.h" >&5
-+echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_X_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
-+echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking X11/X.h usability" >&5
-+echo $ECHO_N "checking X11/X.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <X11/X.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking X11/X.h presence" >&5
-+echo $ECHO_N "checking X11/X.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <X11/X.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: X11/X.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: X11/X.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: X11/X.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: X11/X.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: X11/X.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: X11/X.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: X11/X.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: X11/X.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: X11/X.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for X11/X.h" >&5
-+echo $ECHO_N "checking for X11/X.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_X11_X_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_X11_X_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_X_h" >&5
-+echo "${ECHO_T}$ac_cv_header_X11_X_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_X11_X_h = yes; then
-+   have_x="yes"
-+else
-+   have_x="no"
-+fi
-+
-+
-+fi
-+
-+if test "x$have_x" = "xno"; then
-+   # If --without-x was passed, this will be "disabled" instead of "no" --
-+   # so always treat "no" as an error
-+   { { echo "$as_me:$LINENO: error: no X support found.  Use --x-includes and --x-libraries to specify the X
-+path on your system, or --without-x to disable X support." >&5
-+echo "$as_me: error: no X support found.  Use --x-includes and --x-libraries to specify the X
-+path on your system, or --without-x to disable X support." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if test "x$have_x" = "xyes"; then
-+  if test "$no_x" = yes; then
-   # Not all programs may use this symbol, but it does not hurt to define it.
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -21835,12 +21069,12 @@
-     X_LIBS="$X_LIBS -L$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
--    case `(uname -sr) 2>/dev/null` in
--    "SunOS 5"*)
--      { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
- echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
--      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
--      cat >conftest.$ac_ext <<_ACEOF
-+    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+    ac_xsave_c_werror_flag=$ac_c_werror_flag
-+    ac_c_werror_flag=yes
-+    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21864,48 +21098,24 @@
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_R_nospace=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+       X_LIBS="$X_LIBS -R$x_libraries"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_R_nospace=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--      if test $ac_R_nospace = yes; then
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--	X_LIBS="$X_LIBS -R$x_libraries"
--      else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
--	cat >conftest.$ac_ext <<_ACEOF
-+       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -21933,48 +21143,30 @@
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_R_space=yes
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	  X_LIBS="$X_LIBS -R $x_libraries"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_R_space=no
-+	{ echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
--	if test $ac_R_space = yes; then
--	  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--	  X_LIBS="$X_LIBS -R $x_libraries"
--	else
--	  { echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6; }
--	fi
--      fi
--      LIBS=$ac_xsave_LIBS
--    esac
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_c_werror_flag=$ac_xsave_c_werror_flag
-+    LIBS=$ac_xsave_LIBS
-   fi
- 
-   # Check for system-dependent libraries X programs must link with.
diff --git a/graphics/imlib2/files/patch-imlib2.pc.in b/graphics/imlib2/files/patch-imlib2.pc.in
new file mode 100644
index 000000000000..e32e118568ad
--- /dev/null
+++ b/graphics/imlib2/files/patch-imlib2.pc.in
@@ -0,0 +1,9 @@
+--- imlib2.pc.in.orig	Mon Feb 26 02:38:45 2007
++++ imlib2.pc.in	Mon Feb 26 02:38:57 2007
+@@ -8,5 +8,5 @@
+ Requires: @requirements@
+ Version: @VERSION@
+ Libs: -L${libdir} -lImlib2
+-Cflags: -I${includedir}
++Cflags: -I${includedir} @my_includes@
+ 
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c
deleted file mode 100644
index 7d3d0925140a..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/modules/loaders/loader_argb.c.orig	Wed Nov  8 19:39:37 2006
-+++ src/modules/loaders/loader_argb.c	Wed Nov  8 19:41:38 2006
-@@ -23,7 +23,7 @@
- load(ImlibImage * im, ImlibProgressFunction progress,
-      char progress_granularity, char immediate_load)
- {
--   int                 w, h, alpha;
-+   int                 w = 0, h = 0, alpha = 0;
-    FILE               *f;
- 
-    if (im->data)
-@@ -36,13 +36,16 @@
-    {
-       char                buf[256], buf2[256];
- 
-+      bzero(buf, sizeof(buf));
-+      bzero(buf2, sizeof(buf2));
-+
-       if (!fgets(buf, 255, f))
-         {
-            fclose(f);
-            return 0;
-         }
-       sscanf(buf, "%s %i %i %i", buf2, &w, &h, &alpha);
--      if (strcmp(buf2, "ARGB"))
-+      if (strcmp(buf2, "ARGB") || w < 1 || h < 1 || w > 16383 || h > 16383)
-         {
-            fclose(f);
-            return 0;
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c
deleted file mode 100644
index 9ac40f336bd0..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/modules/loaders/loader_jpeg.c.orig	Wed Nov  8 19:41:41 2006
-+++ src/modules/loaders/loader_jpeg.c	Wed Nov  8 19:42:43 2006
-@@ -104,8 +104,11 @@
-         im->w = w = cinfo.output_width;
-         im->h = h = cinfo.output_height;
- 
--        if (cinfo.rec_outbuf_height > 16)
-+        if (cinfo.rec_outbuf_height > 16 \
-+	    || w < 1 || h < 1 || w > 16383 || h > 16383)
-           {
-+	     im->w = 0;
-+	     im->h = 0;
-              jpeg_destroy_decompress(&cinfo);
-              fclose(f);
-              return 0;
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c
deleted file mode 100644
index ab5fb9aacb0f..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/modules/loaders/loader_lbm.c.orig	Wed Nov  8 19:42:46 2006
-+++ src/modules/loaders/loader_lbm.c	Wed Nov  8 19:47:10 2006
-@@ -421,7 +421,7 @@
- 
-         im->w = L2RWORD(ilbm.bmhd.data);
-         im->h = L2RWORD(ilbm.bmhd.data + 2);
--        if (im->w <= 0 || im->h <= 0) ok = 0;
-+        if (im->w <= 0 || im->h <= 0 || im->w > 16383 || im->h > 16383) ok = 0;
- 
-         ilbm.depth = ilbm.bmhd.data[8];
-         if (ilbm.depth < 1 || (ilbm.depth > 8 && ilbm.depth != 24 && ilbm.depth != 32)) ok = 0; /* Only 1 to 8, 24, or 32 planes. */
-@@ -453,6 +453,8 @@
-         }
-     }
-     if (!full || !ok) {
-+	im->w = 0;
-+	im->h = 0;
-         freeilbm(&ilbm);
-         return ok;
-     }
-@@ -468,11 +470,14 @@
-     plane[0] = NULL;
- 
-     im->data = malloc(im->w * im->h * sizeof(DATA32));
--    if (im->data) {
--        n = ilbm.depth;
--        if (ilbm.mask == 1) n++;
- 
--        plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
-+    n = ilbm.depth;
-+    if (ilbm.mask == 1)
-+	n++;
-+
-+    plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
-+
-+    if (im->data != NULL && plane[0] != NULL) {
-         for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
- 
-         z = ((im->w + 15) / 16) * 2 * n;
-@@ -511,6 +516,8 @@
-    * the memory for im->data.
-    *----------*/
-     if (!ok) {
-+	im->w = 0;
-+	im->h = 0;
-         if (im->data) free(im->data);
-         im->data = NULL;
-     }
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_png.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_png.c
deleted file mode 100644
index 0eeb196eb47d..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_png.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/modules/loaders/loader_png.c.orig	Wed Nov  8 19:47:13 2006
-+++ src/modules/loaders/loader_png.c	Wed Nov  8 19:48:04 2006
-@@ -83,6 +83,13 @@
-         png_get_IHDR(png_ptr, info_ptr, (png_uint_32 *) (&w32),
-                      (png_uint_32 *) (&h32), &bit_depth, &color_type,
-                      &interlace_type, NULL, NULL);
-+        if (w32 < 1 || h32 < 1 || w32 > 16383 || h32 > 16383) {
-+              png_read_end(png_ptr, info_ptr);
-+              png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
-+              fclose(f);
-+              return 0;
-+        }
-+
-         im->w = (int)w32;
-         im->h = (int)h32;
-         if (color_type == PNG_COLOR_TYPE_PALETTE)
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c
deleted file mode 100644
index 32262a903558..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/loaders/loader_pnm.c.orig	Wed Nov  8 19:48:10 2006
-+++ src/modules/loaders/loader_pnm.c	Wed Nov  8 19:48:51 2006
-@@ -80,7 +80,7 @@
-              int                 i = 0;
- 
-              /* read numbers */
--             while (c != EOF && !isspace(c))
-+             while (c != EOF && !isspace(c) && (sizeof(buf) < (i + 1)))
-                {
-                   buf[i++] = c;
-                   c = fgetc(f);
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c
deleted file mode 100644
index 422f02f8dbff..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/modules/loaders/loader_tga.c.orig	Wed Nov  8 19:48:53 2006
-+++ src/modules/loaders/loader_tga.c	Wed Nov  8 19:54:47 2006
-@@ -319,6 +319,7 @@
-      {
-         unsigned long       datasize;
-         unsigned char      *bufptr;
-+        unsigned char      *bufend;
-         DATA32             *dataptr;
- 
-         int                 y;
-@@ -347,6 +348,9 @@
-         /* bufptr is the next byte to be read from the buffer */
-         bufptr = filedata;
- 
-+        /* bufend is one past the last byte to be read from the buffer */
-+        bufend = filedata + datasize;
-+
-         /* dataptr is the next 32-bit pixel to be filled in */
-         dataptr = im->data;
- 
-@@ -364,7 +368,8 @@
-                   else
-                      dataptr = im->data + (y * im->w);
- 
--                  for (x = 0; x < im->w; x++)   /* for each pixel in the row */
-+		  /* for each pixel in the row */
-+                  for (x = 0; x < im->w && ((bufptr + bpp/8) < bufend); x++)
-                     {
-                        switch (bpp)
-                          {
-@@ -419,7 +424,7 @@
-              DATA32             *final_pixel = dataptr + im->w * im->h;
- 
-              /* loop until we've got all the pixels */
--             while (dataptr < final_pixel)
-+             while (dataptr < final_pixel && ((bufptr + 1 + bpp/8) < bufend))
-                {
-                   int                 count;
- 
-@@ -437,7 +442,7 @@
-                               green = *bufptr++;
-                               red = *bufptr++;
-                               alpha = *bufptr++;
--                              for (i = 0; i < count; i++)
-+                              for (i = 0; i < count && dataptr < final_pixel; i++)
-                                 {
-                                    WRITE_RGBA(dataptr, red, green, blue, alpha);
-                                    dataptr++;
-@@ -448,7 +453,7 @@
-                               blue = *bufptr++;
-                               green = *bufptr++;
-                               red = *bufptr++;
--                              for (i = 0; i < count; i++)
-+                              for (i = 0; i < count && dataptr < final_pixel; i++)
-                                 {
-                                    WRITE_RGBA(dataptr, red, green, blue,
-                                               (char)0xff);
-@@ -458,7 +463,7 @@
- 
-                            case 8:
-                               alpha = *bufptr++;
--                              for (i = 0; i < count; i++)
-+                              for (i = 0; i < count && dataptr < final_pixel; i++)
-                                 {
-                                    WRITE_RGBA(dataptr, alpha, alpha, alpha,
-                                               (char)0xff);
-@@ -473,7 +478,7 @@
-                     {
-                        int                 i;
- 
--                       for (i = 0; i < count; i++)
-+                       for (i = 0; i < count && dataptr < final_pixel; i++)
-                          {
-                             switch (bpp)
-                               {
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c b/graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c
deleted file mode 100644
index 27ec0d0b290a..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/modules/loaders/loader_tiff.c.orig	Tue Sep 26 23:17:49 2006
-+++ src/modules/loaders/loader_tiff.c	Wed Nov  8 19:58:57 2006
-@@ -75,7 +75,7 @@
- raster(TIFFRGBAImage_Extra * img, uint32 * rast,
-        uint32 x, uint32 y, uint32 w, uint32 h)
- {
--   uint32              image_width, image_height;
-+   int              image_width, image_height;
-    uint32             *pixel, pixel_value;
-    int                 i, j, dy, rast_offset;
-    DATA32             *buffer_pixel, *buffer = img->image->data;
-@@ -202,8 +202,15 @@
-      }
-    
-    rgba_image.image = im;
--   im->w = width = rgba_image.rgba.width;
--   im->h = height = rgba_image.rgba.height;
-+   width = rgba_image.rgba.width;
-+   height = rgba_image.rgba.height;
-+   if (width < 1 || height < 1 || width >= 16384 || height >= 16384) {
-+        TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
-+        TIFFClose(tif);
-+        return 0;
-+   }
-+   im->w = width;
-+   im->h = height;
-    rgba_image.num_pixels = num_pixels = width * height;
-    if (rgba_image.rgba.alpha != EXTRASAMPLE_UNSPECIFIED)
-       SET_FLAG(im->flags, F_HAS_ALPHA);
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 9e59bb39bb93..46eeebc0e5de 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -59,7 +59,7 @@ lib/imlib2/loaders/zlib.so
 lib/libImlib2.a
 lib/libImlib2.la
 lib/libImlib2.so
-lib/libImlib2.so.3
+lib/libImlib2.so.4
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf