3 files changed, 8 insertions, 19 deletions

diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 6f5627fc3db0..9a3e809e63ce 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -27,25 +27,14 @@ OPTIONS_DEFINE=	IMLIB2 PIXBUF V4L DOCS
 OPTIONS_DEFAULT=IMLIB2
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIMLIB2}
-USE_EFL+=	imlib2
-.else
-CONFIGURE_ENV+=	ac_cv_path_IMLIB2_CONFIG=no
-.endif
-
-.if ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf
-.else
-CONFIGURE_ENV+=	ac_cv_path_GDKPIXBUF_CONFIG=no
-.endif
-
-.if ${PORT_OPTIONS:MV4L}
-BUILD_DEPENDS+=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
-.else
-CONFIGURE_ENV=	ac_cv_header_linux_videodev_h=no
-.endif
+IMLIB2_USE=	EFL=imlib2
+IMLIB2_CONFIGURE_OFF=	ac_cv_path_IMLIB2_CONFIG=no
+
+PIXBUF_USE=	GNOME=gdkpixbuf
+PIXBUF_CONFIGURE_OFF=	ac_cv_path_GDKPIXBUF_CONFIG=no
+
+V4L_BUILD_DEPENDS=	v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
+V4L_CONFIGURE_OFF=	ac_cv_header_linux_videodev_h=no
 
 post-patch:
 	@${REINPLACE_CMD} -e \
diff --git a/multimedia/camserv/files/patch-ad b/multimedia/camserv/files/patch-Makefile.in
index 56d8922a1a77..56d8922a1a77 100644
--- a/multimedia/camserv/files/patch-ad
+++ b/multimedia/camserv/files/patch-Makefile.in
diff --git a/multimedia/camserv/files/patch-ab b/multimedia/camserv/files/patch-camserv_video_fbsd_bttv.c
index e2b8cf1d2ebb..e2b8cf1d2ebb 100644
--- a/multimedia/camserv/files/patch-ab
+++ b/multimedia/camserv/files/patch-camserv_video_fbsd_bttv.c