upgrade to gettext 0.10.39
This commit is contained in:
brad
parent
5d02579a42
commit
9dea100b96
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2001/05/30 02:14:12 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2001/08/27 19:16:00 brad Exp $
|
||||
# $FreeBSD: Makefile,v 1.4 1998/11/18 15:09:35 vanilla Exp $
|
||||
|
||||
COMMENT= "GNU gettext"
|
||||
|
||||
DISTNAME= gettext-0.10.38
|
||||
DISTNAME= gettext-0.10.39
|
||||
CATEGORIES= devel
|
||||
NEED_VERSION= 1.402
|
||||
NEED_VERSION= 1.435
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= gettext
|
||||
|
||||
@ -26,9 +26,6 @@ CONFIGURE_ARGS+= --enable-static
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
post-patch:
|
||||
@rm -f ${WRKSRC}/doc/gettext.info*
|
||||
|
||||
pre-extract:
|
||||
@if [ -f ${LOCALBASE}/lib/libintl.so.?.? ]; then \
|
||||
echo "+-------------------"; \
|
||||
@ -43,6 +40,9 @@ pre-extract:
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
post-extract:
|
||||
@rm -f ${WRKSRC}/doc/gettext.info*
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
|
||||
${PREFIX}/share/gettext/po-mode.el
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (gettext-0.10.38.tar.gz) = c807f357ea5e5324adf7ad3d52c40c84
|
||||
RMD160 (gettext-0.10.38.tar.gz) = b526927b06a5b4c3addf92870dda061b2fa4db37
|
||||
SHA1 (gettext-0.10.38.tar.gz) = 2c616a9bc6b4c27713822d898100d4931e30b92e
|
||||
MD5 (gettext-0.10.39.tar.gz) = dbf95acae3cd03c85c86efed85969d30
|
||||
RMD160 (gettext-0.10.39.tar.gz) = 7d6213dfbb79bb0d998d0ba2e50b1708908fff0a
|
||||
SHA1 (gettext-0.10.39.tar.gz) = 0341183c97bc88a50ab45d56ff01cd95158160f4
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2001/05/30 02:14:13 brad Exp $
|
||||
--- configure.orig Wed May 23 16:48:44 2001
|
||||
+++ configure Tue May 29 21:02:16 2001
|
||||
@@ -980,52 +980,32 @@ echo "configure:980: checking for workin
|
||||
$OpenBSD: patch-configure,v 1.5 2001/08/27 19:16:00 brad Exp $
|
||||
--- configure.orig Tue Jul 24 10:27:27 2001
|
||||
+++ configure Mon Aug 27 11:23:33 2001
|
||||
@@ -1214,52 +1214,32 @@ echo "configure:1214: checking for worki
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@ -16,7 +16,7 @@ $OpenBSD: patch-configure,v 1.4 2001/05/30 02:14:13 brad Exp $
|
||||
+echo "$ac_t""missing" 1>&6
|
||||
|
||||
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
|
||||
echo "configure:993: checking for working autoconf" >&5
|
||||
echo "configure:1227: checking for working autoconf" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@ -31,7 +31,7 @@ $OpenBSD: patch-configure,v 1.4 2001/05/30 02:14:13 brad Exp $
|
||||
+echo "$ac_t""missing" 1>&6
|
||||
|
||||
echo $ac_n "checking for working automake""... $ac_c" 1>&6
|
||||
echo "configure:1006: checking for working automake" >&5
|
||||
echo "configure:1240: checking for working automake" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.4 2001/05/30 02:14:13 brad Exp $
|
||||
+echo "$ac_t""missing" 1>&6
|
||||
|
||||
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
|
||||
echo "configure:1019: checking for working autoheader" >&5
|
||||
echo "configure:1253: checking for working autoheader" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
# Redirect stdin to placate older versions of autoconf. Sigh.
|
||||
@ -61,8 +61,86 @@ $OpenBSD: patch-configure,v 1.4 2001/05/30 02:14:13 brad Exp $
|
||||
+echo "$ac_t""missing" 1>&6
|
||||
|
||||
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
|
||||
echo "configure:1032: checking for working makeinfo" >&5
|
||||
@@ -4855,7 +4835,7 @@ else
|
||||
echo "configure:1266: checking for working makeinfo" >&5
|
||||
@@ -2962,7 +2942,14 @@ old_postuninstall_cmds=
|
||||
|
||||
if test -n "$RANLIB"; then
|
||||
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
||||
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ case "$host_os" in
|
||||
+ openbsd*)
|
||||
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
|
||||
# Allow CC to be a program name with arguments.
|
||||
@@ -3459,7 +3446,9 @@ cygwin* | mingw* | pw32* )
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
-
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
@@ -3863,10 +3852,21 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ case "$host_os" in
|
||||
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -4343,9 +4343,23 @@ newsos6)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
- if test "$with_gnu_ld" = yes; then
|
||||
- need_lib_prefix=no
|
||||
- need_version=no
|
||||
+ need_lib_prefix=no
|
||||
+ need_version=no
|
||||
+ file_magic_cmd=/usr/bin/file
|
||||
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
||||
+ case "$host_os" in
|
||||
+ openbsd2.[89] | openbsd2.[89].*)
|
||||
+ shlibpath_overrides_runpath=no
|
||||
+ ;;
|
||||
+ *)
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
+ ;;
|
||||
+ esac
|
||||
+ else
|
||||
+ deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ shlibpath_overrides_runpath=yes
|
||||
fi
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
@@ -8369,7 +8383,7 @@ else
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- doc/Makefile.in.orig Wed May 23 16:48:53 2001
|
||||
+++ doc/Makefile.in Tue May 29 20:57:55 2001
|
||||
@@ -97,7 +97,7 @@ YACC = @YACC@
|
||||
--- doc/Makefile.in.orig Tue Jul 24 10:27:41 2001
|
||||
+++ doc/Makefile.in Mon Aug 27 11:23:33 2001
|
||||
@@ -99,7 +99,7 @@ YACC = @YACC@
|
||||
aclocaldir = @aclocaldir@
|
||||
lispdir = @lispdir@
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
dvidir = $(docdir)
|
||||
psdir = $(docdir)
|
||||
pdfdir = $(docdir)
|
||||
@@ -108,7 +108,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits
|
||||
@@ -110,7 +110,7 @@ AUTOMAKE_OPTIONS = 1.2 gnits
|
||||
SED = sed
|
||||
RM = rm -f
|
||||
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
$OpenBSD: patch-ltconfig,v 1.5 2001/04/04 19:51:41 brad Exp $
|
||||
--- ltconfig.orig Sat May 27 07:15:00 2000
|
||||
+++ ltconfig Tue Feb 20 13:25:13 2001
|
||||
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
+openbsd*)
|
||||
+ with_gnu_ld=no
|
||||
+ ;;
|
||||
|
||||
esac
|
||||
|
||||
@@ -1402,10 +1405,21 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
- hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_shlibpath_var=no
|
||||
+ case "$host_os" in
|
||||
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='-R$libdir'
|
||||
+ ;;
|
||||
+ *)
|
||||
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
|
||||
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
|
||||
+ export_dynamic_flag_spec='${wl}-E'
|
||||
+ fi
|
||||
+ ;;
|
||||
+ esac
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@@ -2021,13 +2035,10 @@ netbsd*)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
- if test "$with_gnu_ld" = yes; then
|
||||
- need_lib_prefix=no
|
||||
- need_version=no
|
||||
- fi
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
+ deplibs_check_method='pass_all'
|
||||
;;
|
||||
|
||||
os2*)
|
||||
@ -1,26 +1,26 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2001/04/04 19:51:41 brad Exp $
|
||||
--- ltmain.sh.orig Sat May 27 07:15:01 2000
|
||||
+++ ltmain.sh Tue Feb 20 13:25:14 2001
|
||||
@@ -1079,6 +1079,17 @@ compiler."
|
||||
# These systems don't actually have c library (as such)
|
||||
continue
|
||||
$OpenBSD: patch-ltmain_sh,v 1.3 2001/08/27 19:16:00 brad Exp $
|
||||
--- ltmain.sh.orig Mon Aug 27 11:36:08 2001
|
||||
+++ ltmain.sh Mon Aug 27 11:36:30 2001
|
||||
@@ -1031,12 +1031,28 @@ compiler."
|
||||
# These systems don't actually have a C library (as such)
|
||||
test "X$arg" = "X-lc" && continue
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ continue
|
||||
+ test "X$arg" = "X-lc" && continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ elif test "$arg" = "-lc_r"; then
|
||||
+ case "$host" in
|
||||
+ fi
|
||||
+ if test "$X$arg" = "X-lc_r"; then
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc_r directly, use -pthread flag.
|
||||
+ continue
|
||||
+ ;;
|
||||
esac
|
||||
elif test "$arg" = "-lm"; then
|
||||
case "$host" in
|
||||
@@ -1091,6 +1102,10 @@ compiler."
|
||||
fi
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -?thread)
|
||||
@ -30,19 +30,19 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2001/04/04 19:51:41 brad Exp $
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1795,6 +1810,9 @@ compiler."
|
||||
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*-*-rhapsody*)
|
||||
# rhapsody is a little odd...
|
||||
deplibs="$deplibs -framework System"
|
||||
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
|
||||
@@ -2408,6 +2424,9 @@ compiler."
|
||||
*-*-netbsd*)
|
||||
# Don't link with libc until the a.out ld.so is fixed.
|
||||
;;
|
||||
+ *-*-openbsd*)
|
||||
+ # Do not include libc due to us having libc/libc_r.
|
||||
+ ;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems if necessary.
|
||||
if test $build_libtool_need_lc = "yes"; then
|
||||
@@ -4412,40 +4431,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
@ -52,7 +52,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2001/04/04 19:51:41 brad Exp $
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use \`-LLIBDIR'"
|
||||
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-man_Makefile_in,v 1.1 2001/05/30 02:14:13 brad Exp $
|
||||
--- man/Makefile.in.orig Tue May 29 21:47:03 2001
|
||||
+++ man/Makefile.in Tue May 29 21:47:37 2001
|
||||
@@ -101,7 +101,7 @@ lispdir = @lispdir@
|
||||
$OpenBSD: patch-man_Makefile_in,v 1.2 2001/08/27 19:16:00 brad Exp $
|
||||
--- man/Makefile.in.orig Tue Jul 24 10:27:37 2001
|
||||
+++ man/Makefile.in Mon Aug 27 11:23:34 2001
|
||||
@@ -103,7 +103,7 @@ lispdir = @lispdir@
|
||||
|
||||
VERSION = @VERSION@
|
||||
mandir = @mandir@
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- misc/Makefile.in.orig Wed May 23 16:54:14 2001
|
||||
+++ misc/Makefile.in Tue May 29 20:57:56 2001
|
||||
@@ -218,13 +218,13 @@ installcheck: installcheck-am
|
||||
--- misc/Makefile.in.orig Thu Jul 26 16:00:28 2001
|
||||
+++ misc/Makefile.in Mon Aug 27 11:23:34 2001
|
||||
@@ -224,13 +224,13 @@ installcheck: installcheck-am
|
||||
install-exec-am: install-binSCRIPTS
|
||||
install-exec: install-exec-am
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user