head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.1 OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_2_STABLE:1.1 OPENPKG_E1_FP:1.1 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1 OPENPKG_2_STABLE_20060622:1.1 OPENPKG_2_STABLE:1.1.0.4 OPENPKG_2_STABLE_BP:1.1 OPENPKG_2_5_RELEASE:1.1 OPENPKG_2_5_SOLID:1.1.0.2 OPENPKG_2_5_SOLID_BP:1.1; locks; strict; comment @# @; 1.4 date 2009.07.01.08.54.20; author rse; state Exp; branches; next 1.3; commitid CZ2azUowJjqJfZTt; 1.3 date 2009.04.01.05.30.11; author rse; state Exp; branches; next 1.2; commitid 3lc6x1JhAQP23hIt; 1.2 date 2007.11.12.07.45.55; author rse; state Exp; branches; next 1.1; commitid y18FJjHG23B14gFs; 1.1 date 2005.07.27.07.31.42; author rse; state Exp; branches; next ; desc @@ 1.4 log @upgrading package: libiconv 1.13 -> 1.13.1 @ text @Index: configure --- configure.orig 2009-06-30 22:51:53 +0200 +++ configure 2009-07-01 10:46:05 +0200 @@@@ -4306,13 +4306,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $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; }; }; } + : fi ac_ext=c Index: libcharset/configure --- libcharset/configure.orig 2009-06-30 22:52:12 +0200 +++ libcharset/configure 2009-07-01 10:46:05 +0200 @@@@ -3199,13 +3199,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $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; }; }; } + : fi ac_ext=c Index: src/Makefile.in --- src/Makefile.in.orig 2009-06-21 13:17:33 +0200 +++ src/Makefile.in 2009-07-01 10:51:16 +0200 @@@@ -111,11 +111,7 @@@@ # ../lib/libiconv.la entirely. install : all force if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi - case "@@host_os@@" in \ - hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@@OBJEXT@@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @@LIBINTL@@ $(OBJECTS_RES_@@WOE32@@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \ - *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@@OBJEXT@@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @@LTLIBINTL@@ $(OBJECTS_RES_@@WOE32@@) -o iconv$(EXEEXT);; \ - esac - $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv_no_i18n$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT) install-strip : force case '$(INSTALL_PROGRAM)' in \ @ 1.3 log @upgrading package: libiconv 1.12 -> 1.13 @ text @d2 3 a4 3 --- configure.orig 2009-03-26 13:10:59 +0100 +++ configure 2009-03-31 21:00:49 +0200 @@@@ -4240,13 +4240,7 @@@@ d20 2 a21 2 --- libcharset/configure.orig 2009-03-26 13:11:20 +0100 +++ libcharset/configure 2009-03-31 21:01:20 +0200 d38 2 a39 2 --- src/Makefile.in.orig 2009-01-17 10:00:59 +0100 +++ src/Makefile.in 2009-03-31 20:45:48 +0200 d45 2 a46 2 - hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@@OBJEXT@@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @@LIBINTL@@ $(OBJECTS_RES_@@WOE32@@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \ - *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@@OBJEXT@@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @@LTLIBINTL@@ $(OBJECTS_RES_@@WOE32@@) -o iconv;; \ d48 2 a49 2 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv_no_i18n $(DESTDIR)$(bindir)/iconv @ 1.2 log @upgrading package: libiconv 1.11 -> 1.12 @ text @d1 36 d38 3 a40 3 --- src/Makefile.in.orig 2007-05-28 00:15:52 +0200 +++ src/Makefile.in 2007-11-12 08:42:45 +0100 @@@@ -102,11 +102,7 @@@@ d51 2 a52 2 installdirs : force if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi @ 1.1 log @upgrading package: libiconv 1.9.2 -> 1.10 @ text @d2 5 a6 5 --- src/Makefile.in.orig 2005-06-09 21:04:50 +0200 +++ src/Makefile.in 2005-07-27 09:30:39 +0200 @@@@ -90,11 +90,7 @@@@ if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi d9 2 a10 2 - hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@@OBJEXT@@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @@LIBINTL@@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \ - *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@@OBJEXT@@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @@LTLIBINTL@@ -o iconv;; \ d16 1 a16 1 if [ ! -d $(DESTDIR)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi @