Index: head/graphics/mtpaint/Makefile
===================================================================
--- head/graphics/mtpaint/Makefile	(revision 456615)
+++ head/graphics/mtpaint/Makefile	(revision 456616)
@@ -1,69 +1,62 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mtpaint
 PORTVERSION=	3.40
 PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple painting program
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libgif.so:graphics/giflib \
 		libfreetype.so:print/freetype2
 
-USE_GNOME=	gtk20
 USES=		desktop-file-utils gmake iconv jpeg pkgconfig tar:bzip2
+USE_GNOME=	gtk20
 HAS_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MAN1PREFIX}/man/man1 \
 		--localedir=${PREFIX}/share/locale \
 		gtk2 cflags asneeded ft jpeg tiff man GIF
 
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+
 OPTIONS_DEFINE=	LCMS2 OPENJPEG NLS
 OPTIONS_DEFAULT=	LCMS2 OPENJPEG
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
+LCMS2_CONFIGURE_ON=	lcms2
+LCMS2_CONFIGURE_OFF=	nolcms
 
-.if ${PORT_OPTIONS:MLCMS2}
-LIB_DEPENDS+=	liblcms2.so:graphics/lcms2
-CONFIGURE_ARGS+=lcms2
-.else
-CONFIGURE_ARGS+=nolcms
-.endif
+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15
+OPENJPEG_CONFIGURE_ON=	jp2
+OPENJPEG_LIB_DEPENDS_OFF=libjasper.so:graphics/jasper
+OPENJPEG_CONFIGURE_OFF=	jasper
 
-.if ${PORT_OPTIONS:MOPENJPEG}
-LIB_DEPENDS+=	libopenjpeg.so:graphics/openjpeg15
-CONFIGURE_ARGS+=jp2
-.else
-LIB_DEPENDS+=	libjasper.so:graphics/jasper
-CONFIGURE_ARGS+=jasper
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ON=	intl
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=intl
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
+
+do-install-NLS-on:
 .for lang in cs de es fr gl hu it ja nl pl pt pt_BR ru sk sv tl tr zh_CN zh_TW
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
 		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/mtpaint.mo
 .endfor
 
 .include <bsd.port.mk>