Date: Mon, 20 Jul 2015 21:16:10 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392604 - in head/java/openjdk8: . files Message-ID: <201507202116.t6KLGABL062354@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Jul 20 21:16:09 2015 New Revision: 392604 URL: https://svnweb.freebsd.org/changeset/ports/392604 Log: Tidy up couple of problems in the previous update. Added: head/java/openjdk8/files/patch-jdk-src-bsd-doc-man-javadoc.1 (contents, props changed) Modified: head/java/openjdk8/Makefile head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Mon Jul 20 21:07:08 2015 (r392603) +++ head/java/openjdk8/Makefile Mon Jul 20 21:16:09 2015 (r392604) @@ -239,7 +239,7 @@ post-patch: ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java \ ${WRKSRC}/jdk/src/share/classes/sun/print/PSPrinterJob.java \ ${WRKSRC}/jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java - @${REINPLACE_CMD} -e 's|/usr/local/java/classes|${LOCALBASE}/share/java/classes|' \ + @${REINPLACE_CMD} -e 's|/usr/local/share/java/classes|${LOCALBASE}/share/java/classes|' \ ${WRKSRC}/jdk/src/bsd/doc/man/*.1 @${REINPLACE_CMD} -e 's|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|' \ -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ Modified: head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk ============================================================================== --- head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Mon Jul 20 21:07:08 2015 (r392603) +++ head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk Mon Jul 20 21:16:09 2015 (r392604) @@ -1,15 +1,15 @@ --- jdk/make/lib/Awt2dLibraries.gmk.orig 2015-07-18 14:30:01.000000000 -0700 +++ jdk/make/lib/Awt2dLibraries.gmk 2015-07-18 14:30:08.000000000 -0700 -@@ -1260,6 +1260,8 @@ +@@ -1259,7 +1259,7 @@ + else ifeq ($(OPENJDK_TARGET_OS), bsd) LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) - LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG -+ else +- LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG + LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%% endif else LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -@@ -1285,7 +1287,7 @@ +@@ -1285,7 +1285,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) Added: head/java/openjdk8/files/patch-jdk-src-bsd-doc-man-javadoc.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-jdk-src-bsd-doc-man-javadoc.1 Mon Jul 20 21:16:09 2015 (r392604) @@ -0,0 +1,11 @@ +--- jdk/src/bsd/doc/man/javadoc.1.orig ++++ jdk/src/bsd/doc/man/javadoc.1 +@@ -2966,7 +2966,7 @@ + + \fIWindows example\fR: \f3\&.;C:\eclasses;C:\ehome\ejava\eclasses\fR + +-\fIOracle Solaris example\fR: \f3\&.:/home/classes:/usr/local/java/classes\fR\&. ++\fIOracle Solaris example\fR: \f3\&.:/home/classes:/usr/local/share/java/classes\fR\&. + .SH SEE\ ALSO + .TP 0.2i + \(bu
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507202116.t6KLGABL062354>