23 files changed, 11 insertions, 22 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
diff --git a/multimedia/dtv/files/patch-aa b/multimedia/dtv/files/patch-defs.h
index 352edad42153..352edad42153 100644
--- a/multimedia/dtv/files/patch-aa
+++ b/multimedia/dtv/files/patch-defs.h
diff --git a/multimedia/fxtv/files/patch-ae b/multimedia/fxtv/files/patch-remote.c
index 8bc5c1c8fb3c..8bc5c1c8fb3c 100644
--- a/multimedia/fxtv/files/patch-ae
+++ b/multimedia/fxtv/files/patch-remote.c
diff --git a/multimedia/fxtv/files/patch-ac b/multimedia/fxtv/files/patch-videolib_Makefile
index 393b25bf1dc1..393b25bf1dc1 100644
--- a/multimedia/fxtv/files/patch-ac
+++ b/multimedia/fxtv/files/patch-videolib_Makefile
diff --git a/multimedia/fxtv/files/patch-ad b/multimedia/fxtv/files/patch-voxware.h
index cecee252f3a3..cecee252f3a3 100644
--- a/multimedia/fxtv/files/patch-ad
+++ b/multimedia/fxtv/files/patch-voxware.h
diff --git a/multimedia/mpeg2codec/files/patch-ab b/multimedia/mpeg2codec/files/patch-src_mpeg2enc_mpeg2enc.c
index b0f6df0ce9fb..b0f6df0ce9fb 100644
--- a/multimedia/mpeg2codec/files/patch-ab
+++ b/multimedia/mpeg2codec/files/patch-src_mpeg2enc_mpeg2enc.c
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index e0057b453a03..727abb2b6d64 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -17,9 +17,9 @@ ALL_TARGET=	mpeg2play
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mpeg2play ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/Mpeg2play ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/
+	${INSTALL_PROGRAM} ${WRKSRC}/mpeg2play ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/Mpeg2play ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/mpeg2play/files/patch-ab b/multimedia/mpeg2play/files/patch-Imakefile
index 9bb8e0ee0dd6..9bb8e0ee0dd6 100644
--- a/multimedia/mpeg2play/files/patch-ab
+++ b/multimedia/mpeg2play/files/patch-Imakefile
diff --git a/multimedia/mpeg2play/files/patch-aa b/multimedia/mpeg2play/files/patch-mpeg2play.c
index 8b1efae8a44e..8b1efae8a44e 100644
--- a/multimedia/mpeg2play/files/patch-aa
+++ b/multimedia/mpeg2play/files/patch-mpeg2play.c
diff --git a/multimedia/mpeg_encode/files/patch-ac b/multimedia/mpeg_encode/files/patch-Makefile
index 4760ecb9ecfc..4760ecb9ecfc 100644
--- a/multimedia/mpeg_encode/files/patch-ac
+++ b/multimedia/mpeg_encode/files/patch-Makefile
diff --git a/multimedia/mpeg_encode/files/patch-aa b/multimedia/mpeg_encode/files/patch-header_libpnmrw.h
index 7bd0c1b7fc5e..7bd0c1b7fc5e 100644
--- a/multimedia/mpeg_encode/files/patch-aa
+++ b/multimedia/mpeg_encode/files/patch-header_libpnmrw.h
diff --git a/multimedia/mpeg_encode/files/patch-ad b/multimedia/mpeg_encode/files/patch-jpeg_Makefile
index 22085cdd4bec..22085cdd4bec 100644
--- a/multimedia/mpeg_encode/files/patch-ad
+++ b/multimedia/mpeg_encode/files/patch-jpeg_Makefile
diff --git a/multimedia/mpeg_encode/files/patch-ab b/multimedia/mpeg_encode/files/patch-libpnmrw.c
index 5af9c672ec4a..5af9c672ec4a 100644
--- a/multimedia/mpeg_encode/files/patch-ab
+++ b/multimedia/mpeg_encode/files/patch-libpnmrw.c
diff --git a/multimedia/mpeg_play/files/patch-aa b/multimedia/mpeg_play/files/patch-Imakefile
index 46a447230e06..46a447230e06 100644
--- a/multimedia/mpeg_play/files/patch-aa
+++ b/multimedia/mpeg_play/files/patch-Imakefile
diff --git a/multimedia/mplex/files/patch-ab b/multimedia/mplex/files/patch-Makefile
index cee34107968d..cee34107968d 100644
--- a/multimedia/mplex/files/patch-ab
+++ b/multimedia/mplex/files/patch-Makefile
diff --git a/multimedia/mplex/files/patch-ac b/multimedia/mplex/files/patch-inptstrm.c
index 92e720da93e8..92e720da93e8 100644
--- a/multimedia/mplex/files/patch-ac
+++ b/multimedia/mplex/files/patch-inptstrm.c
diff --git a/multimedia/mplex/files/patch-ae b/multimedia/mplex/files/patch-interact.c
index 41149fd1580f..41149fd1580f 100644
--- a/multimedia/mplex/files/patch-ae
+++ b/multimedia/mplex/files/patch-interact.c
diff --git a/multimedia/mplex/files/patch-af b/multimedia/mplex/files/patch-main.c
index 12d99a0ca25d..12d99a0ca25d 100644
--- a/multimedia/mplex/files/patch-af
+++ b/multimedia/mplex/files/patch-main.c
diff --git a/multimedia/mplex/files/patch-ad b/multimedia/mplex/files/patch-multplex.c
index 7830a3668993..7830a3668993 100644
--- a/multimedia/mplex/files/patch-ad
+++ b/multimedia/mplex/files/patch-multplex.c
diff --git a/multimedia/smpeg/files/patch-ab b/multimedia/smpeg/files/patch-gtv.c
index dbdb5b55ab1f..dbdb5b55ab1f 100644
--- a/multimedia/smpeg/files/patch-ab
+++ b/multimedia/smpeg/files/patch-gtv.c
diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-Imakefile
index 20268744731c..20268744731c 100644
--- a/multimedia/xanim/files/patch-ab
+++ b/multimedia/xanim/files/patch-Imakefile