Index: head/graphics/xmedcon/Makefile
===================================================================
--- head/graphics/xmedcon/Makefile	(revision 72283)
+++ head/graphics/xmedcon/Makefile	(revision 72284)
@@ -1,79 +1,100 @@
 # New ports collection makefile for:	xmedcon
 # Date created:		26 September 2002
 # Whom:			Paul Everlund
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xmedcon
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	tdv94ped@cs.umu.se
 
+USE_SUBMAKE=	yes
 USE_LIBTOOL=	yes
-USE_AUTOMAKE=	yes
-GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS=	--disable-gui
-PKGNAMESUFFIX=	-nox11
-PLIST_SUB=	X11="@comment "
-.else
+SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
+		MKDIR="${MKDIR}" \
+		REALCURDIR=${.CURDIR}
+
+pre-fetch:
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
+
+post-clean:
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
+.if defined(WITH_X11)
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12 gdkpixbuf
 PLIST_SUB=	X11=""
+.else
+CONFIGURE_ARGS=	--disable-gui
+PKGNAMESUFFIX=	-nox11
+PLIST_SUB=	X11="@comment "
 .endif
 
-.if defined(NOACR) && defined(NODICOM)
+.if !defined(WITH_ACRNEMA) && !defined(WITH_DICOM)
 CONFIGURE_ARGS+=	--disable-acr
 .endif
-.if defined(NOGIF)
+
+.if !defined(WITH_GIF)
 CONFIGURE_ARGS+=	--disable-gif
 .endif
-.if defined(NOINW)
+
+.if !defined(WITH_INW)
 CONFIGURE_ARGS+=	--disable-inw
 .endif
-.if defined(NOANLZ)
+
+.if !defined(WITH_ANALYZE)
 CONFIGURE_ARGS+=	--disable-anlz
 .endif
-.if defined(NOCONC)
+
+.if !defined(WITH_CONCORDE)
 CONFIGURE_ARGS+=	--disable-conc
 .endif
-.if defined(NOECAT)
+
+.if !defined(WITH_ECAT)
 CONFIGURE_ARGS+=	--disable-ecat
 .endif
-.if defined(NOINTF)
+
+.if !defined(WITH_INTERFILE)
 CONFIGURE_ARGS+=	--disable-intf
 .endif
-.if defined(NODICOM)
+
+.if !defined(WITH_DICOM) && !defined(WITH_DICOM_LJPEG)
 CONFIGURE_ARGS+=	--disable-dicom
 .endif
-.if defined(NOLJPG)
+
+.if !defined(WITH_DICOM_LJPEG)
 CONFIGURE_ARGS+=	--disable-ljpg
-PLIST_SUB+=		LJPG="@comment "
-.else
-PLIST_SUB+=		LJPG=""
 .endif
-.if defined(NOPNG)
+
+.if !defined(WITH_PNG)
 CONFIGURE_ARGS+=	--disable-png
 .else
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 .endif
 
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/xmedcon
 
 MAN1=	medcon.1 xmedcon-config.1
-.if !defined(WITHOUT_X11)
+.if defined(WITH_X11)
 MAN1+=	xmedcon.1
 .endif
+
 MAN3=	medcon.3
+
 MAN4=	m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
 
 .include <bsd.port.mk>

Property changes on: head/graphics/xmedcon/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/graphics/xmedcon/distinfo
===================================================================
--- head/graphics/xmedcon/distinfo	(revision 72283)
+++ head/graphics/xmedcon/distinfo	(revision 72284)
@@ -1 +1 @@
-MD5 (xmedcon-0.8.2.tar.gz) = bdd39c347330541a7b4ad6d94b25d5bc
+MD5 (xmedcon-0.8.8.tar.gz) = 4d6a72506e35d12e73374f72e043bca2

