Date: Thu, 29 Mar 2001 14:11:04 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: portmgr@FreeBSD.org, ports@FreeBSD.org Subject: -pthread cleanup [megapatch] Message-ID: <3AC31847.C28A26EB@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------5E4A375B78594831175BE6CF Content-Type: text/plain; charset=koi8-r Content-Transfer-Encoding: 7bit Hi folks, I would like to put attached patch for testing on bento/beta to check that there are no undesirable side affects. Also I would like to ask maintainers of individual ports listed here to avoid tweaking -pthread in their ports until this patch has been committed to avoid merging conflicts. Thank you! -Maxim --------------5E4A375B78594831175BE6CF Content-Type: text/plain; charset=koi8-r; name="pthread.megadiff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="pthread.megadiff" Index: astro/glunarclock/Makefile =================================================================== RCS file: /home/ncvs/ports/astro/glunarclock/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- astro/glunarclock/Makefile 2001/01/29 09:14:29 1.5 +++ astro/glunarclock/Makefile 2001/03/29 10:44:05 @@ -23,7 +23,7 @@ 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 ; \ Index: astro/seti_applet/Makefile =================================================================== RCS file: /home/ncvs/ports/astro/seti_applet/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- astro/seti_applet/Makefile 2001/03/27 03:51:26 1.6 +++ astro/seti_applet/Makefile 2001/03/29 10:44:05 @@ -25,7 +25,7 @@ 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 ; \ Index: audio/extace/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/extace/Makefile,v retrieving revision 1.8 diff -d -u -r1.8 Makefile --- audio/extace/Makefile 2001/01/02 19:32:19 1.8 +++ audio/extace/Makefile 2001/03/29 10:44:05 @@ -31,7 +31,7 @@ .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' Index: audio/glame/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/glame/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- audio/glame/Makefile 2001/02/04 21:12:47 1.2 +++ audio/glame/Makefile 2001/03/29 10:44:05 @@ -33,12 +33,12 @@ 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 \ Index: audio/gnapster/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/gnapster/Makefile,v retrieving revision 1.23 diff -d -u -r1.23 Makefile --- audio/gnapster/Makefile 2001/01/25 01:12:56 1.23 +++ audio/gnapster/Makefile 2001/03/29 10:44:05 @@ -31,7 +31,7 @@ .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 ; \ Index: audio/gnomemedia/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/gnomemedia/Makefile,v retrieving revision 1.14 diff -d -u -r1.14 Makefile --- audio/gnomemedia/Makefile 2000/10/05 07:10:23 1.14 +++ audio/gnomemedia/Makefile 2001/03/29 10:44:05 @@ -25,7 +25,7 @@ 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 ; \ Index: audio/libmikmod/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/libmikmod/Makefile,v retrieving revision 1.18 diff -d -u -r1.18 Makefile --- audio/libmikmod/Makefile 2001/03/12 19:40:04 1.18 +++ audio/libmikmod/Makefile 2001/03/29 10:44:05 @@ -22,7 +22,7 @@ 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-* Index: audio/soundtracker/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/soundtracker/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- audio/soundtracker/Makefile 2001/02/26 05:11:53 1.10 +++ audio/soundtracker/Makefile 2001/03/29 10:44:05 @@ -30,7 +30,7 @@ .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 ; \ Index: audio/sweep/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/sweep/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- audio/sweep/Makefile 2001/02/04 21:12:59 1.3 +++ audio/sweep/Makefile 2001/03/29 10:44:05 @@ -24,7 +24,7 @@ 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 ; \ Index: audio/teknap/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/teknap/Makefile,v retrieving revision 1.7 diff -d -u -r1.7 Makefile --- audio/teknap/Makefile 2001/03/27 13:10:14 1.7 +++ audio/teknap/Makefile 2001/03/29 10:44:05 @@ -53,7 +53,7 @@ @${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) Index: audio/xmms/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/xmms/Makefile,v retrieving revision 1.31 diff -d -u -r1.31 Makefile --- audio/xmms/Makefile 2001/03/29 02:32:02 1.31 +++ audio/xmms/Makefile 2001/03/29 10:44:06 @@ -87,7 +87,7 @@ .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 ; \ Index: audio/xsidplay/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/xsidplay/Makefile,v retrieving revision 1.8 diff -d -u -r1.8 Makefile --- audio/xsidplay/Makefile 2001/03/17 14:02:28 1.8 +++ audio/xsidplay/Makefile 2001/03/29 10:44:06 @@ -29,7 +29,7 @@ --with-x-includes=${X11BASE}/include \ --with-x-libraries=${X11BASE}/lib -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= ${PTHREAD_CFLAGS} .include <bsd.port.pre.mk> Index: audio/yamt/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/yamt/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- audio/yamt/Makefile 2000/11/13 12:42:53 1.9 +++ audio/yamt/Makefile 2001/03/29 10:44:06 @@ -22,7 +22,7 @@ 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 Index: cad/oregano/Makefile =================================================================== RCS file: /home/ncvs/ports/cad/oregano/Makefile,v retrieving revision 1.1 diff -d -u -r1.1 Makefile --- cad/oregano/Makefile 2001/03/07 11:00:31 1.1 +++ cad/oregano/Makefile 2001/03/29 10:44:06 @@ -24,7 +24,7 @@ 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 ; \ Index: databases/db3/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/db3/Makefile,v retrieving revision 1.27 diff -d -u -r1.27 Makefile --- databases/db3/Makefile 2001/02/02 12:37:59 1.27 +++ databases/db3/Makefile 2001/03/29 10:44:06 @@ -28,7 +28,7 @@ --target=$(ARCH)-unknown-freebsd$(OSREL) pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} post-patch: @${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT} Index: deskutils/bitnotes/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/bitnotes/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- deskutils/bitnotes/Makefile 2000/10/05 07:10:25 1.2 +++ deskutils/bitnotes/Makefile 2001/03/29 10:44:06 @@ -26,7 +26,7 @@ LIBS="-L${LOCALBASE}/lib" AUTOCONF= autoconf && \ - ${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + ${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' \ ${WRKSRC}/configure Index: deskutils/bulb/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/bulb/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- deskutils/bulb/Makefile 2000/10/05 07:10:25 1.3 +++ deskutils/bulb/Makefile 2001/03/29 10:44:06 @@ -19,7 +19,7 @@ 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 Index: deskutils/genius/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/genius/Makefile,v retrieving revision 1.12 diff -d -u -r1.12 Makefile --- deskutils/genius/Makefile 2000/11/17 17:00:47 1.12 +++ deskutils/genius/Makefile 2001/03/29 10:44:06 @@ -20,7 +20,7 @@ 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 ; \ Index: deskutils/gnofin/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/gnofin/Makefile,v retrieving revision 1.17 diff -d -u -r1.17 Makefile --- deskutils/gnofin/Makefile 2000/12/02 12:20:12 1.17 +++ deskutils/gnofin/Makefile 2001/03/29 10:44:06 @@ -23,7 +23,7 @@ MAN1= gnofin.1 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 Index: deskutils/gnomepim/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/gnomepim/Makefile,v retrieving revision 1.24 diff -d -u -r1.24 Makefile --- deskutils/gnomepim/Makefile 2000/10/07 21:40:17 1.24 +++ deskutils/gnomepim/Makefile 2001/03/29 10:44:06 @@ -38,7 +38,7 @@ .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 ; \ Index: deskutils/gnucash/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/gnucash/Makefile,v retrieving revision 1.27 diff -d -u -r1.27 Makefile --- deskutils/gnucash/Makefile 2001/01/22 19:33:59 1.27 +++ deskutils/gnucash/Makefile 2001/03/29 10:44:06 @@ -41,7 +41,7 @@ MAN1= gnc-prices.1 gnucash.1 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 ; \ Index: deskutils/yank/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/yank/Makefile,v retrieving revision 1.12 diff -d -u -r1.12 Makefile --- deskutils/yank/Makefile 2001/02/25 19:12:21 1.12 +++ deskutils/yank/Makefile 2001/03/29 10:44:06 @@ -23,7 +23,7 @@ LIBS="-L${LOCALBASE}/lib" 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 ; \ Index: devel/bonobo/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/bonobo/Makefile,v retrieving revision 1.32 diff -d -u -r1.32 Makefile --- devel/bonobo/Makefile 2001/02/15 19:22:14 1.32 +++ devel/bonobo/Makefile 2001/03/29 10:44:06 @@ -27,7 +27,7 @@ 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 ; \ Index: devel/bonobo-conf/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/bonobo-conf/Makefile,v retrieving revision 1.1 diff -d -u -r1.1 Makefile --- devel/bonobo-conf/Makefile 2001/02/09 23:18:15 1.1 +++ devel/bonobo-conf/Makefile 2001/03/29 10:44:06 @@ -26,7 +26,7 @@ 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 ; \ Index: devel/bugbuddy/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/bugbuddy/Makefile,v retrieving revision 1.13 diff -d -u -r1.13 Makefile --- devel/bugbuddy/Makefile 2000/11/16 00:19:13 1.13 +++ devel/bugbuddy/Makefile 2001/03/29 10:44:06 @@ -24,7 +24,7 @@ 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 ; \ Index: devel/cervisia/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/cervisia/Makefile,v retrieving revision 1.13 diff -d -u -r1.13 Makefile --- devel/cervisia/Makefile 2001/03/29 00:29:07 1.13 +++ devel/cervisia/Makefile 2001/03/29 10:44:06 @@ -46,13 +46,6 @@ .if exists(${X11BASE}/lib/libqt2-mt.so) .if exists(${X11BASE}/lib/libXThrStub.so) QT_ADD= -mt -.if ${OSVERSION} >= 500016 -PTHREAD_CFLAGS= -PTHREAD_LIBS= -lc_r -.else -PTHREAD_CFLAGS= -D_THREAD_SAFE -PTHREAD_LIBS= -pthread -.endif .else QT_ADD= "" PTHREAD_CFLAGS= Index: devel/commoncpp/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/commoncpp/Makefile,v retrieving revision 1.8 diff -d -u -r1.8 Makefile --- devel/commoncpp/Makefile 2000/11/01 20:28:40 1.8 +++ devel/commoncpp/Makefile 2001/03/29 10:44:06 @@ -21,7 +21,7 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|-release \$$\(LT_RELEASE\)||g' - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|l\$$ost_cv_thread_library|\$$ost_cv_thread_library|g ; \ s|=c_r|=pthread|g' ${WRKSRC}/configure Index: devel/dmalloc/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/dmalloc/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- devel/dmalloc/Makefile 2001/01/16 17:30:16 1.2 +++ devel/dmalloc/Makefile 2001/03/29 10:44:06 @@ -23,7 +23,7 @@ ALL_TARGET= dmalloc_t all light pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dmalloc ${PREFIX}/bin Index: devel/dryad/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/dryad/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- devel/dryad/Makefile 2000/12/15 17:57:45 1.9 +++ devel/dryad/Makefile 2001/03/29 10:44:06 @@ -32,7 +32,7 @@ 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 ; \ Index: devel/gconf/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gconf/Makefile,v retrieving revision 1.12 diff -d -u -r1.12 Makefile --- devel/gconf/Makefile 2001/02/09 22:00:30 1.12 +++ devel/gconf/Makefile 2001/03/29 10:44:06 @@ -28,7 +28,7 @@ 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 ; \ Index: devel/gide/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gide/Makefile,v retrieving revision 1.43 diff -d -u -r1.43 Makefile --- devel/gide/Makefile 2001/02/05 14:34:38 1.43 +++ devel/gide/Makefile 2001/03/29 10:44:06 @@ -28,7 +28,7 @@ PLIST_SUB= VERSION=${PORTVERSION} 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 Index: devel/glade/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/glade/Makefile,v retrieving revision 1.28 diff -d -u -r1.28 Makefile --- devel/glade/Makefile 2001/01/16 17:30:17 1.28 +++ devel/glade/Makefile 2001/03/29 10:44:06 @@ -20,7 +20,7 @@ LIBS="-L${LOCALBASE}/libs" 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 Index: devel/gnomecrash/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gnomecrash/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- devel/gnomecrash/Makefile 2000/11/14 14:10:13 1.2 +++ devel/gnomecrash/Makefile 2001/03/29 10:44:06 @@ -25,7 +25,7 @@ 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 ; \ Index: devel/gnomedebug/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gnomedebug/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- devel/gnomedebug/Makefile 2000/12/15 17:57:15 1.9 +++ devel/gnomedebug/Makefile 2001/03/29 10:44:12 @@ -32,7 +32,7 @@ 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 ; \ Index: devel/gnomevfs/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gnomevfs/Makefile,v retrieving revision 1.15 diff -d -u -r1.15 Makefile --- devel/gnomevfs/Makefile 2001/01/30 04:39:16 1.15 +++ devel/gnomevfs/Makefile 2001/03/29 10:44:12 @@ -30,7 +30,7 @@ MAN5= gnome-vfs-mime.5 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 ; \ Index: devel/gtranslator/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/gtranslator/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- devel/gtranslator/Makefile 2001/02/25 21:17:03 1.6 +++ devel/gtranslator/Makefile 2001/03/29 10:44:12 @@ -31,7 +31,7 @@ MANCOMPRESSED= yes 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 ; \ Index: devel/libgii/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/libgii/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- devel/libgii/Makefile 2000/06/16 21:50:13 1.4 +++ devel/libgii/Makefile 2001/03/29 10:44:12 @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes # NOTE: We can not define USE_LIBTOOL for this port to build. #USE_LIBTOOL= yes -CFLAGS+= -pthread +CFLAGS+= ${PTHREAD_LIBS} MAN1= mhub.1 MAN3= giiEventPoll.3gii giiInit.3gii giiOpen.3gii \ Index: devel/libgtop/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/libgtop/Makefile,v retrieving revision 1.41 diff -d -u -r1.41 Makefile --- devel/libgtop/Makefile 2001/02/15 19:21:51 1.41 +++ devel/libgtop/Makefile 2001/03/29 10:44:12 @@ -25,7 +25,7 @@ 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 ; \ Index: devel/oaf/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/oaf/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- devel/oaf/Makefile 2001/01/24 05:10:18 1.10 +++ devel/oaf/Makefile 2001/03/29 10:44:12 @@ -30,7 +30,7 @@ LIBS="-L${LOCALBASE}/lib -lintl" 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 ; \ Index: devel/pharmacy/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/pharmacy/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- devel/pharmacy/Makefile 2000/12/10 23:36:01 1.9 +++ devel/pharmacy/Makefile 2001/03/29 10:44:12 @@ -21,7 +21,7 @@ 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 Index: devel/sdl/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/sdl/Makefile,v retrieving revision 1.20 diff -d -u -r1.20 Makefile --- devel/sdl/Makefile 2000/10/05 05:19:38 1.20 +++ devel/sdl/Makefile 2001/03/29 10:44:12 @@ -26,7 +26,7 @@ CONFIGURE_ENV= NASM="${LOCALBASE}/bin/nasm" CONFIGURE_ARGS= --enable-video-svga -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= ${PTHREAD_CFLAGS} post-configure: @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ Index: devel/sdl-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/sdl-devel/Makefile,v retrieving revision 1.36 diff -d -u -r1.36 Makefile --- devel/sdl-devel/Makefile 2001/03/13 15:29:31 1.36 +++ devel/sdl-devel/Makefile 2001/03/29 10:44:12 @@ -28,7 +28,7 @@ --disable-arts \ --disable-nas -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= ${PTHREAD_CFLAGS} .if exists(/usr/lib/libvgl.so.3) CONFIGURE_ARGS+=--enable-video-vgl Index: devel/titano/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/titano/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- devel/titano/Makefile 2001/02/05 14:34:42 1.4 +++ devel/titano/Makefile 2001/03/29 10:44:12 @@ -34,7 +34,7 @@ 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 ; \ Index: devel/veepee/Makefile =================================================================== RCS file: /home/ncvs/ports/devel/veepee/Makefile,v retrieving revision 1.7 diff -d -u -r1.7 Makefile --- devel/veepee/Makefile 2001/02/12 10:01:01 1.7 +++ devel/veepee/Makefile 2001/03/29 10:44:12 @@ -20,7 +20,7 @@ USE_XLIB= yes USE_PYTHON= yes USE_LIBTOOL= yes -CONFIGURE_ENV= LDFLAGS="-pthread ${PYTHON_LIBS}" +CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} ${PYTHON_LIBS}" CONFIGURE_ARGS= --with-gd-includes=${LOCALBASE}/include/gd \ --disable-kde .if exists(/usr/lib/libcrypto.a) @@ -28,7 +28,7 @@ .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure post-configure: Index: editors/gedit/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/gedit/Makefile,v retrieving revision 1.32 diff -d -u -r1.32 Makefile --- editors/gedit/Makefile 2000/11/30 18:16:35 1.32 +++ editors/gedit/Makefile 2001/03/29 10:44:12 @@ -26,7 +26,7 @@ MAN1= gedit.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 ; \ Index: editors/ghex/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/ghex/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- editors/ghex/Makefile 2000/11/14 14:10:10 1.9 +++ editors/ghex/Makefile 2001/03/29 10:44:12 @@ -23,7 +23,7 @@ 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 ; \ Index: editors/glimmer/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/glimmer/Makefile,v retrieving revision 1.17 diff -d -u -r1.17 Makefile --- editors/glimmer/Makefile 2001/02/05 14:36:17 1.17 +++ editors/glimmer/Makefile 2001/03/29 10:44:12 @@ -29,7 +29,7 @@ PYTHON_LIBS+= -lutil -lreadline -lcrypt -lpython pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|-lpython|${PYTHON_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ Index: editors/gmanedit/Makefile =================================================================== RCS file: /home/ncvs/ports/editors/gmanedit/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- editors/gmanedit/Makefile 2001/02/05 14:36:19 1.4 +++ editors/gmanedit/Makefile 2001/03/29 10:44:12 @@ -28,7 +28,7 @@ @${RM} -rf ${WRKSRC}/config.cache 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 ; \ Index: emulators/basiliskII/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/basiliskII/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- emulators/basiliskII/Makefile 2000/11/01 15:51:03 1.6 +++ emulators/basiliskII/Makefile 2001/03/29 10:44:12 @@ -26,7 +26,7 @@ CONFIGURE_ARGS= --disable-fbdev-dga CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CFLAGS+= -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/pthread/linuxthreads MAN1= BasiliskII.1 Index: emulators/visualos/Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/visualos/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- emulators/visualos/Makefile 2001/02/05 14:49:04 1.2 +++ emulators/visualos/Makefile 2001/03/29 10:44:12 @@ -23,7 +23,7 @@ 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 ; \ Index: ftp/gftp/Makefile =================================================================== RCS file: /home/ncvs/ports/ftp/gftp/Makefile,v retrieving revision 1.15 diff -d -u -r1.15 Makefile --- ftp/gftp/Makefile 2000/10/05 07:22:34 1.15 +++ ftp/gftp/Makefile 2001/03/29 10:44:12 @@ -29,7 +29,7 @@ .endif 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 Index: ftp/gtm/Makefile =================================================================== RCS file: /home/ncvs/ports/ftp/gtm/Makefile,v retrieving revision 1.17 diff -d -u -r1.17 Makefile --- ftp/gtm/Makefile 2000/10/05 07:10:34 1.17 +++ ftp/gtm/Makefile 2001/03/29 10:44:12 @@ -24,7 +24,7 @@ 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 ; \ Index: ftp/junglemonkey/Makefile =================================================================== RCS file: /home/ncvs/ports/ftp/junglemonkey/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- ftp/junglemonkey/Makefile 2000/11/03 16:19:27 1.10 +++ ftp/junglemonkey/Makefile 2001/03/29 10:44:12 @@ -28,7 +28,7 @@ MAN1= jm.1 jmlite.1 jmsearchserver.1 mtprendezvous.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 ; \ Index: ftp/lftp/Makefile =================================================================== RCS file: /home/ncvs/ports/ftp/lftp/Makefile,v retrieving revision 1.45 diff -d -u -r1.45 Makefile --- ftp/lftp/Makefile 2001/03/27 14:20:46 1.45 +++ ftp/lftp/Makefile 2001/03/29 10:44:12 @@ -25,7 +25,7 @@ MAN1= lftp.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 post-install: Index: games/asc/Makefile =================================================================== RCS file: /home/ncvs/ports/games/asc/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- games/asc/Makefile 2001/03/10 15:11:40 1.2 +++ games/asc/Makefile 2001/03/29 10:44:12 @@ -35,7 +35,7 @@ DATAFILE= main.con pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @find ${WRKSRC} \( -name "*.cpp" -or -name "*.h" \) | xargs \ ${PERL} -pi -e 's|malloc\.h|stdlib.h|g' Index: games/atomix/Makefile =================================================================== RCS file: /home/ncvs/ports/games/atomix/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- games/atomix/Makefile 2000/11/01 13:09:00 1.6 +++ games/atomix/Makefile 2001/03/29 10:44:12 @@ -19,7 +19,7 @@ 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 ; \ Index: games/baduki/Makefile =================================================================== RCS file: /home/ncvs/ports/games/baduki/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- games/baduki/Makefile 2000/10/10 04:56:40 1.5 +++ games/baduki/Makefile 2001/03/29 10:44:13 @@ -20,7 +20,7 @@ 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 Index: games/bombermaze/Makefile =================================================================== RCS file: /home/ncvs/ports/games/bombermaze/Makefile,v retrieving revision 1.12 diff -d -u -r1.12 Makefile --- games/bombermaze/Makefile 2001/02/27 11:22:36 1.12 +++ games/bombermaze/Makefile 2001/03/29 10:44:13 @@ -23,7 +23,7 @@ CFLAGS+= -fpermissive 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 ; \ Index: games/clanbomber/Makefile =================================================================== RCS file: /home/ncvs/ports/games/clanbomber/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- games/clanbomber/Makefile 2000/11/01 15:51:05 1.2 +++ games/clanbomber/Makefile 2001/03/29 10:44:13 @@ -16,7 +16,7 @@ USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-pthread -L${LOCALBASE}/lib" \ +CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" CFLAGS+= -fpermissive Index: games/freeciv/Makefile =================================================================== RCS file: /home/ncvs/ports/games/freeciv/Makefile,v retrieving revision 1.37 diff -d -u -r1.37 Makefile --- games/freeciv/Makefile 2000/10/10 17:12:22 1.37 +++ games/freeciv/Makefile 2001/03/29 10:44:13 @@ -32,7 +32,7 @@ .endif 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 Index: games/gcompris/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gcompris/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- games/gcompris/Makefile 2001/02/19 13:37:27 1.10 +++ games/gcompris/Makefile 2001/03/29 10:44:13 @@ -29,7 +29,7 @@ @${RM} -f ${WRKSRC}/config.cache 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 ; \ Index: games/glife/Makefile =================================================================== RCS file: /home/ncvs/ports/games/glife/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- games/glife/Makefile 2000/11/03 16:19:08 1.9 +++ games/glife/Makefile 2001/03/29 10:44:13 @@ -25,7 +25,7 @@ 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 ; \ Index: games/gniffel/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gniffel/Makefile,v retrieving revision 1.1 diff -d -u -r1.1 Makefile --- games/gniffel/Makefile 2000/10/06 09:09:32 1.1 +++ games/gniffel/Makefile 2001/03/29 10:44:13 @@ -21,7 +21,7 @@ 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 ; \ Index: games/gno3dtet/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gno3dtet/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- games/gno3dtet/Makefile 2001/02/03 15:11:48 1.10 +++ games/gno3dtet/Makefile 2001/03/29 10:44:13 @@ -21,7 +21,7 @@ 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 ; \ Index: games/gnocatan/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gnocatan/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- games/gnocatan/Makefile 2000/11/03 16:19:23 1.6 +++ games/gnocatan/Makefile 2001/03/29 10:44:13 @@ -21,7 +21,7 @@ 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 ; \ Index: games/gnomebreakout/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gnomebreakout/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- games/gnomebreakout/Makefile 2001/02/12 13:16:53 1.5 +++ games/gnomebreakout/Makefile 2001/03/29 10:44:13 @@ -21,7 +21,7 @@ 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 ; \ Index: games/gnomegames/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gnomegames/Makefile,v retrieving revision 1.31 diff -d -u -r1.31 Makefile --- games/gnomegames/Makefile 2000/10/05 07:10:38 1.31 +++ games/gnomegames/Makefile 2001/03/29 10:44:13 @@ -25,7 +25,7 @@ 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 ; \ Index: games/gnomememoryblocks/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gnomememoryblocks/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- games/gnomememoryblocks/Makefile 2000/11/03 16:19:26 1.6 +++ games/gnomememoryblocks/Makefile 2001/03/29 10:44:13 @@ -21,7 +21,7 @@ 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 ; \ Index: games/gtktetcolor/Makefile =================================================================== RCS file: /home/ncvs/ports/games/gtktetcolor/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- games/gtktetcolor/Makefile 2001/02/05 14:51:41 1.4 +++ games/gtktetcolor/Makefile 2001/03/29 10:44:13 @@ -20,7 +20,7 @@ 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 ; \ Index: games/heroes/Makefile =================================================================== RCS file: /home/ncvs/ports/games/heroes/Makefile,v retrieving revision 1.7 diff -d -u -r1.7 Makefile --- games/heroes/Makefile 2001/02/24 21:03:15 1.7 +++ games/heroes/Makefile 2001/03/29 10:44:13 @@ -40,7 +40,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sdl_mixer=${LOCALBASE} CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib -lgnugetopt -pthread -lsmpeg" \ + LIBS="-L${LOCALBASE}/lib -lgnugetopt ${PTHREAD_LIBS} -lsmpeg" \ CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} Index: games/lbreakout/Makefile =================================================================== RCS file: /home/ncvs/ports/games/lbreakout/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- games/lbreakout/Makefile 2001/03/17 08:27:48 1.4 +++ games/lbreakout/Makefile 2001/03/29 10:44:13 @@ -23,7 +23,7 @@ SDL_CONFIG="${SDL_CONFIG}" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \ xargs ${PERL} -pi -e 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g' Index: games/ltris/Makefile =================================================================== RCS file: /home/ncvs/ports/games/ltris/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- games/ltris/Makefile 2001/03/11 09:42:24 1.3 +++ games/ltris/Makefile 2001/03/29 10:44:13 @@ -23,7 +23,7 @@ LIBS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lcompat" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \ xargs ${PERL} -pi -e 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g' Index: games/pythoong/Makefile =================================================================== RCS file: /home/ncvs/ports/games/pythoong/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- games/pythoong/Makefile 2001/02/05 14:51:43 1.5 +++ games/pythoong/Makefile 2001/03/29 10:44:13 @@ -25,7 +25,7 @@ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' Index: games/teg/Makefile =================================================================== RCS file: /home/ncvs/ports/games/teg/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- games/teg/Makefile 2001/02/28 09:08:15 1.4 +++ games/teg/Makefile 2001/03/29 10:44:13 @@ -21,7 +21,7 @@ LDFLAGS="-L${LOCALBASE}/lib -lintl" 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 ; \ Index: graphics/Mesa3/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/Mesa3/Makefile,v retrieving revision 1.46 diff -d -u -r1.46 Makefile --- graphics/Mesa3/Makefile 2001/03/20 16:37:50 1.46 +++ graphics/Mesa3/Makefile 2001/03/29 10:44:13 @@ -51,7 +51,7 @@ INCLUDE_GL=${INCLUDE_GL} pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/config.c Index: graphics/dia/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/dia/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- graphics/dia/Makefile 2000/10/05 07:22:37 1.9 +++ graphics/dia/Makefile 2001/03/29 10:44:14 @@ -34,7 +34,7 @@ .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 ; \ Index: graphics/electriceyes/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/electriceyes/Makefile,v retrieving revision 1.24 diff -d -u -r1.24 Makefile --- graphics/electriceyes/Makefile 2000/10/05 07:10:44 1.24 +++ graphics/electriceyes/Makefile 2001/03/29 10:44:14 @@ -22,7 +22,7 @@ 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 ; \ Index: graphics/eog/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/eog/Makefile,v retrieving revision 1.19 diff -d -u -r1.19 Makefile --- graphics/eog/Makefile 2001/02/15 19:22:43 1.19 +++ graphics/eog/Makefile 2001/03/29 10:44:14 @@ -25,7 +25,7 @@ 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 ; \ Index: graphics/gcolor/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gcolor/Makefile,v retrieving revision 1.8 diff -d -u -r1.8 Makefile --- graphics/gcolor/Makefile 2000/10/05 06:36:17 1.8 +++ graphics/gcolor/Makefile 2001/03/29 10:44:17 @@ -20,7 +20,7 @@ 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 .include <bsd.port.mk> Index: graphics/giram/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/giram/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- graphics/giram/Makefile 2000/12/06 07:43:26 1.9 +++ graphics/giram/Makefile 2001/03/29 10:44:17 @@ -35,7 +35,7 @@ .endif 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 Index: graphics/gnofract4d/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gnofract4d/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- graphics/gnofract4d/Makefile 2000/12/22 16:49:45 1.10 +++ graphics/gnofract4d/Makefile 2001/03/29 10:44:17 @@ -21,7 +21,7 @@ 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' Index: graphics/gnomeiconedit/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gnomeiconedit/Makefile,v retrieving revision 1.14 diff -d -u -r1.14 Makefile --- graphics/gnomeiconedit/Makefile 2000/11/14 14:10:13 1.14 +++ graphics/gnomeiconedit/Makefile 2001/03/29 10:44:17 @@ -31,7 +31,7 @@ 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 ; \ Index: graphics/gpaint/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gpaint/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- graphics/gpaint/Makefile 2001/02/05 15:57:14 1.4 +++ graphics/gpaint/Makefile 2001/03/29 10:44:17 @@ -24,7 +24,7 @@ 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 ; \ Index: graphics/gqview/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gqview/Makefile,v retrieving revision 1.29 diff -d -u -r1.29 Makefile --- graphics/gqview/Makefile 2001/03/17 15:24:52 1.29 +++ graphics/gqview/Makefile 2001/03/29 10:44:17 @@ -22,7 +22,7 @@ MAN1= gqview.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|GNOME_DATADIR\)/gnome/|GNOME_DATADIR\)/|g' Index: graphics/gtkgraph/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gtkgraph/Makefile,v retrieving revision 1.11 diff -d -u -r1.11 Makefile --- graphics/gtkgraph/Makefile 2000/10/05 06:57:38 1.11 +++ graphics/gtkgraph/Makefile 2001/03/29 10:44:17 @@ -22,7 +22,7 @@ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; s|-O2|${CFLAGS}| ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; s|-O2|${CFLAGS}| ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure .include <bsd.port.mk> Index: graphics/gview/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/gview/Makefile,v retrieving revision 1.17 diff -d -u -r1.17 Makefile --- graphics/gview/Makefile 2000/10/05 06:57:38 1.17 +++ graphics/gview/Makefile 2001/03/29 10:44:17 @@ -21,7 +21,7 @@ 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 Index: graphics/morpheus/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/morpheus/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- graphics/morpheus/Makefile 2001/02/05 15:57:17 1.4 +++ graphics/morpheus/Makefile 2001/03/29 10:44:17 @@ -24,7 +24,7 @@ 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 ; \ Index: graphics/smpeg-xmms/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/smpeg-xmms/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- graphics/smpeg-xmms/Makefile 2000/12/27 08:06:22 1.2 +++ graphics/smpeg-xmms/Makefile 2001/03/29 10:44:17 @@ -25,7 +25,7 @@ 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 post-configure: Index: graphics/sodipodi/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/sodipodi/Makefile,v retrieving revision 1.21 diff -d -u -r1.21 Makefile --- graphics/sodipodi/Makefile 2001/01/31 16:13:08 1.21 +++ graphics/sodipodi/Makefile 2001/03/29 10:44:17 @@ -26,7 +26,7 @@ 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 ; \ Index: graphics/xmps/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/xmps/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- graphics/xmps/Makefile 2001/02/16 19:48:10 1.10 +++ graphics/xmps/Makefile 2001/03/29 10:44:17 @@ -25,12 +25,12 @@ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e "s|-lpthread|-pthread|g" ${WRKSRC}/configure + @${PERL} -pi -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ s|\$$\(datadir\)/aclocal|\$$\(prefix\)/share/aclocal|g ; \ s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g ; \ - s|-lpthread|-pthread|g' + s|-lpthread|${PTHREAD_LIBS}|g' post-configure: @${PERL} -pi -e 's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \ Index: irc/irssi/Makefile =================================================================== RCS file: /home/ncvs/ports/irc/irssi/Makefile,v retrieving revision 1.44 diff -d -u -r1.44 Makefile --- irc/irssi/Makefile 2001/03/26 16:23:55 1.44 +++ irc/irssi/Makefile 2001/03/29 10:44:17 @@ -32,7 +32,7 @@ .endif 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 Index: irc/xchat/Makefile =================================================================== RCS file: /home/ncvs/ports/irc/xchat/Makefile,v retrieving revision 1.75 diff -d -u -r1.75 Makefile --- irc/xchat/Makefile 2001/02/16 22:51:20 1.75 +++ irc/xchat/Makefile 2001/03/29 10:44:17 @@ -47,7 +47,7 @@ .endif post-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 Index: irc/xchat-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/irc/xchat-devel/Makefile,v retrieving revision 1.72 diff -d -u -r1.72 Makefile --- irc/xchat-devel/Makefile 2001/03/28 15:24:08 1.72 +++ irc/xchat-devel/Makefile 2001/03/29 10:44:17 @@ -45,7 +45,7 @@ .endif 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 Index: japanese/balsa/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/balsa/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- japanese/balsa/Makefile 2000/10/13 09:34:41 1.3 +++ japanese/balsa/Makefile 2001/03/29 10:44:17 @@ -29,7 +29,7 @@ MAN1= balsa.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 ; \ Index: japanese/xchat/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/xchat/Makefile,v retrieving revision 1.7 diff -d -u -r1.7 Makefile --- japanese/xchat/Makefile 2001/02/25 19:02:30 1.7 +++ japanese/xchat/Makefile 2001/03/29 10:44:17 @@ -68,7 +68,7 @@ # begin master part post-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 Index: korean/gtkcomm/Makefile =================================================================== RCS file: /home/ncvs/ports/korean/gtkcomm/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- korean/gtkcomm/Makefile 2001/02/22 14:50:39 1.5 +++ korean/gtkcomm/Makefile 2001/03/29 10:44:17 @@ -19,7 +19,7 @@ GNU_CONFIGURE= yes 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 .include <bsd.port.mk> Index: lang/python/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/python/Makefile,v retrieving revision 1.75 diff -d -u -r1.75 Makefile --- lang/python/Makefile 2001/03/29 08:13:31 1.75 +++ lang/python/Makefile 2001/03/29 10:44:17 @@ -39,8 +39,8 @@ LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads -CFLAGS+= -D_THREAD_SAFE -CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads .endif Index: lang/python+ipv6/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/python+ipv6/Makefile,v retrieving revision 1.67 diff -d -u -r1.67 Makefile --- lang/python+ipv6/Makefile 2000/10/09 23:47:49 1.67 +++ lang/python+ipv6/Makefile 2001/03/29 10:44:17 @@ -43,8 +43,8 @@ LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-thread -CFLAGS+= -D_THREAD_SAFE -CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .endif # Index: lang/python15/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/python15/Makefile,v retrieving revision 1.71 diff -d -u -r1.71 Makefile --- lang/python15/Makefile 2001/01/29 14:13:10 1.71 +++ lang/python15/Makefile 2001/03/29 10:44:17 @@ -38,8 +38,8 @@ LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-thread -CFLAGS+= -D_THREAD_SAFE -CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .endif # Index: mail/balsa/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/balsa/Makefile,v retrieving revision 1.40 diff -d -u -r1.40 Makefile --- mail/balsa/Makefile 2001/03/06 11:07:37 1.40 +++ mail/balsa/Makefile 2001/03/29 10:44:18 @@ -31,7 +31,7 @@ MAN1= balsa.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 ; \ Index: mail/evolution/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/evolution/Makefile,v retrieving revision 1.24 diff -d -u -r1.24 Makefile --- mail/evolution/Makefile 2001/03/16 20:59:47 1.24 +++ mail/evolution/Makefile 2001/03/29 10:44:18 @@ -40,7 +40,7 @@ PLIST_SUB= VERSION=${PORTVERSION} 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 ; \ Index: mail/mmc/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/mmc/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- mail/mmc/Makefile 2001/02/05 15:10:56 1.5 +++ mail/mmc/Makefile 2001/03/29 10:44:18 @@ -23,7 +23,7 @@ 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|\$$\(gnomedatadir\)/gnome/|\$$\(datadir\)/|g ; \ Index: mail/vbsfilter/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/vbsfilter/Makefile,v retrieving revision 1.1 diff -d -u -r1.1 Makefile --- mail/vbsfilter/Makefile 2001/03/13 06:47:25 1.1 +++ mail/vbsfilter/Makefile 2001/03/29 10:44:18 @@ -20,8 +20,8 @@ NO_PACKAGE= "only with sendmail from the ports" CTARGETS+= vbsfilter-1.3 -CFLAGS+= -Wall -I$(LOCALBASE)/include -D_THREAD_SAFE -FLAGS+= -pthread +CFLAGS+= -Wall -I$(LOCALBASE)/include ${PTHREAD_CFLAGS} +FLAGS+= ${PTHREAD_LIBS} LDFLAGS+= -L$(LOCALBASE)/lib LIBS+= -lmilter -lsmutil .if defined(SENDMAIL_WITH_SFIO) Index: math/gnumeric/Makefile =================================================================== RCS file: /home/ncvs/ports/math/gnumeric/Makefile,v retrieving revision 1.54 diff -d -u -r1.54 Makefile --- math/gnumeric/Makefile 2001/02/09 22:01:56 1.54 +++ math/gnumeric/Makefile 2001/03/29 10:44:18 @@ -33,7 +33,7 @@ PLIST_SUB= VERSION=${PORTVERSION} 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 ; \ Index: math/scigraphica/Makefile =================================================================== RCS file: /home/ncvs/ports/math/scigraphica/Makefile,v retrieving revision 1.11 diff -d -u -r1.11 Makefile --- math/scigraphica/Makefile 2001/03/11 11:30:00 1.11 +++ math/scigraphica/Makefile 2001/03/29 10:44:18 @@ -30,7 +30,7 @@ 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 ; \ Index: misc/emma/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/emma/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- misc/emma/Makefile 2001/03/22 13:36:50 1.3 +++ misc/emma/Makefile 2001/03/29 10:44:18 @@ -27,7 +27,7 @@ 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 ; \ Index: misc/gnomepm/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/gnomepm/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- misc/gnomepm/Makefile 2001/03/13 15:03:20 1.6 +++ misc/gnomepm/Makefile 2001/03/29 10:44:18 @@ -24,7 +24,7 @@ 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 ; \ Index: misc/gnomeusersguide/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/gnomeusersguide/Makefile,v retrieving revision 1.13 diff -d -u -r1.13 Makefile --- misc/gnomeusersguide/Makefile 2000/10/05 07:17:05 1.13 +++ misc/gnomeusersguide/Makefile 2001/03/29 10:44:18 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes 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 ; \ Index: misc/gnomeutils/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/gnomeutils/Makefile,v retrieving revision 1.24 diff -d -u -r1.24 Makefile --- misc/gnomeutils/Makefile 2000/10/05 07:17:06 1.24 +++ misc/gnomeutils/Makefile 2001/03/29 10:44:18 @@ -26,7 +26,7 @@ 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 ; \ Index: misc/grdb/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/grdb/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- misc/grdb/Makefile 2001/02/05 15:47:10 1.6 +++ misc/grdb/Makefile 2001/03/29 10:44:18 @@ -31,7 +31,7 @@ .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 ; \ Index: misc/metatheme/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/metatheme/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- misc/metatheme/Makefile 2001/02/09 22:01:59 1.6 +++ misc/metatheme/Makefile 2001/03/29 10:44:18 @@ -24,7 +24,7 @@ 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 ; \ Index: misc/misterproper/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/misterproper/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- misc/misterproper/Makefile 2001/02/05 15:47:11 1.2 +++ misc/misterproper/Makefile 2001/03/29 10:44:18 @@ -22,7 +22,7 @@ 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 ; \ Index: misc/pybliographer/Makefile =================================================================== RCS file: /home/ncvs/ports/misc/pybliographer/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- misc/pybliographer/Makefile 2001/01/28 07:44:32 1.3 +++ misc/pybliographer/Makefile 2001/03/29 10:44:18 @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --with-recode-prefix="${LOCALBASE}" 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 ; \ Index: net/dnrd/Makefile =================================================================== RCS file: /home/ncvs/ports/net/dnrd/Makefile,v retrieving revision 1.1 diff -d -u -r1.1 Makefile --- net/dnrd/Makefile 2001/03/10 19:33:50 1.1 +++ net/dnrd/Makefile 2001/03/29 10:44:18 @@ -23,6 +23,6 @@ @(cd ${WRKSRC} && ${SED} -e 's,%%PREFIX%%,${PREFIX},g' $F > foo && \ ${MV} foo $F) .endfor - ${PERL} -pi -e "s@cc@${CC}@g; s@-lc_r@-pthread@g" ${WRKSRC}/Makefile + ${PERL} -pi -e "s@cc@${CC}@g; s@-lc_r@${PTHREAD_LIBS}@g" ${WRKSRC}/Makefile .include <bsd.port.mk> Index: net/fidelio/Makefile =================================================================== RCS file: /home/ncvs/ports/net/fidelio/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- net/fidelio/Makefile 2001/02/09 14:13:09 1.4 +++ net/fidelio/Makefile 2001/03/29 10:44:18 @@ -28,7 +28,7 @@ XML_CONFIG="${XML_CONFIG}" 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 ; \ Index: net/gabber/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gabber/Makefile,v retrieving revision 1.11 diff -d -u -r1.11 Makefile --- net/gabber/Makefile 2001/03/13 15:18:04 1.11 +++ net/gabber/Makefile 2001/03/29 10:44:18 @@ -30,7 +30,7 @@ LDFLAGS="-L${LOCALBASE}/lib" post-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 ; \ Index: net/gaim/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gaim/Makefile,v retrieving revision 1.40 diff -d -u -r1.40 Makefile --- net/gaim/Makefile 2001/03/24 15:56:45 1.40 +++ net/gaim/Makefile 2001/03/29 10:44:18 @@ -42,7 +42,7 @@ .endif 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 Index: net/gicq/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gicq/Makefile,v retrieving revision 1.17 diff -d -u -r1.17 Makefile --- net/gicq/Makefile 2000/10/05 07:22:46 1.17 +++ net/gicq/Makefile 2001/03/29 10:44:18 @@ -32,7 +32,7 @@ .endif 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 Index: net/gnomba/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gnomba/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- net/gnomba/Makefile 2000/11/13 12:44:27 1.5 +++ net/gnomba/Makefile 2001/03/29 10:44:18 @@ -21,7 +21,7 @@ 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 ; \ Index: net/gnomeicu/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gnomeicu/Makefile,v retrieving revision 1.34 diff -d -u -r1.34 Makefile --- net/gnomeicu/Makefile 2001/03/01 22:46:28 1.34 +++ net/gnomeicu/Makefile 2001/03/29 10:44:18 @@ -39,7 +39,7 @@ CFLAGS="${CFLAGS}" 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 ; \ Index: net/gnometelnet/Makefile =================================================================== RCS file: /home/ncvs/ports/net/gnometelnet/Makefile,v retrieving revision 1.7 diff -d -u -r1.7 Makefile --- net/gnometelnet/Makefile 2001/03/13 11:37:28 1.7 +++ net/gnometelnet/Makefile 2001/03/29 10:44:19 @@ -24,7 +24,7 @@ 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 ; \ Index: net/kdenetwork2/Makefile =================================================================== RCS file: /home/ncvs/ports/net/kdenetwork2/Makefile,v retrieving revision 1.58 diff -d -u -r1.58 Makefile --- net/kdenetwork2/Makefile 2001/03/24 22:15:40 1.58 +++ net/kdenetwork2/Makefile 2001/03/29 10:44:19 @@ -30,7 +30,7 @@ USE_GMAKE= yes pre-configure: - ${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in + ${PERL} -pi -e "s:-lpthread:${PTHREAD_LIBS}:g" ${WRKSRC}/knode/Makefile.in ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 .include <bsd.port.mk> Index: net/openldap/Makefile =================================================================== RCS file: /home/ncvs/ports/net/openldap/Makefile,v retrieving revision 1.22 diff -d -u -r1.22 Makefile --- net/openldap/Makefile 2001/02/23 16:52:37 1.22 +++ net/openldap/Makefile 2001/03/29 10:44:19 @@ -37,7 +37,7 @@ .if defined(WITH_DB2) BUILD_DEPENDS= ${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db/ -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/db2 -D_THREAD_SAFE" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/db2 ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --enable-ldbm \ --with-ldbm-api=db2 Index: net/openldap2/Makefile =================================================================== RCS file: /home/ncvs/ports/net/openldap2/Makefile,v retrieving revision 1.29 diff -d -u -r1.29 Makefile --- net/openldap2/Makefile 2001/03/05 22:27:09 1.29 +++ net/openldap2/Makefile 2001/03/29 10:44:19 @@ -41,7 +41,7 @@ .endif # math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. -CPPFLAGS+= -D_REENTRANT -D_THREAD_SAFE \ +CPPFLAGS+= -D_REENTRANT ${PTHREAD_CFLAGS} \ -I${LOCALBASE}/include \ -I${LOCALBASE}/include/db3 LDFLAGS+= -L${LOCALBASE}/lib Index: net/spat/Makefile =================================================================== RCS file: /home/ncvs/ports/net/spat/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- net/spat/Makefile 2001/02/05 15:50:40 1.3 +++ net/spat/Makefile 2001/03/29 10:44:19 @@ -23,7 +23,7 @@ LIBS="-lcompat -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 ; \ Index: news/grn/Makefile =================================================================== RCS file: /home/ncvs/ports/news/grn/Makefile,v retrieving revision 1.7 diff -d -u -r1.7 Makefile --- news/grn/Makefile 2001/02/05 15:47:59 1.7 +++ news/grn/Makefile 2001/03/29 10:44:19 @@ -24,7 +24,7 @@ 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 ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure Index: news/pan/Makefile =================================================================== RCS file: /home/ncvs/ports/news/pan/Makefile,v retrieving revision 1.38 diff -d -u -r1.38 Makefile --- news/pan/Makefile 2001/02/11 02:40:02 1.38 +++ news/pan/Makefile 2001/03/29 10:44:19 @@ -25,7 +25,7 @@ CONFIGURE_ARGS= --enable-html 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 ; \ Index: palm/gnomepilot/Makefile =================================================================== RCS file: /home/ncvs/ports/palm/gnomepilot/Makefile,v retrieving revision 1.19 diff -d -u -r1.19 Makefile --- palm/gnomepilot/Makefile 2000/10/05 07:17:15 1.19 +++ palm/gnomepilot/Makefile 2001/03/29 10:44:19 @@ -29,7 +29,7 @@ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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 ; \ Index: palm/gnomepilot-conduits/Makefile =================================================================== RCS file: /home/ncvs/ports/palm/gnomepilot-conduits/Makefile,v retrieving revision 1.11 diff -d -u -r1.11 Makefile --- palm/gnomepilot-conduits/Makefile 2000/10/05 07:17:16 1.11 +++ palm/gnomepilot-conduits/Makefile 2001/03/29 10:44:19 @@ -26,7 +26,7 @@ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/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 ; \ Index: print/ggv/Makefile =================================================================== RCS file: /home/ncvs/ports/print/ggv/Makefile,v retrieving revision 1.23 diff -d -u -r1.23 Makefile --- print/ggv/Makefile 2000/10/05 07:17:16 1.23 +++ print/ggv/Makefile 2001/03/29 10:44:20 @@ -22,7 +22,7 @@ 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 ; \ Index: print/gnomeprint/Makefile =================================================================== RCS file: /home/ncvs/ports/print/gnomeprint/Makefile,v retrieving revision 1.28 diff -d -u -r1.28 Makefile --- print/gnomeprint/Makefile 2000/11/14 14:09:33 1.28 +++ print/gnomeprint/Makefile 2001/03/29 10:44:20 @@ -30,7 +30,7 @@ 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 ; \ Index: security/aide/Makefile =================================================================== RCS file: /home/ncvs/ports/security/aide/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- security/aide/Makefile 2001/02/06 13:17:00 1.4 +++ security/aide/Makefile 2001/03/29 10:44:20 @@ -21,7 +21,7 @@ --with-zlib \ --with-config_file=/var/adm/aide/aide.conf -CONFIGURE_ENV+= LIBS='-L${LOCALBASE}/lib -pthread' +CONFIGURE_ENV+= LIBS='-L${LOCALBASE}/lib ${PTHREAD_LIBS}' MAN1= aide.1 MAN5= aide.conf.5 Index: security/mhash/Makefile =================================================================== RCS file: /home/ncvs/ports/security/mhash/Makefile,v retrieving revision 1.14 diff -d -u -r1.14 Makefile --- security/mhash/Makefile 2001/02/23 16:07:16 1.14 +++ security/mhash/Makefile 2001/03/29 10:44:20 @@ -14,7 +14,7 @@ INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --with-LDFLAGS="-pthread" +CONFIGURE_ARGS+= --with-LDFLAGS="${PTHREAD_LIBS}" MAN3= mhash.3 Index: security/seahorse/Makefile =================================================================== RCS file: /home/ncvs/ports/security/seahorse/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- security/seahorse/Makefile 2000/10/05 07:17:17 1.9 +++ security/seahorse/Makefile 2001/03/29 10:44:20 @@ -24,7 +24,7 @@ MAN1= seahorse.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|datadir\`/gnome/|datadir\`/|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ Index: security/snort/Makefile =================================================================== RCS file: /home/ncvs/ports/security/snort/Makefile,v retrieving revision 1.17 diff -d -u -r1.17 Makefile --- security/snort/Makefile 2001/01/27 07:55:06 1.17 +++ security/snort/Makefile 2001/03/29 10:44:20 @@ -34,7 +34,7 @@ LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+=--with-unixodbc-includes=${LOCALBASE}/include \ --with-unixodbc-libraries=${LOCALBASE}/lib -LDFLAGS+= -pthread +LDFLAGS+= ${PTHREAD_LIBS} .endif .if defined(WITH_POSTGRES) Index: sysutils/battstat-applet/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/battstat-applet/Makefile,v retrieving revision 1.4 diff -d -u -r1.4 Makefile --- sysutils/battstat-applet/Makefile 2001/01/16 17:32:26 1.4 +++ sysutils/battstat-applet/Makefile 2001/03/29 10:44:20 @@ -23,7 +23,7 @@ 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 ; \ Index: sysutils/gcombust/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gcombust/Makefile,v retrieving revision 1.21 diff -d -u -r1.21 Makefile --- sysutils/gcombust/Makefile 2001/03/09 07:19:19 1.21 +++ sysutils/gcombust/Makefile 2001/03/29 10:44:20 @@ -25,7 +25,7 @@ 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 @${PERL} -pi -e 's|==|=|g' ${WRKSRC}/po/Makefile.in.in Index: sysutils/gnomecontrolcenter/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gnomecontrolcenter/Makefile,v retrieving revision 1.30 diff -d -u -r1.30 Makefile --- sysutils/gnomecontrolcenter/Makefile 2001/03/23 05:42:24 1.30 +++ sysutils/gnomecontrolcenter/Makefile 2001/03/29 10:44:20 @@ -26,7 +26,7 @@ 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 ; \ Index: sysutils/gnomefind/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gnomefind/Makefile,v retrieving revision 1.15 diff -d -u -r1.15 Makefile --- sysutils/gnomefind/Makefile 2001/02/05 16:04:22 1.15 +++ sysutils/gnomefind/Makefile 2001/03/29 10:44:21 @@ -26,7 +26,7 @@ MAN1= gnome-find.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 ; \ Index: sysutils/gtop/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gtop/Makefile,v retrieving revision 1.26 diff -d -u -r1.26 Makefile --- sysutils/gtop/Makefile 2001/02/15 19:22:27 1.26 +++ sysutils/gtop/Makefile 2001/03/29 10:44:21 @@ -22,7 +22,7 @@ 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 ; \ Index: sysutils/gupsc/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/gupsc/Makefile,v retrieving revision 1.1 diff -d -u -r1.1 Makefile --- sysutils/gupsc/Makefile 2001/03/13 15:08:45 1.1 +++ sysutils/gupsc/Makefile 2001/03/29 10:44:21 @@ -21,7 +21,7 @@ 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 \ ${WRKSRC}/src/Makefile.in @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ Index: sysutils/medusa/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/medusa/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- sysutils/medusa/Makefile 2001/01/30 04:39:53 1.5 +++ sysutils/medusa/Makefile 2001/03/29 10:44:21 @@ -26,7 +26,7 @@ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/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 ; \ Index: textproc/gtkdiff/Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/gtkdiff/Makefile,v retrieving revision 1.11 diff -d -u -r1.11 Makefile --- textproc/gtkdiff/Makefile 2001/02/05 16:34:39 1.11 +++ textproc/gtkdiff/Makefile 2001/03/29 10:44:21 @@ -21,7 +21,7 @@ MAN1= gtkdiff.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 ; \ Index: textproc/textutils/Makefile =================================================================== RCS file: /home/ncvs/ports/textproc/textutils/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- textproc/textutils/Makefile 2001/02/05 16:35:16 1.10 +++ textproc/textutils/Makefile 2001/03/29 10:44:21 @@ -28,7 +28,7 @@ gsplit.1 gunexpand.1 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 Index: www/encompass/Makefile =================================================================== RCS file: /home/ncvs/ports/www/encompass/Makefile,v retrieving revision 1.14 diff -d -u -r1.14 Makefile --- www/encompass/Makefile 2001/03/13 14:45:31 1.14 +++ www/encompass/Makefile 2001/03/29 10:44:21 @@ -28,7 +28,7 @@ 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 ; \ Index: www/galeon/Makefile =================================================================== RCS file: /home/ncvs/ports/www/galeon/Makefile,v retrieving revision 1.23 diff -d -u -r1.23 Makefile --- www/galeon/Makefile 2001/03/10 12:52:58 1.23 +++ www/galeon/Makefile 2001/03/29 10:44:21 @@ -39,8 +39,8 @@ 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 @@ .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 ; \ Index: www/gtkhtml/Makefile =================================================================== RCS file: /home/ncvs/ports/www/gtkhtml/Makefile,v retrieving revision 1.21 diff -d -u -r1.21 Makefile --- www/gtkhtml/Makefile 2001/03/12 15:56:54 1.21 +++ www/gtkhtml/Makefile 2001/03/29 10:44:21 @@ -29,7 +29,7 @@ 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 ; \ Index: www/kannel/Makefile =================================================================== RCS file: /home/ncvs/ports/www/kannel/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- www/kannel/Makefile 2001/03/28 13:09:06 1.9 +++ www/kannel/Makefile 2001/03/29 10:44:21 @@ -17,7 +17,7 @@ USE_AUTOCONF= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/gateway-${PORTVERSION}/ -CFLAGS+= -pthread +CFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-malloc=native do-install: Index: www/peacock/Makefile =================================================================== RCS file: /home/ncvs/ports/www/peacock/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- www/peacock/Makefile 2000/11/03 16:19:29 1.9 +++ www/peacock/Makefile 2001/03/29 10:44:21 @@ -21,7 +21,7 @@ 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 ; \ Index: www/quanta/Makefile =================================================================== RCS file: /home/ncvs/ports/www/quanta/Makefile,v retrieving revision 1.8 diff -d -u -r1.8 Makefile --- www/quanta/Makefile 2001/03/18 07:53:02 1.8 +++ www/quanta/Makefile 2001/03/29 10:44:22 @@ -39,7 +39,7 @@ --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 Index: www/screem/Makefile =================================================================== RCS file: /home/ncvs/ports/www/screem/Makefile,v retrieving revision 1.18 diff -d -u -r1.18 Makefile --- www/screem/Makefile 2001/02/28 10:51:58 1.18 +++ www/screem/Makefile 2001/03/29 10:44:22 @@ -30,7 +30,7 @@ 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 ; \ Index: www/squid23/Makefile =================================================================== RCS file: /home/ncvs/ports/www/squid23/Makefile,v retrieving revision 1.76 diff -d -u -r1.76 Makefile --- www/squid23/Makefile 2001/02/19 13:15:19 1.76 +++ www/squid23/Makefile 2001/03/29 10:44:22 @@ -98,7 +98,7 @@ #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 Index: www/squid24/Makefile =================================================================== RCS file: /home/ncvs/ports/www/squid24/Makefile,v retrieving revision 1.78 diff -d -u -r1.78 Makefile --- www/squid24/Makefile 2001/03/27 12:56:41 1.78 +++ www/squid24/Makefile 2001/03/29 10:44:22 @@ -93,7 +93,7 @@ #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 Index: x11/gdm/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gdm/Makefile,v retrieving revision 1.6 diff -d -u -r1.6 Makefile --- x11/gdm/Makefile 2000/10/17 09:13:37 1.6 +++ x11/gdm/Makefile 2001/03/29 10:44:22 @@ -28,7 +28,7 @@ .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 ; \ Index: x11/gnomeapplets/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gnomeapplets/Makefile,v retrieving revision 1.9 diff -d -u -r1.9 Makefile --- x11/gnomeapplets/Makefile 2001/02/05 16:18:00 1.9 +++ x11/gnomeapplets/Makefile 2001/03/29 10:44:22 @@ -25,7 +25,7 @@ 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 ; \ Index: x11/gnomecore/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gnomecore/Makefile,v retrieving revision 1.54 diff -d -u -r1.54 Makefile --- x11/gnomecore/Makefile 2001/02/05 16:18:01 1.54 +++ x11/gnomecore/Makefile 2001/03/29 10:44:22 @@ -31,7 +31,7 @@ MAN5= default.session.5 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 ; \ Index: x11/gnomelibs/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gnomelibs/Makefile,v retrieving revision 1.81 diff -d -u -r1.81 Makefile --- x11/gnomelibs/Makefile 2001/02/05 16:18:01 1.81 +++ x11/gnomelibs/Makefile 2001/03/29 10:44:22 @@ -35,7 +35,7 @@ MAN5= gnome-mime.5 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 ; \ Index: x11/gnomeres_applet/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gnomeres_applet/Makefile,v retrieving revision 1.2 diff -d -u -r1.2 Makefile --- x11/gnomeres_applet/Makefile 2000/10/05 07:17:24 1.2 +++ x11/gnomeres_applet/Makefile 2001/03/29 10:44:22 @@ -19,7 +19,7 @@ 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 ; \ Index: x11/xscreensaver/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/xscreensaver/Makefile,v retrieving revision 1.36 diff -d -u -r1.36 Makefile --- x11/xscreensaver/Makefile 2001/03/05 11:23:02 1.36 +++ x11/xscreensaver/Makefile 2001/03/29 10:44:22 @@ -38,7 +38,7 @@ post-patch: @ ${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Patched - @ ${SED} -e 's#-lpthread#-pthread#g' \ + @ ${SED} -e 's#-lpthread#${PTHREAD_LIBS}#g' \ ${WRKSRC}/configure.Patched > ${WRKSRC}/configure .include <bsd.port.pre.mk> Index: x11-clocks/sanduhr/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-clocks/sanduhr/Makefile,v retrieving revision 1.3 diff -d -u -r1.3 Makefile --- x11-clocks/sanduhr/Makefile 2001/02/05 17:05:24 1.3 +++ x11-clocks/sanduhr/Makefile 2001/03/29 10:44:22 @@ -22,7 +22,7 @@ MAN1= sanduhr.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 ; \ Index: x11-fm/nautilus/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-fm/nautilus/Makefile,v retrieving revision 1.15 diff -d -u -r1.15 Makefile --- x11-fm/nautilus/Makefile 2001/03/20 20:28:09 1.15 +++ x11-fm/nautilus/Makefile 2001/03/29 10:44:22 @@ -33,7 +33,7 @@ USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="-pthread -L${LOCALBASE}/lib" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ --with-freetype2-include-place=${LOCALBASE}/include/freetype2 @@ -55,7 +55,7 @@ .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 ; \ Index: x11-toolkits/bakery/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/bakery/Makefile,v retrieving revision 1.5 diff -d -u -r1.5 Makefile --- x11-toolkits/bakery/Makefile 2001/02/05 16:48:45 1.5 +++ x11-toolkits/bakery/Makefile 2001/03/29 10:44:22 @@ -25,7 +25,7 @@ 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 ; \ Index: x11-toolkits/gal/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/gal/Makefile,v retrieving revision 1.10 diff -d -u -r1.10 Makefile --- x11-toolkits/gal/Makefile 2001/03/21 15:59:32 1.10 +++ x11-toolkits/gal/Makefile 2001/03/29 10:44:22 @@ -32,7 +32,7 @@ PLIST_SUB= VERSION=${PORTVERSION} 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 ; \ Index: x11-toolkits/qt23/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt23/Makefile,v retrieving revision 1.81 diff -d -u -r1.81 Makefile --- x11-toolkits/qt23/Makefile 2001/03/27 02:19:55 1.81 +++ x11-toolkits/qt23/Makefile 2001/03/29 10:44:22 @@ -91,7 +91,7 @@ (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o) ${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4 ${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \ - s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= -pthread -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile + s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= ${PTHREAD_LIBS} -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile (cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all) ${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4 ${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4 Index: x11-toolkits/wxgtk/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/wxgtk/Makefile,v retrieving revision 1.19 diff -d -u -r1.19 Makefile --- x11-toolkits/wxgtk/Makefile 2001/02/05 16:49:13 1.19 +++ x11-toolkits/wxgtk/Makefile 2001/03/29 10:44:22 @@ -29,12 +29,12 @@ --with-libjpeg=sys \ --with-libtiff=sys \ --with-zlib=sys -CONFIGURE_ENV= CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" AUTOCONF= autoconf && \ - ${PERL} -pi -e 's|-l\$$THREADS_LIB|-pthread|g ; \ - s|-l\$$THREADS_LINK|-pthread|g' \ + ${PERL} -pi -e 's|-l\$$THREADS_LIB|${PTHREAD_LIBS}|g ; \ + s|-l\$$THREADS_LINK|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure post-install: Index: x11-wm/sawfish/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-wm/sawfish/Makefile,v retrieving revision 1.43 diff -d -u -r1.43 Makefile --- x11-wm/sawfish/Makefile 2001/03/15 10:56:07 1.43 +++ x11-wm/sawfish/Makefile 2001/03/29 10:44:22 @@ -44,7 +44,7 @@ .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 ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure --------------5E4A375B78594831175BE6CF-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3AC31847.C28A26EB>