6 files changed, 6 insertions, 39 deletions

diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 8b54d3e99553..d3d8bdb49282 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -30,7 +30,7 @@ GDBM_DESC=	GDBM_File extension
 PERL_MALLOC_DESC=	Use Perl malloc
 PERL_64BITINT_DESC=	Use 64 bit integers (on i386)
 THREADS_DESC=		Build threaded perl
-PTHREAD_DESC=		Build with -pthread
+PTHREAD_DESC=		Build with -lpthread
 MULTIPLICITY_DESC=	Use multiplicity
 SITECUSTOMIZE_DESC=	Run-time customization of @INC
 USE_PERL_DESC=		Rewrite links in /usr/bin
@@ -210,12 +210,10 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \
-		-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
 		${WRKSRC}/hints/freebsd.sh
 .else
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \
-		-e 's|%%PTHREAD_CFLAGS%%||g;' \
 		${WRKSRC}/hints/freebsd.sh
 .endif
 
diff --git a/lang/perl5.16/files/patch-hints__freebsd.sh b/lang/perl5.16/files/patch-hints__freebsd.sh
index 42dd19c79b8c..56c1354ca021 100644
--- a/lang/perl5.16/files/patch-hints__freebsd.sh
+++ b/lang/perl5.16/files/patch-hints__freebsd.sh
@@ -38,15 +38,6 @@
          lddlflags="-shared "
          cccdlflags='-DPIC -fPIC'
         ;;
-@@ -143,7 +149,7 @@
- 0*|1*|2*|3*) ;;
- 
- *)
--	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
-+	ccflags="${ccflags} %%PTHREAD_CFLAGS%% -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
- 	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
- 	    usenm=false
- 	fi
 @@ -190,7 +196,9 @@
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure 
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index e5ed96f3692e..b36e657c27cb 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -31,7 +31,7 @@ GDBM_DESC=	GDBM_File extension
 PERL_MALLOC_DESC=	Use Perl malloc
 PERL_64BITINT_DESC=	Use 64 bit integers (on i386)
 THREADS_DESC=		Build threaded perl
-PTHREAD_DESC=		Build with -pthread
+PTHREAD_DESC=		Build with -lpthread
 MULTIPLICITY_DESC=	Use multiplicity
 SITECUSTOMIZE_DESC=	Run-time customization of @INC
 USE_PERL_DESC=		Rewrite links in /usr/bin
@@ -188,12 +188,10 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \
-		-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
 		${WRKSRC}/hints/freebsd.sh
 .else
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \
-		-e 's|%%PTHREAD_CFLAGS%%||g;' \
 		${WRKSRC}/hints/freebsd.sh
 .endif
 
diff --git a/lang/perl5.18/files/patch-hints__freebsd.sh b/lang/perl5.18/files/patch-hints__freebsd.sh
index a4cbcec4a402..78a8a266547f 100644
--- a/lang/perl5.18/files/patch-hints__freebsd.sh
+++ b/lang/perl5.18/files/patch-hints__freebsd.sh
@@ -38,15 +38,6 @@
          lddlflags="-shared "
          cccdlflags='-DPIC -fPIC'
         ;;
-@@ -144,7 +150,7 @@
- 0.*|1.*|2.*|3.*) ;;
- 
- *)
--	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
-+	ccflags="${ccflags} %%PTHREAD_CFLAGS%% -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
- 	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
- 	    usenm=false
- 	fi
 @@ -191,7 +197,9 @@
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure 
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index 2d2ba4459cd2..451fbcea31c9 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -30,7 +30,7 @@ GDBM_DESC=	GDBM_File extension
 PERL_MALLOC_DESC=	Use Perl malloc
 PERL_64BITINT_DESC=	Use 64 bit integers (on i386)
 THREADS_DESC=		Build threaded perl
-PTHREAD_DESC=		Build with -pthread
+PTHREAD_DESC=		Build with -lpthread
 MULTIPLICITY_DESC=	Use multiplicity
 SITECUSTOMIZE_DESC=	Run-time customization of @INC
 
@@ -184,12 +184,10 @@ post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if ${PORT_OPTIONS:MPTHREAD}
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g;' \
-		-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g;' \
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lpthread|g;' \
 		${WRKSRC}/hints/freebsd.sh
 .else
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%||g;' \
-		-e 's|%%PTHREAD_CFLAGS%%||g;' \
 		${WRKSRC}/hints/freebsd.sh
 .endif
 
diff --git a/lang/perl5.20/files/patch-hints__freebsd.sh b/lang/perl5.20/files/patch-hints__freebsd.sh
index 6f28b6babb5c..4d1697040405 100644
--- a/lang/perl5.20/files/patch-hints__freebsd.sh
+++ b/lang/perl5.20/files/patch-hints__freebsd.sh
@@ -38,15 +38,6 @@
          lddlflags="-shared "
          cccdlflags='-DPIC -fPIC'
         ;;
-@@ -144,7 +150,7 @@ case "$osvers" in
- 0.*|1.*|2.*|3.*) ;;
- 
- *)
--	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
-+	ccflags="${ccflags} %%PTHREAD_CFLAGS%% -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
- 	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
- 	    usenm=false
- 	fi
 @@ -191,7 +197,9 @@ esac
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure