Do not add /usr/local/lib three times to DEFAULT_LIBPATH.

Update cacerts file from Sun's JRE 6u20.
svn path=/head/; revision=254555
2010-05-18 13:29:10 +00:00 · 2010-05-18 13:29:10 +00:00 · ece2cbf4a8 · 2021-03-31 03:12:20 +00:00
commit ece2cbf4a8
parent 81372342ff
3 changed files with 3 additions and 5 deletions
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	openjdk6
 PORTVERSION=	b19
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
--- a/java/openjdk6/files/cacerts
+++ b/java/openjdk6/files/cacerts
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@ -3441,19 +3441,17 @@
 
 void os::init_system_properties_values() {
 //  char arch[12];
-@@ -281,10 +356,8 @@
+@@ -281,9 +356,7 @@
  *        ...
  *        7: The default directories, normally /lib and /usr/lib.
  */
 -#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
 -#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
 -#else
-#define DEFAULT_LIBPATH "/lib:/usr/lib"
 +#ifndef DEFAULT_LIBPATH
-+#define DEFAULT_LIBPATH "/lib:/usr/lib:/usr/local/lib:/usr/local/lib"
+ #define DEFAULT_LIBPATH "/lib:/usr/lib"
 #endif
 
- #define EXTENSIONS_DIR  "/lib/ext"
@@ -362,7 +435,11 @@
          * should always exist (until the legacy problem cited above is
          * addressed).