From 6e2b9def0c49c3e565a14f5987fd3e9f46d285c6 Mon Sep 17 00:00:00 2001 From: sobomax Date: Thu, 29 Mar 2001 16:35:19 +0000 Subject: -pthread --> ${PTHREAD_LIBS} -D_THREAD_SAFE --> ${PTHREAD_CFLAGS} Note: my first intention was to test this out on bento/beta, but per ade's requiest I opted to do it quickly. --- audio/extace/Makefile | 2 +- audio/glame/Makefile | 4 ++-- audio/gnapster/Makefile | 2 +- audio/gnome-media/Makefile | 2 +- audio/gnomemedia/Makefile | 2 +- audio/gnomemedia2/Makefile | 2 +- audio/libmikmod/Makefile | 2 +- audio/soundtracker/Makefile | 2 +- audio/sweep/Makefile | 2 +- audio/teknap/Makefile | 2 +- audio/xmms/Makefile | 2 +- audio/xsidplay/Makefile | 2 +- audio/yamt/Makefile | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'audio') diff --git a/audio/extace/Makefile b/audio/extace/Makefile index 89e7a0a82cc..398738a9d6c 100644 --- a/audio/extace/Makefile +++ b/audio/extace/Makefile @@ -31,7 +31,7 @@ USE_GNOME= yes .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' diff --git a/audio/glame/Makefile b/audio/glame/Makefile index 2dddd3a4bfd..c34ad5648fb 100644 --- a/audio/glame/Makefile +++ b/audio/glame/Makefile @@ -33,12 +33,12 @@ CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|-lpthread|-pthread|g' + s|-lpthread|${PTHREAD_LIBS}|g' post-install: @install-info ${PREFIX}/info/glame.info \ diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile index 22985959a29..012fd27d496 100644 --- a/audio/gnapster/Makefile +++ b/audio/gnapster/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 92f098633e8..c3ae650a45b 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile index 92f098633e8..c3ae650a45b 100644 --- a/audio/gnomemedia/Makefile +++ b/audio/gnomemedia/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 92f098633e8..c3ae650a45b 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index f2738500ae1..8edd244611e 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -22,7 +22,7 @@ INSTALLS_SHLIB= yes MAN1= libmikmod-config.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure pre-build: ${RM} -rf ${WRKSRC}/docs/mikmod.info-* diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile index 0266a8d2376..1f58530a1a1 100644 --- a/audio/soundtracker/Makefile +++ b/audio/soundtracker/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--disable-gnome .endif pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 1652a6602a2..e43d2d85dbc 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= sweep.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile index e26bac3f6f7..f5ddc251077 100644 --- a/audio/teknap/Makefile +++ b/audio/teknap/Makefile @@ -53,7 +53,7 @@ pre-extract: @${ECHO} "WITH_XMMS - Support XMMS" pre-configure: - @${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure + @${PERL} -pi -e "s:-lc_r:${PTHREAD_LIBS}:g" ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index 68b05e2a3ad..7d0f8c2f98f 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -87,7 +87,7 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index b50e0a9b8fa..f3456bece2c 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \ --with-x-includes=${X11BASE}/include \ --with-x-libraries=${X11BASE}/lib -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= ${PTHREAD_CFLAGS} .include diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile index a6dc41e4851..70a9de10571 100644 --- a/audio/yamt/Makefile +++ b/audio/yamt/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure -- cgit