Date: Tue, 15 Jan 2019 21:11:14 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490404 - in head/shells/bash: . files Message-ID: <201901152111.x0FLBEoK020580@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Tue Jan 15 21:11:14 2019 New Revision: 490404 URL: https://svnweb.freebsd.org/changeset/ports/490404 Log: Update to 5.0 PR: 234827 Exp-run by: antoine Deleted: head/shells/bash/files/extrapatch-colonbreakswords Modified: head/shells/bash/Makefile head/shells/bash/distinfo head/shells/bash/files/patch-lib_readline_display.c head/shells/bash/pkg-plist Modified: head/shells/bash/Makefile ============================================================================== --- head/shells/bash/Makefile Tue Jan 15 20:54:32 2019 (r490403) +++ head/shells/bash/Makefile Tue Jan 15 21:11:14 2019 (r490404) @@ -1,20 +1,24 @@ # Created by: Oliver Eikemeier # $FreeBSD$ +# Please keep commented out variables. They will be needed once patches are +# released. + PORTNAME= bash -PATCHLEVEL= 23 -PORTVERSION= 4.4.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 1 +#PATCHLEVEL= 0 +#PORTVERSION= 5.0.${PATCHLEVEL:S/^0//g} +PORTVERSION= 5.0 +PORTREVISION?= 0 CATEGORIES= shells MASTER_SITES= GNU -DISTNAME= ${PORTNAME}-${PORTVERSION:R} +#DISTNAME= ${PORTNAME}-${PORTVERSION:R} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PATCH_SITES= GNU/${PORTNAME}/${DISTNAME}-patches/ -PATCHFILES!= /usr/bin/jot -s " " -w \ - ${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \ - ${PATCHLEVEL} 1 ${PATCHLEVEL} +#PATCH_SITES= GNU/${PORTNAME}/${DISTNAME}-patches/ +#PATCHFILES!= /usr/bin/jot -s " " -w \ +# ${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \ +# ${PATCHLEVEL} 1 ${PATCHLEVEL} MAINTAINER= ehaupt@FreeBSD.org COMMENT= GNU Project's Bourne Again SHell @@ -22,21 +26,18 @@ COMMENT= GNU Project's Bourne Again SHell LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= COLONBREAKSWORDS FDESCFS HELP NLS STATIC SYSBASHRC SYSLOG DOCS -COLONBREAKSWORDS_DESC= Colons break words +OPTIONS_DEFINE= FDESCFS HELP NLS STATIC SYSBASHRC SYSLOG DOCS FDESCFS_DESC= Enable use of /dev/fd HELP_DESC= Enable builtin help SYSBASHRC_DESC= Enable system-wide rc files -OPTIONS_DEFAULT= COLONBREAKSWORDS HELP +OPTIONS_DEFAULT= HELP -USES= bison cpe iconv makeinfo pathfix +USES= bison cpe iconv makeinfo pathfix localbase GNU_CONFIGURE= yes OPTIONS_SUB= yes CPE_VENDOR= gnu -COLONBREAKSWORDS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-colonbreakswords - FDESCFS_CONFIGURE_ENV_OFF= bash_cv_dev_fd=absent FDESCFS_SUB_FILES= pkg-message @@ -83,6 +84,7 @@ post-patch: .if ${PORT_OPTIONS:MSYSLOG} @${REINPLACE_CMD} \ -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \ + -e "s|/\*.*#define SYSLOG_SHOPT .*\*/|#define SYSLOG_SHOPT 1|g" \ ${WRKSRC}/config-top.h .endif Modified: head/shells/bash/distinfo ============================================================================== --- head/shells/bash/distinfo Tue Jan 15 20:54:32 2019 (r490403) +++ head/shells/bash/distinfo Tue Jan 15 21:11:14 2019 (r490404) @@ -1,49 +1,3 @@ -TIMESTAMP = 1527921957 -SHA256 (bash/bash-4.4.tar.gz) = d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb -SIZE (bash/bash-4.4.tar.gz) = 9377313 -SHA256 (bash/bash44-001) = 3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f -SIZE (bash/bash44-001) = 1896 -SHA256 (bash/bash44-002) = 7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53 -SIZE (bash/bash44-002) = 1946 -SHA256 (bash/bash44-003) = 51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2 -SIZE (bash/bash44-003) = 1593 -SHA256 (bash/bash44-004) = ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3 -SIZE (bash/bash44-004) = 2350 -SHA256 (bash/bash44-005) = 221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529 -SIZE (bash/bash44-005) = 1439 -SHA256 (bash/bash44-006) = 6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8 -SIZE (bash/bash44-006) = 1805 -SHA256 (bash/bash44-007) = de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf -SIZE (bash/bash44-007) = 4640 -SHA256 (bash/bash44-008) = 86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba -SIZE (bash/bash44-008) = 2223 -SHA256 (bash/bash44-009) = 0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c -SIZE (bash/bash44-009) = 3117 -SHA256 (bash/bash44-010) = 8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06 -SIZE (bash/bash44-010) = 1670 -SHA256 (bash/bash44-011) = dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d -SIZE (bash/bash44-011) = 1603 -SHA256 (bash/bash44-012) = fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e -SIZE (bash/bash44-012) = 5768 -SHA256 (bash/bash44-013) = 1b25efacbc1c4683b886d065b7a089a3601964555bcbf11f3a58989d38e853b6 -SIZE (bash/bash44-013) = 1255 -SHA256 (bash/bash44-014) = a7f75cedb43c5845ab1c60afade22dcb5e5dc12dd98c0f5a3abcfb9f309bb17c -SIZE (bash/bash44-014) = 2834 -SHA256 (bash/bash44-015) = d37602ecbeb62d5a22c8167ea1e621fcdbaaa79925890a973a45c810dd01c326 -SIZE (bash/bash44-015) = 1233 -SHA256 (bash/bash44-016) = 501f91cc89fadced16c73aa8858796651473602c722bb29f86a8ba588d0ff1b1 -SIZE (bash/bash44-016) = 2069 -SHA256 (bash/bash44-017) = 773f90b98768d4662a22470ea8eec5fdd8e3439f370f94638872aaf884bcd270 -SIZE (bash/bash44-017) = 1143 -SHA256 (bash/bash44-018) = 5bc494b42f719a8b0d844b7bd9ad50ebaae560e97f67c833c9e7e9d53981a8cc -SIZE (bash/bash44-018) = 1319 -SHA256 (bash/bash44-019) = 27170d6edfe8819835407fdc08b401d2e161b1400fe9d0c5317a51104c89c11e -SIZE (bash/bash44-019) = 1671 -SHA256 (bash/bash44-020) = 1840e2cbf26ba822913662f74037594ed562361485390c52813b38156c99522c -SIZE (bash/bash44-020) = 5156 -SHA256 (bash/bash44-021) = bd8f59054a763ec1c64179ad5cb607f558708a317c2bdb22b814e3da456374c1 -SIZE (bash/bash44-021) = 1810 -SHA256 (bash/bash44-022) = 45331f0936e36ab91bfe44b936e33ed8a1b1848fa896e8a1d0f2ef74f297cb79 -SIZE (bash/bash44-022) = 1818 -SHA256 (bash/bash44-023) = 4fec236f3fbd3d0c47b893fdfa9122142a474f6ef66c20ffb6c0f4864dd591b6 -SIZE (bash/bash44-023) = 1557 +TIMESTAMP = 1547129229 +SHA256 (bash/bash-5.0.tar.gz) = b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d +SIZE (bash/bash-5.0.tar.gz) = 10135110 Modified: head/shells/bash/files/patch-lib_readline_display.c ============================================================================== --- head/shells/bash/files/patch-lib_readline_display.c Tue Jan 15 20:54:32 2019 (r490403) +++ head/shells/bash/files/patch-lib_readline_display.c Tue Jan 15 21:11:14 2019 (r490404) @@ -1,9 +1,9 @@ ---- lib/readline/display.c.orig 2016-07-28 18:49:33 UTC +--- lib/readline/display.c.orig 2018-10-01 01:37:48 UTC +++ lib/readline/display.c -@@ -743,7 +743,10 @@ rl_redisplay () - inv_lbreaks[newlines = 0] = 0; - /* lpos is a physical cursor position, so it needs to be adjusted by the - number of invisible characters in the prompt, per line */ +@@ -837,7 +837,10 @@ rl_redisplay (void) + the line breaks in the prompt string in expand_prompt, taking invisible + characters into account, and if lpos exceeds the screen width, we copy + the data in the loop below. */ + if (local_prompt) lpos = prompt_physical_chars + modmark; + else Modified: head/shells/bash/pkg-plist ============================================================================== --- head/shells/bash/pkg-plist Tue Jan 15 20:54:32 2019 (r490403) +++ head/shells/bash/pkg-plist Tue Jan 15 21:11:14 2019 (r490404) @@ -62,10 +62,12 @@ bin/bashbug %%NO_STATIC%%lib/bash/Makefile.inc %%NO_STATIC%%lib/bash/basename %%NO_STATIC%%lib/bash/dirname +%%NO_STATIC%%lib/bash/fdflags %%NO_STATIC%%lib/bash/finfo %%NO_STATIC%%lib/bash/head %%NO_STATIC%%lib/bash/id %%NO_STATIC%%lib/bash/ln +%%NO_STATIC%%lib/bash/loadables.h %%NO_STATIC%%lib/bash/logname %%NO_STATIC%%lib/bash/mkdir %%NO_STATIC%%lib/bash/mypid @@ -75,6 +77,7 @@ bin/bashbug %%NO_STATIC%%lib/bash/push %%NO_STATIC%%lib/bash/realpath %%NO_STATIC%%lib/bash/rmdir +%%NO_STATIC%%lib/bash/seq %%NO_STATIC%%lib/bash/setpgid %%NO_STATIC%%lib/bash/sleep %%NO_STATIC%%lib/bash/strftime @@ -113,6 +116,7 @@ man/man1/bashbug.1.gz %%NLS%%share/locale/nb/LC_MESSAGES/bash.mo %%NLS%%share/locale/nl/LC_MESSAGES/bash.mo %%NLS%%share/locale/pl/LC_MESSAGES/bash.mo +%%NLS%%share/locale/pt/LC_MESSAGES/bash.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/bash.mo %%NLS%%share/locale/ro/LC_MESSAGES/bash.mo %%NLS%%share/locale/ru/LC_MESSAGES/bash.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901152111.x0FLBEoK020580>