aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorStanislav Sedov <stas@FreeBSD.org>2007-03-11 08:51:14 +0000
committerStanislav Sedov <stas@FreeBSD.org>2007-03-11 08:51:14 +0000
commit09e4e6f119b9ec6b0056a841d178b9a94d4663c4 (patch)
tree60dbec4f6c36413d232be56d31553ec53ac5f6fa /graphics
parent6ed6dba53f7727f76189d43bcaac071f15a544b6 (diff)
downloadports-09e4e6f119b9ec6b0056a841d178b9a94d4663c4.tar.gz
ports-09e4e6f119b9ec6b0056a841d178b9a94d4663c4.zip
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/edje/Makefile4
-rw-r--r--graphics/edje/distinfo6
-rw-r--r--graphics/edje/pkg-plist158
-rw-r--r--graphics/edje_viewer/Makefile4
-rw-r--r--graphics/edje_viewer/distinfo6
-rw-r--r--graphics/entice/Makefile4
-rw-r--r--graphics/entice/distinfo6
-rw-r--r--graphics/epeg/Makefile4
-rw-r--r--graphics/epeg/distinfo6
-rw-r--r--graphics/epsilon/Makefile6
-rw-r--r--graphics/epsilon/distinfo6
-rw-r--r--graphics/esmart/Makefile6
-rw-r--r--graphics/esmart/distinfo6
-rw-r--r--graphics/evas/Makefile4
-rw-r--r--graphics/evas/distinfo6
-rw-r--r--graphics/evas/files/patch-src_bin_evas_directfb_window.c11
-rw-r--r--graphics/evas/pkg-plist29
-rw-r--r--graphics/exhibit/Makefile4
-rw-r--r--graphics/exhibit/distinfo6
-rw-r--r--graphics/geist/Makefile4
-rw-r--r--graphics/giblib/Makefile4
-rw-r--r--graphics/hsetroot/Makefile4
-rw-r--r--graphics/imlib2/Makefile6
-rw-r--r--graphics/imlib2/distinfo6
-rw-r--r--graphics/imlib2/files/patch-configure561
-rw-r--r--graphics/imlib2/files/patch-imlib2.pc.in9
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_argb.c29
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_jpeg.c15
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_lbm.c48
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_png.c16
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_pnm.c11
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_tga.c75
-rw-r--r--graphics/imlib2/files/patch-src_modules_loaders_loader_tiff.c29
-rw-r--r--graphics/imlib2/pkg-plist2
-rw-r--r--graphics/imlib2_loaders/Makefile9
-rw-r--r--graphics/imlib2_loaders/distinfo6
-rw-r--r--graphics/kipi-plugins-kde4/Makefile4
-rw-r--r--graphics/kipi-plugins/Makefile4
-rw-r--r--graphics/libcaca/Makefile4
-rw-r--r--graphics/p5-Image-Imlib2/Makefile3
-rw-r--r--graphics/p5-Imlib2/Makefile4
-rw-r--r--graphics/qcomicbook/Makefile3
-rw-r--r--graphics/ruby-imlib2/Makefile5
-rw-r--r--graphics/telak/Makefile4
-rw-r--r--graphics/zphoto/Makefile4
45 files changed, 88 insertions, 1063 deletions
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index 30574d1b01e4..df65a5d36950 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= edje
-PORTVERSION= 20060926
+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= Edje is a complex graphical design and layout engine
diff --git a/graphics/edje/distinfo b/graphics/edje/distinfo
index b48081b17aca..89a1f9451636 100644
--- a/graphics/edje/distinfo
+++ b/graphics/edje/distinfo
@@ -1,3 +1,3 @@
-MD5 (edje-20060926.tar.bz2) = ce4874d6b3324dd39abf196841f1d0c0
-SHA256 (edje-20060926.tar.bz2) = d9bc56e6d578abe90c55006e5802e6e69106ee431ceaac6f435fc9fd290d8f0a
-SIZE (edje-20060926.tar.bz2) = 3027081
+MD5 (edje-20070223.tar.bz2) = 58cb7589902f03ea6b56bbddb1114f48
+SHA256 (edje-20070223.tar.bz2) = cb5005e8b2e5b7cf88dea639d406cdec9c2ff21bf2c2b8285283073810b51caf
+SIZE (edje-20070223.tar.bz2) = 1356646
diff --git a/graphics/edje/pkg-plist b/graphics/edje/pkg-plist
index 86d560c46a66..22a69c5a7e36 100644
--- a/graphics/edje/pkg-plist
+++ b/graphics/edje/pkg-plist
@@ -1,171 +1,13 @@
-bin/edje
bin/edje-config
bin/edje_cc
bin/edje_decc
-bin/edje_ls
bin/edje_recc
-bin/edje_test
-bin/edje_thumb
include/Edje.h
lib/libedje.a
lib/libedje.la
lib/libedje.so
lib/libedje.so.5
libdata/pkgconfig/edje.pc
-%%DATADIR%%/data/e_logo.sh
-%%DATADIR%%/data/images/bg.png
-%%DATADIR%%/data/images/e.png
-%%DATADIR%%/data/images/e001.png
-%%DATADIR%%/data/images/e002.png
-%%DATADIR%%/data/images/e003.png
-%%DATADIR%%/data/images/e004.png
-%%DATADIR%%/data/images/e005.png
-%%DATADIR%%/data/images/e006.png
-%%DATADIR%%/data/images/e007.png
-%%DATADIR%%/data/images/e008.png
-%%DATADIR%%/data/images/e009.png
-%%DATADIR%%/data/images/e010.png
-%%DATADIR%%/data/images/e011.png
-%%DATADIR%%/data/images/e012.png
-%%DATADIR%%/data/images/e013.png
-%%DATADIR%%/data/images/e014.png
-%%DATADIR%%/data/images/e015.png
-%%DATADIR%%/data/images/e016.png
-%%DATADIR%%/data/images/e017.png
-%%DATADIR%%/data/images/e018.png
-%%DATADIR%%/data/images/e019.png
-%%DATADIR%%/data/images/e020.png
-%%DATADIR%%/data/images/e021.png
-%%DATADIR%%/data/images/e022.png
-%%DATADIR%%/data/images/e023.png
-%%DATADIR%%/data/images/e024.png
-%%DATADIR%%/data/images/e025.png
-%%DATADIR%%/data/images/e026.png
-%%DATADIR%%/data/images/e027.png
-%%DATADIR%%/data/images/e028.png
-%%DATADIR%%/data/images/e029.png
-%%DATADIR%%/data/images/e030.png
-%%DATADIR%%/data/images/e031.png
-%%DATADIR%%/data/images/e032.png
-%%DATADIR%%/data/images/e033.png
-%%DATADIR%%/data/images/e034.png
-%%DATADIR%%/data/images/e035.png
-%%DATADIR%%/data/images/e036.png
-%%DATADIR%%/data/images/e037.png
-%%DATADIR%%/data/images/e038.png
-%%DATADIR%%/data/images/e039.png
-%%DATADIR%%/data/images/e040.png
-%%DATADIR%%/data/images/e041.png
-%%DATADIR%%/data/images/e042.png
-%%DATADIR%%/data/images/e043.png
-%%DATADIR%%/data/images/e044.png
-%%DATADIR%%/data/images/e045.png
-%%DATADIR%%/data/images/e046.png
-%%DATADIR%%/data/images/e047.png
-%%DATADIR%%/data/images/e048.png
-%%DATADIR%%/data/images/e049.png
-%%DATADIR%%/data/images/e050.png
-%%DATADIR%%/data/images/e051.png
-%%DATADIR%%/data/images/e052.png
-%%DATADIR%%/data/images/e053.png
-%%DATADIR%%/data/images/e054.png
-%%DATADIR%%/data/images/e055.png
-%%DATADIR%%/data/images/e056.png
-%%DATADIR%%/data/images/e057.png
-%%DATADIR%%/data/images/e058.png
-%%DATADIR%%/data/images/e059.png
-%%DATADIR%%/data/images/e060.png
-%%DATADIR%%/data/images/e061.png
-%%DATADIR%%/data/images/e062.png
-%%DATADIR%%/data/images/e063.png
-%%DATADIR%%/data/images/e064.png
-%%DATADIR%%/data/images/e065.png
-%%DATADIR%%/data/images/e066.png
-%%DATADIR%%/data/images/e067.png
-%%DATADIR%%/data/images/e068.png
-%%DATADIR%%/data/images/e069.png
-%%DATADIR%%/data/images/e070.png
-%%DATADIR%%/data/images/e071.png
-%%DATADIR%%/data/images/e072.png
-%%DATADIR%%/data/images/e073.png
-%%DATADIR%%/data/images/e074.png
-%%DATADIR%%/data/images/e075.png
-%%DATADIR%%/data/images/e076.png
-%%DATADIR%%/data/images/e077.png
-%%DATADIR%%/data/images/e078.png
-%%DATADIR%%/data/images/e079.png
-%%DATADIR%%/data/images/e080.png
-%%DATADIR%%/data/images/e081.png
-%%DATADIR%%/data/images/e082.png
-%%DATADIR%%/data/images/e083.png
-%%DATADIR%%/data/images/e084.png
-%%DATADIR%%/data/images/e085.png
-%%DATADIR%%/data/images/e086.png
-%%DATADIR%%/data/images/e087.png
-%%DATADIR%%/data/images/e088.png
-%%DATADIR%%/data/images/e089.png
-%%DATADIR%%/data/images/e090.png
-%%DATADIR%%/data/images/e091.png
-%%DATADIR%%/data/images/e092.png
-%%DATADIR%%/data/images/e093.png
-%%DATADIR%%/data/images/e094.png
-%%DATADIR%%/data/images/e095.png
-%%DATADIR%%/data/images/e096.png
-%%DATADIR%%/data/images/e097.png
-%%DATADIR%%/data/images/e098.png
-%%DATADIR%%/data/images/e099.png
-%%DATADIR%%/data/images/e100.png
-%%DATADIR%%/data/images/e101.png
-%%DATADIR%%/data/images/e102.png
-%%DATADIR%%/data/images/e103.png
-%%DATADIR%%/data/images/e104.png
-%%DATADIR%%/data/images/e105.png
-%%DATADIR%%/data/images/e106.png
-%%DATADIR%%/data/images/e107.png
-%%DATADIR%%/data/images/e108.png
-%%DATADIR%%/data/images/e109.png
-%%DATADIR%%/data/images/e110.png
-%%DATADIR%%/data/images/e111.png
-%%DATADIR%%/data/images/e112.png
-%%DATADIR%%/data/images/e113.png
-%%DATADIR%%/data/images/e114.png
-%%DATADIR%%/data/images/e115.png
-%%DATADIR%%/data/images/e116.png
-%%DATADIR%%/data/images/e117.png
-%%DATADIR%%/data/images/e118.png
-%%DATADIR%%/data/images/e119.png
-%%DATADIR%%/data/images/e120.png
-%%DATADIR%%/data/src/e_logo.edc
-%%DATADIR%%/data/src/test.edc
-%%DATADIR%%/data/template/README
-%%DATADIR%%/data/template/build_theme.sh
-%%DATADIR%%/data/template/default.edc
-%%DATADIR%%/data/template/embryo/global.edc
-%%DATADIR%%/data/template/fonts/Vera.ttf
-%%DATADIR%%/data/template/fonts/fonts.edc
-%%DATADIR%%/data/template/hashes/hashes.edc
-%%DATADIR%%/data/template/images/images.edc
-%%DATADIR%%/data/template/macros/mymacro.edc
-%%DATADIR%%/data/template/parts/bg.edc
-%%DATADIR%%/data/template/programs/bg.edc
-%%DATADIR%%/data/test/fonts/Vera.ttf
-%%DATADIR%%/data/test/fonts/VeraBI.ttf
-%%DATADIR%%/data/test/fonts/VeraBd.ttf
-%%DATADIR%%/data/test/fonts/VeraIt.ttf
-%%DATADIR%%/data/test/fonts/VeraMoBI.ttf
-%%DATADIR%%/data/test/fonts/VeraMoBd.ttf
-%%DATADIR%%/data/test/fonts/VeraMoIt.ttf
-%%DATADIR%%/data/test/fonts/VeraMono.ttf
-%%DATADIR%%/data/test/fonts/VeraSe.ttf
-%%DATADIR%%/data/test/fonts/VeraSeBd.ttf
-%%DATADIR%%/data/test/fonts/fonts.alias
-%%DATADIR%%/data/test/fonts/fonts.dir
-%%DATADIR%%/data/test/images/bg.png
-%%DATADIR%%/data/test/images/border.png
-%%DATADIR%%/data/test/images/item_normal.png
-%%DATADIR%%/data/test/images/item_selected.png
-%%DATADIR%%/data/test/images/item_title.png
-%%DATADIR%%/data/test/images/shadow.png
%%DATADIR%%/include/edje.inc
@dirrmtry %%DATADIR%%/include
@dirrmtry %%DATADIR%%/data/test/images
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index e2cf803cba14..98e489f2fd80 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= edje_viewer
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= A simple viewer for .edj files
diff --git a/graphics/edje_viewer/distinfo b/graphics/edje_viewer/distinfo
index 3c5d6b21ee28..348b2f9fa6a2 100644
--- a/graphics/edje_viewer/distinfo
+++ b/graphics/edje_viewer/distinfo
@@ -1,3 +1,3 @@
-MD5 (edje_viewer-20060926.tar.bz2) = d4a3bdb00af5b5c847178695aa8ccb04
-SHA256 (edje_viewer-20060926.tar.bz2) = 0fe339ac3e9c4a70fdb6d942a718abb2fe362abae3e1765978128cc99da4d671
-SIZE (edje_viewer-20060926.tar.bz2) = 263533
+MD5 (edje_viewer-20070223.tar.bz2) = ca78913cccab72cc667d77f4be95ff04
+SHA256 (edje_viewer-20070223.tar.bz2) = c9fd85b81a19ad9ac20f6f5a6554837d2255efde8cbac2c5030742f8ffa0d049
+SIZE (edje_viewer-20070223.tar.bz2) = 262613
diff --git a/graphics/entice/Makefile b/graphics/entice/Makefile
index ba37a3d3ca83..abc9a846d657 100644
--- a/graphics/entice/Makefile
+++ b/graphics/entice/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= entice
-PORTVERSION= 20060926
+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= An image viewer written using libraries for Enlightenment 0.17
diff --git a/graphics/entice/distinfo b/graphics/entice/distinfo
index ad0e2758c440..63517e7e19d8 100644
--- a/graphics/entice/distinfo
+++ b/graphics/entice/distinfo
@@ -1,3 +1,3 @@
-MD5 (entice-20060926.tar.bz2) = d2d786a9fd8bc26af51ff2a8d1aadb3d
-SHA256 (entice-20060926.tar.bz2) = c291eabf3ab361d486186055ee4aaac352a06f2197423fade5c853f4b675faf0
-SIZE (entice-20060926.tar.bz2) = 794085
+MD5 (entice-20070223.tar.bz2) = 3f0ba702de5679830ab09f00779e3331
+SHA256 (entice-20070223.tar.bz2) = d55495af7d2b66a3404184b84ec42e3d63c168416f40a9f7a564c9cd39c269f6
+SIZE (entice-20070223.tar.bz2) = 792196
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index e021e8e08746..f1058d66ac07 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= epeg
-PORTVERSION= 20060926
+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= An IMMENSELY FAST JPEG thumbnailer library API
diff --git a/graphics/epeg/distinfo b/graphics/epeg/distinfo
index 6feef53a100a..079569c41b92 100644
--- a/graphics/epeg/distinfo
+++ b/graphics/epeg/distinfo
@@ -1,3 +1,3 @@
-MD5 (epeg-20060926.tar.bz2) = 33ee80c85c6859084c1164e8575e4b4a
-SHA256 (epeg-20060926.tar.bz2) = cb3ae987ce05865a65ab0c3f8a14784578f14b8d43987e226ad73507b142b1ec
-SIZE (epeg-20060926.tar.bz2) = 1263246
+MD5 (epeg-20070223.tar.bz2) = adbb92d557cda3bbe1478f8c89ee71df
+SHA256 (epeg-20070223.tar.bz2) = b7b9eca6144ab9ab399134f2ca97fdef93933bd03f469cca562b0354bb2909a9
+SIZE (epeg-20070223.tar.bz2) = 1262325
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index 16d819181c56..a7298bfbc00a 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= epsilon
-PORTVERSION= 20060926
-PORTREVISION= 1
+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= A small, display independent, and quick thumbnailing library
diff --git a/graphics/epsilon/distinfo b/graphics/epsilon/distinfo
index 041dce9314c8..f701015354c4 100644
--- a/graphics/epsilon/distinfo
+++ b/graphics/epsilon/distinfo
@@ -1,3 +1,3 @@
-MD5 (epsilon-20060926.tar.bz2) = 796f188c4de29d43eb67625029659abe
-SHA256 (epsilon-20060926.tar.bz2) = 0efd02f9b1dfba97bebb1f44eeedd047a849289ef3f080378b3b53a299c07465
-SIZE (epsilon-20060926.tar.bz2) = 288795
+MD5 (epsilon-20070223.tar.bz2) = 6e7574727b3581c23f07b55fff215972
+SHA256 (epsilon-20070223.tar.bz2) = 6209539781617c59205266b121346db247c6c2af80a0f2036d78aa38d859896c
+SIZE (epsilon-20070223.tar.bz2) = 286825
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index be6dadbb830b..ef5223c939c4 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -6,17 +6,15 @@
#
PORTNAME= esmart
-PORTVERSION= 20060926
+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= Evas smart objects development libraries
-LIB_DEPENDS= epsilon.0:${PORTSDIR}/graphics/epsilon
-
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl:15
USE_BZIP2= yes
diff --git a/graphics/esmart/distinfo b/graphics/esmart/distinfo
index 02e39e4587d6..9b61df6dbba1 100644
--- a/graphics/esmart/distinfo
+++ b/graphics/esmart/distinfo
@@ -1,3 +1,3 @@
-MD5 (esmart-20060926.tar.bz2) = dd492859552858c7e21b7a89525503e7
-SHA256 (esmart-20060926.tar.bz2) = a23d92cadc5df8795b6a93caaf08080c16e4918573a9d45690b5ea093a6d3a5d
-SIZE (esmart-20060926.tar.bz2) = 294546
+MD5 (esmart-20070223.tar.bz2) = a1cb39975fc802d76add1c7689eecae9
+SHA256 (esmart-20070223.tar.bz2) = 4fb398fc2b5b7cf1ee6ffbe2c6c4f16c597ec7a8a16b0c3fd21810880195c40f
+SIZE (esmart-20070223.tar.bz2) = 291879
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 912395599616..69116d90c095 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= evas
-PORTVERSION= 20060926
+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= A hardware-accelerated canvas API for X-Windows
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 6ac8c2bbc653..b310ded67a6f 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,3 +1,3 @@
-MD5 (evas-20060926.tar.bz2) = 4cf57ca17141e52679ead8bb61e9772e
-SHA256 (evas-20060926.tar.bz2) = 029cd028b6925c4b6b99bc79247dc1fb73bd24e7747761f0126f7eb041dfe6e5
-SIZE (evas-20060926.tar.bz2) = 4343022
+MD5 (evas-20070223.tar.bz2) = 11baa88bdda77d846db0c7d090d9ec75
+SHA256 (evas-20070223.tar.bz2) = 0bd21a807092af4c5e21132cd41a2159d08b0e099dcf947fec094fdecc3d07dc
+SIZE (evas-20070223.tar.bz2) = 3683644
diff --git a/graphics/evas/files/patch-src_bin_evas_directfb_window.c b/graphics/evas/files/patch-src_bin_evas_directfb_window.c
deleted file mode 100644
index b3c9e11854f0..000000000000
--- a/graphics/evas/files/patch-src_bin_evas_directfb_window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/evas_directfb_window.c.orig Wed Sep 27 00:21:47 2006
-+++ src/bin/evas_directfb_window.c Wed Sep 27 00:22:37 2006
-@@ -35,7 +35,7 @@
- #include <time.h>
-
- #include <directfb/directfb.h>
--#include <directfb/directfb_version.h>
-+#include <directfb-internal/directfb_version.h>
-
- #include "config.h"
- #include "Evas.h"
diff --git a/graphics/evas/pkg-plist b/graphics/evas/pkg-plist
index 8e95e353e86d..358a874ef42a 100644
--- a/graphics/evas/pkg-plist
+++ b/graphics/evas/pkg-plist
@@ -1,12 +1,4 @@
bin/evas-config
-%%BUFFER%%bin/evas_buffer_test
-%%DIRECTFB%%bin/evas_directfb_test
-%%DIRECTFB%%bin/evas_directfb_window
-%%WITH_GL%%bin/evas_gl_x11_test
-%%SOFTX11%%bin/evas_software_x11_perf_load
-%%SOFTX11%%bin/evas_software_x11_perf_test
-%%SOFTX11%%bin/evas_software_x11_test
-%%XRENDER%%bin/evas_xrender_x11_test
include/Evas.h
%%BUFFER%%include/Evas_Engine_Buffer.h
%%DIRECTFB%%include/Evas_Engine_DirectFB.h
@@ -75,27 +67,6 @@ lib/libevas.la
lib/libevas.so
lib/libevas.so.1
libdata/pkgconfig/evas.pc
-%%DATADIR%%/Vera.ttf
-%%DATADIR%%/VeraBI.ttf
-%%DATADIR%%/VeraBd.ttf
-%%DATADIR%%/VeraIt.ttf
-%%DATADIR%%/VeraMoBI.ttf
-%%DATADIR%%/VeraMoBd.ttf
-%%DATADIR%%/VeraMoIt.ttf
-%%DATADIR%%/VeraMono.ttf
-%%DATADIR%%/VeraSe.ttf
-%%DATADIR%%/VeraSeBd.ttf
-%%DATADIR%%/backdrop.png
-%%DATADIR%%/e_logo.png
-%%DATADIR%%/evas_logo.png
-%%DATADIR%%/fonts.alias
-%%DATADIR%%/fonts.dir
-%%DATADIR%%/panel.png
-%%DATADIR%%/panel_shadow.png
-%%DATADIR%%/panel_top.png
-%%DATADIR%%/t1.png
-%%DATADIR%%/t2.png
-%%DATADIR%%/test_pattern.png
@dirrm %%DATADIR%%
%%TIFF%%@dirrm lib/evas/modules/savers/tiff/%%E17_ARCH%%
%%TIFF%%@dirrm lib/evas/modules/savers/tiff
diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile
index b9eedadbf1c7..dda886cad730 100644
--- a/graphics/exhibit/Makefile
+++ b/graphics/exhibit/Makefile
@@ -7,9 +7,9 @@
#
PORTNAME= exhibit
-PORTVERSION= 20060926
+PORTVERSION= 20070223
CATEGORIES= graphics
-MASTER_SITES= http://sunner.elcomnet.ru/~stas/
+MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
COMMENT= An ETK-based image viewer
diff --git a/graphics/exhibit/distinfo b/graphics/exhibit/distinfo
index 4fce8851f7c2..046f3138f8ea 100644
--- a/graphics/exhibit/distinfo
+++ b/graphics/exhibit/distinfo
@@ -1,3 +1,3 @@
-MD5 (exhibit-20060926.tar.bz2) = 0057914c0640932fff612435177e0d44
-SHA256 (exhibit-20060926.tar.bz2) = 6ed79409af59b396b8a9765cae91f6940fadbdc5a1849aafd662a87d79a5b041
-SIZE (exhibit-20060926.tar.bz2) = 276307
+MD5 (exhibit-20070223.tar.bz2) = e64b74615c31437b3cebc50677b11048
+SHA256 (exhibit-20070223.tar.bz2) = 9096329f4fdfd32d140d54eafd71c8c42cceb8774cc3b348d17c60f9595d1867
+SIZE (exhibit-20070223.tar.bz2) = 275461
diff --git a/graphics/geist/Makefile b/graphics/geist/Makefile
index 5abfc650ca07..1648de0d136d 100644
--- a/graphics/geist/Makefile
+++ b/graphics/geist/Makefile
@@ -7,14 +7,14 @@
PORTNAME= geist
PORTVERSION= 0.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= danfe@FreeBSD.org
COMMENT= An object-based image creation/layout application
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2 \
xml2.5:${PORTSDIR}/textproc/libxml2
XML_CONFIG?= ${LOCALBASE}/bin/xml2-config
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 1af07f2a1fcb..095f911ef96d 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -7,14 +7,14 @@
PORTNAME= giblib
PORTVERSION= 1.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics devel
MASTER_SITES= http://linuxbrit.co.uk/downloads/
MAINTAINER= andrew.nau.ua@gmail.com
COMMENT= A utility library that includes a wrapper for imlib2
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_AUTOTOOLS= libtool:15
USE_X_PREFIX= yes
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index 8628f9026aad..f51de018c697 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -7,14 +7,14 @@
PORTNAME= hsetroot
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://thegraveyard.org/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility to compose wallpapers for X
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
PLIST_FILES= bin/hsetroot
USE_X_PREFIX= YES
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
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index dbe0c30cc762..e97b634b9241 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,22 +6,19 @@
#
PORTNAME= imlib2_loaders
-PORTVERSION= 20060926
+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= Extra image loader plugins for Imlib 2
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2 \
- edb.1:${PORTSDIR}/databases/edb \
- eet.9:${PORTSDIR}/devel/eet
-
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack gnometarget
+USE_EFL= edb eet imlib2
OPTIONS= EDB "Enable edb loader" on \
EET "Enable eet loader" on \
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index c2dd1711461d..c619d0adf08a 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,3 +1,3 @@
-MD5 (imlib2_loaders-20060926.tar.bz2) = 452b7661ed24be80ebf1d8755e5bbfa4
-SHA256 (imlib2_loaders-20060926.tar.bz2) = e70e057076013f20dd37645bf55ea0740f0ff5905847be50e57f20216583f192
-SIZE (imlib2_loaders-20060926.tar.bz2) = 242000
+MD5 (imlib2_loaders-20070223.tar.bz2) = 44f88b81042b4cd205505a20058c89f4
+SHA256 (imlib2_loaders-20070223.tar.bz2) = f8476002583e4277840010fef3e56071849ec85b4f5b24e860fabf01e3f69c8d
+SIZE (imlib2_loaders-20070223.tar.bz2) = 240441
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 895192a9ec91..f1ada3e41215 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kipi-plugins
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -185,7 +185,7 @@ PLIST_SUB+= SIMPLEVIEWEREXPORT:="@comment "
.if !defined(WITHOUT_SLIDESHOW)
PLIST_SUB+= SLIDESHOW:=""
SUBDIRS+= slideshow
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
.else
PLIST_SUB+= SLIDESHOW:="@comment "
.endif
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 895192a9ec91..f1ada3e41215 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= kipi-plugins
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -185,7 +185,7 @@ PLIST_SUB+= SIMPLEVIEWEREXPORT:="@comment "
.if !defined(WITHOUT_SLIDESHOW)
PLIST_SUB+= SLIDESHOW:=""
SUBDIRS+= slideshow
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
.else
PLIST_SUB+= SLIDESHOW:="@comment "
.endif
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index 9303088c7026..1b44b22e332f 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -6,7 +6,7 @@
PORTNAME= libcaca
PORTVERSION= 0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://libcaca.zoy.org/files/
@@ -29,7 +29,7 @@ USE_XLIB= yes
.if defined(WITHOUT_IMLIB2)
CONFIGURE_ARGS+= --disable-imlib2
.else
-LIB_DEPENDS+= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+= Imlib2.4:${PORTSDIR}/graphics/imlib2
.endif
.include <bsd.port.pre.mk>
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 97e004699f3d..534b8792eb22 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Image-Imlib2
PORTVERSION= 1.13
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Image
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to the Imlib2 image library
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
BUILD_DEPENDS+= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
PERL_MODBUILD= yes
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index 97c7809ca315..817e8eaa74b9 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Imlib2
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics perl5
MASTER_SITES= http://www.muhri.net/
PKGNAMEPREFIX= p5-
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl bindings for Imlib2
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
PERL_CONFIGURE= yes
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index b8a9cb7c1fe0..5ca70f28f9c4 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -7,13 +7,14 @@
PORTNAME= qcomicbook
PORTVERSION= 0.3.4
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://linux.bydg.org/~yogin/
MAINTAINER= ports@FreeBSD.org
COMMENT= QT-based comic book archive viewer
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
RUN_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
unrar:${PORTSDIR}/archivers/unrar
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index abb10d5db54d..49cdde3afd79 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -7,16 +7,17 @@
PORTNAME= imlib2
PORTVERSION= 0.5.2
+PORTREVISION= 1
CATEGORIES= graphics ruby
MASTER_SITES= http://www.pablotron.org/download/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
DIST_SUBDIR= ruby
-MAINTAINER= ssedov@mbsd.msk.ru
+MAINTAINER= stas@FreeBSD.org
COMMENT= Imlib2 bindings for Ruby
-LIB_DEPENDS= Imlib2.3:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS= Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index c00c6f9c0014..0a6ee3b03ee0 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -7,7 +7,7 @@
PORTNAME= telak
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://julien.danjou.info/telak/ \
http://critical.ch/distfiles/ \
@@ -18,7 +18,7 @@ COMMENT= A tool to draw pictures on your root window
LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \
gcrypt.13:${PORTSDIR}/security/libgcrypt \
- Imlib2.3:${PORTSDIR}/graphics/imlib2
+ Imlib2.4:${PORTSDIR}/graphics/imlib2
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index e2bfdd10a39f..eedd6147882b 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zphoto
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics www
MASTER_SITES= http://namazu.org/~satoru/zphoto/
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= Zooming photo album generator
LIB_DEPENDS= ming.4:${PORTSDIR}/graphics/ming \
- Imlib2.3:${PORTSDIR}/graphics/imlib2 \
+ Imlib2.4:${PORTSDIR}/graphics/imlib2 \
popt.0:${PORTSDIR}/devel/popt
.if !defined (WITHOUT_AVIPLAY)
LIB_DEPENDS+= aviplay.0:${PORTSDIR}/multimedia/avifile