diff options
| author | jkim <jkim@FreeBSD.org> | 2015-07-21 05:16:09 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-07-21 05:16:09 +0800 |
| commit | 626ac6c8640534f565492e2e219d9fe2b7b9cbce (patch) | |
| tree | d9f0c88a160e32bb2a56cddcbec593c583021607 /java | |
| parent | 860bcd0cc2924d0fbb2791488e13891d5ced44a3 (diff) | |
| download | freebsd-ports-gnome-626ac6c8640534f565492e2e219d9fe2b7b9cbce.tar.gz freebsd-ports-gnome-626ac6c8640534f565492e2e219d9fe2b7b9cbce.tar.zst freebsd-ports-gnome-626ac6c8640534f565492e2e219d9fe2b7b9cbce.zip | |
Tidy up couple of problems in the previous update.
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk8/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk | 8 | ||||
| -rw-r--r-- | java/openjdk8/files/patch-jdk-src-bsd-doc-man-javadoc.1 | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 2be19b8f8bc5..3f09ee95a11e 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -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}|' \ diff --git a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk index 74afef350bc8..42b66e13e3e0 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk @@ -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) diff --git a/java/openjdk8/files/patch-jdk-src-bsd-doc-man-javadoc.1 b/java/openjdk8/files/patch-jdk-src-bsd-doc-man-javadoc.1 new file mode 100644 index 000000000000..a057c172f4ff --- /dev/null +++ b/java/openjdk8/files/patch-jdk-src-bsd-doc-man-javadoc.1 @@ -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 |