svn commit: r381431 - head/java/openjdk8/files

[Jung-uk Kim]

Author: jkim
Date: Mon Mar 16 18:53:10 2015
New Revision: 381431
URL: https://svnweb.freebsd.org/changeset/ports/381431
QAT: https://qat.redports.org/buildarchive/r381431/

Log:
  Clean up patches again.  No functional change.

Modified:
  head/java/openjdk8/files/patch-bsd
  head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk

Modified: head/java/openjdk8/files/patch-bsd
==============================================================================
--- head/java/openjdk8/files/patch-bsd	Mon Mar 16 18:35:54 2015	(r381430)
+++ head/java/openjdk8/files/patch-bsd	Mon Mar 16 18:53:10 2015	(r381431)
@@ -6143,7 +6143,7 @@
      # Solaris still uses OPENWIN_LIB ..
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
 +  else ifeq ($(OPENJDK_TARGET_OS), bsd)
-+    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM)  -pthread
++    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -liconv -pthread
    else	# .. all other Unixes can use X_LIBS
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
    endif
@@ -7556,48 +7556,6 @@
 +        return new KQueueSelectorImpl(this);
 +    }
 +}
---- ./jdk/src/bsd/doc/man/javah.1	Mon Feb 02 10:12:21 2015 -0800
-+++ ./jdk/src/bsd/doc/man/javah.1	Sat Mar 14 22:56:25 2015 -0700
-@@ -110,7 +110,7 @@
- 
- \&.:\fIyour-path\fR
- 
--Example: \f3\&.:/home/avh/classes:/usr/local/java/classes\fR
-+Example: \f3\&.:/home/avh/classes:/usr/local/share/java/classes\fR
- 
- \fIWindows\fR:
- 
---- ./jdk/src/bsd/doc/man/rmic.1	Mon Feb 02 10:12:21 2015 -0800
-+++ ./jdk/src/bsd/doc/man/rmic.1	Sat Mar 14 22:56:25 2015 -0700
-@@ -93,7 +93,7 @@
- .TP
- -classpath path
- .br
--Specifies the path the \f3rmic\fR command uses to look up classes\&. This option overrides the default or the \f3CLASSPATH\fR environment variable when it is set\&. Directories are separated by colons\&. The general format for path is: \f3\&.:<your_path>\fR, for example: \f3\&.:/usr/local/java/classes\fR\&.
-+Specifies the path the \f3rmic\fR command uses to look up classes\&. This option overrides the default or the \f3CLASSPATH\fR environment variable when it is set\&. Directories are separated by colons\&. The general format for path is: \f3\&.:<your_path>\fR, for example: \f3\&.:/usr/local/share/java/classes\fR\&.
- .TP
- -d \fIdirectory\fR
- .br
-@@ -207,7 +207,7 @@
- .SH ENVIRONMENT\ VARIABLES    
- .TP     
- CLASSPATH
--Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/java/classes\fR\&.
-+Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/share/java/classes\fR\&.
- .SH SEE\ ALSO    
- .TP 0.2i    
- \(bu
---- ./jdk/src/bsd/doc/man/rmid.1	Mon Feb 02 10:12:21 2015 -0800
-+++ ./jdk/src/bsd/doc/man/rmid.1	Sat Mar 14 22:56:25 2015 -0700
-@@ -301,7 +301,7 @@
- .SH ENVIRONMENT\ VARIABLES    
- .TP     
- CLASSPATH
--Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/java/classes\fR\&.
-+Used to provide the system a path to user-defined classes\&. Directories are separated by colons, for example: \f3\&.:/usr/local/share/java/classes\fR\&.
- .SH SEE\ ALSO    
- .TP 0.2i    
- \(bu
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ ./jdk/src/bsd/native/sun/nio/ch/KQueueArrayWrapper.c	Sat Mar 14 22:56:25 2015 -0700
 @@ -0,0 +1,171 @@

Modified: head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
==============================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	Mon Mar 16 18:35:54 2015	(r381430)
+++ head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	Mon Mar 16 18:53:10 2015	(r381431)
@@ -13,7 +13,7 @@
      # Solaris still uses OPENWIN_LIB ..
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
    else ifeq ($(OPENJDK_TARGET_OS), bsd)
--    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM)  -pthread
+-    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -liconv -pthread
 +    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
    else	# .. all other Unixes can use X_LIBS
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread