From 75b1a2a76b78fe73684b97b4951a76b0a90807ff Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Tue, 28 Jun 2016 07:28:01 +0000 Subject: [PATCH] [1] Make USES=iconv permanent, instead of being only for NLS=on case. The reason is that NLS is related to message translations to different languages. And bash has the general feature that \uNNNN is translated into the unicode character using iconv. This is unicode support, and should have nothing to do with translations. bash also currently has a bug that --disable-nls causes it to fail to find iconv. This bug has been reported upstream to bash-devel ML. In the future, when bash will fix this, this will make a difference. Note that this uses iconv from libc. [2] Update to 4.3.46 PR: 206903 [1], 210620 [2] Submitted by: yuri@rawbw.com [1], pkubaj@anongoth.pl [2] Discussed with: adamw --- shells/bash/Makefile | 8 ++++---- shells/bash/distinfo | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/shells/bash/Makefile b/shells/bash/Makefile index df0918065d7c..dde03018d86d 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= bash -PATCHLEVEL= 42 +PATCHLEVEL= 46 PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES= shells MASTER_SITES= GNU/${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -30,7 +30,7 @@ COLONBREAKSWORDS_DESC= Colons break words HELP_DESC= Enable builtin help IMPORTFUNCTIONS_DESC= Import function from env without --import-functions -USES= bison cpe makeinfo +USES= bison cpe iconv makeinfo OPTIONS_SUB= yes CPE_VENDOR= gnu @@ -41,7 +41,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-import-functions HELP_CONFIGURE_ENABLE= help-builtin NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext iconv +NLS_USES= gettext INFO= bash diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 8f5474279c08..539e6055b2f0 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,3 +1,4 @@ +TIMESTAMP = 1467096568 SHA256 (bash/bash-4.3.tar.gz) = afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SIZE (bash/bash-4.3.tar.gz) = 7955839 SHA256 (bash/bash43-001) = ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 @@ -84,3 +85,11 @@ SHA256 (bash/bash43-041) = 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac SIZE (bash/bash43-041) = 2362 SHA256 (bash/bash43-042) = ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919 SIZE (bash/bash43-042) = 1535 +SHA256 (bash/bash43-043) = 47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180 +SIZE (bash/bash43-043) = 1942 +SHA256 (bash/bash43-044) = 9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99 +SIZE (bash/bash43-044) = 1658 +SHA256 (bash/bash43-045) = ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023 +SIZE (bash/bash43-045) = 1312 +SHA256 (bash/bash43-046) = b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f +SIZE (bash/bash43-046) = 1494