11 files changed, 49 insertions, 29 deletions

diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 29bf340d3e9e..c74cc47acc40 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -22,6 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 ONLY_FOR_ARCHS=	i386
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 MAKE_ARGS=	MAKE="${GMAKE}" LOCALBASE="${LOCALBASE}"
 CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
 		--disable-grab
@@ -44,7 +45,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
+	@${REINPLACE_CMD} -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
 		${WRKSRC}/ffserver.c
 
 post-install:
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 29bf340d3e9e..c74cc47acc40 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -22,6 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 ONLY_FOR_ARCHS=	i386
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 MAKE_ARGS=	MAKE="${GMAKE}" LOCALBASE="${LOCALBASE}"
 CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
 		--disable-grab
@@ -44,7 +45,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
+	@${REINPLACE_CMD} -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
 		${WRKSRC}/ffserver.c
 
 post-install:
diff --git a/multimedia/ffmpeg045/Makefile b/multimedia/ffmpeg045/Makefile
index 29bf340d3e9e..c74cc47acc40 100644
--- a/multimedia/ffmpeg045/Makefile
+++ b/multimedia/ffmpeg045/Makefile
@@ -22,6 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 ONLY_FOR_ARCHS=	i386
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 MAKE_ARGS=	MAKE="${GMAKE}" LOCALBASE="${LOCALBASE}"
 CONFIGURE_ARGS= --cc="${CC}" --prefix="${PREFIX}" \
 		--disable-grab
@@ -44,7 +45,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
+	@${REINPLACE_CMD} -e "s!/etc/ffserver.conf!${PREFIX}/etc/ffserver.conf!g" \
 		${WRKSRC}/ffserver.c
 
 post-install:
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 96450a2f3228..f8e843b5cbab 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 USE_GNOMELIBS=	yes
 USE_GTK=	yes
+USE_REINPLACE=	yes
 USE_XLIB=	yes
 XFREE86_VERSION=	4
 GNU_CONFIGURE=	yes
@@ -52,21 +53,20 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 
 post-patch:
-	@${PERL} -pi -e 's|(pkgconfigdir =).+?(/pkgconfig)|\1 ${LOCALBASE}/libdata\2|' \
+	@${REINPLACE_CMD} -E \
+		-e 's|(pkgconfigdir =).+(/pkgconfig)|\1 ${LOCALBASE}/libdata\2|' \
 		${WRKSRC}/Makefile.in
-	@${PERL} -pi -e 's|(-lXv)|\1 -lXext -L${X11BASE}/lib|; \
+	@${REINPLACE_CMD} -E -e 's|(-lXv)|\1 -lXext -L${X11BASE}/lib|; \
 		s@(PKG_CONFIG --(cflags|libs) )"\$$REQUIRES"@\1 gtk@' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e 's|stdint.h|sys/types.h|' \
+	@${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|' \
 		${WRKSRC}/libdv/dv_types.h \
 		${WRKSRC}/libdv/encode.c
-	@${PERL} -pi -e 's|void\s+swab.+||' ${WRKSRC}/libdv/encode.c
-	@${PERL} -pi -e 's|SDL/|SDL11/|' ${WRKSRC}/playdv/display.h
-	@${PERL} -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/encodedv/dvavi.c \
+	@${REINPLACE_CMD} -E -e 's|^void swab.+$$||' ${WRKSRC}/libdv/encode.c
+	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/playdv/display.h
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/encodedv/dvavi.c \
 		${WRKSRC}/encodedv/dvconnect.c
-	@${PERL} -pi -e 's|(^.+?<sys/mman.h>)|#include <sys/types.h>\n\1|' \
-		${WRKSRC}/encodedv/dvconnect.c
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/encodedv/Makefile.in
 
 post-install:
diff --git a/multimedia/libdv/files/patch-encodedv::dvconnect.c b/multimedia/libdv/files/patch-encodedv::dvconnect.c
new file mode 100644
index 000000000000..b180dad296f5
--- /dev/null
+++ b/multimedia/libdv/files/patch-encodedv::dvconnect.c
@@ -0,0 +1,10 @@
+--- encodedv/dvconnect.c.orig	Wed Jul  3 14:44:37 2002
++++ encodedv/dvconnect.c	Wed Jul  3 14:51:44 2002
+@@ -26,6 +26,7 @@
+ 
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include <sys/time.h>
+ #include <unistd.h>
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index b2868a2fb51e..352e0d2c3b38 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/graphics/libdvdcss
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 DOC_FILES=	AUTHORS COPYING NEWS README TODO
@@ -27,11 +28,11 @@ DVDCSS_LIBVERSION=	2
 
 post-patch:
 .for p in Makefile.in dvdread/Makefile.in src/Makefile.in
-	@${PERL} -pi -e 's|cd \$$\(top_srcdir\) && \$$\(AUTOMAKE\)|\#|; \
+	@${REINPLACE_CMD} -E -e 's|cd \$$\(top_srcdir\) && \$$\(AUTOMAKE\)|\#|; \
 		s|cd \$$\(srcdir\) && \$$\(ACLOCAL\)|\#|' ${WRKSRC}/${p}
 .endfor
 # update this in sync with libdvdcss shared library version
-	@${PERL} -pi -e 's|(libdvdcss.so).2|\1.${DVDCSS_LIBVERSION}|' \
+	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so).2|\1.${DVDCSS_LIBVERSION}|' \
 		${WRKSRC}/dvdread/dvd_input.c
 
 post-configure:
diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index 13f32bb4bfd0..8a99d2497a14 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 
 USE_GTK=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-m4data-prefix=${PREFIX}/share
 CONFIGURE_ENV=  SDL_CONFIG="${SDL_CONFIG}" \
@@ -28,10 +29,10 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
 
 post-patch:
-	@${PERL} -pi -e 's|SDL/|SDL11/|' \
+	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \
 		${WRKSRC}/rtjpeg/rtjshow.c \
 		${WRKSRC}/movtar_play.c
-	@${PERL} -pi -e 's|^(LIBS="-ljpeg )|\1 -L${LOCALBASE}/lib|; \
+	@${REINPLACE_CMD} -E -e 's|^(LIBS="-ljpeg )|\1 -L${LOCALBASE}/lib|; \
 		s|(LIBS -ljpeg)"|\1 -L${LOCALBASE}/lib"|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 7d53d0118b96..96f5b6bc5454 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	lioux@FreeBSD.org
 
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 
 CONFIGURE_ARGS= --enable-shared
 
@@ -45,13 +46,14 @@ pre-everything::
 	@${ECHO_MSG} "====>"
 
 post-patch:
-	@${PERL} -pi -e 's|<SDL/|<SDL11/|' ${WRKSRC}/libvo/*
-	@${PERL} -pi -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|<SDL/|<SDL11/|' ${WRKSRC}/libvo/*
+	@${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure
 
 post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${CP} -f ${LOCALBASE}/bin/libtool ${WRKSRC}
+	@${CHMOD} u+w ${WRKSRC}/libtool
 # Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
-	@${PERL} -pi.orig \
+	@${REINPLACE_CMD} -E \
 		-e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|; \
 		s|(install_ltlibs=)yes|\1no|' \
 		${WRKSRC}/libtool
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index d59efbd423ec..99241feb45b1 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	aviplay-0.7.0:${PORTSDIR}/graphics/avifile \
 
 USE_GLIB=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=  CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
@@ -122,25 +123,25 @@ pre-everything::
 .endif
 
 post-patch:
-	@${PERL} -pi -e 's|^(pkgconfigdir = )\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \
+	@${REINPLACE_CMD} -E -e 's|^(pkgconfigdir = )\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \
 		${WRKSRC}/Makefile.in
-	@${PERL} -pi -e 's|stdint.h|sys/types.h|' \
+	@${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|' \
 		${WRKSRC}/lavtools/lav2divx.cpp \
 		${WRKSRC}/lavtools/yuv2divx.cpp \
 		${WRKSRC}/lavtools/divxdec.cpp
-	@${PERL} -pi -e 's@(-l(jpeg|openquicktime|png))@-L${LOCALBASE}/lib \1@; \
+	@${REINPLACE_CMD} -E -e 's@(-l(jpeg|openquicktime|png))@-L${LOCALBASE}/lib \1@; \
 		s|(-I) (\$$with_quicktime)|\1\2/include/openquicktime|; \
 		s|(with_quicktime/)(openquicktime)(.h)|\1include/\2/\2\3|; \
 		s|-ldl||; \
 		s|(-ldv)|-L${LOCALBASE}/lib \1 ${PTHREAD_LIBS:S/"//g}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e 's|SDL/|SDL11/|' \
+	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' \
 		${WRKSRC}/lavtools/liblavplay.c \
 		${WRKSRC}/lavtools/yuvplay.c
 .ifdef(WITH_QUICKTIME)
-	@${PERL} -pi -e 's|^(have_openquicktime=).+|\1true|' \
+	@${REINPLACE_CMD} -E -e 's|^(have_openquicktime=).+|\1true|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e 's|HAVE_OPENQUICKTIME|__FreeBSD__|' \
+	@${REINPLACE_CMD} -e 's|HAVE_OPENQUICKTIME|__FreeBSD__|' \
 		${WRKSRC}/lavtools/lav_io.h
 .endif
 
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 476063450a13..5cca414867ef 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -20,11 +20,12 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 GNU_CONFIGURE=	yes
 USE_GTK=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 INSTALL_SHLIBS=	yes
 PKGDEINSTALL=	${PKGINSTALL}
 
 post-patch:
-	@${PERL} -pi -e "s/xCC/xc/" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s/xCC/xc/" ${WRKSRC}/configure
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
diff --git a/multimedia/xmps-win32-plugin/Makefile b/multimedia/xmps-win32-plugin/Makefile
index e9cb901fdaab..7f653f6f6d3e 100644
--- a/multimedia/xmps-win32-plugin/Makefile
+++ b/multimedia/xmps-win32-plugin/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_GTK=	yes
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
@@ -30,9 +31,9 @@ CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 LIB_VERSION=	0
 
 post-patch:
-	@${PERL} -pi -e "s|/usr/lib/win32|${LOCALBASE}/lib/win32|" \
+	@${REINPLACE_CMD} -e "s|/usr/lib/win32|${LOCALBASE}/lib/win32|" \
 		${WRKSRC}/src/win32_codec.c
-	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/src/*
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/src/*
 
 post-install:
 	@${LN} -sf libwin32.so ${PREFIX}/lib/xmps/codecs/video/libwin32.so.${LIB_VERSION}