- update to 0.9.1

- use OPTIONS

PR:             61876
Submitted by:   Paul Everlund <tdv94ped@cs.umu.se> (maintainer)

5 files changed, 38 insertions, 128 deletions

diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 13caf2182321..78f864dabcb3 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		xmedcon
-PORTVERSION=		0.8.13
+PORTVERSION=		0.9.1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,42 +14,47 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	tdv94ped@cs.umu.se
 COMMENT=	A medical image conversion utility and library
 
-USE_SUBMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_SUBMAKE=	yes
 
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		MKDIR="${MKDIR}" \
-		REALCURDIR=${.CURDIR}
+OPTIONS=	X11 "With X11" on \
+		GLIB "With Glib" on \
+		ACR_NEMA "With Acr/Nema 2.0" on \
+		ANALYZE "With Analyze (SPM)" on \
+		CONCORDE "With COncorde µPET" on \
+		DICOM "With DICOM 3.0" on \
+		DICOM_LJPEG "With DICOM 3.0 Lossless JPEG" on \
+		ECAT "With ECAT 6.4 / 7.2" on \
+		GIF "With GIF87a/89a" on \
+		INTERFILE "With InterFile 3.3" on \
+		INW "With INW (RUG)" on \
+		PNG "With PNG" on
 
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+WANT_GNOME=	yes
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+.include <bsd.port.pre.mk>
 
 .if !defined(WITH_X11)
 CONFIGURE_ARGS=	--disable-gui
-PLIST_SUB=	X11="@comment "
+PLIST_SUB+=	X11="@comment "
 .else
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12 gdkpixbuf
-PLIST_SUB=	X11=""
+#USE_X_PREFIX=	yes
+USE_GNOME+=	gtk12 gdkpixbuf
+PLIST_SUB+=	X11=""
 .endif
 
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
 .if !defined(WITH_GLIB)
 CONFIGURE_ARGS+=	--disable-glib
 .else
-USE_GNOME+=	glib12
+#USE_GNOME+=		glib12
 .endif
 
-.if !defined(WITH_ACRNEMA) && !defined(WITH_DICOM)
+.if !defined(WITH_ACR_NEMA) && !defined(WITH_DICOM)
 CONFIGURE_ARGS+=	--disable-acr
 .endif
 
@@ -88,7 +93,7 @@ CONFIGURE_ARGS+=	--disable-ljpg
 .if !defined(WITH_PNG)
 CONFIGURE_ARGS+=	--disable-png
 .else
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
 .endif
 
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/xmedcon
@@ -98,8 +103,8 @@ MAN1=	medcon.1 xmedcon-config.1
 MAN1+=	xmedcon.1
 .endif
 
-MAN3=	medcon.3
+MAN3+=	medcon.3
 
-MAN4=	m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
+MAN4+=	m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/xmedcon/distinfo b/graphics/xmedcon/distinfo
index 0c45544c33b6..9828d0b33e72 100644
--- a/graphics/xmedcon/distinfo
+++ b/graphics/xmedcon/distinfo
@@ -1 +1,2 @@
-MD5 (xmedcon-0.8.13.tar.gz) = 34731a0b96c1c442329ed081acb11d41
+MD5 (xmedcon-0.9.1.tar.gz) = 06c28901770a52279a7d50c0a34869cb
+SIZE (xmedcon-0.9.1.tar.gz) = 837878
diff --git a/graphics/xmedcon/files/patch-source::Makefile.in b/graphics/xmedcon/files/patch-source::Makefile.in
index cd729bb3de9f..3ada86d8528c 100644
--- a/graphics/xmedcon/files/patch-source::Makefile.in
+++ b/graphics/xmedcon/files/patch-source::Makefile.in
@@ -1,11 +1,11 @@
---- source/Makefile.in.orig	Tue Jun 17 01:16:18 2003
-+++ source/Makefile.in	Tue Jun 17 01:17:16 2003
-@@ -413,7 +413,7 @@
+--- 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-autoconf.h m-config.h
+ configheaders_DATA = m-depend.h m-config.h
  
- INCLUDES = $(DICM_INC) $(LJPG_INC) $(PNG_INC) $(GDK_PIXBUF_CFLAGS) $(GLIB_CFLAGS)
+ INCLUDES = $(DICM_INC) $(PNG_INC) $(GDK_PIXBUF_CFLAGS) $(GLIB_CFLAGS)
diff --git a/graphics/xmedcon/pkg-plist b/graphics/xmedcon/pkg-plist
index 09a7cbdedd4b..66c5e8f758df 100644
--- a/graphics/xmedcon/pkg-plist
+++ b/graphics/xmedcon/pkg-plist
@@ -4,7 +4,6 @@ bin/xmedcon-config
 %%X11%%etc/xmedcon.png
 %%X11%%etc/xmedconrc
 %%X11%%etc/xmedconrc.linux
-include/xmedcon/m-autoconf.h
 include/xmedcon/m-acr.h
 include/xmedcon/m-algori.h
 include/xmedcon/m-anlz.h
@@ -13,6 +12,7 @@ include/xmedcon/m-conc.h
 include/xmedcon/m-config.h
 include/xmedcon/m-debug.h
 include/xmedcon/m-defs.h
+include/xmedcon/m-depend.h
 include/xmedcon/m-dicm.h
 include/xmedcon/m-ecat64.h
 include/xmedcon/m-ecat72.h
diff --git a/graphics/xmedcon/scripts/configure b/graphics/xmedcon/scripts/configure
deleted file mode 100644
index f85f2d9a5f5c..000000000000
--- a/graphics/xmedcon/scripts/configure
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${BATCH}" ]; then
-else
-	/usr/bin/dialog --title "Configuration options: (X)Medcon" --clear \
-		--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 \
-dicom		"With DICOM 3.0 (implies acr/nema)" ON \
-dicom_ljpeg	"With DICOM 3.0 Lossless JPEG (implies acr/nema and dicom)" ON \
-ecat		"With ECAT 6.4 / 7.2" ON \
-gif		"With GIF87a/89a" ON \
-interfile	"With InterFile 3.3" ON \
-inw		"With INW (RUG)" ON \
-png		"With PNG" ON \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
-echo "SCRIPT_RUN=yes" >${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-
-while [ "$1" ]; do
-	case $1 in
-		\"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
-			;;
-		\"analyze\")
-			echo "WITH_ANALYZE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"concorde\")
-			echo "WITH_CONCORDE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"dicom\")
-			echo "WITH_DICOM=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"dicom_ljpeg\")
-			echo "WITH_ACRNEMA=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			echo "WITH_DICOM=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			echo "WITH_DICOM_LJPEG=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"ecat\")
-			echo "WITH_ECAT=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"gif\")
-			echo "WITH_GIF=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"interfile\")
-			echo "WITH_INTERFILE=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"inw\")
-			echo "WITH_INW=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		\"png\")
-			echo "WITH_PNG=YES" >>${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			;;
-		*)
-			echo "Invalid option: $1"
-			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done