cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename patches; sync with libtool

Browse Source
This commit is contained in:
danh 2001-02-19 20:25:49 +00:00
parent 30c19863f4
commit 9d61381df1
12 changed files with 90 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/gettext/patches/patch-ab
View File

@ -1,12 +0,0 @@
--- m4/gettext.m4.orig Sun Feb 6 01:35:59 2000
+++ m4/gettext.m4 Sun Feb 6 01:36:49 2000
@@ -73,6 +73,9 @@
INSTOBJEXT=.mo
fi
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ INTLLIBS='-lintl'
+ fi
])
if test "$CATOBJEXT" = "NONE"; then

10
devel/gettext/patches/patch-af
View File

@ -1,10 +0,0 @@
--- misc/locale.alias.orig Sat Oct 19 23:40:54 1996
+++ misc/locale.alias Thu Dec 3 20:11:52 1998
@@ -40,6 +40,7 @@
icelandic is_IS.ISO-8859-1
italian it_CH.ISO-8859-1
japanese ja_JP.EUC
+korean ko_KR.EUC
norwegian no_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
portuguese pt_PT.ISO-8859-1

11
devel/gettext/patches/patch-ae → devel/gettext/patches/patch-configure
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2001/02/19 20:25:50 danh Exp $
--- configure.orig Fri May 1 01:48:25 1998
+++ configure Sun Feb 6 01:46:33 2000
@@ -837,13 +837,8 @@
+++ configure Mon Feb 19 15:16:34 2001
@@ -837,13 +837,8 @@ echo "configure:837: checking for workin
# 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.
@ -14,7 +15,7 @@
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
echo "configure:850: checking for working autoconf" >&5
@@ -863,13 +858,8 @@
@@ -863,13 +858,8 @@ echo "configure:863: checking for workin
# 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.
@ -28,7 +29,7 @@
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
echo "configure:876: checking for working autoheader" >&5
@@ -3958,7 +3948,7 @@
@@ -3958,7 +3948,7 @@ fi
fi
@ -37,7 +38,7 @@
test -d po || mkdir po
@@ -4004,7 +3994,7 @@
@@ -4004,7 +3994,7 @@ else
;;
esac
fi

5
devel/gettext/patches/patch-ad → devel/gettext/patches/patch-doc_Makefile_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1 2001/02/19 20:25:50 danh Exp $
--- doc/Makefile.in.orig Fri May 1 02:47:15 1998
+++ doc/Makefile.in Tue Dec 7 21:58:58 1999
@@ -79,7 +79,7 @@
+++ doc/Makefile.in Mon Feb 19 15:16:33 2001
@@ -79,7 +79,7 @@ LD = @LD@
LIBOBJS = @LIBOBJS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@

5
devel/gettext/patches/patch-ah → devel/gettext/patches/patch-intl_Makefile_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-intl_Makefile_in,v 1.1 2001/02/19 20:25:50 danh Exp $
--- intl/Makefile.in.orig Mon Apr 27 17:53:18 1998
+++ intl/Makefile.in Tue Mar 7 17:03:17 2000
@@ -114,26 +114,26 @@
+++ intl/Makefile.in Mon Feb 19 15:16:34 2001
@@ -114,26 +114,26 @@ install-exec: all
if test "$(PACKAGE)" = "gettext" \
&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \
if test -r $(MKINSTALLDIRS); then \

9
devel/gettext/patches/patch-ltconfig
View File

@ -1,6 +1,7 @@
--- ltconfig.orig Wed Mar 25 10:25:39 1998
+++ ltconfig Sat Jan 13 20:18:19 2001
@@ -702,7 +702,7 @@
$OpenBSD: patch-ltconfig,v 1.4 2001/02/19 20:25:50 danh Exp $
--- ltconfig.orig Mon Apr 27 17:22:35 1998
+++ ltconfig Mon Feb 19 15:16:34 2001
@@ -702,7 +702,7 @@ hardcode_shlibpath_var=unsupported
runpath_var=
case "$host_os" in
@ -9,7 +10,7 @@
# On these operating systems, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
@@ -815,10 +815,21 @@
@@ -815,10 +815,21 @@ else
;;
openbsd*)

39
devel/gettext/patches/patch-ag → devel/gettext/patches/patch-ltmain_sh
View File

