Date: Mon, 10 May 2010 22:11:46 +0200 From: Emanuel Haupt <ehaupt@critical.ch> To: "David E. O'Brien" <obrien@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/shells/bash Makefile distinfo Message-ID: <20100510221146.c70877af.ehaupt@critical.ch> In-Reply-To: <201005101825.o4AIPXGC040135@repoman.freebsd.org> References: <201005101825.o4AIPXGC040135@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
"David E. O'Brien" <obrien@FreeBSD.org> wrote:
> obrien 2010-05-10 18:25:33 UTC
>
> FreeBSD ports repository
>
> Modified files:
> shells/bash Makefile distinfo
> Log:
> Update to Bash 4.1 patchlevel 5.
>
> Revision Changes Path
> 1.119 +2 -2 ports/shells/bash/Makefile
> 1.46 +18 -108 ports/shells/bash/distinfo
Hi David, this broke the statically linked version (shells/bash-static),
please apply the following patch:
--- bash.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/bash/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- Makefile 10 May 2010 18:25:33 -0000 1.119
+++ Makefile 10 May 2010 20:08:38 -0000
@@ -3,13 +3,13 @@
# Date created: 30 Jul 2004
# Whom: Oliver Eikemeier
#
-# $FreeBSD: ports/shells/bash/Makefile,v 1.119 2010/05/10 18:25:33 obrien Exp $
+# $FreeBSD: ports/shells/bash/Makefile,v 1.118 2009/11/14 12:05:54 ehaupt Exp $
#
PORTNAME= bash
PATCHLEVEL= 5
PORTVERSION= 4.1.${PATCHLEVEL:S/^0//g}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:S/$/:bash/} \
ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/shells/bash/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist 12 Mar 2009 09:54:01 -0000 1.25
+++ pkg-plist 10 May 2010 20:08:38 -0000
@@ -89,7 +89,9 @@
%%NLS%%share/locale/eo/LC_MESSAGES/bash.mo
%%NLS%%share/locale/es/LC_MESSAGES/bash.mo
%%NLS%%share/locale/et/LC_MESSAGES/bash.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/bash.mo
%%NLS%%share/locale/fr/LC_MESSAGES/bash.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/bash.mo
%%NLS%%share/locale/hu/LC_MESSAGES/bash.mo
%%NLS%%share/locale/id/LC_MESSAGES/bash.mo
%%NLS%%share/locale/ja/LC_MESSAGES/bash.mo
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in 10 May 2010 20:08:38 -0000
@@ -0,0 +1,11 @@
+--- ./Makefile.in.orig 2010-05-10 21:44:45.000000000 +0200
++++ ./Makefile.in 2010-05-10 21:44:59.000000000 +0200
+@@ -349,7 +349,7 @@
+ LIBINTL_H = @LIBINTL_H@
+
+ # libiconv
+-LIBICONV = @LIBICONV@
++LIBICONV = -liconv
+
+ # tests
+ LIBINTL = @LIBINTL@
--- bash.patch ends here ---
Emanuel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100510221146.c70877af.ehaupt>