Index: head/print/cups-filters/Makefile
===================================================================
--- head/print/cups-filters/Makefile	(revision 408846)
+++ head/print/cups-filters/Makefile	(revision 408847)
@@ -1,69 +1,71 @@
 # $FreeBSD$
 
 PORTNAME=	cups-filters
 PORTVERSION=	1.8.2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Backends, filters and other software (was part of the core CUPS)
 
 BUILD_DEPENDS=	pdftops:${PORTSDIR}/graphics/poppler-utils
 RUN_DEPENDS=	pdftops:${PORTSDIR}/graphics/poppler-utils
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libijs.so:${PORTSDIR}/print/libijs \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libqpdf.so:${PORTSDIR}/print/qpdf \
 		libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libcups.so:${PORTSDIR}/print/cups-client \
 		libcupsimage.so:${PORTSDIR}/print/cups-image \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libpoppler.so:${PORTSDIR}/graphics/poppler
 
+CONFLICTS=	foomatic-filters-4*
+
 USES=		compiler:c++11-lib cpe ghostscript gmake jpeg libtool pathfix \
 		pkgconfig shebangfix tar:xz
 CPE_VENDOR=	linuxfoundation
 SHEBANG_FILES=	filter/braille/drivers/generic/brftoembosser.in \
 		filter/braille/drivers/index/imageubrltoindexv3.in \
 		filter/braille/drivers/index/imageubrltoindexv4.in \
 		filter/braille/drivers/index/textbrftoindexv3.in \
 		filter/braille/filters/imagetobrf.in \
 		filter/braille/filters/texttobrf.in filter/textonly
 USE_GNOME=	glib20
 USE_RC_SUBR=	cups_browsed
 GNU_CONFIGURE=	yes
 CUPS_SOCKET?=	/var/run/cups.sock
 CONFIGURE_ARGS=	--with-cups-domainsocket=${CUPS_SOCKET}
 CONFIGURE_ENV=	ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz" \
 		LIBQPDF_CFLAGS="-I${LOCALBASE}/include" LIBQPDF_LIBS="-lqpdf"
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	AVAHI
 
 AVAHI_CONFIGURE_ENABLE=	avahi
 AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
 
 post-patch:
 	@${REINPLACE_CMD} 's:-std=c++0x:-std=c++11:' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/filter/pdftops.c
 
 post-configure:
 	@${REINPLACE_CMD} \
 		-e 's|\(BANNERTOPDF_DATADIR = \).*\(/share/cups/data\)|\1${PREFIX}\2|' \
 		-e 's|\(CUPS_DATADIR = \).*\(/share/cups\)|\1${PREFIX}\2|' \
 		-e 's|\(CUPS_SERVERBIN = \).*\(/libexec/cups\)|\1${PREFIX}\2|' \
 		-e 's|\(CUPS_SERVERROOT = \).*\(/etc/cups\)|\1${PREFIX}\2|' \
 		${WRKSRC}/Makefile
 
 post-install:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip \
 		${STAGEDIR}${PREFIX}/bin/foomatic-rip \
 		${STAGEDIR}${PREFIX}/man/man1/foomatic-rip.1
 
 .include <bsd.port.mk>
Index: head/print/foomatic-filters/Makefile
===================================================================
--- head/print/foomatic-filters/Makefile	(revision 408846)
+++ head/print/foomatic-filters/Makefile	(revision 408847)
@@ -1,80 +1,82 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	foomatic-filters
 PORTVERSION=	4.0.17
 PORTREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/foomatic/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Foomatic wrapper scripts
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 
+CONFLICTS=	cups-filters-1.8*
+
 USES=		autoreconf ghostscript perl5 pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_A2PS=${LOCALBASE}/bin/a2ps \
 		ac_cv_path_CUPS=${LOCALBASE}/libexec/cups \
 		ac_cv_path_CUPS_FILTERS=${LOCALBASE}/libexec/cups/filter \
 		ac_cv_path_CUPS_BACKENDS=${LOCALBASE}/libexec/cups/backend \
 		ac_cv_path_ENSCRIPT=${LOCALBASE}/bin/enscript \
 		ac_cv_path_MPAGE=${LOCALBASE}/bin/mpage \
 		ac_cv_path_PERL=${LOCALBASE}/bin/perl \
 		ac_cv_path_PPR=${LOCALBASE}/lib/ppr \
 		ac_cv_path_PPR_INTERFACES=${LOCALBASE}/lib/ppr/interfaces \
 		ac_cv_path_PPR_LIB=${LOCALBASE}/lib/ppr/lib \
 		ac_cv_path_TEXTTOPS=${LOCALBASE}/libexec/cups/filter/texttops
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	A2PS CUPS_IMAGE MPAGE
 OPTIONS_RADIO=	ENSCRIPT
 OPTIONS_RADIO_ENSCRIPT=	ENSCRIPT_A4 ENSCRIPT_LETTER ENSCRIPT_LETTERDJ
 OPTIONS_DEFAULT=	CUPS_IMAGE A2PS ENSCRIPT_A4 MPAGE
 CUPS_IMAGE_DESC=	Install cups image utilities
 A2PS_DESC=		Install a2ps convertor
 ENSCRIPT_A4_DESC=	Install enscript convertor (A4)
 ENSCRIPT_LETTER_DESC=	Install enscript convertor (letter)
 ENSCRIPT_LETTERDJ_DESC=	Install enscript convertor (letterdj)
 MPAGE_DESC=		Print multiple pages per sheet of paper
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCUPS_IMAGE}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libcupsimage.so:${PORTSDIR}/print/cups-image
 .endif
 
 .if ${PORT_OPTIONS:MA2PS}
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps
 .endif
 
 .if ${PORT_OPTIONS:MENSCRIPT_A4}
 RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-a4
 .endif
 
 .if ${PORT_OPTIONS:MENSCRIPT_LETTER}
 RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-letter
 .endif
 
 .if ${PORT_OPTIONS:MENSCRIPT_LETTERDJ}
 RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-letterdj
 .endif
 
 .if ${PORT_OPTIONS:MMPAGE}
 RUN_DEPENDS+=	mpage:${PORTSDIR}/print/mpage
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' ${WRKSRC}/foomaticrip.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/foomaticrip.c
 	@${REINPLACE_CMD} -e '/filter.conf/ s|if|#if|g' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/foomatic-rip
 
 .include <bsd.port.mk>