diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2012-06-16 14:46:02 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2012-06-16 14:46:02 +0000 |
| commit | 0484c2a45e7329d63bfc11ec19f60b760f64d531 (patch) | |
| tree | 958ffeda2c4c598f5f8d76f445ac0adaa6ce98e6 /java | |
| parent | a87fdf9774bf8fb4e7bc5c17d6279e88c69da9f5 (diff) | |
. Fix locale generation.
PR: 169037
Notes
Notes:
svn path=/head/; revision=299406
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk7/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-make-java-java-genlocales.gmk | 40 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-set | 21 |
3 files changed, 41 insertions, 22 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 184acebfd5d6..1d1bf91e4566 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -7,7 +7,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ http://download.java.net/jaxp/1.4.5/:jaxp \ diff --git a/java/openjdk7/files/patch-make-java-java-genlocales.gmk b/java/openjdk7/files/patch-make-java-java-genlocales.gmk new file mode 100644 index 000000000000..4430bcdf626b --- /dev/null +++ b/java/openjdk7/files/patch-make-java-java-genlocales.gmk @@ -0,0 +1,40 @@ +$FreeBSD$ + +--- jdk/make/java/java/genlocales.gmk.orig 2012-05-03 04:15:03.000000000 -0700 ++++ jdk/make/java/java/genlocales.gmk 2012-06-15 23:06:56.000000000 -0700 +@@ -93,6 +93,26 @@ + + else + ++ifeq ($(PLATFORM), bsd) ++ ++$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) ++ @$(RM) $@.tmp.euro $@.tmp.noneuro; ++ @$(prep-target) ++ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\ ++'@g > $@.tmp.euro; ++ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\ ++'@g >> $@.tmp.euro; ++ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\ ++'@g > $@.tmp.noneuro; ++ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\ ++'@g >> $@.tmp.noneuro; ++ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ ++ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ ++ $@.tmp.noneuro $< $@ ++ @$(RM) $@.tmp.euro $@.tmp.noneuro; ++ ++else ++ + $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) + @$(RM) $@.tmp.euro $@.tmp.noneuro; + @$(prep-target) +@@ -105,6 +125,8 @@ + $@.tmp.noneuro $< $@ + @$(RM) $@.tmp.euro $@.tmp.noneuro; + endif ++ ++endif + + genlocales : $(LocaleDataMetaInfo_Dest) + diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set index 4381a9da6cb8..76d84639d284 100644 --- a/java/openjdk7/files/patch-set +++ b/java/openjdk7/files/patch-set @@ -1707,27 +1707,6 @@ ifeq ($(HAVE_ALTZONE),true) OTHER_CPPFLAGS += -DHAVE_ALTZONE ---- jdk/make/java/java/genlocales.gmk 2012-05-26 23:29:12.000000000 -0700 -+++ jdk/make/java/java/genlocales.gmk 2012-05-20 10:37:13.000000000 -0700 -@@ -82,10 +82,14 @@ - $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) - @$(RM) $@.tmp.euro $@.tmp.noneuro; - @$(prep-target) -- @$(ECHO) $(Euro_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.euro; -- @$(ECHO) $(Euro_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.euro; -- @$(ECHO) $(NonEuro_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.noneuro; -- @$(ECHO) $(NonEuro_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.noneuro; -+ @$(ECHO) $(Euro_Resources_properties) | $(SED) -e s@.properties@'\ -+'@g > $@.tmp.euro; -+ @$(ECHO) $(Euro_Resources_java) | $(SED) -e s@.java@'\ -+'@g >> $@.tmp.euro; -+ @$(ECHO) $(NonEuro_Resources_properties) | $(SED) -e s@.properties@'\ -+'@g > $@.tmp.noneuro; -+ @$(ECHO) $(NonEuro_Resources_java) | $(SED) -e s@.java@'\ -+'@g >> $@.tmp.noneuro; - NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ - $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ - $@.tmp.noneuro $< $@ --- jdk/make/java/jli/Makefile 2012-05-26 23:29:12.000000000 -0700 +++ jdk/make/java/jli/Makefile 2012-05-17 16:18:00.000000000 -0700 @@ -116,9 +116,9 @@ |