diff options
| -rw-r--r-- | emulators/e-uae/Makefile | 4 | ||||
| -rw-r--r-- | games/freeciv/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/avidemux2/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/libmpeg2/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/libtheora/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/transcode/Makefile | 3 | ||||
| -rw-r--r-- | x11/electricsheep/Makefile | 4 |
9 files changed, 3 insertions, 29 deletions
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile index 83f7c0799c65..273c132c9441 100644 --- a/emulators/e-uae/Makefile +++ b/emulators/e-uae/Makefile @@ -26,10 +26,6 @@ PLIST_FILES= bin/uae bin/readdisk PORTDOCS= README bsdsocket.txt compiling.txt configuration.txt \ floppies.txt keyboard.txt scsi.txt -post-patch: - @${REINPLACE_CMD} -e 's|sdl-config|sdl11-config|' \ - ${WRKSRC}/configure - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/uae ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/readdisk ${PREFIX}/bin diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index ea42412b337d..cbb0da600d8a 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -7,6 +7,7 @@ PORTNAME= freeciv PORTVERSION= 2.0.8 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://ftp.freeciv.org/pub/freeciv/stable/ SF @@ -28,7 +29,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png USE_XPM= yes WANT_GNOME= yes -CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" +CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" PLIST_SUB+= X11="" .endif 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} diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile index e473ea1c913b..19cb88b55ea8 100644 --- a/x11/electricsheep/Makefile +++ b/x11/electricsheep/Makefile @@ -52,10 +52,6 @@ pre-everything:: post-patch: @${REINPLACE_CMD} -e \ - 's|sdl-config|sdl11-config|' \ - ${WRKSRC}/mpeg2dec/configure - - @${REINPLACE_CMD} -e \ 's|/usr/X11R6/lib/xscreensaver/config|${X11BASE}/share/xscreensaver/config|' \ ${WRKSRC}/Makefile.in |