Fixes for gettext-0.18.1

Adjust the documentation location.
Do our config/build/install from the top level so we get all of the tools.
This commit is contained in:
Chris Roberts
2012-05-05 05:10:34 +00:00
parent 8dd8a5b188
commit b96c78d8f1
2 changed files with 29 additions and 12 deletions

View File

@@ -2,7 +2,7 @@ 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"
REVISION="2"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
@@ -22,9 +22,10 @@ BUILD {
autoconf -Wnone
export EXTRA_CONF="--disable-java"
# export LDFLAGS="-lnetwork -liconv"
cd ..
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \
--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
@@ -32,12 +33,12 @@ BUILD {
}
INSTALL {
cd gettext-0.18.1.1/gettext-runtime
cd gettext-0.18.1.1
make install
}
TEST {
cd gettext-0.18.1.1/gettext-runtime
cd gettext-0.18.1.1
make check
}

View File

@@ -1,7 +1,7 @@
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 @@
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.
@@ -10,10 +10,10 @@ diff -urN gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac gettext-0.18
*) 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 @@
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.
@@ -22,3 +22,19 @@ diff -urN gettext-0.18.1.1/gettext-tools/configure.ac gettext-0.18.1.1-haiku/get
*) 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 @@
# 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