[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Don't need to set -DDEFAULT_LIBPATH on c...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a54ca0f91e0
branches:  trunk
changeset: 646362:8a54ca0f91e0
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Feb 08 05:55:29 2015 +0000

description:
Don't need to set -DDEFAULT_LIBPATH on compiler command line when it's
handled in a patch already.

diffstat:

 lang/openjdk7/Makefile         |  3 +--
 lang/openjdk7/distinfo         |  4 ++--
 lang/openjdk7/patches/patch-aa |  4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r aed1d488b431 -r 8a54ca0f91e0 lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Sun Feb 08 04:13:23 2015 +0000
+++ b/lang/openjdk7/Makefile    Sun Feb 08 05:55:29 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2015/02/07 22:35:24 tnn Exp $
+# $NetBSD: Makefile,v 1.86 2015/02/08 05:55:29 tnn Exp $
 
 DISTNAME=      openjdk-1.7.76-20150127
 PKGNAME=       openjdk7-1.7.76
@@ -69,7 +69,6 @@
 MAKE_ENV+=     JAVA_HOME=
 MAKE_ENV+=     CLASSPATH=
 
-MAKE_ENV+=     EXTRA_CFLAGS="-DDEFAULT_LIBPATH=\\\"${PREFIX}/lib/jni:${PREFIX}/lib:/lib:/usr/lib\\\""
 BUILDDIR=      ${WRKSRC}/build/${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/}-${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/}
 LD_LIBRARY_PATH=       
${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${BUILDDIR}/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/jli:${WRKDIR}/bootstrap/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server
 MAKE_ENV+=     LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
diff -r aed1d488b431 -r 8a54ca0f91e0 lang/openjdk7/distinfo
--- a/lang/openjdk7/distinfo    Sun Feb 08 04:13:23 2015 +0000
+++ b/lang/openjdk7/distinfo    Sun Feb 08 05:55:29 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2015/02/07 22:35:24 tnn Exp $
+$NetBSD: distinfo,v 1.68 2015/02/08 05:55:29 tnn Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -43,7 +43,7 @@
 RMD160 (openjdk7/rhino1_7R4.zip) = fba5ce71edd396a241991fb7b3ce43628b891035
 Size (openjdk7/rhino1_7R4.zip) = 6481918 bytes
 SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6
-SHA1 (patch-aa) = d47738b934304ee0921fe56b036fc0483faa328b
+SHA1 (patch-aa) = 33197f638bb8516e3ecc465e32e15db5381c2aae
 SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998
 SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6
 SHA1 (patch-ae) = 843f05cfe8f18d080cae80eed92d9ad89a5c0917
diff -r aed1d488b431 -r 8a54ca0f91e0 lang/openjdk7/patches/patch-aa
--- a/lang/openjdk7/patches/patch-aa    Sun Feb 08 04:13:23 2015 +0000
+++ b/lang/openjdk7/patches/patch-aa    Sun Feb 08 05:55:29 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.12 2014/07/25 20:35:14 ryoon Exp $
+$NetBSD: patch-aa,v 1.13 2015/02/08 05:55:29 tnn Exp $
 
 DragonFly support.
 Add workaround for missing  sem_timedwait() in NetBSD < 6.99.4
@@ -51,7 +51,7 @@
   */
  #ifndef DEFAULT_LIBPATH
 -#define DEFAULT_LIBPATH "/lib:/usr/lib"
-+#define DEFAULT_LIBPATH "/lib:/usr/lib:@PREFIX@/lib"
++#define DEFAULT_LIBPATH "@PREFIX@/lib/jni:@PREFIX@/lib:/lib:/usr/lib"
  #endif
  
  #define EXTENSIONS_DIR  "/lib/ext"