Index: imlib2/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/imlib2/Makefile,v retrieving revision 1.138 diff -u -r1.138 Makefile --- imlib2/Makefile 30 Mar 2010 13:55:19 -0000 1.138 +++ imlib2/Makefile 18 Aug 2010 11:27:46 -0000 @@ -6,12 +6,10 @@ # PORTNAME= imlib2 -PORTVERSION= 1.4.1.000 -PORTREVISION= 9 +PORTVERSION= 1.4.4 PORTEPOCH= 2 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ - http://download.enlightenment.org/snapshots/2008-01-25/ +MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}/ MAINTAINER= stas@FreeBSD.org COMMENT= The next generation graphics library for Enlightenment Index: imlib2/distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/imlib2/distinfo,v retrieving revision 1.45 diff -u -r1.45 distinfo --- imlib2/distinfo 11 Mar 2008 21:13:34 -0000 1.45 +++ imlib2/distinfo 18 Aug 2010 11:28:33 -0000 @@ -1,3 +1,3 @@ -MD5 (imlib2-1.4.1.000.tar.bz2) = cbb3180c80f12db01decd2ad4ae3a94a -SHA256 (imlib2-1.4.1.000.tar.bz2) = bfd6871c19ca26b23116b5418962844b0db179bccbb0465176464780d483be79 -SIZE (imlib2-1.4.1.000.tar.bz2) = 861125 +MD5 (imlib2-1.4.4.tar.bz2) = b6de51879502e857d5b1f7622267a030 +SHA256 (imlib2-1.4.4.tar.bz2) = 6441fb1e88a31533791c40ea4b3310b6d5d46233ca69d9f731a2846e4e423404 +SIZE (imlib2-1.4.4.tar.bz2) = 888878 Index: imlib2/pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/imlib2/pkg-plist,v retrieving revision 1.43 diff -u -r1.43 pkg-plist --- imlib2/pkg-plist 11 Mar 2008 21:13:34 -0000 1.43 +++ imlib2/pkg-plist 18 Aug 2010 11:28:11 -0000 @@ -8,52 +8,36 @@ %%X11%%bin/imlib2_test %%X11%%bin/imlib2_view include/Imlib2.h -lib/imlib2/filters/bumpmap.a lib/imlib2/filters/bumpmap.la lib/imlib2/filters/bumpmap.so -lib/imlib2/filters/colormod.a lib/imlib2/filters/colormod.la lib/imlib2/filters/colormod.so -lib/imlib2/filters/testfilter.a lib/imlib2/filters/testfilter.la lib/imlib2/filters/testfilter.so -lib/imlib2/loaders/argb.a lib/imlib2/loaders/argb.la lib/imlib2/loaders/argb.so -lib/imlib2/loaders/bmp.a lib/imlib2/loaders/bmp.la lib/imlib2/loaders/bmp.so -lib/imlib2/loaders/bz2.a lib/imlib2/loaders/bz2.la lib/imlib2/loaders/bz2.so -%%GIF%%lib/imlib2/loaders/gif.a %%GIF%%lib/imlib2/loaders/gif.la %%GIF%%lib/imlib2/loaders/gif.so -%%ID3%%lib/imlib2/loaders/id3.a %%ID3%%lib/imlib2/loaders/id3.la %%ID3%%lib/imlib2/loaders/id3.so -%%JPEG%%lib/imlib2/loaders/jpeg.a %%JPEG%%lib/imlib2/loaders/jpeg.la %%JPEG%%lib/imlib2/loaders/jpeg.so -lib/imlib2/loaders/lbm.a lib/imlib2/loaders/lbm.la lib/imlib2/loaders/lbm.so -%%PNG%%lib/imlib2/loaders/png.a %%PNG%%lib/imlib2/loaders/png.la %%PNG%%lib/imlib2/loaders/png.so -lib/imlib2/loaders/pnm.a lib/imlib2/loaders/pnm.la lib/imlib2/loaders/pnm.so -lib/imlib2/loaders/tga.a lib/imlib2/loaders/tga.la lib/imlib2/loaders/tga.so -%%TIFF%%lib/imlib2/loaders/tiff.a %%TIFF%%lib/imlib2/loaders/tiff.la %%TIFF%%lib/imlib2/loaders/tiff.so -lib/imlib2/loaders/xpm.a lib/imlib2/loaders/xpm.la lib/imlib2/loaders/xpm.so -lib/imlib2/loaders/zlib.a lib/imlib2/loaders/zlib.la lib/imlib2/loaders/zlib.so lib/libImlib2.a Index: imlib2/files/patch-CVE-2008-5187 =================================================================== RCS file: imlib2/files/patch-CVE-2008-5187 diff -N imlib2/files/patch-CVE-2008-5187 --- imlib2/files/patch-CVE-2008-5187 24 Nov 2008 17:50:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -Obtained from: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505714#15 - ---- src/modules/loaders/loader_xpm.c -+++ src/modules/loaders/loader_xpm.c -@@ -246,8 +246,8 @@ - return 0; - } - ptr = im->data; -- end = ptr + (sizeof(DATA32) * w * h); - pixels = w * h; -+ end = ptr + pixels; - } - else - { Index: imlib2/files/patch-amd64_blend =================================================================== RCS file: imlib2/files/patch-amd64_blend diff -N imlib2/files/patch-amd64_blend --- imlib2/files/patch-amd64_blend 18 Aug 2010 08:21:45 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- src/lib/amd64_blend.S.orig 2010-08-18 09:19:53.000000000 +0000 -+++ src/lib/amd64_blend.S 2010-08-18 09:20:01.000000000 +0000 -@@ -11,6 +11,7 @@ - - /*\ Some useful masks \*/ - .data -+.align 16 - m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 - .byte 0, 0, 0, 0, 0, 0, 255, 0 - m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 ---- src/lib/amd64_blend_cmod.S.orig 2010-08-18 09:20:09.000000000 +0000 -+++ src/lib/amd64_blend_cmod.S 2010-08-18 09:20:16.000000000 +0000 -@@ -11,6 +11,7 @@ - - /*\ Some useful masks \*/ - .data -+.align 16 - m0X000000: .byte 0, 0, 0, 0, 0, 0, 255, 0 - .byte 0, 0, 0, 0, 0, 0, 255, 0 - m10000000: .byte 0, 0, 0, 0, 0, 0, 0, 1 Index: imlib2/files/patch-imlib2-config.in =================================================================== RCS file: imlib2/files/patch-imlib2-config.in diff -N imlib2/files/patch-imlib2-config.in --- imlib2/files/patch-imlib2-config.in 3 Jul 2005 00:02:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- imlib2-config.in.orig Sun Jul 3 07:35:44 2005 -+++ imlib2-config.in Sun Jul 3 07:36:02 2005 -@@ -42,7 +42,7 @@ - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ - fi -- echo $includes -+ echo $includes @my_includes@ - ;; - --libs) - libdirs=-L@libdir@ Index: imlib2/files/patch-imlib2.pc.in =================================================================== RCS file: imlib2/files/patch-imlib2.pc.in diff -N imlib2/files/patch-imlib2.pc.in --- imlib2/files/patch-imlib2.pc.in 11 Mar 2007 08:51:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ ---- 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@ - Index: imlib2/files/patch-loader_png.c =================================================================== RCS file: imlib2/files/patch-loader_png.c diff -N imlib2/files/patch-loader_png.c --- imlib2/files/patch-loader_png.c 30 Mar 2010 13:55:19 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- src/modules/loaders/loader_png.c.orig 2007-08-25 04:33:10.000000000 +0200 -+++ src/modules/loaders/loader_png.c 2010-03-28 16:18:53.000000000 +0200 -@@ -38,7 +38,7 @@ - - /* if we haven't read the header before, set the header data */ - fread(buf, 1, PNG_BYTES_TO_CHECK, f); -- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK)) -+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) - { - fclose(f); - return 0; Index: imlib2_loaders/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/imlib2_loaders/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- imlib2_loaders/Makefile 28 Mar 2010 06:36:51 -0000 1.32 +++ imlib2_loaders/Makefile 18 Aug 2010 11:27:47 -0000 @@ -6,12 +6,10 @@ # PORTNAME= imlib2_loaders -PORTVERSION= 1.4.1.000 -PORTREVISION= 3 +PORTVERSION= 1.4.4 PORTEPOCH= 2 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ - http://download.enlightenment.org/snapshots/2008-01-25/ +MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}/ MAINTAINER= stas@FreeBSD.org COMMENT= Extra image loader plugins for Imlib 2 Index: imlib2_loaders/distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/imlib2_loaders/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- imlib2_loaders/distinfo 11 Mar 2008 21:13:34 -0000 1.16 +++ imlib2_loaders/distinfo 18 Aug 2010 10:53:45 -0000 @@ -1,3 +1,3 @@ -MD5 (imlib2_loaders-1.4.1.000.tar.bz2) = 4b04b6b11e0e7ae8494fdc554a880429 -SHA256 (imlib2_loaders-1.4.1.000.tar.bz2) = b95c4e29328b1d2210ad51c516959aa50a94787ba115277ed9c9b695b6542381 -SIZE (imlib2_loaders-1.4.1.000.tar.bz2) = 256470 +MD5 (imlib2_loaders-1.4.4.tar.bz2) = 22730ff2a402985b2a0c121603986d1f +SHA256 (imlib2_loaders-1.4.4.tar.bz2) = 846f1bdd7e1b86aa11e0225056700eff6f40eef65dcf0ab93178ada34e571231 +SIZE (imlib2_loaders-1.4.4.tar.bz2) = 263710