diff --git a/sys-devel/gettext/gettext-0.17.bep b/sys-devel/gettext/gettext-0.17.bep index c46cc333d..da33c7509 100644 --- a/sys-devel/gettext/gettext-0.17.bep +++ b/sys-devel/gettext/gettext-0.17.bep @@ -27,9 +27,9 @@ BUILD { libtoolize --force --copy --install cd ../.. export EXTRA_CONF="--disable-java" - export LDFLAGS="-lnetwork -liconv" +# export LDFLAGS="-lnetwork -liconv" ./autogen.sh --quick --skip-gnulib - ./configure --prefix=/boot/common LDFLAGS="-lnetwork -liconv" + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/gettext/gettext-0.18.1.1.bep b/sys-devel/gettext/gettext-0.18.1.1.bep new file mode 100644 index 000000000..0f31b9edb --- /dev/null +++ b/sys-devel/gettext/gettext-0.18.1.1.bep @@ -0,0 +1,40 @@ +DESCRIPTION="gettext" +HOMEPAGE="http://www.gnu.org/software/gettext/" +SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" +CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd gettext-0.18.1.1 + libtoolize --force --copy --install + sed -i 's/AC_INIT/AC_INIT([gettext],[0.18.1.1])/' configure.ac + ./autogen.sh --quick --skip-gnulib + cd gettext-runtime + sed -i 's/AC_INIT/AC_INIT([gettext-runtime],[0.18.1.1])/' configure.ac + sed -i 's/gl_INIT_PACKAGE/dnl gl_INIT_PACKAGE was here/' configure.ac + sed -i 's/gl_WOE32_DLL/dnl gl_WOE32_DLL was here/' configure.ac + echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac + libtoolize --force --copy --install + autoconf -Wnone + aclocal -I m4 -I gnulib-m4 --install --force + libtoolize --force --copy --install + autoconf -Wnone + export EXTRA_CONF="--disable-java" +# export LDFLAGS="-lnetwork -liconv" + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd gettext-0.18.1.1/gettext-runtime + make install +} + +TEST { + cd gettext-0.18.1.1/gettext-runtime + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1998, 2010 Free Software Foundation, Inc." diff --git a/sys-devel/gettext/patches/gettext-0.17.patch b/sys-devel/gettext/patches/gettext-0.17.patch index bce4e0373..0af1e7c81 100644 --- a/sys-devel/gettext/patches/gettext-0.17.patch +++ b/sys-devel/gettext/patches/gettext-0.17.patch @@ -1,27 +1,3 @@ ---- gettext-0.17/gettext-tools/gnulib-lib/binary-io.h 2009-03-03 02:29:57.000000000 +0000 -+++ work-gettext/gettext-tools/gnulib-lib/binary-io.h 2009-03-03 02:25:54.000000000 +0000 -@@ -30,7 +30,7 @@ - # define O_BINARY _O_BINARY - # define O_TEXT _O_TEXT - #endif --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ - # undef O_BINARY - # undef O_TEXT - ---- gettext-0.17/gettext-runtime/intl/loadmsgcat.c 2009-03-03 02:29:54.000000000 +0000 -+++ work-gettext/gettext-runtime/intl/loadmsgcat.c 2009-03-03 02:26:29.000000000 +0000 -@@ -489,7 +489,7 @@ - # define O_BINARY _O_BINARY - # define O_TEXT _O_TEXT - #endif --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ - # undef O_BINARY - # undef O_TEXT - --- gettext-0.17/gettext-runtime/intl/vasnprintf.c 2009-03-03 02:29:54.000000000 +0000 +++ work-gettext/gettext-runtime/intl/vasnprintf.c 2009-03-03 02:27:36.000000000 +0000 @@ -186,7 +186,7 @@ @@ -29,7 +5,7 @@ But don't use it on BeOS, since BeOS snprintf produces no output if the size argument is >= 0x3000000. */ -# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ -+# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ && !defined __HAIKU__ ++# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __HAIKU__ # define USE_SNPRINTF 1 # else # define USE_SNPRINTF 0 @@ -41,7 +17,7 @@ But don't use it on BeOS, since BeOS snprintf produces no output if the size argument is >= 0x3000000. */ -# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ -+# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ && !defined __HAIKU__ ++# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __HAIKU__ # define USE_SNPRINTF 1 # else # define USE_SNPRINTF 0 @@ -53,7 +29,7 @@ /* 'long double' properties. */ -#if defined __i386__ && defined __BEOS__ -+#if defined __i386__ && (defined __BEOS__ || defined __HAIKU__) ++#if defined __i386__ && defined __HAIKU__ /* Number of mantissa units, in base FLT_RADIX. */ # undef LDBL_MANT_DIG # define LDBL_MANT_DIG 64 @@ -65,7 +41,7 @@ stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP)); -# ifdef __BEOS__ -+# if defined __BEOS__ || defined __HAIKU__ ++# ifdef __HAIKU__ /* The BeOS termcap entry for "beterm" is broken: For "AF" and "AB" it contains balues in terminfo syntax but the system's tparam() function understands only the termcap syntax. */ @@ -77,7 +53,7 @@ Except on Darwin 7 or newer and on BeOS, for which locale_charset () always returns "UTF-8" (see config.charset). */ -#if !((defined __APPLE__ && defined __MACH__) || defined __BEOS__) -+#if !((defined __APPLE__ && defined __MACH__) || defined __BEOS__ || defined __HAIKU__) ++#if !((defined __APPLE__ && defined __MACH__) || defined __HAIKU__) s = gettext ("cheese"); if (strcmp (s, "K\344se")) { @@ -89,7 +65,7 @@ stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP)); -# ifdef __BEOS__ -+# if defined __BEOS__ || defined __HAIKU__ ++# ifdef __HAIKU__ /* The BeOS termcap entry for "beterm" is broken: For "AF" and "AB" it contains balues in terminfo syntax but the system's tparam() function understands only the termcap syntax. */ diff --git a/sys-devel/gettext/patches/gettext-0.18.1.1.patch b/sys-devel/gettext/patches/gettext-0.18.1.1.patch new file mode 100644 index 000000000..8ff3a0f51 --- /dev/null +++ b/sys-devel/gettext/patches/gettext-0.18.1.1.patch @@ -0,0 +1,24 @@ +diff -urN gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac gettext-0.18.1.1-haiku/gettext-runtime/libasprintf/configure.ac +--- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac 2010-06-06 12:49:57.044040192 +0000 ++++ gettext-0.18.1.1-haiku/gettext-runtime/libasprintf/configure.ac 2011-01-14 15:54:38.003670016 +0000 +@@ -44,7 +44,7 @@ + case "$host_os" in + # On Cygwin, without -no-undefined, a warning is emitted and only a static + # library is built. +- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; ++ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; + *) LTNOUNDEF='' ;; + esac + AC_SUBST([LTNOUNDEF]) +diff -urN gettext-0.18.1.1/gettext-tools/configure.ac gettext-0.18.1.1-haiku/gettext-tools/configure.ac +--- gettext-0.18.1.1/gettext-tools/configure.ac 2010-06-06 20:04:04.061079552 +0000 ++++ gettext-0.18.1.1-haiku/gettext-tools/configure.ac 2011-01-14 15:54:53.031981568 +0000 +@@ -100,7 +100,7 @@ + case "$host_os" in + # On Cygwin, without -no-undefined, a warning is emitted and only a static + # library is built. +- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; ++ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; + *) LTNOUNDEF='' ;; + esac + AC_SUBST([LTNOUNDEF])