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. --- www/encompass/Makefile | 2 +- www/galeon/Makefile | 8 ++++---- www/galeon2/Makefile | 8 ++++---- www/gtkhtml/Makefile | 2 +- www/gtkhtml3/Makefile | 2 +- www/gtkhtml38/Makefile | 2 +- www/kannel/Makefile | 2 +- www/kdewebdev/Makefile | 2 +- www/kdewebdev4/Makefile | 2 +- www/libgtkhtml/Makefile | 2 +- www/peacock/Makefile | 2 +- www/quanta/Makefile | 2 +- www/screem-devel/Makefile | 2 +- www/screem/Makefile | 2 +- www/squid/Makefile | 2 +- www/squid23/Makefile | 2 +- www/squid24/Makefile | 2 +- www/squid25/Makefile | 2 +- www/squid26/Makefile | 2 +- www/squid27/Makefile | 2 +- www/squid30/Makefile | 2 +- www/squid31/Makefile | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) (limited to 'www') diff --git a/www/encompass/Makefile b/www/encompass/Makefile index e5ddf33..afcb392 100644 --- a/www/encompass/Makefile +++ b/www/encompass/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 674bd58..4a42e13 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -39,8 +39,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -D_REENTRANT -D_THREAD_SAFE -fno-rtti" \ - LIBS="-L${LOCALBASE}/lib -L${WRKSRC} -pthread ${GCC_R_LIB}" + -D_REENTRANT ${PTHREAD_CFLAGS} -fno-rtti" \ + LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS} ${GCC_R_LIB}" .if exists(/usr/lib/libgcc_r.a) GCC_R_LIB= -lgcc_r @@ -56,12 +56,12 @@ post-extract: .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 ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|-lpthread|-pthread|g' + s|-lpthread|${PTHREAD_LIBS}|g' post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 674bd58..4a42e13 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -39,8 +39,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -D_REENTRANT -D_THREAD_SAFE -fno-rtti" \ - LIBS="-L${LOCALBASE}/lib -L${WRKSRC} -pthread ${GCC_R_LIB}" + -D_REENTRANT ${PTHREAD_CFLAGS} -fno-rtti" \ + LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS} ${GCC_R_LIB}" .if exists(/usr/lib/libgcc_r.a) GCC_R_LIB= -lgcc_r @@ -56,12 +56,12 @@ post-extract: .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 ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|-lpthread|-pthread|g' + s|-lpthread|${PTHREAD_LIBS}|g' post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 18ad5f7..6b045d0 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -29,7 +29,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/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 18ad5f7..6b045d0 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -29,7 +29,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/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 18ad5f7..6b045d0 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -29,7 +29,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/www/kannel/Makefile b/www/kannel/Makefile index ea0e18d..09cdbcd 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 USE_AUTOCONF= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/gateway-${PORTVERSION}/ -CFLAGS+= -pthread +CFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-malloc=native do-install: diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index fd6556d..58217d5 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc -pthread" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index fd6556d..58217d5 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc -pthread" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 18ad5f7..6b045d0 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -29,7 +29,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/www/peacock/Makefile b/www/peacock/Makefile index 159a473..d4276ef 100644 --- a/www/peacock/Makefile +++ b/www/peacock/Makefile @@ -21,7 +21,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/www/quanta/Makefile b/www/quanta/Makefile index fd6556d..58217d5 100644 --- a/www/quanta/Makefile +++ b/www/quanta/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc -pthread" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index 51fa9d9..f1a4460 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-gnomevfs 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|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g ; \ diff --git a/www/screem/Makefile b/www/screem/Makefile index 51fa9d9..f1a4460 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-gnomevfs 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|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g ; \ diff --git a/www/squid/Makefile b/www/squid/Makefile index 616414d..3a5657d 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid23/Makefile b/www/squid23/Makefile index 0421718..8fe80a2 100644 --- a/www/squid23/Makefile +++ b/www/squid23/Makefile @@ -98,7 +98,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: cd ${WRKSRC}/src; make install-pinger diff --git a/www/squid24/Makefile b/www/squid24/Makefile index 616414d..3a5657d 100644 --- a/www/squid24/Makefile +++ b/www/squid24/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 616414d..3a5657d 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 616414d..3a5657d 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 616414d..3a5657d 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 616414d..3a5657d 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 616414d..3a5657d 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you -- cgit v1.1