diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index 5491bbf6d63..c8e9fddc24b 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.32 2013/12/06 08:09:14 benoit Exp $
+# $OpenBSD: Makefile,v 1.33 2014/03/16 11:21:28 ajacoutot Exp $
 
 COMMENT =	Amide a Medical Imaging Data Examiner
 
 DISTNAME =	amide-1.0.4
 CATEGORIES =	graphics
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://amide.sourceforge.net/
 
@@ -31,28 +31,23 @@ MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=amide/}
 EXTRACT_SUFX =	.tgz
 
 MODULES =	devel/gettext \
-		textproc/intltool
+		x11/gnome
+
+MODGNOME_TOOLS=	yelp
+MODGNOME_DESKTOP_FILE= Yes
+
+BUILD_DEPENDS =	devel/m4
 
-BUILD_DEPENDS =	devel/m4 \
-		x11/gnome/doc-utils
-RUN_DEPENDS =	devel/desktop-file-utils \
-		x11/gnome/yelp
 LIB_DEPENDS =	devel/gsl>=1.6 \
 		x11/gnome/libgnomecanvas \
 		graphics/xmedcon \
 		graphics/ffmpeg>=20121026 \
 		devel/gconf2
 
-USE_GMAKE =	Yes
-USE_GROFF =		Yes
-
 AUTOCONF_VERSION =	2.68
 CONFIGURE_STYLE =	autoconf
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			XMEDCON_CONFIG="${LOCALBASE}/bin/xmedcon-config"
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-xmedcontest \
+CONFIGURE_ENV =		XMEDCON_CONFIG="${LOCALBASE}/bin/xmedcon-config"
+CONFIGURE_ARGS +=	--disable-xmedcontest \
 			--disable-libfame \
 			--disable-libdcmdata \
 			--enable-ffmpeg
diff --git a/graphics/amide/patches/patch-configure_in b/graphics/amide/patches/patch-configure_in
index 24daa1a8933..ea37d4a87d9 100644
--- a/graphics/amide/patches/patch-configure_in
+++ b/graphics/amide/patches/patch-configure_in
@@ -1,6 +1,6 @@
 --- configure.in.orig	Fri Oct  5 00:17:23 2012
-+++ configure.in	Mon May 20 12:05:41 2013
-@@ -53,7 +53,7 @@
++++ configure.in	Sun Mar 16 10:31:17 2014
+@@ -53,7 +53,7 @@ dnl esac
  dnl specify optimization level, added 2010.02.20
  OPTIMIZATION_LEVEL="-O3"
  echo "setting optimization level to $OPTIMIZATION_LEVEL"
@@ -9,7 +9,7 @@
  
  if test $CC = "gcc"; then
     echo -n "checking version of gcc... "
-@@ -101,7 +101,7 @@
+@@ -101,7 +101,7 @@ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDC
  dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
  dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
  AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
@@ -18,7 +18,7 @@
  AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
  dnl 2010.02.20	AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include/dcmtk/dcmdata -I/usr/local/dicom/include/dcmtk/ofstd -I/usr/local/dicom/include -I/usr/include/dcmtk/dcmdata -I/usr/local/include/dcmtk/ofstd -I/sw/include/dcmtk/dcmdata -I/sw/include/dcmtk/ofstd -I/sw/include/dcmtk"
  saved_libs="${LIBS}"
-@@ -348,11 +348,8 @@
+@@ -348,11 +348,8 @@ fi
  ## add in gnome-vfs if not on win32 or gtk-osx
  ## gnome-vfs is only used by amide_gnome.c and only on unix
  if (test $native_win32 = no) && (test $enable_native_gtk_osx = no); then
diff --git a/graphics/amide/patches/patch-src_Makefile_in b/graphics/amide/patches/patch-src_Makefile_in
index b198fad4d34..a55c16103ef 100644
--- a/graphics/amide/patches/patch-src_Makefile_in
+++ b/graphics/amide/patches/patch-src_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2013/11/03 10:31:01 benoit Exp $
+$OpenBSD: patch-src_Makefile_in,v 1.5 2014/03/16 11:21:28 ajacoutot Exp $
 
 Don't build amide_gnome.c, it's only there because upstream didn't
 migrate away from this deprecated library yet. It's function is to
 display help, which is also available online.
 
