svn commit: r419988 - head/sysutils/syslog-ng37/files

[Cy Schubert]

Author: cy
Date: Wed Aug 10 03:38:51 2016
New Revision: 419988
URL: https://svnweb.freebsd.org/changeset/ports/419988

Log:
  Improve the search performance looking for required openjdk files.

Modified:
  head/sysutils/syslog-ng37/files/patch-configure

Modified: head/sysutils/syslog-ng37/files/patch-configure
==============================================================================
--- head/sysutils/syslog-ng37/files/patch-configure	Wed Aug 10 02:37:08 2016	(r419987)
+++ head/sysutils/syslog-ng37/files/patch-configure	Wed Aug 10 03:38:51 2016	(r419988)
@@ -1,6 +1,6 @@
---- configure.orig	2016-03-22 04:58:27.000000000 -0700
-+++ configure	2016-03-23 20:51:10.722420000 -0700
-@@ -14996,9 +14996,9 @@
+--- configure.orig	2016-04-01 01:45:11.000000000 -0700
++++ configure	2016-08-09 20:35:26.657622000 -0700
+@@ -15049,9 +15049,9 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNET" >&5
  $as_echo_n "checking for LIBNET... " >&6; }
  if test "x$with_libnet" = "x"; then
@@ -12,3 +12,21 @@
  fi
  
  if test -n "$LIBNET_CONFIG" -a -x "$LIBNET_CONFIG"; then
+@@ -16086,7 +16086,7 @@
+ 
+     if test "$VERSION_OK" = "1";
+     then
+-      JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"`
++      JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"`
+       JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1`
+       JNI_LIBS="-L$JNI_LIBDIR -ljvm"
+       JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" |  sed "s/\(.*\)jni.h/\1/" | head -n 1`
+@@ -16187,7 +16187,7 @@
+ 
+     if test "$VERSION_OK" = "1";
+     then
+-      JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"`
++      JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1\/openjdk\*/"`
+       JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1`
+       JNI_LIBS="-L$JNI_LIBDIR -ljvm"
+       JNI_INCLUDE_DIR=`find $JNI_HOME -name "jni.h" |  sed "s/\(.*\)jni.h/\1/" | head -n 1`