Index: branches/2018Q2/graphics/fotoxx/Makefile
===================================================================
--- branches/2018Q2/graphics/fotoxx/Makefile	(revision 470958)
+++ branches/2018Q2/graphics/fotoxx/Makefile	(revision 470959)
@@ -1,46 +1,48 @@
 # Created by: Rod Person <rodperson@rodperson.com>
 # $FreeBSD$
 
 PORTNAME=	fotoxx
 PORTVERSION=	15.05
 CATEGORIES=	graphics
 MASTER_SITES=	GENTOO/distfiles \
 		http://fossies.org/linux/misc/legacy/ \
 		http://www.kornelix.com/uploads/1/3/0/3/13035936/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application to organize and edit image collections
 
 LICENSE=	GPLv3
 
+BROKEN=		conflicting dependencies dcraw and ufraw
+
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		dcraw:graphics/dcraw \
 		exiftool:graphics/p5-Image-ExifTool \
 		ufraw-batch:graphics/ufraw
 
 USES=		desktop-file-utils gmake pkgconfig
 USE_GNOME=	gtk30
 ALL_TARGET=	fotoxx
 
 PORTDOCS=	*
 PORTDATA=	*
 PLIST_FILES=	bin/fotoxx \
 		man/man1/fotoxx.1.gz \
 		share/appdata/fotoxx.appdata.xml \
 		share/applications/fotoxx.desktop
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-ggdb|| ; \
 		 s|-rdynamic|-Wl,-export-dynamic| ; \
 		 s|share/man|man| ; \
 		 s|-lpthread|-lexecinfo|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/fotoxx|${DATADIR}|' ${WRKSRC}/desktop
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
 
 .include <bsd.port.mk>
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 470958)
+++ branches/2018Q2	(revision 470959)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r466538