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 +IMLIB2_USE= EFL=imlib2 +IMLIB2_CONFIGURE_OFF= ac_cv_path_IMLIB2_CONFIG=no -.if ${PORT_OPTIONS:MIMLIB2} -USE_EFL+= imlib2 -.else -CONFIGURE_ENV+= ac_cv_path_IMLIB2_CONFIG=no -.endif +PIXBUF_USE= GNOME=gdkpixbuf +PIXBUF_CONFIGURE_OFF= ac_cv_path_GDKPIXBUF_CONFIG=no -.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 +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 similarity index 100% rename from multimedia/camserv/files/patch-ad rename to multimedia/camserv/files/patch-Makefile.in diff --git a/multimedia/camserv/files/patch-ab b/multimedia/camserv/files/patch-camserv_video_fbsd_bttv.c similarity index 100% rename from multimedia/camserv/files/patch-ab rename to multimedia/camserv/files/patch-camserv_video_fbsd_bttv.c diff --git a/multimedia/dtv/files/patch-aa b/multimedia/dtv/files/patch-defs.h similarity index 100% rename from multimedia/dtv/files/patch-aa rename to multimedia/dtv/files/patch-defs.h diff --git a/multimedia/fxtv/files/patch-ae b/multimedia/fxtv/files/patch-remote.c similarity index 100% rename from multimedia/fxtv/files/patch-ae rename to multimedia/fxtv/files/patch-remote.c diff --git a/multimedia/fxtv/files/patch-ac b/multimedia/fxtv/files/patch-videolib_Makefile similarity index 100% rename from multimedia/fxtv/files/patch-ac rename to multimedia/fxtv/files/patch-videolib_Makefile diff --git a/multimedia/fxtv/files/patch-ad b/multimedia/fxtv/files/patch-voxware.h similarity index 100% rename from multimedia/fxtv/files/patch-ad rename to multimedia/fxtv/files/patch-voxware.h diff --git a/multimedia/mpeg2codec/files/patch-ab b/multimedia/mpeg2codec/files/patch-src_mpeg2enc_mpeg2enc.c similarity index 100% rename from multimedia/mpeg2codec/files/patch-ab rename to 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 diff --git a/multimedia/mpeg2play/files/patch-ab b/multimedia/mpeg2play/files/patch-Imakefile similarity index 100% rename from multimedia/mpeg2play/files/patch-ab rename to multimedia/mpeg2play/files/patch-Imakefile diff --git a/multimedia/mpeg2play/files/patch-aa b/multimedia/mpeg2play/files/patch-mpeg2play.c similarity index 100% rename from multimedia/mpeg2play/files/patch-aa rename to multimedia/mpeg2play/files/patch-mpeg2play.c diff --git a/multimedia/mpeg_encode/files/patch-ac b/multimedia/mpeg_encode/files/patch-Makefile similarity index 100% rename from multimedia/mpeg_encode/files/patch-ac rename to multimedia/mpeg_encode/files/patch-Makefile diff --git a/multimedia/mpeg_encode/files/patch-aa b/multimedia/mpeg_encode/files/patch-header_libpnmrw.h similarity index 100% rename from multimedia/mpeg_encode/files/patch-aa rename to 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 similarity index 100% rename from multimedia/mpeg_encode/files/patch-ad rename to multimedia/mpeg_encode/files/patch-jpeg_Makefile diff --git a/multimedia/mpeg_encode/files/patch-ab b/multimedia/mpeg_encode/files/patch-libpnmrw.c similarity index 100% rename from multimedia/mpeg_encode/files/patch-ab rename to multimedia/mpeg_encode/files/patch-libpnmrw.c diff --git a/multimedia/mpeg_play/files/patch-aa b/multimedia/mpeg_play/files/patch-Imakefile similarity index 100% rename from multimedia/mpeg_play/files/patch-aa rename to multimedia/mpeg_play/files/patch-Imakefile diff --git a/multimedia/mplex/files/patch-ab b/multimedia/mplex/files/patch-Makefile similarity index 100% rename from multimedia/mplex/files/patch-ab rename to multimedia/mplex/files/patch-Makefile diff --git a/multimedia/mplex/files/patch-ac b/multimedia/mplex/files/patch-inptstrm.c similarity index 100% rename from multimedia/mplex/files/patch-ac rename to multimedia/mplex/files/patch-inptstrm.c diff --git a/multimedia/mplex/files/patch-ae b/multimedia/mplex/files/patch-interact.c similarity index 100% rename from multimedia/mplex/files/patch-ae rename to multimedia/mplex/files/patch-interact.c diff --git a/multimedia/mplex/files/patch-af b/multimedia/mplex/files/patch-main.c similarity index 100% rename from multimedia/mplex/files/patch-af rename to multimedia/mplex/files/patch-main.c diff --git a/multimedia/mplex/files/patch-ad b/multimedia/mplex/files/patch-multplex.c similarity index 100% rename from multimedia/mplex/files/patch-ad rename to multimedia/mplex/files/patch-multplex.c diff --git a/multimedia/smpeg/files/patch-ab b/multimedia/smpeg/files/patch-gtv.c similarity index 100% rename from multimedia/smpeg/files/patch-ab rename to multimedia/smpeg/files/patch-gtv.c diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-Imakefile similarity index 100% rename from multimedia/xanim/files/patch-ab rename to multimedia/xanim/files/patch-Imakefile