- Fix SDL-dependent ports broken by last update.

Approved by: kris (portmgr), sem (mentor)

6 files changed, 1 insertions, 20 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index b89fe79aedbe..853926c8e29a 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -126,10 +126,6 @@ post-patch:
 .if !defined(WITH_OPTIMIZED_CFLAGS)
 	@${REINPLACE_CMD} "s|-O3|${CFLAGS}|" ${WRKSRC}/adm_lavcodec/Makefile.am
 .endif
-	@${REINPLACE_CMD} 's|SDL/|SDL11/|' \
-		${WRKSRC}/avidemux/ADM_audiodevice/ADM_deviceSDL.cpp \
-		${WRKSRC}/avidemux/ADM_gui2/GUI_sdlDraw.cpp \
-		${WRKSRC}/avidemux/main.cpp
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} 's|-falign-loops=16||' ${WRKSRC}/configure \
 		${WRKSRC}/adm_lavcodec/Makefile.in \
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 946c54c9a756..809e9e93b980 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -545,9 +545,6 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E \
-		-e 's|#include <SDL|#include <SDL11/SDL|'
 .endif
 .ifndef(WITHOUT_POSTPROCESS)
 	@${LN} -sf libpostproc.so \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index ad42a25c0872..804896cceeee 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -364,9 +364,6 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E \
-		-e 's|#include <SDL|#include <SDL11/SDL|'
 .endif
 
 pre-build:
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index d136b552b7b4..6b749eb19c87 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -65,9 +65,6 @@ pre-everything::
 	@${ECHO_MSG} "====>"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|<SDL/|<SDL11/|' \
-		${WRKSRC}/src/* \
-		${WRKSRC}/libvo/*
 	@${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' ${WRKSRC}/configure
 # AMD64 prefers position independent code
 .if ${ARCH:L} == "amd64"
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 7cd9d9b0f643..aa4e7340870e 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -27,11 +27,6 @@ CONFIGURE_ARGS=	--disable-sdltest \
 		--enable-shared
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|sdl11-config|g; \
-		s|-O2||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|SDL/SDL.h|SDL11/SDL.h|g; \
-		s|machine/soundcard.h|sys/soundcard.h|g' \
-		${WRKSRC}/examples/player_example.c
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/examples/Makefile.in
 	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 56a162d06278..88fdfd1ef740 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -33,7 +33,7 @@ USE_AUTOTOOLS=	libtool:15
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 CPPFLAGS=	-I${X11BASE}/include -I${LOCALBASE}/include
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
-		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+		SDL_CONFIG="${SDL_CONFIG}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-ffmpeg_libs-prefix=${LOCALBASE} \
 			--with-libdvdread-prefix=${LOCALBASE} \
@@ -409,7 +409,6 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -E -e 's|(seek)64|\1|' ${WRKSRC}/avilib/avidump.c
 	@${REINPLACE_CMD} -E -e 's|<SDL/|<|' ${WRKSRC}/filter/preview/display.h
-	@${REINPLACE_CMD} -E -e 's|sdl-config|sdl11-config|g' ${WRKSRC}/configure
 
 	@${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}