5 files changed, 41 insertions, 49 deletions

diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index 7c7088585c10..f88c5980294c 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	exact-image
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	graphics perl5 python
 MASTER_SITES=	http://dl.exactcode.de/oss/${PORTNAME}/
 
@@ -45,6 +44,7 @@ PLIST_FILES=	${BINS:S|^|bin/|} \
 		%%SITE_PERL%%/ExactImage.pm \
 		%%PYTHON_SITELIBDIR%%/ExactImage.py \
 		%%PYTHON_SITELIBDIR%%/_ExactImage.so
+LICENSE=	GPLv2
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/agg-2.4/
@@ -80,10 +80,4 @@ do-install:
 		${INSTALL_SCRIPT} ExactImage.py ${PYTHONPREFIX_SITELIBDIR}/&&\
 		${INSTALL_PROGRAM} _ExactImage.so ${PYTHONPREFIX_SITELIBDIR}/
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-BROKEN=	does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/exact-image/distinfo b/graphics/exact-image/distinfo
index b4da072be22e..e31fff8c7741 100644
--- a/graphics/exact-image/distinfo
+++ b/graphics/exact-image/distinfo
@@ -1,3 +1,2 @@
-MD5 (exact-image-0.8.1.tar.bz2) = f6c5a068a21a90c314ba557f0a601352
-SHA256 (exact-image-0.8.1.tar.bz2) = 926a09c897489705ba42daeb01fc4a3c327a8194dc65431f630d50684390e28b
-SIZE (exact-image-0.8.1.tar.bz2) = 283660
+SHA256 (exact-image-0.8.4.tar.bz2) = c594486e3ac1d8454bded568ecbd9f659b8e05f2b9cc2ef8ee0ab0f3cf780e91
+SIZE (exact-image-0.8.4.tar.bz2) = 283613
diff --git a/graphics/exact-image/files/patch-edisplay_Makefile b/graphics/exact-image/files/patch-edisplay_Makefile
deleted file mode 100644
index 61a4a180a8f2..000000000000
--- a/graphics/exact-image/files/patch-edisplay_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: Makefile
-===================================================================
---- edisplay/Makefile	(revision 1751)
-+++ edisplay/Makefile	(revision 1752)
-@@ -4,7 +4,9 @@
- BINARY = edisplay
- BINARY_EXT = $(X_EXEEXT)
- 
--CPPFLAGS += -I . -I lib -I gfx $(shell pkg-config evas --atleast-version 0.9.9.050 && echo -D WITHEVAS_X11_CONNECTION)
-+CPPFLAGS += -I . -I lib -I gfx
-+CPPFLAGS +=  $(shell pkg-config evas --atleast-version 0.9.9.050 && echo -D WITHEVAS_X11_CONNECTION)
-+CPPFLAGS +=  $(shell pkg-config evas --atleast-version 0.9.9.49898 && echo -D WITHEVAS_X11_SCREEN)
- 
- DEPS += $(X_OUTARCH)/gfx/X11Helper$(X_OBJEXT) $(X_OUTARCH)/gfx/EvasHelper$(X_OBJEXT) $(X_OUTARCH)/utility/Timer$(X_OBJEXT) $(X_OUTARCH)/utility/ArgumentList$(X_OBJEXT) $(lib_BINARY) $(codecs_BINARY)
- 
diff --git a/graphics/exact-image/files/patch-edisplay_edisplay.cc b/graphics/exact-image/files/patch-edisplay_edisplay.cc
index 4f909e6ed84f..35eb081a3ec0 100644
--- a/graphics/exact-image/files/patch-edisplay_edisplay.cc
+++ b/graphics/exact-image/files/patch-edisplay_edisplay.cc
@@ -1,24 +1,14 @@
-Index: edisplay.cc
-===================================================================
---- edisplay/edisplay.cc	(revision 1751)
-+++ edisplay/edisplay.cc	(revision 1752)
-@@ -269,12 +269,14 @@
-       
-       /* the following is specific to the engine */
-       einfo->info.display = dpy;
--      einfo->info.visual =
--	einfo->func.best_visual_get (dpy, DefaultScreen(dpy));
--      einfo->info.colormap =
--	einfo->func.best_colormap_get(dpy,DefaultScreen(dpy));
--
-+#ifdef WITHEVAS_X11_SCREEN
-+      einfo->info.screen = DefaultScreen(dpy);
-+      einfo->info.visual = einfo->func.best_visual_get(einfo);
-+      einfo->info.colormap = einfo->func.best_colormap_get(einfo);
+--- ./edisplay/edisplay.cc.orig	2011-03-15 09:03:47.000000000 -0400
++++ ./edisplay/edisplay.cc	2011-03-15 09:05:59.000000000 -0400
+@@ -27,7 +27,11 @@
+ #include "Evas_Engine_GL_X11.h"
+ #endif
+ 
++#if defined(__FreeBSD__)
++#include <sys/endian.h>
 +#else
-+      einfo->info.visual = einfo->func.best_visual_get(dpy, DefaultScreen(dpy));
-       einfo->info.colormap = einfo->func.best_colormap_get(dpy, DefaultScreen(dpy));
+ #include <endian.h>
 +#endif
-       einfo->info.drawable = win;
-       einfo->info.depth = depth;
-       
+ #include <algorithm>
+ #include <iostream>
+ #include <sstream>
diff --git a/graphics/exact-image/files/patch-lib__ImageIterator2.hh b/graphics/exact-image/files/patch-lib__ImageIterator2.hh
new file mode 100644
index 000000000000..52eafc91d456
--- /dev/null
+++ b/graphics/exact-image/files/patch-lib__ImageIterator2.hh
@@ -0,0 +1,24 @@
+--- lib/ImageIterator2.hh.orig	2011-03-16 13:35:37.000000000 -0400
++++ lib/ImageIterator2.hh	2011-03-16 13:36:39.000000000 -0400
+@@ -358,9 +358,9 @@
+     }
+     
+     accu& abs() {
+-      v[0] = std::abs(v[0]);
+-      v[1] = std::abs(v[1]);
+-      v[2] = std::abs(v[2]);
++      v[0] = std::labs(v[0]);
++      v[1] = std::labs(v[1]);
++      v[2] = std::labs(v[2]);
+       return *this;
+     }
+ 
+@@ -639,7 +639,7 @@
+     }
+     
+     accu& abs() {
+-      v[0] = std::abs(v[0]);
++      v[0] = std::labs(v[0]);
+       return *this;
+     }
+