head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.6 OPENPKG_E1_MP:1.6 OPENPKG_E1_MP_2_STABLE:1.5.2.1 OPENPKG_E1_FP:1.5.2.1 OPENPKG_2_STABLE_MP:1.6 OPENPKG_2_STABLE_20061018:1.5 OPENPKG_2_STABLE_20060622:1.5 OPENPKG_2_STABLE:1.5.0.2 OPENPKG_2_STABLE_BP:1.5 OPENPKG_2_5_RELEASE:1.4 OPENPKG_2_5_SOLID:1.4.0.2 OPENPKG_2_5_SOLID_BP:1.4 OPENPKG_CW_FP:1.2; locks; strict; comment @# @; 1.8 date 2009.09.06.21.14.49; author rse; state Exp; branches; next 1.7; commitid 348JLDcEx6rfcF2u; 1.7 date 2009.04.06.20.32.33; author rse; state Exp; branches; next 1.6; commitid 5vWxkc7vVC2ESZIt; 1.6 date 2006.10.22.17.53.43; author rse; state Exp; branches; next 1.5; commitid esH7ZKUyVyONPHRr; 1.5 date 2006.06.04.13.50.15; author rse; state Exp; branches 1.5.2.1; next 1.4; commitid 43Srjc5ySzngZGzr; 1.4 date 2005.08.29.05.57.11; author rse; state Exp; branches; next 1.3; 1.3 date 2005.07.08.11.54.23; author rse; state Exp; branches; next 1.2; 1.2 date 2005.02.16.21.56.02; author rse; state Exp; branches; next 1.1; 1.1 date 2004.02.01.10.40.46; author rse; state Exp; branches; next ; 1.5.2.1 date 2006.10.22.17.57.22; author rse; state Exp; branches; next ; commitid UWF4ILtPkmf3RHRr; desc @@ 1.8 log @upgrading package: libedit 3.0.20090722 -> 3.0.20090905 @ text @Index: configure --- configure.orig 2009-09-05 14:41:22 +0200 +++ configure 2009-09-06 23:09:15 +0200 @@@@ -6712,10 +6712,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } + : fi ac_ext=c Index: src/unvis.c --- src/unvis.c.orig 2009-09-05 13:47:56 +0200 +++ src/unvis.c 2009-09-06 23:04:33 +0200 @@@@ -45,7 +45,7 @@@@ #include #include -#ifdef __weak_alias +#if defined(__linux) && defined(__weak_alias) __weak_alias(strunvis,_strunvis) #endif Index: src/vi.c --- src/vi.c.orig 2009-09-05 13:47:56 +0200 +++ src/vi.c 2009-09-06 23:04:33 +0200 @@@@ -916,14 +916,14 @@@@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__linux__) && defined(__weak_reference) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t /*ARGSUSED*/ vi_alias(EditLine *el, int c) { -#ifdef __weak_reference +#if defined(__linux__) && defined(__weak_reference) char alias_name[3]; char *alias_text; @ 1.7 log @upgrading package: libedit 3.0.20090111 -> 3.0.20090405 @ text @d2 5 a6 5 --- configure.orig 2009-04-05 17:40:30 +0200 +++ configure 2009-04-06 22:25:23 +0200 @@@@ -6550,13 +6550,7 @@@@ if $ac_preproc_ok; then : d8 1 a8 1 - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 d10 3 a12 6 -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + : d17 2 a18 2 --- src/unvis.c.orig 2009-04-05 17:30:28 +0200 +++ src/unvis.c 2009-04-06 22:25:03 +0200 d29 2 a30 2 --- src/vi.c.orig 2009-04-05 17:30:28 +0200 +++ src/vi.c 2009-04-06 22:25:03 +0200 @ 1.6 log @upgrading package: libedit 2.9.20060829 -> 2.9.20061022 @ text @d1 18 d20 2 a21 2 --- src/unvis.c.orig 2006-10-22 15:25:36 +0200 +++ src/unvis.c 2006-10-22 19:51:19 +0200 d32 3 a34 3 --- src/vi.c.orig 2006-10-22 15:25:36 +0200 +++ src/vi.c 2006-10-22 19:51:55 +0200 @@@@ -915,14 +915,14 @@@@ @ 1.5 log @upgrading package: libedit 2.9.20060213 -> 2.9.20060603 @ text @d2 2 a3 2 --- src/unvis.c.orig 2006-06-03 21:54:21 +0200 +++ src/unvis.c 2006-06-04 15:47:58 +0200 d14 11 a24 3 --- src/vi.c.orig 2006-06-03 21:54:21 +0200 +++ src/vi.c 2006-06-04 15:48:16 +0200 @@@@ -919,7 +919,7 @@@@ d32 1 a32 1 extern char *get_alias_text(const char *) @ 1.5.2.1 log @MFC: latest version @ text @d2 2 a3 2 --- src/unvis.c.orig 2006-10-22 15:25:36 +0200 +++ src/unvis.c 2006-10-22 19:51:19 +0200 d14 3 a16 11 --- src/vi.c.orig 2006-10-22 15:25:36 +0200 +++ src/vi.c 2006-10-22 19:51:55 +0200 @@@@ -915,14 +915,14 @@@@ * NB: posix implies that we should enter insert mode, however * this is against historical precedent... */ -#ifdef __weak_reference +#if defined(__linux__) && defined(__weak_reference) extern char *get_alias_text(const char *) __weak_reference(get_alias_text); #endif protected el_action_t d24 1 a24 1 @ 1.4 log @upgrading package: libedit 2.9.20050816 -> 2.9.20050828 @ text @d2 3 a4 3 --- src/unvis.c.orig 2005-08-28 10:25:26 +0200 +++ src/unvis.c 2005-08-29 07:56:18 +0200 @@@@ -40,7 +40,7 @@@@ d9 1 a9 1 +#if defined(__linux) && __weak_alias a10 1 __weak_alias(unvis,_unvis) d12 13 @ 1.3 log @upgrading package: libedit 2.6.7 -> 2.9.20050707 @ text @d2 3 a4 3 --- src/unvis.c.orig 2005-07-07 20:58:24 +0200 +++ src/unvis.c 2005-07-08 13:50:16 +0200 @@@@ -40,12 +40,12 @@@@ d9 1 a9 1 +#if defined(__linux) && defined(__weak_alias) a12 6 -#ifdef __warn_references +#if defined(__linux) && defined(__warn_references) __warn_references(unvis, "warning: reference to compatibility unvis(); include for correct reference") #endif @ 1.2 log @fix building under Solaris @ text @d1 18 a18 90 Index: Makefile.in --- Makefile.in.orig 2002-03-25 22:20:42.000000000 +0100 +++ Makefile.in 2005-02-16 22:55:07.510906984 +0100 @@@@ -65,7 +65,7 @@@@ .SUFFIXES : .SUFFIXES : .c .o .o_a .o_s -all : lib_a lib_s +all : lib_a lib_a : $(LIB_A) lib_s : $(LIB_S) @@@@ -76,8 +76,8 @@@@ install_hdr : @@for i in $(HDR_DIRS) ; do \ - echo "$(INSTALL) -d $(PREFIX)/$$i/"; \ - $(INSTALL) -d $(PREFIX)/$$i/; \ + echo "$(INSTALL) -d $(PREFIX)/$$i"; \ + $(INSTALL) -d $(PREFIX)/$$i; \ done @@for i in $(IHDRS); do \ echo "$(INSTALL) -m 0444 $$i $(PREFIX)/include/`dirname $$i`/"; \ @@@@ -90,18 +90,18 @@@@ else \ echo "rm -f $(PREFIX)/include/$$i"; \ rm -f $(PREFIX)/include/$$i; \ - echo "ln -s $$f $(PREFIX)/include/$$i"; \ - ln -s $$f $(PREFIX)/include/$$i; \ + echo "ln $$f $(PREFIX)/include/$$i"; \ + ln $$f $(PREFIX)/include/$$i; \ f=; \ fi; \ done -install_lib : install_lib_a install_lib_s +install_lib : install_lib_a install_lib_common : @@for i in $(LIB_DIRS) ; do \ - echo "$(INSTALL) -d $(PREFIX)/$$i/"; \ - $(INSTALL) -d $(PREFIX)/$$i/; \ + echo "$(INSTALL) -d $(PREFIX)/$$i"; \ + $(INSTALL) -d $(PREFIX)/$$i; \ done install_lib_a : $(LIB_A) install_lib_common @@@@ -113,8 +113,8 @@@@ else \ echo "rm -f $(PREFIX)/lib/$$i"; \ rm -f $(PREFIX)/lib/$$i; \ - echo "ln -s $$f $(PREFIX)/lib/$$i"; \ - ln -s $$f $(PREFIX)/lib/$$i; \ + echo "ln $$f $(PREFIX)/lib/$$i"; \ + ln $$f $(PREFIX)/lib/$$i; \ f=; \ fi; \ done @@@@ -128,16 +128,16 @@@@ else \ echo "rm -f $(PREFIX)/lib/$$i"; \ rm -f $(PREFIX)/lib/$$i; \ - echo "ln -s $$f $(PREFIX)/lib/$$i"; \ - ln -s $$f $(PREFIX)/lib/$$i; \ + echo "ln $$f $(PREFIX)/lib/$$i"; \ + ln $$f $(PREFIX)/lib/$$i; \ f=; \ fi; \ done install_man : @@for i in $(MAN_DIRS) ; do \ - echo "$(INSTALL) -d $(PREFIX)/$$i/"; \ - $(INSTALL) -d $(PREFIX)/$$i/; \ + echo "$(INSTALL) -d $(PREFIX)/$$i"; \ + $(INSTALL) -d $(PREFIX)/$$i; \ done @@for i in $(MAN3); do \ echo $(INSTALL) -m 0444 $$i $(PREFIX)/man/man3/; \ @@@@ -150,8 +150,8 @@@@ else \ echo "rm -f $(PREFIX)/man/man3/$$i"; \ rm -f $(PREFIX)/man/man3/$$i; \ - echo "ln -s $$f $(PREFIX)/man/man3/$$i"; \ - ln -s $$f $(PREFIX)/man/man3/$$i; \ + echo "ln $$f $(PREFIX)/man/man3/$$i"; \ + ln $$f $(PREFIX)/man/man3/$$i; \ f=; \ fi; \ done @ 1.1 log @new package: libedit 2.6.7 (Line Editing Library) @ text @d3 1 a3 1 +++ Makefile.in 2004-02-01 11:37:31.000000000 +0100 d13 12 a24 1 @@@@ -90,13 +90,13 @@@@ d41 7 d59 1 a59 1 @@@@ -128,8 +128,8 @@@@ d70 10 @