---- src/Makefile.in.orig	Wed Nov  9 20:28:51 2011
-+++ src/Makefile.in	Wed May  8 18:00:11 2013
-@@ -116,7 +116,7 @@
+--- src/Makefile.in.orig	Wed Oct 17 17:53:12 2012
++++ src/Makefile.in	Sun Mar 16 10:31:17 2014
+@@ -133,7 +133,7 @@ am__objects_6 = amitk_roi_ELLIPSOID.$(OBJEXT) \
  am_amide_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3) \
  	$(am__objects_4) $(am__objects_3) $(am__objects_5) \
  	$(am__objects_3) $(am__objects_6) $(am__objects_3) \
@@ -15,7 +15,7 @@ display help, which is also available online.
  	amitk_common.$(OBJEXT) amitk_canvas.$(OBJEXT) \
  	amitk_canvas_object.$(OBJEXT) amitk_color_table.$(OBJEXT) \
  	amitk_color_table_menu.$(OBJEXT) amitk_data_set.$(OBJEXT) \
-@@ -415,8 +415,6 @@
+@@ -444,8 +444,6 @@ amide_SOURCES = \
  	amide_intl.h \
  	amide_gconf.c \
  	amide_gconf.h \
@@ -24,7 +24,7 @@ display help, which is also available online.
  	amitk_common.c \
  	amitk_common.h \
  	amitk_canvas.c \
-@@ -779,7 +777,6 @@
+@@ -813,7 +811,6 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alignment_procrustes.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amide.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amide_gconf.Po@am__quote@
diff --git a/graphics/amide/patches/patch-src_amitk_common_c b/graphics/amide/patches/patch-src_amitk_common_c
index 116fe38bf6a..0e95a865309 100644
--- a/graphics/amide/patches/patch-src_amitk_common_c
+++ b/graphics/amide/patches/patch-src_amitk_common_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_amitk_common_c,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
---- src/amitk_common.c.orig	Sun Dec  2 14:34:04 2007
-+++ src/amitk_common.c	Wed May 27 15:24:04 2009
-@@ -262,25 +262,37 @@ gboolean amitk_is_xif_directory(const gchar * filename
+$OpenBSD: patch-src_amitk_common_c,v 1.2 2014/03/16 11:21:28 ajacoutot Exp $
+--- src/amitk_common.c.orig	Fri Oct 19 05:17:55 2012
++++ src/amitk_common.c	Sun Mar 16 10:31:13 2014
+@@ -267,25 +267,37 @@ gboolean amitk_is_xif_directory(const gchar * filename
  
      return TRUE;
    }
diff --git a/graphics/amide/patches/patch-src_ui_common_c b/graphics/amide/patches/patch-src_ui_common_c
index 5f2ab9f2787..a73accd0804 100644
--- a/graphics/amide/patches/patch-src_ui_common_c
+++ b/graphics/amide/patches/patch-src_ui_common_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-src_ui_common_c,v 1.3 2013/11/03 10:31:01 benoit Exp $
+$OpenBSD: patch-src_ui_common_c,v 1.4 2014/03/16 11:21:28 ajacoutot Exp $
 
 - Remove call to amide_gnome_help_display(), thus dropping the
   dependency on gnome-vfs2.
 
---- src/ui_common.c.orig	Wed May  8 18:09:25 2013
-+++ src/ui_common.c	Wed May  8 18:09:58 2013
-@@ -903,7 +903,7 @@
+--- src/ui_common.c.orig	Wed Oct  3 23:49:10 2012
++++ src/ui_common.c	Sun Mar 16 10:31:14 2014
+@@ -963,7 +963,7 @@ void amide_unregister_all_windows(void) {
  
  void amide_call_help(const gchar * link_id) {
  
@@ -14,7 +14,7 @@ $OpenBSD: patch-src_ui_common_c,v 1.3 2013/11/03 10:31:01 benoit Exp $
    GError *error=NULL;
    amide_gnome_help_display(PACKAGE, link_id, &error);
    if (error != NULL) {
-@@ -912,7 +912,7 @@
+@@ -972,7 +972,7 @@ void amide_call_help(const gchar * link_id) {
    }
  
  #else