[Maintainer update]: graphics/xmedcon 0.8.8 -> 0.8.9

PR:		ports/47188
Submitted by:	Paul Everlund <su_paul@everlund.homeip.net>

5 files changed, 44 insertions, 42 deletions

diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 869797b5e747..99a3b9d7dc39 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xmedcon
-PORTVERSION=	0.8.8
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+PORTNAME=		xmedcon
+PORTVERSION=		0.8.9
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tdv94ped@cs.umu.se
@@ -40,10 +40,16 @@ USE_GNOME=	gtk12 gdkpixbuf
 PLIST_SUB=	X11=""
 .else
 CONFIGURE_ARGS=	--disable-gui
-PKGNAMESUFFIX=	-nox11
 PLIST_SUB=	X11="@comment "
 .endif
 
+.if !defined(WITH_GLIB)
+CONFIGURE_ARGS+=	--disable-glib
+.else
+USE_GNOMENG=	yes
+USE_GNOME+=	glib12
+.endif
+
 .if !defined(WITH_ACRNEMA) && !defined(WITH_DICOM)
 CONFIGURE_ARGS+=	--disable-acr
 .endif
diff --git a/graphics/xmedcon/distinfo b/graphics/xmedcon/distinfo
index 6a24e9779c16..4ee8a528cb20 100644
--- a/graphics/xmedcon/distinfo
+++ b/graphics/xmedcon/distinfo
@@ -1 +1 @@
-MD5 (xmedcon-0.8.8.tar.gz) = 4d6a72506e35d12e73374f72e043bca2
+MD5 (xmedcon-0.8.9.tar.gz) = 5fb4f5e95b90d6da660388d5a106df4e
diff --git a/graphics/xmedcon/files/patch-etc::Makefile.in b/graphics/xmedcon/files/patch-etc::Makefile.in
index fa02634aa901..0247b67cf91b 100644
--- a/graphics/xmedcon/files/patch-etc::Makefile.in
+++ b/graphics/xmedcon/files/patch-etc::Makefile.in
@@ -1,23 +1,21 @@
---- etc/Makefile.in.orig	Sun Dec  8 01:39:58 2002
-+++ etc/Makefile.in	Mon Dec  9 13:14:55 2002
-@@ -180,13 +180,15 @@
+--- etc/Makefile.in.orig	Fri Jan 17 20:39:56 2003
++++ etc/Makefile.in	Fri Jan 17 20:40:57 2003
+@@ -190,15 +190,14 @@
  
- AUTOMAKE_OPTIONS = gnu
- 
-+.if(DO_XSUPPORT)
  RC_FILES = \
   xmedconrc \
 - xmedconrc.linux \
 - xmedconrc.win32
--
--
--ICONS = xmedcon.ico xmedcon.png
 + xmedconrc.linux
+ 
+ 
+-ICONS = xmedcon.ico xmedcon.png
 +ICONS = xmedcon.png
-+.else
-+RC_FILES =
-+ICONS =
-+.endif
  
  GTK_DIST = README $(RC_FILES) $(ICONS)
  
+-sysconf_DATA = $(RC_FILES) $(ICONS)
++@DO_XSUPPORT_TRUE@sysconf_DATA = $(RC_FILES) $(ICONS)
+ 
+ EXTRA_DIST = $(GTK_DIST)
+ subdir = etc
diff --git a/graphics/xmedcon/files/patch-man::Makefile.in b/graphics/xmedcon/files/patch-man::Makefile.in
index e5d764e0419b..0e0f97618c07 100644
--- a/graphics/xmedcon/files/patch-man::Makefile.in
+++ b/graphics/xmedcon/files/patch-man::Makefile.in
@@ -1,29 +1,23 @@
---- man/Makefile.in.orig	Mon Dec  9 12:56:39 2002
-+++ man/Makefile.in	Mon Dec  9 12:52:38 2002
-@@ -180,6 +180,7 @@
+--- man/Makefile.in.orig	Wed Jan 15 22:36:59 2003
++++ man/Makefile.in	Fri Jan 17 22:01:00 2003
+@@ -188,18 +188,9 @@
  
  AUTOMAKE_OPTIONS = gnu
  
-+.if(DO_XSUPPORT)
- man_MANS = \
-  medcon.1 \
-  xmedcon.1 \
-@@ -191,6 +192,18 @@
-  m-gif.4 \
-  m-intf.4 \
-  m-inw.4
-+.else
-+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
-+.endif
+-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)
  subdir = man
diff --git a/graphics/xmedcon/scripts/configure b/graphics/xmedcon/scripts/configure
index ba6ca3efa52b..f462828d6ce1 100644
--- a/graphics/xmedcon/scripts/configure
+++ b/graphics/xmedcon/scripts/configure
@@ -12,6 +12,7 @@ else
 		--checklist "\n\
 Please select desired options:" -1 -1 11 \
 x11		"With X11" ON \
+glib		"With GLib convience functions" ON \
 acr/nema	"With Acr/Nema 2.0" ON \
 analyze		"With Analyze (SPM)" ON \
 concorde	"With Concorde æPET" ON \
@@ -50,6 +51,9 @@ while [ "$1" ]; do
 		\"x11\")
 			echo "WITH_X11=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 			;;
+		\"glib\")
+			echo "WITH_GLIB=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+			;;
 		\"acr/nema\")
 			echo "WITH_ACRNEMA=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 			;;