From 13f820fab3b5d430dde3bae4824024d3cbb861b0 Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Mon, 22 Mar 2004 00:25:55 +0000 Subject: [PATCH] Split out header/PTHREAD_LIBS fixups into post-patch, otherwise the latter prevents the patching of nearby parts of files. This fixes patching on 4.x. --- audio/portaudio/Makefile | 8 ++++++-- audio/portaudio2/Makefile | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile index 3e0189f4e6b3..dc8d98499335 100644 --- a/audio/portaudio/Makefile +++ b/audio/portaudio/Makefile @@ -37,11 +37,15 @@ PLIST_SUB+= WITH_PATESTS="" pre-patch: # replace \r\n with \n -# replace with @${FIND} ${WRKSRC} -type f \ | ${XARGS} -x -n 10 \ ${REINPLACE_CMD} -E \ - -e 's| ||' \ + -e 's| ||' +post-patch: +# replace obsolete headers, and fix up thread library + @${FIND} ${WRKSRC} -type f \ + | ${XARGS} -x -n 10 \ + ${REINPLACE_CMD} -E \ -e 's|malloc.h|stdlib.h|' \ -e 's|machine\/soundcard.h|sys\/soundcard.h|' \ -e 's|-lpthread|${PTHREAD_LIBS}|' diff --git a/audio/portaudio2/Makefile b/audio/portaudio2/Makefile index 3e0189f4e6b3..dc8d98499335 100644 --- a/audio/portaudio2/Makefile +++ b/audio/portaudio2/Makefile @@ -37,11 +37,15 @@ PLIST_SUB+= WITH_PATESTS="" pre-patch: # replace \r\n with \n -# replace with @${FIND} ${WRKSRC} -type f \ | ${XARGS} -x -n 10 \ ${REINPLACE_CMD} -E \ - -e 's| ||' \ + -e 's| ||' +post-patch: +# replace obsolete headers, and fix up thread library + @${FIND} ${WRKSRC} -type f \ + | ${XARGS} -x -n 10 \ + ${REINPLACE_CMD} -E \ -e 's|malloc.h|stdlib.h|' \ -e 's|machine\/soundcard.h|sys\/soundcard.h|' \ -e 's|-lpthread|${PTHREAD_LIBS}|'