diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-03-29 16:35:19 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-03-29 16:35:19 +0000 |
| commit | 4ca0e60800b90ba4a6de31beabeee8ccce611649 (patch) | |
| tree | 8324ab31f68eba587c532d238cd3f502d0a56322 | |
| parent | Update to version 2.28 (diff) | |
-pthread --> ${PTHREAD_LIBS}
-D_THREAD_SAFE --> ${PTHREAD_CFLAGS}
Note: my first intention was to test this out on bento/beta, but per ade's
requiest I opted to do it quickly.
Notes
Notes:
svn path=/head/; revision=40539
290 files changed, 323 insertions, 330 deletions
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile index 4e329bd4f4d9..bfa2efe77282 100644 --- a/astro/glunarclock/Makefile +++ b/astro/glunarclock/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/astro/seti_applet/Makefile b/astro/seti_applet/Makefile index 35de40fdd31e..e3431fa1401d 100644 --- a/astro/seti_applet/Makefile +++ b/astro/seti_applet/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/extace/Makefile b/audio/extace/Makefile index 89e7a0a82ccc..398738a9d6c9 100644 --- a/audio/extace/Makefile +++ b/audio/extace/Makefile @@ -31,7 +31,7 @@ USE_GNOME= yes .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' diff --git a/audio/glame/Makefile b/audio/glame/Makefile index 2dddd3a4bfdd..c34ad5648fbd 100644 --- a/audio/glame/Makefile +++ b/audio/glame/Makefile @@ -33,12 +33,12 @@ CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|-lpthread|-pthread|g' + s|-lpthread|${PTHREAD_LIBS}|g' post-install: @install-info ${PREFIX}/info/glame.info \ diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile index 22985959a291..012fd27d4963 100644 --- a/audio/gnapster/Makefile +++ b/audio/gnapster/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 92f098633e89..c3ae650a45b2 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile index 92f098633e89..c3ae650a45b2 100644 --- a/audio/gnomemedia/Makefile +++ b/audio/gnomemedia/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 92f098633e89..c3ae650a45b2 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index f2738500ae11..8edd244611e4 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -22,7 +22,7 @@ INSTALLS_SHLIB= yes MAN1= libmikmod-config.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure pre-build: ${RM} -rf ${WRKSRC}/docs/mikmod.info-* diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile index 0266a8d23769..1f58530a1a14 100644 --- a/audio/soundtracker/Makefile +++ b/audio/soundtracker/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--disable-gnome .endif pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 1652a6602a26..e43d2d85dbcc 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= sweep.1 pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/teknap/Makefile b/audio/teknap/Makefile index e26bac3f6f7d..f5ddc251077d 100644 --- a/audio/teknap/Makefile +++ b/audio/teknap/Makefile @@ -53,7 +53,7 @@ pre-extract: @${ECHO} "WITH_XMMS - Support XMMS" pre-configure: - @${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure + @${PERL} -pi -e "s:-lc_r:${PTHREAD_LIBS}:g" ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index 68b05e2a3ad9..7d0f8c2f98f3 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -87,7 +87,7 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index b50e0a9b8faf..f3456bece2c9 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \ --with-x-includes=${X11BASE}/include \ --with-x-libraries=${X11BASE}/lib -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= ${PTHREAD_CFLAGS} .include <bsd.port.pre.mk> diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile index a6dc41e4851f..70a9de10571d 100644 --- a/audio/yamt/Makefile +++ b/audio/yamt/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile index 7b4953a0e5ab..e51a743cc63e 100644 --- a/cad/oregano/Makefile +++ b/cad/oregano/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/databases/db3/Makefile b/databases/db3/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db33/Makefile b/databases/db33/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db33/Makefile +++ b/databases/db33/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db4/Makefile b/databases/db4/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db41/Makefile b/databases/db41/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db41/Makefile +++ b/databases/db41/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db42/Makefile b/databases/db42/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db42/Makefile +++ b/databases/db42/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db43/Makefile b/databases/db43/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db43/Makefile +++ b/databases/db43/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db44/Makefile b/databases/db44/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db44/Makefile +++ b/databases/db44/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db45/Makefile b/databases/db45/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db45/Makefile +++ b/databases/db45/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db46/Makefile b/databases/db46/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db46/Makefile +++ b/databases/db46/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/databases/db47/Makefile b/databases/db47/Makefile index 7d1e0b4d79b0..85151d77dfe2 100644 --- a/databases/db47/Makefile +++ b/databases/db47/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-compat185 \ --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} diff --git a/deskutils/bitnotes/Makefile b/deskutils/bitnotes/Makefile index 0fc66587aab9..c5ec666d21b2 100644 --- a/deskutils/bitnotes/Makefile +++ b/deskutils/bitnotes/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 diff --git a/deskutils/bulb/Makefile b/deskutils/bulb/Makefile index cab2b75907c9..66c588fe47bc 100644 --- a/deskutils/bulb/Makefile +++ b/deskutils/bulb/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile index 49a6d8dc2596..386ba89e104d 100644 --- a/deskutils/genius/Makefile +++ b/deskutils/genius/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/deskutils/gnofin/Makefile b/deskutils/gnofin/Makefile index 1fa7f102328e..d170faf3d953 100644 --- a/deskutils/gnofin/Makefile +++ b/deskutils/gnofin/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile index b43099783102..b688bc0ac521 100644 --- a/deskutils/gnome-pim/Makefile +++ b/deskutils/gnome-pim/Makefile @@ -38,7 +38,7 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 0200e1f452ff..255eb9d58b55 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile index b43099783102..b688bc0ac521 100644 --- a/deskutils/gnomepim/Makefile +++ b/deskutils/gnomepim/Makefile @@ -38,7 +38,7 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 0200e1f452ff..255eb9d58b55 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile index 591a4a4755eb..32d5fd6a4d9b 100644 --- a/deskutils/gnucash/Makefile +++ b/deskutils/gnucash/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ 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 ; \ diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile index 4af9d9ecc050..b237a4d99640 100644 --- a/deskutils/yank/Makefile +++ b/deskutils/yank/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile index 7562e119ef0c..42c3a2e22e40 100644 --- a/devel/bonobo-conf/Makefile +++ b/devel/bonobo-conf/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile index 33701d026699..10e4f37e1873 100644 --- a/devel/bonobo/Makefile +++ b/devel/bonobo/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index 81d07e839120..ce11bef4d952 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index 81d07e839120..ce11bef4d952 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index 81d07e839120..ce11bef4d952 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile index 60b31275ad30..261579380799 100644 --- a/devel/cervisia/Makefile +++ b/devel/cervisia/Makefile @@ -46,13 +46,6 @@ KDE_VERSION?= 2 .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= diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile index 60fb50126174..edfed2aadb1d 100644 --- a/devel/commoncpp/Makefile +++ b/devel/commoncpp/Makefile @@ -21,7 +21,7 @@ INSTALLS_SHLIB= yes 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 diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index c6df7b21d776..a8ecfa7b6c9c 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--enable-threads --enable-shlib 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 diff --git a/devel/dryad/Makefile b/devel/dryad/Makefile index 28d27263c2b3..1bdadf1758b6 100644 --- a/devel/dryad/Makefile +++ b/devel/dryad/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index 4de0c11ba352..670f4c2671c0 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 4de0c11ba352..670f4c2671c0 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/gide/Makefile b/devel/gide/Makefile index db77f92b532e..13446a9ca1ee 100644 --- a/devel/gide/Makefile +++ b/devel/gide/Makefile @@ -28,7 +28,7 @@ MAN1= gide.1 gdbio.1 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 diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 46e718fd981b..ea47aa04f408 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index 46e718fd981b..ea47aa04f408 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile index 1f660cd5c84b..70f999a3dabf 100644 --- a/devel/gnome-crash/Makefile +++ b/devel/gnome-crash/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 52a64d518e8d..e10c3bff11d8 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile index 52a64d518e8d..e10c3bff11d8 100644 --- a/devel/gnome-vfs1/Makefile +++ b/devel/gnome-vfs1/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile index 1f660cd5c84b..70f999a3dabf 100644 --- a/devel/gnomecrash/Makefile +++ b/devel/gnomecrash/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/gnomedebug/Makefile b/devel/gnomedebug/Makefile index 2d5dbb7accf5..822ae0027184 100644 --- a/devel/gnomedebug/Makefile +++ b/devel/gnomedebug/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile index 52a64d518e8d..e10c3bff11d8 100644 --- a/devel/gnomevfs/Makefile +++ b/devel/gnomevfs/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 52a64d518e8d..e10c3bff11d8 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile index 75ab7b1996dc..d5afda67e1e2 100644 --- a/devel/gtranslator/Makefile +++ b/devel/gtranslator/Makefile @@ -31,7 +31,7 @@ MAN1= gtranslator.1 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 ; \ diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile index 15c512b5d2ef..c70ecb475674 100644 --- a/devel/libgii/Makefile +++ b/devel/libgii/Makefile @@ -18,7 +18,7 @@ INSTALLS_SHLIB= yes 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 \ diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 7bb3906e8a14..75269fc7e812 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 7bb3906e8a14..75269fc7e812 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 27a0c1a99094..82e5c6894f2b 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile index 181cf7241b04..a6ed2390e2fe 100644 --- a/devel/pharmacy/Makefile +++ b/devel/pharmacy/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV+= CPPCFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile index 2978e3de90de..f25238362a95 100644 --- a/devel/sdl-devel/Makefile +++ b/devel/sdl-devel/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-video-aalib \ --disable-arts \ --disable-nas -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= ${PTHREAD_CFLAGS} .if exists(/usr/lib/libvgl.so.3) CONFIGURE_ARGS+=--enable-video-vgl diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile index ec5af0dceefb..a86a566db247 100644 --- a/devel/sdl/Makefile +++ b/devel/sdl/Makefile @@ -26,7 +26,7 @@ USE_LIBTOOL= yes 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|' \ diff --git a/devel/sdl10/Makefile b/devel/sdl10/Makefile index ec5af0dceefb..a86a566db247 100644 --- a/devel/sdl10/Makefile +++ b/devel/sdl10/Makefile @@ -26,7 +26,7 @@ USE_LIBTOOL= yes 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|' \ diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 2978e3de90de..f25238362a95 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --enable-video-aalib \ --disable-arts \ --disable-nas -CFLAGS+= -D_THREAD_SAFE +CFLAGS+= ${PTHREAD_CFLAGS} .if exists(/usr/lib/libvgl.so.3) CONFIGURE_ARGS+=--enable-video-vgl diff --git a/devel/titano/Makefile b/devel/titano/Makefile index d95159b4b2c6..a87dbf49cd06 100644 --- a/devel/titano/Makefile +++ b/devel/titano/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/devel/veepee/Makefile b/devel/veepee/Makefile index 1819d8f9ce92..3f6bf91fc2b3 100644 --- a/devel/veepee/Makefile +++ b/devel/veepee/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ 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 @@ PYTHON_LIBS+= -lssl -lcrypto .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g' \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure post-configure: diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile index 3938364c8d36..701e0b57f7ba 100644 --- a/dns/dnrd/Makefile +++ b/dns/dnrd/Makefile @@ -23,6 +23,6 @@ post-patch: @(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> diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index daa6e9181b01..790ccebe424a 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index daa6e9181b01..790ccebe424a 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index a369cf69e2b1..115052f36b39 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile index a369cf69e2b1..115052f36b39 100644 --- a/editors/ghex2/Makefile +++ b/editors/ghex2/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile index 2b2ef2ed00c6..92fa7878cd51 100644 --- a/editors/glimmer/Makefile +++ b/editors/glimmer/Makefile @@ -29,7 +29,7 @@ PYTHON_LIBS= -lssl -lcrypto 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 \ diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile index 0012d8f7d91a..e3744176574f 100644 --- a/editors/gmanedit/Makefile +++ b/editors/gmanedit/Makefile @@ -28,7 +28,7 @@ post-extract: @${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 ; \ diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile index cf54299fad41..65aa10e3f7d6 100644 --- a/emulators/basiliskII/Makefile +++ b/emulators/basiliskII/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes 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 diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile index 471c72bf703e..c9acf86439cc 100644 --- a/emulators/visualos/Makefile +++ b/emulators/visualos/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/finance/emma/Makefile b/finance/emma/Makefile index 44af09361aeb..69055e2c333d 100644 --- a/finance/emma/Makefile +++ b/finance/emma/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile index 1fa7f102328e..d170faf3d953 100644 --- a/finance/gnofin/Makefile +++ b/finance/gnofin/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 diff --git a/finance/gnomepm/Makefile b/finance/gnomepm/Makefile index d6bf14ce61c2..581379ff5acf 100644 --- a/finance/gnomepm/Makefile +++ b/finance/gnomepm/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile index 591a4a4755eb..32d5fd6a4d9b 100644 --- a/finance/gnucash-devel/Makefile +++ b/finance/gnucash-devel/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ 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 ; \ diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 591a4a4755eb..32d5fd6a4d9b 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ 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 ; \ diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile index a06c5b672592..4de93c232079 100644 --- a/ftp/gftp/Makefile +++ b/ftp/gftp/Makefile @@ -29,7 +29,7 @@ USE_GNOME= yes .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile index c1107396ee77..575b1b5f0f3b 100644 --- a/ftp/gtm/Makefile +++ b/ftp/gtm/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile index d4cf0e374a09..d19a1a37050a 100644 --- a/ftp/junglemonkey/Makefile +++ b/ftp/junglemonkey/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/ftp/lftp/Makefile b/ftp/lftp/Makefile index c6170d9ef039..5f048084c984 100644 --- a/ftp/lftp/Makefile +++ b/ftp/lftp/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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: diff --git a/games/asc/Makefile b/games/asc/Makefile index ee7cad21895d..8953ba38fd05 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -35,7 +35,7 @@ CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ 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' diff --git a/games/atomix/Makefile b/games/atomix/Makefile index 18d3abb7651b..3abba5fa2085 100644 --- a/games/atomix/Makefile +++ b/games/atomix/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/baduki/Makefile b/games/baduki/Makefile index 3f0dcbfab2c2..19b4faea9402 100644 --- a/games/baduki/Makefile +++ b/games/baduki/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile index ae0a5b46b11a..853e40a9f4ad 100644 --- a/games/bombermaze/Makefile +++ b/games/bombermaze/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile index 3380b73e4212..7089a21f8d30 100644 --- a/games/clanbomber/Makefile +++ b/games/clanbomber/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= clanCore.0:${PORTSDIR}/devel/clanlib 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 diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile index 956e6c8504fd..0ce17a95b1fa 100644 --- a/games/freeciv-gtk2/Makefile +++ b/games/freeciv-gtk2/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --disable-gtktest .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 diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 956e6c8504fd..0ce17a95b1fa 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS= --disable-gtktest .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 diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 8c4c8e4ef96e..7925c5f06bd7 100644 --- a/games/gcompris/Makefile +++ b/games/gcompris/Makefile @@ -29,7 +29,7 @@ post-extract: @${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 ; \ diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile index 8c4c8e4ef96e..7925c5f06bd7 100644 --- a/games/gcompris2/Makefile +++ b/games/gcompris2/Makefile @@ -29,7 +29,7 @@ post-extract: @${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 ; \ diff --git a/games/glife/Makefile b/games/glife/Makefile index c204e37e51d0..6121acf31318 100644 --- a/games/glife/Makefile +++ b/games/glife/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gniffel/Makefile b/games/gniffel/Makefile index cb496433d224..7f7b256e1d61 100644 --- a/games/gniffel/Makefile +++ b/games/gniffel/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile index 7a3d93633ef3..7cc322fdb2d9 100644 --- a/games/gno3dtet/Makefile +++ b/games/gno3dtet/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index 67732eae2f11..3a6e759c510d 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 83b8044bef9c..3fc21bbd6026 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile index 6d13b8ec2aed..ef909a27c5ea 100644 --- a/games/gnomebreakout/Makefile +++ b/games/gnomebreakout/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile index 83b8044bef9c..3fc21bbd6026 100644 --- a/games/gnomegames/Makefile +++ b/games/gnomegames/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 83b8044bef9c..3fc21bbd6026 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile index 2ff6489043c7..4e376c16f6ce 100644 --- a/games/gnomememoryblocks/Makefile +++ b/games/gnomememoryblocks/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile index 64301f0d5e94..ec51d9314218 100644 --- a/games/gtktetcolor/Makefile +++ b/games/gtktetcolor/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/heroes/Makefile b/games/heroes/Makefile index a94bb9fc2854..ea4a58cda9dc 100644 --- a/games/heroes/Makefile +++ b/games/heroes/Makefile @@ -40,7 +40,7 @@ USE_GMAKE= yes 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} diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile index db895af96ced..663e60048260 100644 --- a/games/lbreakout/Makefile +++ b/games/lbreakout/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= LIBS="-lcompat" \ 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' diff --git a/games/ltris/Makefile b/games/ltris/Makefile index 64c3cfd7b531..030810c2f3fa 100644 --- a/games/ltris/Makefile +++ b/games/ltris/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags`" \ 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' diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile index 67732eae2f11..3a6e759c510d 100644 --- a/games/pioneers/Makefile +++ b/games/pioneers/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/games/pythoong/Makefile b/games/pythoong/Makefile index 4d188369fe42..ef06f47fa44b 100644 --- a/games/pythoong/Makefile +++ b/games/pythoong/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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' diff --git a/games/teg/Makefile b/games/teg/Makefile index dcc79bb89c20..66c66024c5d7 100644 --- a/games/teg/Makefile +++ b/games/teg/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile index 0c1e8142ab4a..657ef8b8657e 100644 --- a/graphics/Mesa3/Makefile +++ b/graphics/Mesa3/Makefile @@ -51,7 +51,7 @@ MAKE_ENV+= SUB_GL=${SUB_GL} \ 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 diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 69fd0575d9cb..9bc220594bb9 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --enable-gnome .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index 46b83229e5af..58b9b5c6fe4b 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 7ea2b1219ca7..4ca742492b49 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 7ea2b1219ca7..4ca742492b49 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile index ae28b6392d22..f1a52fe1e9b7 100644 --- a/graphics/gcolor/Makefile +++ b/graphics/gcolor/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 8d4b08e6d5e2..c95f1bc1c025 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -35,7 +35,7 @@ CONFIGURE_ARGS+=--disable-gnome .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 diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile index 23e2c594ee5d..45582c00a9a5 100644 --- a/graphics/gnofract4d/Makefile +++ b/graphics/gnofract4d/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile index c6da584f6f5a..efe0cdd3b052 100644 --- a/graphics/gnomeiconedit/Makefile +++ b/graphics/gnomeiconedit/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile index 41c20b193be9..e3d851cc106d 100644 --- a/graphics/gpaint/Makefile +++ b/graphics/gpaint/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index d8394d99c377..88e908ad674d 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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' diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile index 713f81a31417..eeab113ea676 100644 --- a/graphics/gtkgraph/Makefile +++ b/graphics/gtkgraph/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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> diff --git a/graphics/gview/Makefile b/graphics/gview/Makefile index 3bd835aa3255..3887947ae027 100644 --- a/graphics/gview/Makefile +++ b/graphics/gview/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile index 0c1e8142ab4a..657ef8b8657e 100644 --- a/graphics/mesagl/Makefile +++ b/graphics/mesagl/Makefile @@ -51,7 +51,7 @@ MAKE_ENV+= SUB_GL=${SUB_GL} \ 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 diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile index 29a924482756..809abe40650f 100644 --- a/graphics/morpheus/Makefile +++ b/graphics/morpheus/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile index 0fb7cf9a9a66..52b98275fe17 100644 --- a/graphics/smpeg-xmms/Makefile +++ b/graphics/smpeg-xmms/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure post-configure: diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index e01cb6e94abe..261f313371de 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/graphics/xmps/Makefile b/graphics/xmps/Makefile index 36b9123f82d5..8c4339620bb7 100644 --- a/graphics/xmps/Makefile +++ b/graphics/xmps/Makefile @@ -25,12 +25,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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|' \ diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile index 28283554c456..850647e69c29 100644 --- a/irc/irssi-devel/Makefile +++ b/irc/irssi-devel/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-ipv6 .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 diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 28283554c456..850647e69c29 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-ipv6 .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 diff --git a/irc/xchat-devel/Makefile b/irc/xchat-devel/Makefile index 06c8a158f4b3..2bdb988cc65f 100644 --- a/irc/xchat-devel/Makefile +++ b/irc/xchat-devel/Makefile @@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-gdk-pixbuf .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 70aa281b5d14..48f7c5ddffd8 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-gdk-pixbuf .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 diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index 70aa281b5d14..48f7c5ddffd8 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-gdk-pixbuf .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 diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile index 70aa281b5d14..48f7c5ddffd8 100644 --- a/irc/xchat1/Makefile +++ b/irc/xchat1/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-gdk-pixbuf .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 diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index 70aa281b5d14..48f7c5ddffd8 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-gdk-pixbuf .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 diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile index 4af2f4593a0c..edf9dc50bdd9 100644 --- a/japanese/balsa/Makefile +++ b/japanese/balsa/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include' \ 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 ; \ diff --git a/japanese/xchat/Makefile b/japanese/xchat/Makefile index 9988373f16f1..0d403439a6b3 100644 --- a/japanese/xchat/Makefile +++ b/japanese/xchat/Makefile @@ -68,7 +68,7 @@ pre-patch: # 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 diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile index 44ef674865e5..bc919a3de550 100644 --- a/korean/gtkcomm/Makefile +++ b/korean/gtkcomm/Makefile @@ -19,7 +19,7 @@ USE_IMLIB= yes 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> diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile index c54ee904ac72..517ca80b00bf 100644 --- a/lang/python+ipv6/Makefile +++ b/lang/python+ipv6/Makefile @@ -43,8 +43,8 @@ SETUP_FILE= Setup 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 # diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python/Makefile b/lang/python/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python15/Makefile b/lang/python15/Makefile index 3873498c76da..cfc83c25e70f 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -38,8 +38,8 @@ SETUP_FILE= Setup 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 # diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python21/Makefile b/lang/python21/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 06e31e8b738e..3a8b9a65514d 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -39,8 +39,8 @@ SETUP_FILE= Setup 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 diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index dd2448130d72..10f8514eb6b9 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index dd2448130d72..10f8514eb6b9 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile index ef421ead5509..27e523c4d363 100644 --- a/mail/evolution-devel/Makefile +++ b/mail/evolution-devel/Makefile @@ -40,7 +40,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index ef421ead5509..27e523c4d363 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -40,7 +40,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile index b5d34b4f9a67..c5278b6a9f00 100644 --- a/mail/mmc/Makefile +++ b/mail/mmc/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(gnomedatadir\)/gnome/|\$$\(datadir\)/|g ; \ diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile index a589877153fd..9fa3dd9e96d3 100644 --- a/mail/vbsfilter/Makefile +++ b/mail/vbsfilter/Makefile @@ -20,8 +20,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail 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) diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 026392377a86..d43debd5d1e5 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 026392377a86..d43debd5d1e5 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -33,7 +33,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile index eca1982b8926..d924cf20e833 100644 --- a/math/scigraphica/Makefile +++ b/math/scigraphica/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/emma/Makefile b/misc/emma/Makefile index 44af09361aeb..69055e2c333d 100644 --- a/misc/emma/Makefile +++ b/misc/emma/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/gnomepm/Makefile b/misc/gnomepm/Makefile index d6bf14ce61c2..581379ff5acf 100644 --- a/misc/gnomepm/Makefile +++ b/misc/gnomepm/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/gnomeusersguide/Makefile b/misc/gnomeusersguide/Makefile index 44fcd0b1d123..c6ec6b4c5f06 100644 --- a/misc/gnomeusersguide/Makefile +++ b/misc/gnomeusersguide/Makefile @@ -20,7 +20,7 @@ USE_GNOME= yes 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 ; \ diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile index 0200e1f452ff..255eb9d58b55 100644 --- a/misc/gnomeutils/Makefile +++ b/misc/gnomeutils/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index 0200e1f452ff..255eb9d58b55 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/grdb/Makefile b/misc/grdb/Makefile index 2a8bbca84e2f..ade1426afbeb 100644 --- a/misc/grdb/Makefile +++ b/misc/grdb/Makefile @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --disable-gnome .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ diff --git a/misc/metatheme/Makefile b/misc/metatheme/Makefile index 05b251888c2d..a0d3dfbc0873 100644 --- a/misc/metatheme/Makefile +++ b/misc/metatheme/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile index 05b251888c2d..a0d3dfbc0873 100644 --- a/misc/metatheme2/Makefile +++ b/misc/metatheme2/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile index cfd64822e288..5ddd4a545497 100644 --- a/misc/misterproper/Makefile +++ b/misc/misterproper/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile index e566fdc285b1..68966cbc2f9c 100644 --- a/misc/pybliographer/Makefile +++ b/misc/pybliographer/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile index 0fb7cf9a9a66..52b98275fe17 100644 --- a/multimedia/smpeg-xmms/Makefile +++ b/multimedia/smpeg-xmms/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure post-configure: diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index 68b05e2a3ad9..7d0f8c2f98f3 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -87,7 +87,7 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \ + @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile index 36b9123f82d5..8c4339620bb7 100644 --- a/multimedia/xmps/Makefile +++ b/multimedia/xmps/Makefile @@ -25,12 +25,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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|' \ diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 2d384d0a4db9..388a200f577d 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --disable-esd .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 diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile index c51c4e9ec43d..916dc6132b4c 100644 --- a/net-im/gicq/Makefile +++ b/net-im/gicq/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--without-gnome .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 diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile index d077ff574219..f29558638ad6 100644 --- a/net-im/gnomeicu/Makefile +++ b/net-im/gnomeicu/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ 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 ; \ diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile index d077ff574219..f29558638ad6 100644 --- a/net-im/gnomeicu2/Makefile +++ b/net-im/gnomeicu2/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ 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 ; \ diff --git a/net-p2p/fidelio/Makefile b/net-p2p/fidelio/Makefile index 7576270d914c..ca327d415e56 100644 --- a/net-p2p/fidelio/Makefile +++ b/net-p2p/fidelio/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libxml2 \ 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 ; \ diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile index e26bac3f6f7d..f5ddc251077d 100644 --- a/net-p2p/teknap/Makefile +++ b/net-p2p/teknap/Makefile @@ -53,7 +53,7 @@ pre-extract: @${ECHO} "WITH_XMMS - Support XMMS" pre-configure: - @${PERL} -pi -e "s:-lc_r:-pthread:g" ${WRKSRC}/configure + @${PERL} -pi -e "s:-lc_r:${PTHREAD_LIBS}:g" ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) diff --git a/net/dnrd/Makefile b/net/dnrd/Makefile index 3938364c8d36..701e0b57f7ba 100644 --- a/net/dnrd/Makefile +++ b/net/dnrd/Makefile @@ -23,6 +23,6 @@ post-patch: @(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> diff --git a/net/fidelio/Makefile b/net/fidelio/Makefile index 7576270d914c..ca327d415e56 100644 --- a/net/fidelio/Makefile +++ b/net/fidelio/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libxml2 \ 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 ; \ diff --git a/net/gabber/Makefile b/net/gabber/Makefile index 028007b8043f..5bd0cc242746 100644 --- a/net/gabber/Makefile +++ b/net/gabber/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV+= GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \ 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 ; \ diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile index 2d384d0a4db9..388a200f577d 100644 --- a/net/gaim-snapshot/Makefile +++ b/net/gaim-snapshot/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --disable-esd .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 diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 2d384d0a4db9..388a200f577d 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --disable-esd .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 diff --git a/net/gicq/Makefile b/net/gicq/Makefile index c51c4e9ec43d..916dc6132b4c 100644 --- a/net/gicq/Makefile +++ b/net/gicq/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--without-gnome .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 diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile index 7281d7295e1b..08133843db90 100644 --- a/net/gnomba/Makefile +++ b/net/gnomba/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index d077ff574219..f29558638ad6 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ 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 ; \ diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index d077ff574219..f29558638ad6 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ 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 ; \ diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile index d077ff574219..f29558638ad6 100644 --- a/net/gnomeicu2/Makefile +++ b/net/gnomeicu2/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ 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 ; \ diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile index e2c4d1313f09..be244d8e6c6c 100644 --- a/net/gnometelnet/Makefile +++ b/net/gnometelnet/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index 77dba4dc9b97..04ee0ab8718c 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ 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> diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 77dba4dc9b97..04ee0ab8718c 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ 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> diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 77dba4dc9b97..04ee0ab8718c 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" \ 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> diff --git a/net/openldap/Makefile b/net/openldap/Makefile index 29219ba63c22..97ee82b14672 100644 --- a/net/openldap/Makefile +++ b/net/openldap/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap12/Makefile b/net/openldap12/Makefile index 29219ba63c22..97ee82b14672 100644 --- a/net/openldap12/Makefile +++ b/net/openldap12/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap2/Makefile +++ b/net/openldap2/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap20-server/Makefile +++ b/net/openldap20-server/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap20/Makefile +++ b/net/openldap20/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap21-server/Makefile +++ b/net/openldap21-server/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap21/Makefile +++ b/net/openldap21/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap22-server/Makefile +++ b/net/openldap22-server/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap22/Makefile +++ b/net/openldap22/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap23-server/Makefile +++ b/net/openldap23-server/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index dd23b9feb994..795d65429e76 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-wrappers .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 diff --git a/net/spat/Makefile b/net/spat/Makefile index ff3fcc233c4b..ea8d98c3c082 100644 --- a/net/spat/Makefile +++ b/net/spat/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/news/grn/Makefile b/news/grn/Makefile index af69a2e2f1ff..aa5a3cf28126 100644 --- a/news/grn/Makefile +++ b/news/grn/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= glibpath="${GLIB_CONFIG}" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure diff --git a/news/pan/Makefile b/news/pan/Makefile index 58d3a1a8f05c..80d02c1d8cc9 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/news/pan2/Makefile b/news/pan2/Makefile index 58d3a1a8f05c..80d02c1d8cc9 100644 --- a/news/pan2/Makefile +++ b/news/pan2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile index 8f9b539b787b..ee86a4b130c9 100644 --- a/palm/gnome-pilot-conduits/Makefile +++ b/palm/gnome-pilot-conduits/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ 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 ; \ diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 69ec630f4d2e..a209b743ad7e 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ 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 ; \ diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile index 8f9b539b787b..ee86a4b130c9 100644 --- a/palm/gnomepilot-conduits/Makefile +++ b/palm/gnomepilot-conduits/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ 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 ; \ diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile index 8f9b539b787b..ee86a4b130c9 100644 --- a/palm/gnomepilot-conduits2/Makefile +++ b/palm/gnomepilot-conduits2/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ 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 ; \ diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile index 69ec630f4d2e..a209b743ad7e 100644 --- a/palm/gnomepilot/Makefile +++ b/palm/gnomepilot/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ 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 ; \ diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile index 69ec630f4d2e..a209b743ad7e 100644 --- a/palm/gnomepilot2/Makefile +++ b/palm/gnomepilot2/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ 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 ; \ diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 95722aef37bd..c93991509bd5 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 95722aef37bd..c93991509bd5 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 45631c1966a6..83f4f01e60f3 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile index 45631c1966a6..83f4f01e60f3 100644 --- a/print/gnomeprint/Makefile +++ b/print/gnomeprint/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 45631c1966a6..83f4f01e60f3 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/security/aide/Makefile b/security/aide/Makefile index f1e6619d739c..425edabfc9a2 100644 --- a/security/aide/Makefile +++ b/security/aide/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS+=--with-mhash \ --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 diff --git a/security/mhash/Makefile b/security/mhash/Makefile index 1d6ada595847..629342750f07 100644 --- a/security/mhash/Makefile +++ b/security/mhash/Makefile @@ -14,7 +14,7 @@ MAINTAINER= roam@FreeBSD.org INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --with-LDFLAGS="-pthread" +CONFIGURE_ARGS+= --with-LDFLAGS="${PTHREAD_LIBS}" MAN3= mhash.3 diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 328b46ab1c27..3cceebe7c7d5 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 \ diff --git a/security/snort/Makefile b/security/snort/Makefile index 947b608fea22..e52fe63e6577 100644 --- a/security/snort/Makefile +++ b/security/snort/Makefile @@ -34,7 +34,7 @@ CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \ 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) diff --git a/sysutils/battstat-applet/Makefile b/sysutils/battstat-applet/Makefile index af41b483d4cb..7bac1b51ff34 100644 --- a/sysutils/battstat-applet/Makefile +++ b/sysutils/battstat-applet/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \ diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile index 97d755491aa9..3a6f9ae9654b 100644 --- a/sysutils/gcombust/Makefile +++ b/sysutils/gcombust/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${PERL} -pi -e 's|==|=|g' ${WRKSRC}/po/Makefile.in.in diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index b3d1cb727822..a6e1f48cdbbf 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index b3d1cb727822..a6e1f48cdbbf 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 4b39bca005d2..4dbf9a588bf3 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index b3d1cb727822..a6e1f48cdbbf 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index b3d1cb727822..a6e1f48cdbbf 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile index cb3399c4bf3d..3d9df3d28fd4 100644 --- a/sysutils/gnomefind/Makefile +++ b/sysutils/gnomefind/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 4b39bca005d2..4dbf9a588bf3 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index 4b39bca005d2..4dbf9a588bf3 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile index f40f382b05eb..3ea93d7bd8a9 100644 --- a/sysutils/gupsc/Makefile +++ b/sysutils/gupsc/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure \ ${WRKSRC}/src/Makefile.in @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile index 415adf7c8591..a09ddce7fa3e 100644 --- a/sysutils/medusa/Makefile +++ b/sysutils/medusa/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ 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 ; \ diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile index 7ad70f951e4e..1eb2d88bf4a6 100644 --- a/textproc/gtkdiff/Makefile +++ b/textproc/gtkdiff/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile index c279bb2d95e8..bb0333c09ab6 100644 --- a/textproc/textutils/Makefile +++ b/textproc/textutils/Makefile @@ -28,7 +28,7 @@ MAN1= gcomm.1 gcsplit.1 gcut.1 gexpand.1 gfmt.1 ghead.1 \ 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 diff --git a/www/encompass/Makefile b/www/encompass/Makefile index e5ddf337de2c..afcb392d4b65 100644 --- a/www/encompass/Makefile +++ b/www/encompass/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 674bd58ef19f..4a42e13b96bf 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -39,8 +39,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -D_REENTRANT -D_THREAD_SAFE -fno-rtti" \ - LIBS="-L${LOCALBASE}/lib -L${WRKSRC} -pthread ${GCC_R_LIB}" + -D_REENTRANT ${PTHREAD_CFLAGS} -fno-rtti" \ + LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS} ${GCC_R_LIB}" .if exists(/usr/lib/libgcc_r.a) GCC_R_LIB= -lgcc_r @@ -56,12 +56,12 @@ post-extract: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|-lpthread|-pthread|g' + s|-lpthread|${PTHREAD_LIBS}|g' post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 674bd58ef19f..4a42e13b96bf 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -39,8 +39,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -D_REENTRANT -D_THREAD_SAFE -fno-rtti" \ - LIBS="-L${LOCALBASE}/lib -L${WRKSRC} -pthread ${GCC_R_LIB}" + -D_REENTRANT ${PTHREAD_CFLAGS} -fno-rtti" \ + LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS} ${GCC_R_LIB}" .if exists(/usr/lib/libgcc_r.a) GCC_R_LIB= -lgcc_r @@ -56,12 +56,12 @@ post-extract: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|-lpthread|-pthread|g' + s|-lpthread|${PTHREAD_LIBS}|g' post-configure: @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \ diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 18ad5f791f56..6b045d0f6e7b 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 18ad5f791f56..6b045d0f6e7b 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 18ad5f791f56..6b045d0f6e7b 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/www/kannel/Makefile b/www/kannel/Makefile index ea0e18d85cfd..09cdbcdd3d8f 100644 --- a/www/kannel/Makefile +++ b/www/kannel/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 USE_AUTOCONF= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/gateway-${PORTVERSION}/ -CFLAGS+= -pthread +CFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ARGS+= --with-malloc=native do-install: diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index fd6556d7ba6c..58217d55e780 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc -pthread" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index fd6556d7ba6c..58217d55e780 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc -pthread" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index 18ad5f791f56..6b045d0f6e7b 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/www/peacock/Makefile b/www/peacock/Makefile index 159a473acc66..d4276efbe6b9 100644 --- a/www/peacock/Makefile +++ b/www/peacock/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/www/quanta/Makefile b/www/quanta/Makefile index fd6556d7ba6c..58217d55e780 100644 --- a/www/quanta/Makefile +++ b/www/quanta/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc -pthread" + LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc ${PTHREAD_LIBS}" USE_GMAKE= yes DOCS= css html javascript php diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index 51fa9d9fc26c..f1a4460143cc 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-gnomevfs pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g ; \ diff --git a/www/screem/Makefile b/www/screem/Makefile index 51fa9d9fc26c..f1a4460143cc 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-gnomevfs pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\@GNOME_DATA_PREFIX\@|\$$\(datadir\)|g ; \ diff --git a/www/squid/Makefile b/www/squid/Makefile index 616414d6d357..3a5657df0b45 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid23/Makefile b/www/squid23/Makefile index 0421718cc61a..8fe80a28be6c 100644 --- a/www/squid23/Makefile +++ b/www/squid23/Makefile @@ -98,7 +98,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: cd ${WRKSRC}/src; make install-pinger diff --git a/www/squid24/Makefile b/www/squid24/Makefile index 616414d6d357..3a5657df0b45 100644 --- a/www/squid24/Makefile +++ b/www/squid24/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 616414d6d357..3a5657df0b45 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 616414d6d357..3a5657df0b45 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 616414d6d357..3a5657df0b45 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 616414d6d357..3a5657df0b45 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 616414d6d357..3a5657df0b45 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -93,7 +93,7 @@ MAKEFILE= makefile #CONFIGURE_ARGS+= --enable-heap-replacement post-extract: - @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: # I don't think many people use the pinger nowadays, and if you diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile index b32cb43641c2..aeeb5f93da3f 100644 --- a/x11-clocks/sanduhr/Makefile +++ b/x11-clocks/sanduhr/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index afa493d0180f..1e872d0c3f4e 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -33,7 +33,7 @@ USE_GNOME= yes 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 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index afa493d0180f..1e872d0c3f4e 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -33,7 +33,7 @@ USE_GNOME= yes 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 @@ pre-extract: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile index ee7689762eed..f435420d7f2c 100644 --- a/x11-toolkits/bakery/Makefile +++ b/x11-toolkits/bakery/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 39c19bb3b35f..21724db1b826 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 39c19bb3b35f..21724db1b826 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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 ; \ diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index 3d0ad886734f..574991ffd7fc 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -91,7 +91,7 @@ do-build: (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 diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile index 3d0ad886734f..574991ffd7fc 100644 --- a/x11-toolkits/qt30/Makefile +++ b/x11-toolkits/qt30/Makefile @@ -91,7 +91,7 @@ do-build: (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 diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index 3d0ad886734f..574991ffd7fc 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -91,7 +91,7 @@ do-build: (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 diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index 3d0ad886734f..574991ffd7fc 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -91,7 +91,7 @@ do-build: (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 diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 3d0ad886734f..574991ffd7fc 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -91,7 +91,7 @@ do-build: (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 diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile index 18b8b4f72dfa..b7bcc961ee25 100644 --- a/x11-toolkits/wxgtk-devel/Makefile +++ b/x11-toolkits/wxgtk-devel/Makefile @@ -29,12 +29,12 @@ CONFIGURE_ARGS= --with-libpng=sys \ --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: diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile index 18b8b4f72dfa..b7bcc961ee25 100644 --- a/x11-toolkits/wxgtk/Makefile +++ b/x11-toolkits/wxgtk/Makefile @@ -29,12 +29,12 @@ CONFIGURE_ARGS= --with-libpng=sys \ --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: diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 18b8b4f72dfa..b7bcc961ee25 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -29,12 +29,12 @@ CONFIGURE_ARGS= --with-libpng=sys \ --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: diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index 604c475ce4ab..c291d0d3b937 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -44,7 +44,7 @@ PLIST_SUB+= GNOME:="@comment " .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 diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile index 604c475ce4ab..c291d0d3b937 100644 --- a/x11-wm/sawfish2/Makefile +++ b/x11-wm/sawfish2/Makefile @@ -44,7 +44,7 @@ PLIST_SUB+= GNOME:="@comment " .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 diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index ca85544ccf0d..42a4d93e02e5 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -28,7 +28,7 @@ pre-fetch: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index ca85544ccf0d..42a4d93e02e5 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -28,7 +28,7 @@ pre-fetch: .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index f96a4c3450dd..6cdc5a2ccfef 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 62c2e6714418..d8b55194da78 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -35,7 +35,7 @@ MAN1= gnome.1 gnome-config.1 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 ; \ diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile index f96a4c3450dd..6cdc5a2ccfef 100644 --- a/x11/gnomeapplets/Makefile +++ b/x11/gnomeapplets/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index f96a4c3450dd..6cdc5a2ccfef 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index d99dadc36adb..8a4837132e06 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -31,7 +31,7 @@ MAN1= gnome-session.1 gnome-wm.1 save-session.1 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 ; \ diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 62c2e6714418..d8b55194da78 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -35,7 +35,7 @@ MAN1= gnome.1 gnome-config.1 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 ; \ diff --git a/x11/gnomeres_applet/Makefile b/x11/gnomeres_applet/Makefile index 8239bd47e6a6..1cee4f296e10 100644 --- a/x11/gnomeres_applet/Makefile +++ b/x11/gnomeres_applet/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" pre-patch: - @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 62c2e6714418..d8b55194da78 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -35,7 +35,7 @@ MAN1= gnome.1 gnome-config.1 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 ; \ diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 47d1391b6286..dd216ba8acc0 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -38,7 +38,7 @@ MAN1= attraction.1 blitspin.1 bouboule.1 braid.1 \ 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> |