6 files changed, 24 insertions, 57 deletions

diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index de359a1cae22..4366b6507ce1 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmedcon
-PORTVERSION=	0.9.10
+PORTVERSION=	0.10.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -46,13 +46,15 @@ MAN4=	m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
 CONFIGURE_ARGS+=	--disable-gui
 PLIST_SUB+=	X11="@comment "
 .else
-USE_GNOME+=	gtk12 gdkpixbuf
+USE_GNOME+=	gtk20
 PLIST_SUB+=	X11=""
 MAN1+=		xmedcon.1
 .endif
 
 .if defined(WITHOUT_GLIB)
 CONFIGURE_ARGS+=	--disable-glib
+.else
+USE_GNOME+=	glib20
 .endif
 
 .if defined(WITHOUT_ACR_NEMA) || defined(WITHOUT_DICOM)
@@ -97,4 +99,20 @@ CONFIGURE_ARGS+=	--disable-png
 LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|etc||g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^configheadersdir/s|=.*$$|= $$(includedir)|g' \
+		${WRKSRC}/source/Makefile.in
+	@${REINPLACE_CMD} -e '/xmedcon.1/d' \
+		${WRKSRC}/man/Makefile.in
+
+post-install:
+.if !defined(WITHOUT_X11)
+.for file in xmedcon.png xmedconrc xmedconrc.linux
+	${INSTALL_DATA} ${WRKSRC}/etc/${file} ${PREFIX}/etc
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/man/xmedcon.1 ${MANPREFIX}/man/man1
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/xmedcon/distinfo b/graphics/xmedcon/distinfo
index 11e4e09495fc..2fe4fe884899 100644
--- a/graphics/xmedcon/distinfo
+++ b/graphics/xmedcon/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmedcon-0.9.10.tar.gz) = 38c255b1c4859ce410d46d50c2bf30cb
-SHA256 (xmedcon-0.9.10.tar.gz) = b9915cba6234e28f0eb4091a18a8c2ab10b402c10b6abf7ff6b80ab8a089b1ba
-SIZE (xmedcon-0.9.10.tar.gz) = 949888
+MD5 (xmedcon-0.10.2.tar.gz) = acfaa90f6e3e3d5f050329fa84dfe301
+SHA256 (xmedcon-0.10.2.tar.gz) = fabf905a37b28defecc6370c5ebcc5ca1c10278ad74f3fe38d07ba9d3490c397
+SIZE (xmedcon-0.10.2.tar.gz) = 966074
diff --git a/graphics/xmedcon/files/patch-etc::Makefile.in b/graphics/xmedcon/files/patch-etc::Makefile.in
deleted file mode 100644
index e6b95512af69..000000000000
--- a/graphics/xmedcon/files/patch-etc::Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/Makefile.in.orig	Thu Feb 17 20:36:39 2005
-+++ etc/Makefile.in	Thu Feb 17 20:38:47 2005
-@@ -244,12 +244,11 @@
- AUTOMAKE_OPTIONS = gnu
- RC_FILES = \
-  xmedconrc \
-- xmedconrc.linux \
-- xmedconrc.win32
-+ xmedconrc.linux
- 
--ICONS = xmedcon.ico xmedcon.png
-+ICONS = xmedcon.png
- GTK_DIST = README $(RC_FILES) $(ICONS)
--sysconf_DATA = $(RC_FILES) $(ICONS)
-+@DO_XSUPPORT_TRUE@sysconf_DATA = $(RC_FILES) $(ICONS)
- EXTRA_DIST = \
-  $(GTK_DIST) \
-  xmedcon.spec
diff --git a/graphics/xmedcon/files/patch-man::Makefile.in b/graphics/xmedcon/files/patch-man::Makefile.in
deleted file mode 100644
index 3b5c5db17673..000000000000
--- a/graphics/xmedcon/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- man/Makefile.in.orig	Tue Mar 30 16:12:24 2004
-+++ man/Makefile.in	Tue Mar 30 16:13:53 2004
-@@ -232,17 +232,8 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = gnu
--man_MANS = \
-- medcon.1 \
-- xmedcon.1 \
-- xmedcon-config.1 \
-- medcon.3 \
-- m-acr.4 \
-- m-anlz.4 \
-- m-ecat.4 \
-- m-gif.4 \
-- m-intf.4 \
-- m-inw.4
-+@DO_XSUPPORT_TRUE@man_MANS = medcon.1 xmedcon.1 xmedcon-config.1 medcon.3 m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
-+@DO_XSUPPORT_FALSE@man_MANS = medcon.1 xmedcon-config.1 medcon.3 m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
- 
- EXTRA_DIST = $(man_MANS)
- all: all-am
diff --git a/graphics/xmedcon/files/patch-source::Makefile.in b/graphics/xmedcon/files/patch-source::Makefile.in
deleted file mode 100644
index 3ada86d8528c..000000000000
--- a/graphics/xmedcon/files/patch-source::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/Makefile.in.orig	Sat Jan 24 18:00:21 2004
-+++ source/Makefile.in	Sat Jan 24 18:01:00 2004
-@@ -412,7 +412,7 @@
-  m-png.h
- 
- 
--configheadersdir = $(prefix)/include
-+configheadersdir = $(prefix)/include/xmedcon
- configheaders_DATA = m-depend.h m-config.h
- 
- INCLUDES = $(DICM_INC) $(PNG_INC) $(GDK_PIXBUF_CFLAGS) $(GLIB_CFLAGS)
diff --git a/graphics/xmedcon/pkg-descr b/graphics/xmedcon/pkg-descr
index a98318bb9a99..6ccc4127577e 100644
--- a/graphics/xmedcon/pkg-descr
+++ b/graphics/xmedcon/pkg-descr
@@ -5,7 +5,7 @@ toolkit.
 
 Its main purpose is image conversion, while preserving the most valuable
 medical study information. The currently supported formats are: Acr/Nema 2.0,
-Analyze (SPM), Concorde/uPET, DICOM 3.0, Ecat/Matrix 6.4, InterFile 3.3
+Analyze (SPM), Concorde/uPET, DICOM 3.0, CTI ECAT 6/7, NIfTI-1, InterFile 3.3
 and PNG or animated Gif87a/89a towards desktop applications.
 
 WWW: http://xmedcon.sourceforge.net/