Convert gettext recipe to an actual recipe

* The new recipe is based on the *-dev bep file.
* Remove all other patches/non-recipes.
This commit is contained in:
Ingo Weinhold
2013-04-29 11:33:53 +02:00
parent 2089651b58
commit 80154ad209
6 changed files with 83 additions and 271 deletions

View File

@@ -1,36 +0,0 @@
DESCRIPTION="gettext-dev - full tools included"
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="2"
STATUS_HAIKU="stable"
DEPEND=""
BUILD()
{
cd gettext-0.18.1.1
libtoolize --force --copy --install
./autogen.sh --quick --skip-gnulib
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-java --without-git \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL()
{
cd gettext-0.18.1.1
make install
}
TEST()
{
cd gettext-0.18.1.1/gettext-runtime/tests
make check
}
LICENSE="GNU GPL v3"
COPYRIGHT="1998, 2010 Free Software Foundation, Inc."

View File

@@ -1,48 +1,94 @@
DESCRIPTION="gettext"
SUMMARY="GNU tools for native language support"
DESCRIPTION="GNU 'gettext' is an important step for the GNU Translation Project, as it is an asset on which we may build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools and documentation. Specifically, the GNU 'gettext' utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and a few stand-alone programs to massage in various ways the sets of translatable strings, or already translated strings. A special GNU Emacs mode also helps interested parties in preparing these sets, or bringing them up to date."
HOMEPAGE="http://www.gnu.org/software/gettext/"
LICENSE="GNU GPL v3"
COPYRIGHT="1998, 2010 Free Software Foundation, Inc."
SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz"
CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND=""
REVISION="3"
ARCHITECTURES="x86_gcc2 ?x86"
PATCHES="gettext-0.18.1.1.patch"
# TODO: Check command versions!
PROVIDES="
gettext = $portVersion compat >= 0.18.1
cmd:autopoint = $portVersion compat >= 0
cmd:envsubst = $portVersion compat >= 0
cmd:gettext = $portVersion compat >= 0
cmd:gettext.sh = $portVersion compat >= 0
cmd:gettextize = $portVersion compat >= 0
cmd:msgattrib = $portVersion compat >= 0
cmd:msgcat = $portVersion compat >= 0
cmd:msgcmp = $portVersion compat >= 0
cmd:msgcomm = $portVersion compat >= 0
cmd:msgconv = $portVersion compat >= 0
cmd:msgen = $portVersion compat >= 0
cmd:msgexec = $portVersion compat >= 0
cmd:msgfilter = $portVersion compat >= 0
cmd:msgfmt = $portVersion compat >= 0
cmd:msggrep = $portVersion compat >= 0
cmd:msginit = $portVersion compat >= 0
cmd:msgmerge = $portVersion compat >= 0
cmd:msgunfmt = $portVersion compat >= 0
cmd:msguniq = $portVersion compat >= 0
cmd:ngettext = $portVersion compat >= 0
cmd:recode_sr_latin = $portVersion compat >= 0
cmd:xgettext = $portVersion compat >= 0
lib:libasprintf = 0.0.0 compat >= 0
lib:libgettextlib = $portVersion
lib:libgettextpo = 0.5.1 compat >= 0
lib:libgettextsrc = $portVersion
lib:libintl = 8.1.1 compat >= 8
"
REQUIRES="
haiku >= $haikuVersion
lib:libiconv
"
BUILD_REQUIRES="
$REQUIRES
cmd:aclocal
cmd:autoconf
cmd:automake
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:make
cmd:makeinfo
"
BUILD_PREREQUIRES="
haiku_devel >= $haikuVersion
"
SOURCE_DIR="$portVersionedName"
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` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
--localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
runConfigure ./configure \
--disable-java --without-git
make $jobArgs
}
INSTALL()
{
cd gettext-0.18.1.1/gettext-runtime
make install
rm $libDir/charset.alias
prepareInstalledDevelLibs libasprintf libgettextpo libintl
prepareInstalledDevelLib libgettextlib '*.so' '*'
prepareInstalledDevelLib libgettextsrc '*.so' '*'
# TODO: Several programs are installed in $libDir/gettext ($(pkglibdir) in
# the respective Makefile.am files). A better place would be
# $libExecDir/gettext. Since the programs are probably invoked by other
# programs, that might require some additional changes to the sources.
}
TEST()
{
cd gettext-0.18.1.1/gettext-runtime
cd gettext-runtime/tests
make check
}
LICENSE="GNU GPL v3"
COPYRIGHT="1998, 2010 Free Software Foundation, Inc."

View File

@@ -1,125 +0,0 @@
--- 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 @@
# /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'.
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 __HAIKU__
# define USE_SNPRINTF 1
# else
# define USE_SNPRINTF 0
--- gettext-0.17/gettext-runtime/libasprintf/vasnprintf.c 2009-03-03 02:29:54.000000000 +0000
+++ work-gettext/gettext-runtime/libasprintf/vasnprintf.c 2009-03-03 02:27:52.000000000 +0000
@@ -186,7 +186,7 @@
# /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'.
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 __HAIKU__
# define USE_SNPRINTF 1
# else
# define USE_SNPRINTF 0
--- gettext-0.17/gettext-tools/gnulib-lib/float.in.h 2009-03-03 02:29:57.000000000 +0000
+++ work-gettext/gettext-tools/gnulib-lib/float.in.h 2009-03-03 02:28:19.000000000 +0000
@@ -24,7 +24,7 @@
#define _GL_FLOAT_H
/* 'long double' properties. */
-#if defined __i386__ && defined __BEOS__
+#if defined __i386__ && defined __HAIKU__
/* Number of mantissa units, in base FLT_RADIX. */
# undef LDBL_MANT_DIG
# define LDBL_MANT_DIG 64
--- gettext-0.17/gettext-tools/gnulib-lib/term-ostream.c 2009-03-03 02:29:57.000000000 +0000
+++ work-gettext/gettext-tools/gnulib-lib/term-ostream.c 2009-03-03 02:28:43.000000000 +0000
@@ -1780,7 +1780,7 @@
stream->exit_underline_mode = xstrdup0 (tgetstr ("ue", TEBP));
stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP));
-# ifdef __BEOS__
+# 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. */
--- gettext-0.17/gettext-tools/tests/gettext-4-prg.c 2009-03-03 02:29:58.000000000 +0000
+++ work-gettext/gettext-tools/tests/gettext-4-prg.c 2009-03-03 02:29:26.000000000 +0000
@@ -53,7 +53,7 @@
/* Here we expect output in ISO-8859-1.
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 __HAIKU__)
s = gettext ("cheese");
if (strcmp (s, "K\344se"))
{
--- gettext-0.17/gnulib-local/lib/term-ostream.oo.c 2009-03-03 02:29:53.000000000 +0000
+++ work-gettext/gnulib-local/lib/term-ostream.oo.c 2009-03-03 02:29:43.000000000 +0000
@@ -1803,7 +1803,7 @@
stream->exit_underline_mode = xstrdup0 (tgetstr ("ue", TEBP));
stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP));
-# ifdef __BEOS__
+# 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. */
--- gettext-0.17/gettext-tools/gnulib-lib/libxml/encoding.c 2009-03-05 02:09:23.000000000 +0000
+++ work-gettext/gettext-tools/gnulib-lib/libxml/encoding.c 2009-03-05 02:16:35.000000000 +0000
@@ -1611,20 +1611,20 @@
#ifdef LIBXML_ICONV_ENABLED
/* check whether iconv can handle this */
- icv_in = iconv_open("UTF-8", name);
- icv_out = iconv_open(name, "UTF-8");
+ icv_in = libiconv_open("UTF-8", name);
+ icv_out = libiconv_open(name, "UTF-8");
if (icv_in == (iconv_t) -1) {
- icv_in = iconv_open("UTF-8", upper);
+ icv_in = libiconv_open("UTF-8", upper);
}
if (icv_out == (iconv_t) -1) {
- icv_out = iconv_open(upper, "UTF-8");
+ icv_out = libiconv_open(upper, "UTF-8");
}
if ((icv_in != (iconv_t) -1) && (icv_out != (iconv_t) -1)) {
enc = (xmlCharEncodingHandlerPtr)
xmlMalloc(sizeof(xmlCharEncodingHandler));
if (enc == NULL) {
- iconv_close(icv_in);
- iconv_close(icv_out);
+ libiconv_close(icv_in);
+ libiconv_close(icv_out);
return(NULL);
}
enc->name = xmlMemStrdup(name);
@@ -1703,7 +1703,7 @@
}
icv_inlen = *inlen;
icv_outlen = *outlen;
- ret = iconv(cd, (char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen);
+ ret = libiconv(cd, (char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen);
*inlen -= icv_inlen;
*outlen -= icv_outlen;
if ((icv_inlen != 0) || (ret == -1)) {
@@ -2121,12 +2121,12 @@
xmlFree(handler->name);
handler->name = NULL;
if (handler->iconv_out != NULL) {
- if (iconv_close(handler->iconv_out))
+ if (libiconv_close(handler->iconv_out))
ret = -1;
handler->iconv_out = NULL;
}
if (handler->iconv_in != NULL) {
- if (iconv_close(handler->iconv_in))
+ if (libiconv_close(handler->iconv_in))
ret = -1;
handler->iconv_in = NULL;
}

View File

@@ -1,11 +0,0 @@
--- gettext-0.18.1.1-orig/gettext-tools/gnulib-lib/binary-io.h 2010-05-24 09:42:36.028573696 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-08-03 20:17:21.155189248 +0000
@@ -31,7 +31,7 @@
# define O_BINARY _O_BINARY
# define O_TEXT _O_TEXT
#endif
-#if defined __BEOS__ || defined __HAIKU__
+#if defined __BEOS__
/* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */
# undef O_BINARY
# undef O_TEXT

View File

@@ -1,40 +1,11 @@
diff -up gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac
--- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig 2010-06-06 06:49:57.058720256 -0600
+++ gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac 2012-05-04 20:40:00.847511552 -0600
@@ -44,7 +44,7 @@ LT_INIT([win32-dll])
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 -up gettext-0.18.1.1/gettext-tools/configure.ac.orig gettext-0.18.1.1/gettext-tools/configure.ac
--- gettext-0.18.1.1/gettext-tools/configure.ac.orig 2010-06-06 14:04:04.007602176 -0600
+++ gettext-0.18.1.1/gettext-tools/configure.ac 2012-05-04 20:40:00.860880896 -0600
@@ -100,7 +100,7 @@ LT_LANG([Windows Resource])
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 -up gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h
--- gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig 2012-05-04 21:23:18.533200896 -0600
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-05-04 21:23:54.882900992 -0600
@@ -31,11 +31,6 @@
--- gettext-0.18.1.1-orig/gettext-tools/gnulib-lib/binary-io.h 2010-05-24 09:42:36.028573696 +0000
+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-08-03 20:17:21.155189248 +0000
@@ -31,7 +31,7 @@
# define O_BINARY _O_BINARY
# define O_TEXT _O_TEXT
#endif
-#if defined __BEOS__ || defined __HAIKU__
- /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */
-# undef O_BINARY
-# undef O_TEXT
-#endif
/* SET_BINARY (fd);
changes the file descriptor fd to perform binary I/O. */
diff -up gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c
+#if defined __BEOS__
/* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */
# undef O_BINARY
# undef O_TEXT

View File

@@ -1,33 +0,0 @@
? gettext-runtime/libasprintf/autom4te.cache
Index: gettext-runtime/libasprintf/configure.ac
===================================================================
RCS file: /sources/gettext/gettext/gettext-runtime/libasprintf/configure.ac,v
retrieving revision 1.24
diff -u -r1.24 configure.ac
--- gettext-runtime/libasprintf/configure.ac 20 Apr 2008 06:48:03 -0000 1.24
+++ gettext-runtime/libasprintf/configure.ac 4 May 2008 17:26:34 -0000
@@ -41,7 +41,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])
Index: gettext-tools/configure.ac
===================================================================
RCS file: /sources/gettext/gettext/gettext-tools/configure.ac,v
retrieving revision 1.96
diff -u -r1.96 configure.ac
--- gettext-tools/configure.ac 20 Apr 2008 06:48:03 -0000 1.96
+++ gettext-tools/configure.ac 4 May 2008 17:29:23 -0000
@@ -92,7 +92,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])