diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile
index 63deef7acac8..2d3850475946 100644
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@@ -12,20 +12,7 @@ COMMENT=	Medical image conversion utility and library
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-OPTIONS_DEFINE=	X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF INTERFILE INW PNG
-OPTIONS_DEFAULT=X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF INTERFILE INW PNG
-GLIB_DESC=	With Glib
-ACR_NEMA_DESC=	With Acr/Nema 2.0
-ANALYZE_DESC=	With Analyze (SPM)
-CONCORDE_DESC=	With Concorde __ET
-DICOM_DESC=	With DICOM 3.0
-DICOM_LJPEG_DESC=	With DICOM 3.0 Lossless JPEG
-ECAT_DESC=	With CTI ECAT 6/7
-INTERFILE_DESC=	With InterFile 3.3
-INW_DESC=	With INW (RUG)
-
-USE_BZIP2=	yes
-USES=		pkgconfig
+USES=		pkgconfig tar:bzip2
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/xmedcon \
 		--enable-llcheck
@@ -34,71 +21,60 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		medcon.1 xmedcon-config.1
-MAN3=		medcon.3
-MAN4=		m-acr.4 m-anlz.4 m-ecat.4 m-gif.4 m-intf.4 m-inw.4
+OPTIONS_DEFINE=	X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF \
+		INTERFILE INW PNG
+OPTIONS_DEFAULT=X11 GLIB ACR_NEMA ANALYZE CONCORDE DICOM DICOM_LJPEG ECAT GIF \
+		INTERFILE INW PNG
+OPTIONS_SUB=	yes
+
+X11_CONFIGURE_ENABLE=	gui
+X11_USE=		GNOME=gtk20
+
+GLIB_DESC=		With Glib
+GLIB_CONFIGURE_ENABLE=	glib
+GLIB_USE=		GNOME=glib20
+
+ACR_NEMA_DESC=		With Acr/Nema 2.0
+
+ANALYZE_DESC=		With Analyze (SPM)
+ANALYZE_CONFIGURE_ENABLE=	anlz
+
+CONCORDE_DESC=		With Concorde __ET
+CONCORDE_CONFIGURE_ENABLE=	conc
+
+DICOM_DESC=		With DICOM 3.0
+
+DICOM_LJPEG_DESC=	With DICOM 3.0 Lossless JPEG
+DICOM_LJPEG_CONFIGURE_ENABLE=	ljpg
+
+ECAT_DESC=		With CTI ECAT 6/7
+ECAT_CONFIGURE_ENABLE=	ecat
+
+INTERFILE_DESC=		With InterFile 3.3
+INTERFILE_CONFIGURE_ENABLE=	intf
+
+INW_DESC=		With INW (RUG)
+INW_CONFIGURE_ENABLE=	inw
+
+GIF_CONFIGURE_OFF=	--disable-gif
+
+PNG_CONFIGURE_ENABLE=	png
+PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
-USE_GNOME+=	gtk20
-PLIST_SUB+=	X11=""
-MAN1+=		xmedcon.1
 DESKTOP_ENTRIES="XMedCon" "" "${PREFIX}/etc/xmedcon.png" "${PORTNAME}" "" ""
-.else
-CONFIGURE_ARGS+=	--disable-gui
-PLIST_SUB+=	X11="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGLIB}
-USE_GNOME+=	glib20
-.else
-CONFIGURE_ARGS+=	--disable-glib
 .endif
 
 .if empty(PORT_OPTIONS:MACR_NEMA) || empty(PORT_OPTIONS:MDICOM)
 CONFIGURE_ARGS+=	--disable-acr
 .endif
 
-.if empty(PORT_OPTIONS:MGIF)
-CONFIGURE_ARGS+=	--disable-gif
-.endif
-
-.if empty(PORT_OPTIONS:MINW)
-CONFIGURE_ARGS+=	--disable-inw
-.endif
-
-.if empty(PORT_OPTIONS:MANALYZE)
-CONFIGURE_ARGS+=	--disable-anlz
-.endif
-
-.if empty(PORT_OPTIONS:MCONCORDE)
-CONFIGURE_ARGS+=	--disable-conc
-.endif
-
-.if empty(PORT_OPTIONS:MECAT)
-CONFIGURE_ARGS+=	--disable-ecat
-.endif
-
-.if empty(PORT_OPTIONS:MINTERFILE)
-CONFIGURE_ARGS+=	--disable-intf
-.endif
-
 .if empty(PORT_OPTIONS:MDICOM) || empty(PORT_OPTIONS:MDICOM_LJPEG)
 CONFIGURE_ARGS+=	--disable-dicom
 .endif
 
-.if empty(PORT_OPTIONS:MDICOM_LJPEG)
-CONFIGURE_ARGS+=	--disable-ljpg
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
-.else
-CONFIGURE_ARGS+=	--disable-png
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|etc||g' \
 		${WRKSRC}/Makefile.in
@@ -110,9 +86,9 @@ post-patch:
 post-install:
 .if ${PORT_OPTIONS:MX11}
 .for file in xmedcon.png xmedconrc xmedconrc.linux
-	${INSTALL_DATA} ${WRKSRC}/etc/${file} ${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/etc/${file} ${STAGEDIR}${PREFIX}/etc
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/man/xmedcon.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/xmedcon.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/xmedcon/pkg-plist b/graphics/xmedcon/pkg-plist
index 9db9d08a7ef0..35f6a2043c2c 100644
--- a/graphics/xmedcon/pkg-plist
+++ b/graphics/xmedcon/pkg-plist
@@ -45,4 +45,14 @@ lib/libmdc.a
 lib/libmdc.la
 lib/libmdc.so
 lib/libmdc.so.2
+man/man1/medcon.1.gz
+%%X11%%man/man1/xmedcon.1.gz
+man/man1/xmedcon-config.1.gz
+man/man3/medcon.3.gz
+man/man4/m-acr.4.gz
+man/man4/m-anlz.4.gz
+man/man4/m-ecat.4.gz
+man/man4/m-gif.4.gz
+man/man4/m-intf.4.gz
+man/man4/m-inw.4.gz
 share/aclocal/xmedcon.m4