Property changes on: head/graphics/xmedcon/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/graphics/xmedcon/files/patch-etc::Makefile.am
===================================================================
--- head/graphics/xmedcon/files/patch-etc::Makefile.am	(revision 72283)
+++ head/graphics/xmedcon/files/patch-etc::Makefile.am	(nonexistent)
@@ -1,27 +0,0 @@
---- etc/Makefile.am.orig	Sun Oct 13 16:52:25 2002
-+++ etc/Makefile.am	Sun Oct 13 21:35:14 2002
-@@ -12,15 +12,18 @@
- 
- AUTOMAKE_OPTIONS = gnu
- 
-+if DO_XSUPPORT
- RC_FILES = \
-  xmedconrc \
-- xmedconrc.linux \
-- xmedconrc.win32
--
--ICONS = xmedcon.ico xmedcon.png
-+ xmedconrc.linux
-+ICONS = xmedcon.png
-+else
-+RC_FILES =
-+ICONS =
-+endif
- 
--GTK_DIST = README $(RC_FILES) $(ICONS)
-+#GTK_DIST = README $(RC_FILES) $(ICONS)
- 
- sysconf_DATA = $(RC_FILES) $(ICONS)
- 
--EXTRA_DIST = $(GTK_DIST)
-+#EXTRA_DIST = $(GTK_DIST)

Property changes on: head/graphics/xmedcon/files/patch-etc::Makefile.am
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/xmedcon/files/patch-man::Makefile.am
===================================================================
--- head/graphics/xmedcon/files/patch-man::Makefile.am	(revision 72283)
+++ head/graphics/xmedcon/files/patch-man::Makefile.am	(nonexistent)
@@ -1,29 +0,0 @@
---- man/Makefile.am.orig	Sun Oct 13 21:29:18 2002
-+++ man/Makefile.am	Sun Oct 13 21:35:28 2002
-@@ -12,6 +12,7 @@
- 
- AUTOMAKE_OPTIONS = gnu
- 
-+if DO_XSUPPORT
- man_MANS = \
-  medcon.1 \
-  xmedcon.1 \
-@@ -23,5 +24,17 @@
-  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
- 
--EXTRA_DIST = $(man_MANS)
-+#EXTRA_DIST = $(man_MANS)

Property changes on: head/graphics/xmedcon/files/patch-man::Makefile.am
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/xmedcon/files/patch-source::Makefile.am
===================================================================
--- head/graphics/xmedcon/files/patch-source::Makefile.am	(revision 72283)
+++ head/graphics/xmedcon/files/patch-source::Makefile.am	(nonexistent)
@@ -1,11 +0,0 @@
---- source/Makefile.am.orig	Thu Oct 17 12:17:23 2002
-+++ source/Makefile.am	Thu Oct 17 12:19:10 2002
-@@ -223,7 +223,7 @@
-  m-dicm.h \
-  m-png.h
- 
--configheadersdir = $(prefix)/include
-+configheadersdir = $(prefix)/include/xmedcon
- configheaders_DATA = depend.h m-config.h
- 
- INCLUDES = $(DICM_INC) $(LJPG_INC) $(XMEDCON_INC)

Property changes on: head/graphics/xmedcon/files/patch-source::Makefile.am
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/graphics/xmedcon/files/patch-etc::Makefile.in
===================================================================
--- head/graphics/xmedcon/files/patch-etc::Makefile.in	(nonexistent)
+++ head/graphics/xmedcon/files/patch-etc::Makefile.in	(revision 72284)
@@ -0,0 +1,23 @@
+--- 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 @@
+ 
+ AUTOMAKE_OPTIONS = gnu
+ 
++.if(DO_XSUPPORT)
+ RC_FILES = \
+  xmedconrc \
+- xmedconrc.linux \
+- xmedconrc.win32
+-
+-
+-ICONS = xmedcon.ico xmedcon.png
++ xmedconrc.linux
++ICONS = xmedcon.png
++.else
++RC_FILES =
++ICONS =
++.endif
+ 
+ GTK_DIST = README $(RC_FILES) $(ICONS)
+ 

Property changes on: head/graphics/xmedcon/files/patch-etc::Makefile.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/xmedcon/files/patch-man::Makefile.in
===================================================================
--- head/graphics/xmedcon/files/patch-man::Makefile.in	(nonexistent)
+++ head/graphics/xmedcon/files/patch-man::Makefile.in	(revision 72284)
@@ -0,0 +1,29 @@
+--- 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 @@
+ 
+ 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
+ 
+ EXTRA_DIST = $(man_MANS)
+ subdir = man

Property changes on: head/graphics/xmedcon/files/patch-man::Makefile.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/xmedcon/files/patch-source::Makefile.in
===================================================================
--- head/graphics/xmedcon/files/patch-source::Makefile.in	(nonexistent)
+++ head/graphics/xmedcon/files/patch-source::Makefile.in	(revision 72284)
@@ -0,0 +1,11 @@
+--- source/Makefile.in.orig	Mon Dec  9 15:03:20 2002
++++ source/Makefile.in	Mon Dec  9 15:03:55 2002
+@@ -372,7 +372,7 @@
+  m-png.h
+ 
+ 
+-configheadersdir = $(prefix)/include
++configheadersdir = $(prefix)/include/xmedcon
+ configheaders_DATA = m-depend.h m-config.h
+ 
+ INCLUDES = $(DICM_INC) $(LJPG_INC) $(PNG_INC) $(XMEDCON_INC)

Property changes on: head/graphics/xmedcon/files/patch-source::Makefile.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/graphics/xmedcon/pkg-plist
===================================================================
--- head/graphics/xmedcon/pkg-plist	(revision 72283)
+++ head/graphics/xmedcon/pkg-plist	(revision 72284)
@@ -1,52 +1,46 @@
 bin/medcon
 bin/xmedcon-config
 %%X11%%bin/xmedcon
 %%X11%%etc/xmedcon.png
 %%X11%%etc/xmedconrc
 %%X11%%etc/xmedconrc.linux
-%%LJPG%%include/xmedcon/io.h
-%%LJPG%%include/xmedcon/jpeg.h
-%%LJPG%%include/xmedcon/jpegless.h
-%%LJPG%%include/xmedcon/mcu.h
-%%LJPG%%include/xmedcon/predict.h
-%%LJPG%%include/xmedcon/proto.h
-include/xmedcon/depend.h
-include/xmedcon/dicom.h
+include/xmedcon/m-depend.h
+include/xmedcon/m-config.h
 include/xmedcon/m-acr.h
 include/xmedcon/m-algori.h
 include/xmedcon/m-anlz.h
 include/xmedcon/m-color.h
 include/xmedcon/m-conc.h
-include/xmedcon/m-config.h
 include/xmedcon/m-debug.h
 include/xmedcon/m-defs.h
 include/xmedcon/m-dicm.h
 include/xmedcon/m-ecat64.h
 include/xmedcon/m-error.h
 include/xmedcon/m-fancy.h
 include/xmedcon/m-files.h
 include/xmedcon/m-getopt.h
 include/xmedcon/m-gif.h
 include/xmedcon/m-global.h
 include/xmedcon/m-intf.h
 include/xmedcon/m-inw.h
 include/xmedcon/m-matrix.h
 include/xmedcon/m-pixels.h
 include/xmedcon/m-png.h
 include/xmedcon/m-qmedian.h
 include/xmedcon/m-raw.h
 include/xmedcon/m-rslice.h
 include/xmedcon/m-sigfpe.h
 include/xmedcon/m-split.h
+include/xmedcon/m-stack.h
 include/xmedcon/m-structs.h
 include/xmedcon/m-transf.h
 include/xmedcon/m-vifi.h
 include/xmedcon/m-xdummy.h
 include/xmedcon/m-xtract.h
 include/xmedcon/medcon.h
 @dirrm include/xmedcon
 lib/libmdc.a
 lib/libmdc.la
 lib/libmdc.so
 lib/libmdc.so.2
 share/aclocal/xmedcon.m4

Property changes on: head/graphics/xmedcon/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property