From 64ee7e63bfb854b5a2ad27340022112bb00cf3cb Mon Sep 17 00:00:00 2001
From: John Marino <marino@FreeBSD.org>
Date: Tue, 24 Mar 2015 16:01:21 +0000
Subject: 6 ports categories: Remove $PTHREAD_LIBS

Categories: cad, devel, java, x11-fm, biology, deskutils

approved by:	PTHREAD blanket
---
 java/cacao/Makefile                        |  4 ----
 java/cacao/files/patch-boehm-gc__configure |  2 +-
 java/cacao/files/patch-configure           | 18 ------------------
 java/openjdk7/Makefile                     |  2 +-
 4 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'java')

diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index 95f9e32ec32e..8ec737c90a6b 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -49,10 +49,6 @@ CONFIGURE_ENV+=	JAVACFLAGS="${JAVACFLAGS}"
 MAKE_ENV+=	JAVACFLAGS="${JAVACFLAGS}"
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
-	    ${WRKSRC}/configure ${WRKSRC}/src/mm/boehm-gc/configure
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cacao/cacao \
diff --git a/java/cacao/files/patch-boehm-gc__configure b/java/cacao/files/patch-boehm-gc__configure
index 9c38d11e2bf9..fa6ac04df761 100644
--- a/java/cacao/files/patch-boehm-gc__configure
+++ b/java/cacao/files/patch-boehm-gc__configure
@@ -4,7 +4,7 @@
  	$as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
  
  	INCLUDES="$INCLUDES -pthread"
-+	THREADDLLIBS=%%PTHREAD_LIBS%%
++	THREADDLLIBS=-lpthread
        	;;
       *-*-kfreebsd*-gnu)
  	$as_echo "#define GC_FREEBSD_THREADS 1" >>confdefs.h
diff --git a/java/cacao/files/patch-configure b/java/cacao/files/patch-configure
index 5ef477f50f52..3f19ca642014 100644
--- a/java/cacao/files/patch-configure
+++ b/java/cacao/files/patch-configure
@@ -9,21 +9,3 @@
      ARCH_DIR="x86_64"
      ARCH_FLAGS="-m64 -D__X86_64__"
      JAVA_ARCH="amd64"
-@@ -9731,7 +9731,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="%%PTHREAD_LIBS%% $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -9760,7 +9760,7 @@
- #define HAVE_LIBPTHREAD 1
- _ACEOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="%%PTHREAD_LIBS%% $LIBS"
- 
- fi
- 
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index 1c5314033e3c..a879e6f8efb2 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -93,7 +93,7 @@ MAKE_ENV+=	LANG="C" \
 		SKIP_DEBUG_BUILD="true" \
 		ZIP_DEBUGINFO_FILES=0 \
 		ENABLE_FULL_DEBUG_SYMBOLS=0 \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_LIBS="-lpthread" \
 		MILESTONE="fcs" \
 		JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \
 		BUILD_NUMBER="b${PORT_BUILD_NUMBER}"
-- 
cgit v1.2.3