From e2756cb8359659a62a4b5b44143af8d741b3fae2 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 4 Oct 2012 16:13:00 +0000
Subject: - Reset maintainership.  See ports/164941. - Fix conflicts with
 java/classpath.  Note security provider configuration is moved to
 ${PREFIX}/lib/security/SableVM.security.  This file is always loaded first
 because the short vendor name is SableVM.  If it does not exist, then
 classpath.security is loaded (java/security/Security.java). - Reduce Makefile
 headers, add licenses, and convert to optionsNG.

---
 java/cacao/files/patch-configure | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'java/cacao/files/patch-configure')

diff --git a/java/cacao/files/patch-configure b/java/cacao/files/patch-configure
index 813d8e010b3c..266529eeb03c 100644
--- a/java/cacao/files/patch-configure
+++ b/java/cacao/files/patch-configure
@@ -1,11 +1,29 @@
---- configure.orig	Sun Feb  4 14:38:16 2007
-+++ configure	Sun Feb  4 15:30:30 2007
-@@ -2662,7 +2661,7 @@
-     ARCH_CFLAGS="-mcpu=v9 -m64 -D__SPARC_64__"
+--- configure.orig	2012-09-03 12:10:16.000000000 -0400
++++ configure	2012-09-19 19:08:48.000000000 -0400
+@@ -3626,7 +3626,7 @@
+         JAVA_ARCH="sparc"
      ;;
  
 -x86_64 )
 +x86_64 | amd64 )
      ARCH_DIR="x86_64"
-     ARCH_CFLAGS="-D__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
+ 
-- 
cgit v1.2.3