From 0516cc2ece4c25d2e7e36d19faa802aefb4498c1 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 6 Apr 2001 08:48:04 +0000 Subject: Move regex pthread tweak from pre-patch to post-patch to avoid breakage on 4-*. Prompted by: will --- multimedia/smpeg-xmms/Makefile | 2 +- multimedia/smpeg-xmms/files/patch-configure | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'multimedia') diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile index 081d865c02f0..e81c7cd6b40c 100644 --- a/multimedia/smpeg-xmms/Makefile +++ b/multimedia/smpeg-xmms/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -pre-patch: +post-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure diff --git a/multimedia/smpeg-xmms/files/patch-configure b/multimedia/smpeg-xmms/files/patch-configure index aacfc9393d4d..c4372e071456 100644 --- a/multimedia/smpeg-xmms/files/patch-configure +++ b/multimedia/smpeg-xmms/files/patch-configure @@ -16,8 +16,8 @@ $FreeBSD$ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" --LIBS="-lSDL "-lc_r" $LIBS" -+LIBS="-lSDL-1.1 "-lc_r" $LIBS" +-LIBS="-lSDL -lpthread $LIBS" ++LIBS="-lSDL-1.1 -lpthread $LIBS" cat > conftest.$ac_ext <