diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index e7a596fd90f..e986748183b 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -1,34 +1,46 @@
-# $OpenBSD: Makefile,v 1.12 2007/11/13 17:10:26 steven Exp $
+# $OpenBSD: Makefile,v 1.13 2009/03/13 17:58:47 jasper Exp $
 
 COMMENT=	medical image conversion
 
-DISTNAME=	xmedcon-0.5.2
-PKGNAME=	${DISTNAME}p1
-SHARED_LIBS=	mdc	0.0
+DISTNAME=	xmedcon-0.10.4
+SHARED_LIBS=	mdc	2.1	# .2.1
 CATEGORIES=	graphics
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmedcon/}
-
 HOMEPAGE=	http://xmedcon.sourceforge.net
 
-MAINTAINER=	Tom Knienieder <tom@knienieder.com>
+MAINTAINER=	Benoit Lecocq <blq@arcane-labs.net>
 
-LIB_DEPENDS=	gtk.>=1.2::x11/gtk+ \
-		gdk_pixbuf::graphics/gdk-pixbuf
-		
+# GPLv2 - LGPLv2.1
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=	X11 Xau Xdmcp Xext Xi c gdk glib gmodule jpeg m png tiff z
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png z
+                           
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmedcon/}
 
 MODULES=	devel/gettext
 
+LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+
+FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/xmedcon
+
 USE_X11=	Yes
 USE_LIBTOOL=	Yes