@ -1,6 +1,37 @@
--- ltmain.sh.orig Wed Mar 25 10:25:39 1998
+++ ltmain.sh Sat Oct 21 14:18:54 2000
@@ -1002,7 +1002,15 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/19 20:25:50 danh Exp $
--- ltmain.sh.orig Mon Apr 27 17:22:35 1998
+++ ltmain.sh Mon Feb 19 15:18:39 2001
@@ -506,7 +506,28 @@ if test -z "$show_help"; then
deplibs="$deplibs $arg"
;;
- -l*) deplibs="$deplibs $arg" ;;
+ -l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ ;;
+
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
-no-undefined)
allow_undefined=no
@@ -1002,7 +1023,15 @@ if test -z "$show_help"; then
# Add libc to deplibs on all systems.
dependency_libs="$deplibs"
@ -17,7 +48,7 @@
if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library.
@@ -2023,37 +2031,6 @@
@@ -2023,37 +2052,6 @@ libdir='$install_libdir'\
done
fi

13
devel/gettext/patches/patch-m4_gettext_m4 Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-m4_gettext_m4,v 1.1 2001/02/19 20:25:50 danh Exp $
--- m4/gettext.m4.orig Fri May 1 01:45:20 1998
+++ m4/gettext.m4 Mon Feb 19 15:16:33 2001
@@ -73,6 +73,9 @@ AC_DEFUN(AM_WITH_NLS,
INSTOBJEXT=.mo
fi
fi
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
+ INTLLIBS='-lintl'
+ fi
])
if test "$CATOBJEXT" = "NONE"; then

5
devel/gettext/patches/patch-aa → devel/gettext/patches/patch-misc_Makefile_in
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-misc_Makefile_in,v 1.1 2001/02/19 20:25:50 danh Exp $
--- misc/Makefile.in.orig Fri May 1 02:47:40 1998
+++ misc/Makefile.in Tue Mar 7 18:52:56 2000
@@ -232,13 +232,13 @@
+++ misc/Makefile.in Mon Feb 19 15:16:33 2001
@@ -232,13 +232,13 @@ installcheck:
install-exec: install-binSCRIPTS
@$(NORMAL_INSTALL)

11
devel/gettext/patches/patch-misc_locale_alias Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-misc_locale_alias,v 1.1 2001/02/19 20:25:51 danh Exp $
--- misc/locale.alias.orig Sat Oct 19 11:40:54 1996
+++ misc/locale.alias Mon Feb 19 15:16:34 2001
@@ -40,6 +40,7 @@ hungarian hu_HU.ISO-8859-2
icelandic is_IS.ISO-8859-1
italian it_CH.ISO-8859-1
japanese ja_JP.EUC
+korean ko_KR.EUC
norwegian no_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
portuguese pt_PT.ISO-8859-1

7
devel/gettext/patches/patch-ac → devel/gettext/patches/patch-misc_po-mode_el
View File

@ -1,6 +1,7 @@
--- misc/po-mode.el.orig Sun Jan 30 12:22:43 2000
+++ misc/po-mode.el Sun Jan 30 12:22:55 2000
@@ -330,7 +330,7 @@
$OpenBSD: patch-misc_po-mode_el,v 1.1 2001/02/19 20:25:51 danh Exp $
--- misc/po-mode.el.orig Wed Apr 29 18:28:56 1998
+++ misc/po-mode.el Mon Feb 19 15:16:33 2001
@@ -330,7 +330,7 @@ slightly different."
:type 'face
:group 'po)

13
devel/gettext/patches/patch-ai → devel/gettext/patches/patch-po_Makefile_in_in
View File

@ -1,6 +1,7 @@
--- po/Makefile.in.in.orig Tue Mar 7 17:18:48 2000
+++ po/Makefile.in.in Tue Mar 7 17:24:25 2000
@@ -111,9 +111,9 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/02/19 20:25:51 danh Exp $
--- po/Makefile.in.in.orig Tue Apr 28 21:53:09 1998
+++ po/Makefile.in.in Mon Feb 19 15:16:34 2001
@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
@ -12,7 +13,7 @@
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
@@ -123,7 +123,7 @@
@@ -123,7 +123,7 @@ install-data-yes: all
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
@ -21,7 +22,7 @@
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
@@ -153,12 +153,12 @@
@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
@ -37,7 +38,7 @@
else \
: ; \
fi
@@ -171,12 +171,12 @@
@@ -171,12 +171,12 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \