Attachment #200408 for bug #234251

Lines 26-32 CONFLICTS_INSTALL= xpdf Link Here

(-)b/graphics/xpdf4/Makefile (-1 / +1 lines)
26	MANPREFIX= ${PREFIX}/share/xpdf	26	MANPREFIX= ${PREFIX}/share/xpdf
27	SUB_FILES= xpdf-man.conf	27	SUB_FILES= xpdf-man.conf
28		28
29	USES= cmake:outsource localbase	29	USES= compiler:c++11-lang cmake:outsource localbase:ldflags
30	CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \	30	CMAKE_ARGS+= -DOPI_SUPPORT:BOOL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4:BOOL=ON \
31	-DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc	31	-DUSE_LCMS:BOOL=OFF -DSYSTEM_XPDFRC=${PREFIX}/etc/xpdfrc
32		32

Lines 5-11 Link Here

(-)b/graphics/xpdf4/files/patch-xpdf-qt_XpdfWidgetPrint.cc (-2 / +2 lines)
5	# include <CoreFoundation/CoreFoundation.h>	5	# include <CoreFoundation/CoreFoundation.h>
6	# include <ApplicationServices/ApplicationServices.h>	6	# include <ApplicationServices/ApplicationServices.h>
7	-#elif defined(__linux__)	7	-#elif defined(__linux__)
8	+#elif defined(__linux__) \|\| defined(__FreeBSD_cc_version)	8	+#elif defined(__linux__) \|\| defined(__FreeBSD__)
9	# include "PSOutputDev.h"	9	# include "PSOutputDev.h"
10	# include <cups/cups.h>	10	# include <cups/cups.h>
11	#endif	11	#endif
Lines 14-20 Link Here
14	//------------------------------------------------------------------------	14	//------------------------------------------------------------------------
15		15
16	-#elif defined(__linux__)	16	-#elif defined(__linux__)
17	+#elif defined(__linux__) \|\| defined(__FreeBSD_cc_version)	17	+#elif defined(__linux__) \|\| defined(__FreeBSD__)
18		18
19	static void fileOut(void stream, const char data, int len) {	19	static void fileOut(void stream, const char data, int len) {
20	fwrite(data, 1, len, (FILE *)stream);	20	fwrite(data, 1, len, (FILE *)stream);

Return to bug 234251