+
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static 
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+		 --enable-static \
+		 --with-png-prefix=${LOCALBASE} \
+		 --sysconfdir="${SYSCONFDIR}"
+CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+                         
+NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/graphics/xmedcon/distinfo b/graphics/xmedcon/distinfo
index 7c300ad3911..9826c19ac7f 100644
--- a/graphics/xmedcon/distinfo
+++ b/graphics/xmedcon/distinfo
@@ -1,5 +1,5 @@
-MD5 (xmedcon-0.5.2.tar.gz) = un+0cIlxXDRaj/Q/2xnGpg==
-RMD160 (xmedcon-0.5.2.tar.gz) = DoqtokUDSN3rcIZoYDgmN0YBPAY=
-SHA1 (xmedcon-0.5.2.tar.gz) = Ohk0YQtFTcSlKTSDWIMsxUaIwdc=
-SHA256 (xmedcon-0.5.2.tar.gz) = k/7XRp6NPuJQeR/I5WBiVSCr4kT9fziZBJvvS7gnoYE=
-SIZE (xmedcon-0.5.2.tar.gz) = 411022
+MD5 (xmedcon-0.10.4.tar.gz) = RbajBTNrcxrSFuCXRLyUaw==
+RMD160 (xmedcon-0.10.4.tar.gz) = 96aR7KP3xZIwSIpYXjwKHgzcBWc=
+SHA1 (xmedcon-0.10.4.tar.gz) = 04LOBV4Ul9PLZttkmtzBB8WAKqM=
+SHA256 (xmedcon-0.10.4.tar.gz) = QXUynQavWQTMy5ZwjnrQu3/QMrCs9TO3ijqCdakHaqc=
+SIZE (xmedcon-0.10.4.tar.gz) = 970389
diff --git a/graphics/xmedcon/patches/patch-configure b/graphics/xmedcon/patches/patch-configure
deleted file mode 100644
index 2d6fc2716f5..00000000000
--- a/graphics/xmedcon/patches/patch-configure
+++ /dev/null
@@ -1,225 +0,0 @@
---- configure.orig	Mon Dec 25 19:19:34 2000
-+++ configure	Mon Dec 25 19:22:21 2000
-@@ -555,206 +555,22 @@ MEDCON_LIBVERS="(X)${MEDCON_PRGR} ${MEDC
- 
-  
- 
--echo "BEGIN USER INPUT:"
--echo $ac_n "Check  long long  type  enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_lnglngcheck'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_lnglngcheck=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--echo "$ac_t""${mdc_cv_lnglngcheck}" 1>&6
--echo""
--
--echo $ac_n "MedCon with X-support   enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_xsupport'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_xsupport=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--echo "$ac_t""${mdc_cv_xsupport}" 1>&6
--echo ""
--
--echo $ac_n "Format Acr/Nema 2.0     enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_include_acr'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_include_acr=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--if test x$mdc_cv_include_acr = xyes; then
--  ENABLE_ACR=1 
--else
--  ENABLE_ACR=0
--fi
--echo "$ac_t""${mdc_cv_include_acr}" 1>&6
--
--echo $ac_n "Format Gif87a/89a       enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_include_gif'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_include_gif=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--if test x$mdc_cv_include_gif = xyes; then
--  ENABLE_GIF=1
--else
--  ENABLE_GIF=0
--fi
--echo "$ac_t""${mdc_cv_include_gif}" 1>&6
--
--echo $ac_n "Format INW (RUG)        enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_include_inw'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_include_inw=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--if test x$mdc_cv_include_inw = xyes; then
--  ENABLE_INW=1
--else
--  ENABLE_INW=0
--fi
--echo "$ac_t""${mdc_cv_include_inw}" 1>&6
--
--echo $ac_n "Format Analyze (SPM)    enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_include_anlz'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_include_anlz=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--if test x$mdc_cv_include_anlz = xyes; then
--  ENABLE_ANLZ=1
--else
--  ENABLE_ANLZ=0
--fi
--echo "$ac_t""${mdc_cv_include_anlz}" 1>&6
--
--echo $ac_n "Format Matrix/Ecat 6.4  enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_include_ecat'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_include_ecat=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--if test x$mdc_cv_include_ecat = xyes; then
--  ENABLE_ECAT=1
--else
--  ENABLE_ECAT=0
--fi
--echo "$ac_t""${mdc_cv_include_ecat}" 1>&6
--echo $ac_n "Format InterFile 3.3    enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_include_intf'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_include_intf=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--if test x$mdc_cv_include_intf = xyes; then
--  ENABLE_INTF=1
--else
--  ENABLE_INTF=0
--fi
--echo "$ac_t""${mdc_cv_include_intf}" 1>&6
--
--echo $ac_n "Format DICOM 3.0        enabled? ""$ac_c"
--if eval "test \"`echo '$''{'mdc_cv_include_dicm'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  mdc_cv_include_dicm=`
--read answ 
--if test x$answ = xn -o x$answ = xno -o x$answ = xN -o x$answ = xNO;
--then
--  echo "no" 
--else
--  echo "yes"
--fi
--`
--fi
--
--echo "$ac_t""${mdc_cv_include_dicm}" 1>&6
--echo ""
--if test x$mdc_cv_include_dicm = xyes; then 
--  ENABLE_DICM=1
--  if test x$mdc_cv_include_acr != xyes; then
--    echo ""
--    echo " Oeps. DICOM needs Acr/Nema to be enabled."
--    echo " Therefore rerun configure to do so ..."
--    echo ""
--    exit 1
--  fi 
--else
--  ENABLE_DICM=0
--fi
--
--echo ""
--echo "BEGIN CONFIGURATION:"
-+mdc_cv_lnglngcheck="yes"
-+mdc_cv_xsupport="yes"
-+mdc_cv_include_acr="yes"
-+ENABLE_ACR=1 
-+mdc_cv_include_gif="yes"
-+ENABLE_GIF=1
-+mdc_cv_include_inw="yes"
-+ENABLE_INW=1
-+mdc_cv_include_anlz="yes"
-+ENABLE_ANLZ=1
-+mdc_cv_include_ecat="yes"
-+ENABLE_ECAT=1
-+mdc_cv_include_intf="yes"
-+ENABLE_INTF=1
-+mdc_cv_include_dicm="yes"
-+ENABLE_DICM=1
- 
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
diff --git a/graphics/xmedcon/patches/patch-medcon_h b/graphics/xmedcon/patches/patch-medcon_h
deleted file mode 100644
index 4add907364f..00000000000
--- a/graphics/xmedcon/patches/patch-medcon_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/medcon.h.orig	Mon Dec 25 19:46:50 2000
-+++ source/medcon.h	Mon Dec 25 19:47:00 2000
-@@ -44,7 +44,6 @@ extern "C" {
- #include <string.h>
- #include <unistd.h>
- #include <math.h>
--#include <malloc.h>
- #include <stdarg.h>
- 
- #ifndef _WIN32
diff --git a/graphics/xmedcon/pkg/PLIST b/graphics/xmedcon/pkg/PLIST
index 4f908e70c4e..d98a69a56e4 100644
--- a/graphics/xmedcon/pkg/PLIST
+++ b/graphics/xmedcon/pkg/PLIST
@@ -1,36 +1,48 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:50:12 espie Exp $
-bin/medcon
-bin/xmedcon
-include/depend.h
-include/dicom.h
+@comment $OpenBSD: PLIST,v 1.4 2009/03/13 17:58:47 jasper Exp $
+%%SHARED%%
+@bin bin/medcon
+@bin bin/xmedcon
+bin/xmedcon-config
 include/m-acr.h
 include/m-algori.h
 include/m-anlz.h
 include/m-color.h
+include/m-conc.h
 include/m-config.h
 include/m-debug.h
 include/m-defs.h
+include/m-depend.h
 include/m-dicm.h
 include/m-ecat64.h
+include/m-ecat72.h
 include/m-error.h
 include/m-fancy.h
 include/m-files.h
 include/m-getopt.h
 include/m-gif.h
 include/m-global.h
+include/m-init.h
 include/m-intf.h
 include/m-inw.h
 include/m-matrix.h
+include/m-nifti.h
 include/m-pixels.h
+include/m-png.h
+include/m-progress.h
+include/m-qmedian.h
 include/m-raw.h
-include/m-sigfpe.h
+include/m-rslice.h
+include/m-split.h
+include/m-stack.h
+include/m-structs.h
+include/m-transf.h
 include/m-vifi.h
-include/m-xdummy.h
 include/m-xtract.h
 include/medcon.h
 lib/libmdc.a
 lib/libmdc.la
 @man man/man1/medcon.1
+@man man/man1/xmedcon-config.1
 @man man/man1/xmedcon.1
 @man man/man3/medcon.3
 @man man/man4/m-acr.4
@@ -39,4 +51,6 @@ lib/libmdc.la
 @man man/man4/m-gif.4
 @man man/man4/m-intf.4
 @man man/man4/m-inw.4
-%%SHARED%%
+share/aclocal/xmedcon.m4
+share/examples/xmedcon/
+share/examples/xmedcon/xmedconrc