diff --git a/graphics/frei0r/Makefile b/graphics/frei0r/Makefile
index 9a994623bb67..ec77529667e8 100644
--- a/graphics/frei0r/Makefile
+++ b/graphics/frei0r/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	frei0r
 PORTVERSION=	1.3
 DISTVERSIONPREFIX=	plugins-
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://piksel.no/${PORTNAME}/releases/ \
 		ftp://ftp.dyne.org/${PORTNAME}/releases/ \
@@ -16,45 +17,90 @@ MASTER_SITES=	http://piksel.no/${PORTNAME}/releases/ \
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Minimalistic plugin API for video effects
 
-LIB_DEPENDS=	cv.2:${PORTSDIR}/graphics/opencv \
-		gavl.1:${PORTSDIR}/multimedia/gavl
-
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack pkgconfig
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 MAKE_JOBS_SAFE=	yes
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+.if defined(BUILDING_FREI0R_OPENCV) && defined(BUILDING_FREI0R_GAVL)
+IGNORE=		cannot build opencv and gavl plugins simultaneously
+.endif
+
+.if defined(BUILDING_FREI0R_OPENCV)
+COMMENT=	Frei0r OpenCV plugins
+PKGNAMESUFFIX=  -plugins-opencv
+LIB_DEPENDS+=	opencv_legacy.2:${PORTSDIR}/graphics/opencv
+FREI0R_PLUGINS=	facebl0r facedetect
+.elif defined(BUILDING_FREI0R_GAVL)
+COMMENT=	Frei0r gavl plugins
+PKGNAMESUFFIX=  -plugins-gavl
+LIB_DEPENDS+=	gavl.1:${PORTSDIR}/multimedia/gavl
+FREI0R_PLUGINS=	rgbparade scale0tilt vectorscope
+.else
+
 PORTDOCS=	*
 
 OPTIONS=	APIDOC "Install full documentation (requires doxygen)" off \
 		MMX "Enable MMX CPU instructions" off
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 .include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+. if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+. endif
+
+.endif # !defined(BUILDING_FREI0R_OPENCV) && !defined(BUILDING_FREI0R_GAVL)
+
+.if defined(FREI0R_PLUGINS)
+CPPFLAGS+=	"-I${LOCALBASE}/include"
+PLIST=		${WRKSRC}/PLIST
+ALL_TARGET=
+BUILD_WRKSRC=	${WRKSRC}/src
+. for FILE in ${FREI0R_PLUGINS}
+ALL_TARGET+=	${FILE}.la
+PLIST_FILES+=	lib/frei0r-1/${FILE}.so
+. endfor
+PLIST_FILES+=	"@dirrmtry lib/frei0r-1"
 .endif
 
-.if !defined(WITH_MMX)
+.include <bsd.port.pre.mk>
+
+.if !defined(WITH_MMX) && ${ARCH} != "amd64"
 CONFIGURE_ARGS+=--disable-cpuflags
 .endif
 
 post-patch:
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
-	@${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in
+.if !defined(BUILDING_FREI0R_GAVL)
+	@${REINPLACE_CMD} -e 's/HAVE_GAVL=true/HAVE_GAVL=false/g' \
+		${WRKSRC}/configure
 .endif
-.if defined(NOPORTDOCS)
+.if !defined(BUILDING_FREI0R_OPENCV)
+	@${REINPLACE_CMD} -e 's/HAVE_OPENCV=true/HAVE_OPENCV=false/g' \
+		${WRKSRC}/configure
+.endif
+.if !defined(FREI0R_PLUGINS)
+. if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|include|include doc|' ${WRKSRC}/Makefile.in
+. endif
+. if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/^install-data-am/s| install-docsDATA||' \
 		${WRKSRC}/Makefile.in
-.endif
+. endif
 	@${REINPLACE_CMD} -e 's|^docsdir.*|docsdir = ${DOCSDIR}|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|^htmldocsdir.*|htmldocsdir = ${DOCSDIR}|' \
 		${WRKSRC}/doc/Makefile.in
+.else
+do-install:
+	@${MKDIR} ${PREFIX}/lib/frei0r-1
+. for FILE in ${FREI0R_PLUGINS}
+	@${INSTALL_LIB} ${BUILD_WRKSRC}/.libs/${FILE}.so \
+		${PREFIX}/lib/frei0r-1/${FILE}.so
+. endfor
+.endif #!defined(FREI0R_PLUGINS)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/frei0r/pkg-plist b/graphics/frei0r/pkg-plist
index ab41a9cac25f..7f1235071961 100644
--- a/graphics/frei0r/pkg-plist
+++ b/graphics/frei0r/pkg-plist
@@ -42,8 +42,6 @@ lib/frei0r-1/divide.so
 lib/frei0r-1/dodge.so
 lib/frei0r-1/edgeglow.so
 lib/frei0r-1/equaliz0r.so
-lib/frei0r-1/facebl0r.so
-lib/frei0r-1/facedetect.so
 lib/frei0r-1/flippo.so
 lib/frei0r-1/gamma.so
 lib/frei0r-1/glow.so
@@ -76,10 +74,8 @@ lib/frei0r-1/plasma.so
 lib/frei0r-1/pr0be.so
 lib/frei0r-1/pr0file.so
 lib/frei0r-1/primaries.so
-lib/frei0r-1/rgbparade.so
 lib/frei0r-1/saturat0r.so
 lib/frei0r-1/saturation.so
-lib/frei0r-1/scale0tilt.so
 lib/frei0r-1/scanline0r.so
 lib/frei0r-1/screen.so
 lib/frei0r-1/select0r.so
@@ -104,8 +100,7 @@ lib/frei0r-1/transparency.so
 lib/frei0r-1/twolay0r.so
 lib/frei0r-1/uvmap.so
 lib/frei0r-1/value.so
-lib/frei0r-1/vectorscope.so
 lib/frei0r-1/vertigo.so
 lib/frei0r-1/xfade0r.so
 libdata/pkgconfig/frei0r.pc
-@dirrm lib/frei0r-1
+@dirrmtry lib/frei0r-1