summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2008-03-29 08:08:25 +0000
committerHans de Graaff <graaff@gentoo.org>2008-03-29 08:08:25 +0000
commitfbe3db6df15e19c4cc2392d47b8e34386b705110 (patch)
treede541825bca1949056cf36ef1a19a4ff89ed26c1 /net-misc/cadaver
parentVersion bump. (diff)
downloadgentoo-2-fbe3db6df15e19c4cc2392d47b8e34386b705110.tar.gz
gentoo-2-fbe3db6df15e19c4cc2392d47b8e34386b705110.tar.bz2
gentoo-2-fbe3db6df15e19c4cc2392d47b8e34386b705110.zip
Fix building with USE=-nls
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-misc/cadaver')
-rw-r--r--net-misc/cadaver/ChangeLog6
-rw-r--r--net-misc/cadaver/cadaver-0.23.2.ebuild9
-rw-r--r--net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch17
3 files changed, 30 insertions, 2 deletions
diff --git a/net-misc/cadaver/ChangeLog b/net-misc/cadaver/ChangeLog
index 7d8e2c5b964e..0ebfd67e55a8 100644
--- a/net-misc/cadaver/ChangeLog
+++ b/net-misc/cadaver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/cadaver
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/ChangeLog,v 1.24 2008/03/24 06:50:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/ChangeLog,v 1.25 2008/03/29 08:08:25 graaff Exp $
+
+ 29 Mar 2008; Hans de Graaff <graaff@gentoo.org>
+ +files/cadaver-0.23.2-disable-nls.patch, cadaver-0.23.2.ebuild:
+ Fix building without NLS. Closes #214695.
*cadaver-0.23.2 (24 Mar 2008)
diff --git a/net-misc/cadaver/cadaver-0.23.2.ebuild b/net-misc/cadaver/cadaver-0.23.2.ebuild
index 23434c51de81..b201991a20db 100644
--- a/net-misc/cadaver/cadaver-0.23.2.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/cadaver-0.23.2.ebuild,v 1.1 2008/03/24 06:50:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cadaver/cadaver-0.23.2.ebuild,v 1.2 2008/03/29 08:08:25 graaff Exp $
inherit eutils
@@ -25,6 +25,13 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}/${P}-disable-nls.patch"
+}
+
src_compile() {
myconf="--with-libs=/usr $(use_enable nls)"
econf $myconf || die "econf failed"
diff --git a/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
new file mode 100644
index 000000000000..6610d479b30d
--- /dev/null
+++ b/net-misc/cadaver/files/cadaver-0.23.2-disable-nls.patch
@@ -0,0 +1,17 @@
+Fix building with --disable-nls.
+--- src/cadaver.c.~1~ 2007-08-22 14:17:27.000000000 +0200
++++ src/cadaver.c 2008-03-29 08:58:57.248793293 +0100
+@@ -838,11 +838,12 @@
+
+ progname = argv[0];
+
++#ifdef ENABLE_NLS
++
+ #ifdef HAVE_SETLOCALE
+ setlocale(LC_ALL, "");
+ #endif
+
+-#ifdef ENABLE_NLS
+ bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+ textdomain(PACKAGE_NAME);
+ #endif /* ENABLE_NLS */