head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.86 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.84 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.82 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.80 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.78 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.76 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.74 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.72 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.70 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.68 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.66 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.64 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.62 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.60 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.58 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.56 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.54 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.52 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.50 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.48 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.46 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.44 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.42 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.38 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.18 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.40 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.36 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.34 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.32 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.30 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.28 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.26 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.24 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.22 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.20 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.16 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.14 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.12 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.10 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.8 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.6 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.4 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.2 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.2.0.4 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.2 pkgsrc-2015Q1-base:1.2; locks; strict; comment @# @; 1.3 date 2015.07.03.20.40.59; author fhajny; state Exp; branches; next 1.2; commitid hLfEJ7NShOl8FSry; 1.2 date 2015.02.21.10.13.50; author tnn; state Exp; branches; next 1.1; commitid xH4sN95SektArRay; 1.1 date 2015.02.08.08.41.25; author tnn; state Exp; branches; next ; commitid Mw3dYIpIZcmQlb9y; desc @@ 1.3 log @Add support for building with GCC on SunOS, largely based on openjdk7 patches by jesse et al. Fixes build on SunOS. @ text @$NetBSD: patch-jdk_make_Images.gmk,v 1.2 2015/02/21 10:13:50 tnn Exp $ Building ja_JP.UTF-8 manpages crashes the bootstrap JVM. --- jdk/make/Images.gmk.orig 2015-06-10 10:36:15.000000000 +0000 +++ jdk/make/Images.gmk @@@@ -190,7 +190,7 @@@@ $(foreach f,$(filter $(OVERLAY_FILTER),$ $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \ $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),NOMULTIARCHsolaris-64) define AddIsadirLink # Param 1 - src file # Param 2 - variable to add targets to @@@@ -234,7 +234,7 @@@@ ifeq ($(PROFILE), ) endif JDK_LIB_FILES := $(NOT_JRE_LIB_FILES) -ifneq ($(findstring $(OPENJDK_TARGET_OS), linux bsd),) +ifneq ($(findstring $(OPENJDK_TARGET_OS), linux bsd solaris),) JDK_LIB_FILES += jexec endif @@@@ -454,25 +454,15 @@@@ ifneq ($(OPENJDK_TARGET_OS), windows) $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@@) $(CD) $(@@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja - JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \ - $(JRE_IMAGE_DIR)/man/ja - - JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \ - $(JDK_IMAGE_DIR)/man/ja + JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) + + JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) endif ifeq ($(OPENJDK_TARGET_OS), solaris) - JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES)) - - JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES)) + JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) + + JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) endif endif # Windows @ 1.2 log @don't install a broken symlink @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- jdk/make/Images.gmk.orig 2015-02-02 15:37:11.000000000 +0000 d7 18 @ 1.1 log @Import openjdk8-1.8.31 as lang/openjdk8. Open-source implementation of the Java Platform, Standard Edition. @ text @d7 3 a9 2 @@@@ -411,12 +411,12 @@@@ ifneq ($(OPENJDK_TARGET_OS), windows) $(install-file) d11 11 a21 14 define install-ja-manpage - $(MKDIR) -p $(@@D) - $(CAT) $< \ - | $(NATIVE2ASCII) -encoding eucJP \ - | $(SED) 's/@@@@VERSION@@@@/$(THIS_JDK_VERSION)/g' \ - | $(NATIVE2ASCII) -reverse -encoding $1 \ - > $@@ +# $(MKDIR) -p $(@@D) +# $(CAT) $< \ +# | $(NATIVE2ASCII) -encoding eucJP \ +# | $(SED) 's/@@@@VERSION@@@@/$(THIS_JDK_VERSION)/g' \ +# | $(NATIVE2ASCII) -reverse -encoding $1 \ +# > $@@ endef d23 16 a38 1 $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% @