diff options
Diffstat (limited to 'converters/libiconv/files')
| -rw-r--r-- | converters/libiconv/files/patch-aa | 27 | ||||
| -rw-r--r-- | converters/libiconv/files/patch-ab | 62 | ||||
| -rw-r--r-- | converters/libiconv/files/patch-ac | 25 | ||||
| -rw-r--r-- | converters/libiconv/files/patch-ad | 63 | ||||
| -rw-r--r-- | converters/libiconv/files/patch-ae | 63 |
5 files changed, 168 insertions, 72 deletions
diff --git a/converters/libiconv/files/patch-aa b/converters/libiconv/files/patch-aa index f129ee2a06f0..e5e3dd08992d 100644 --- a/converters/libiconv/files/patch-aa +++ b/converters/libiconv/files/patch-aa @@ -1,28 +1,17 @@ ---- Makefile.in.orig Fri Sep 15 11:32:25 2000 -+++ Makefile.in Mon Nov 20 18:45:55 2000 -@@ -36,14 +36,14 @@ - install-lib : all force - cd src; $(MAKE) -r install-lib libdir='$(libdir)' includedir='$(includedir)' +--- Makefile.in.orig Tue Dec 12 13:39:43 2000 ++++ Makefile.in Thu Feb 8 22:56:38 2001 +@@ -40,3 +40,3 @@ if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi - $(INSTALL_DATA) include/iconv.h $(includedir)/iconv.h + $(INSTALL_DATA) include/iconv.h $(includedir)/giconv.h - install : force - cd src; $(MAKE) -r install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi - if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi +@@ -49,3 +49,3 @@ if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi - $(INSTALL_DATA) include/iconv.h $(DESTDIR)$(includedir)/iconv.h + $(INSTALL_DATA) include/iconv.h $(DESTDIR)$(includedir)/giconv.h - cd man; $(MAKE) -r install prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)' - - installdirs : force -@@ -55,7 +55,7 @@ - - uninstall : force - cd src; $(MAKE) -r uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' + cd man && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)' +@@ -65,3 +65,3 @@ + cd src && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - $(RM) $(DESTDIR)$(includedir)/iconv.h + $(RM) $(DESTDIR)$(includedir)/giconv.h - cd man; $(MAKE) -r uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)' - - check : force + cd man && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' mandir='$(mandir)' diff --git a/converters/libiconv/files/patch-ab b/converters/libiconv/files/patch-ab index 38408951f728..a9fc3338dc55 100644 --- a/converters/libiconv/files/patch-ab +++ b/converters/libiconv/files/patch-ab @@ -1,41 +1,25 @@ ---- src/Makefile.in.orig Tue Oct 24 02:24:41 2000 -+++ src/Makefile.in Mon Nov 20 18:54:10 2000 -@@ -49,10 +49,10 @@ - - PLUG_SOURCES = - --all : libiconv.la @PLUGLIB@ -+all : libgiconv.la @PLUGLIB@ - --libiconv.la : $(OBJECTS) -- $(LIBTOOL_LINK) $(CC) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS) -+libgiconv.la : $(OBJECTS) -+ $(LIBTOOL_LINK) $(CC) -o libgiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS) - - libiconv_plug.so : libiconv_plug_@OS@.so - $(RM) libiconv_plug.so -@@ -79,13 +79,13 @@ - # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. - install-lib : all force - if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi -- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la -+ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(libdir)/libgiconv.la - - install : all force - if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi - if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi - if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi -- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la -+ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(DESTDIR)$(libdir)/libgiconv.la - if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi - - installdirs : force -@@ -94,7 +94,7 @@ - if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi - +--- src/Makefile.in.orig Fri Dec 8 08:49:16 2000 ++++ src/Makefile.in Thu Feb 8 22:58:33 2001 +@@ -40,8 +40,8 @@ + +-iconv : $(srcdir)/iconv.c ../lib/libiconv.la +- $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -I../lib $(srcdir)/iconv.c ../lib/libiconv.la -o $@ ++iconv : $(srcdir)/iconv.c ../lib/libgiconv.la ++ $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -I../lib $(srcdir)/iconv.c ../lib/libgiconv.la -o $@ + + # The following rule is necessary to avoid a toplevel "make -n check" failure. +-../lib/libiconv.la : +- cd ../lib && $(MAKE) libiconv.la ++../lib/libgiconv.la : ++ cd ../lib && $(MAKE) libgiconv.la + +@@ -51,3 +51,3 @@ + if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi +- $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv ++ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/giconv + +@@ -59,3 +59,3 @@ uninstall : force -- $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libiconv.la -+ $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libgiconv.la - if test -n "@PLUGLIB@"; then $(RM) $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi +- $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/iconv ++ $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/giconv - check : all diff --git a/converters/libiconv/files/patch-ac b/converters/libiconv/files/patch-ac index 2b689fc6029f..0ea4deb8bf64 100644 --- a/converters/libiconv/files/patch-ac +++ b/converters/libiconv/files/patch-ac @@ -1,20 +1,17 @@ ---- man/Makefile.in.orig Fri Sep 15 11:32:20 2000 -+++ man/Makefile.in Mon Nov 20 18:49:09 2000 -@@ -30,7 +30,7 @@ - if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi - if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi +--- man/Makefile.in.orig Fri Dec 8 08:49:07 2000 ++++ man/Makefile.in Thu Feb 8 23:00:54 2001 +@@ -32,5 +32,5 @@ + if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then mkdir $(DESTDIR)$(mandir)/man1 ; fi +- cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; done ++ cd $(srcdir) && for f in *.1 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/g$$f ; done if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi - cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; done -+ cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/g$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/g$$f ; done - - installdirs : force - if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi -@@ -38,7 +38,7 @@ - if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi ++ cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man3/g$$f ; done +@@ -43,4 +43,4 @@ uninstall : force +- cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/$$f ; done - cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/$$f ; done -+ cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/g$$f ; $(RM) $(DESTDIR)$(mandir)/man3/g$$f ; done - - check : ++ cd $(srcdir) && for f in *.1 ; do echo $(RM) $(DESTDIR)$(mandir)/man1/$$f ; $(RM) $(DESTDIR)$(mandir)/man1/g$$f ; done ++ cd $(srcdir) && for f in *.3 ; do echo $(RM) $(DESTDIR)$(mandir)/man3/$$f ; $(RM) $(DESTDIR)$(mandir)/man3/g$$f ; done diff --git a/converters/libiconv/files/patch-ad b/converters/libiconv/files/patch-ad new file mode 100644 index 000000000000..5995da70576d --- /dev/null +++ b/converters/libiconv/files/patch-ad @@ -0,0 +1,63 @@ +--- lib/Makefile.in.orig Fri Dec 8 08:49:42 2000 ++++ lib/Makefile.in Thu Feb 8 22:59:57 2001 +@@ -1,2 +1,2 @@ +-# Makefile for libiconv/lib ++# Makefile for libgiconv/lib + +@@ -51,23 +51,23 @@ + +-all : libiconv.la @PLUGLIB@ ++all : libgiconv.la @PLUGLIB@ + +-libiconv.la : $(OBJECTS) +- $(LIBTOOL_LINK) $(CC) -o libiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS) $(LIBCHARSET_OBJECTS) ++libgiconv.la : $(OBJECTS) ++ $(LIBTOOL_LINK) $(CC) -o libgiconv.la -rpath $(libdir) -version-info $(LIBICONV_VERSION_INFO) $(OBJECTS) $(LIBCHARSET_OBJECTS) + +-libiconv_plug.so : libiconv_plug_@OS@.so +- $(RM) libiconv_plug.so +- $(LN_S) libiconv_plug_@OS@.so libiconv_plug.so ++libgiconv_plug.so : libgiconv_plug_@OS@.so ++ $(RM) libgiconv_plug.so ++ $(LN_S) libgiconv_plug_@OS@.so libgiconv_plug.so + +-libiconv_plug_linux.so : $(SOURCES) +- $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_linux.so ++libgiconv_plug_linux.so : $(SOURCES) ++ $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_linux.so + +-libiconv_plug_solaris.so : $(SOURCES) +- $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libiconv_plug_solaris.so ++libgiconv_plug_solaris.so : $(SOURCES) ++ $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -G -o libgiconv_plug_solaris.so + +-libiconv_plug_osf.so : $(SOURCES) ++libgiconv_plug_osf.so : $(SOURCES) + if test -n "@GCC@"; then \ +- $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libiconv_plug_osf.so; \ ++ $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -shared -o libgiconv_plug_osf.so; \ + else \ + $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(INCLUDES) -DPIC -DLIBICONV_PLUG $(SOURCES) $(LIBCHARSET_OBJECTS) -c -o iconv_plug.o; \ +- /bin/ld -shared -expect_unresolved \* -o libiconv_plug_osf.so iconv_plug.o; \ ++ /bin/ld -shared -expect_unresolved \* -o libgiconv_plug_osf.so iconv_plug.o; \ + fi +@@ -81,3 +81,3 @@ + if [ ! -d $(libdir) ] ; then mkdir $(libdir) ; fi +- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(libdir)/libiconv.la ++ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(libdir)/libgiconv.la + +@@ -87,3 +87,3 @@ + if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi +- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libiconv.la $(DESTDIR)$(libdir)/libiconv.la ++ $(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(DESTDIR)$(libdir)/libgiconv.la + if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(DESTDIR)$(libdir)/@PLUGLIB@.new && mv $(DESTDIR)$(libdir)/@PLUGLIB@.new $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi +@@ -96,3 +96,3 @@ + uninstall : force +- $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libiconv.la ++ $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libgiconv.la + if test -n "@PLUGLIB@"; then $(RM) $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi +@@ -104,3 +104,3 @@ + clean : force +- $(RM) *.o *.lo *.a *.la libiconv_plug* core ++ $(RM) *.o *.lo *.a *.la libgiconv_plug* core + $(RM) -r .libs _libs diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae new file mode 100644 index 000000000000..e69701bcb996 --- /dev/null +++ b/converters/libiconv/files/patch-ae @@ -0,0 +1,63 @@ + +$FreeBSD$ + +--- libcharset/lib/Makefile.in.orig Tue Dec 12 21:43:30 2000 ++++ libcharset/lib/Makefile.in Fri Feb 9 21:31:11 2001 +@@ -10,6 +10,7 @@ + local_prefix = /usr/local + exec_prefix = @exec_prefix@ + libdir = $(exec_prefix)/lib ++sysconfdir = $(exec_prefix)/etc + + # Programs used by "make": + CC = @CC@ +@@ -50,7 +51,7 @@ + $(LIBTOOL_LINK) $(CC) -o libcharset.la -rpath $(libdir) -version-info $(LIBCHARSET_VERSION_INFO) $(OBJECTS) + + localcharset.lo : $(srcdir)/localcharset.c +- $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(INCLUDES) -DHAVE_CONFIG_H -DLIBDIR=\"$(libdir)\" -c $(srcdir)/localcharset.c ++ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(INCLUDES) -DHAVE_CONFIG_H -DLIBDIR=\"$(sysconfdir)\" -c $(srcdir)/localcharset.c + + charset.alias: $(srcdir)/config.charset + $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ +@@ -69,11 +70,12 @@ + install-lib : all force + $(MKINSTALLDIRS) $(libdir) + $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la +- test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \ ++ $(MKINSTALLDIRS) $(sysconfdir) ++ test -f $(sysconfdir)/charset.alias && orig=$(sysconfdir)/charset.alias \ + || orig=charset.alias; \ +- sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \ +- $(INSTALL_DATA) $(libdir)/t-charset.alias $(libdir)/charset.alias; \ +- rm -f $(libdir)/t-charset.alias ++ sed -f ref-add.sed $$orig > $(sysconfdir)/t-charset.alias; \ ++ $(INSTALL_DATA) $(sysconfdir)/t-charset.alias $(sysconfdir)/charset.alias; \ ++ rm -f $(sysconfdir)/t-charset.alias + + # The following is needed in order to install a simple file in $(libdir) + # which is shared with other installed packages. We use a list of referencing +@@ -85,15 +87,16 @@ + install : all force + $(MKINSTALLDIRS) $(DESTDIR)$(libdir) + $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(DESTDIR)$(libdir)/libcharset.la +- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ +- sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ +- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ +- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ++ if test -f $(DESTDIR)$(sysconfdir)/charset.alias; then \ ++ sed -f ref-add.sed $(DESTDIR)$(sysconfdir)/charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \ ++ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \ ++ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \ + else \ + if test @GLIBC21@ = no; then \ +- sed -f ref-add.sed charset.alias > $(DESTDIR)$(libdir)/t-charset.alias; \ +- $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias $(DESTDIR)$(libdir)/charset.alias; \ +- rm -f $(DESTDIR)$(libdir)/t-charset.alias; \ ++ sed -f ref-add.sed charset.alias > $(DESTDIR)$(sysconfdir)/t-charset.alias; \ ++ $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/t-charset.alias $(DESTDIR)$(sysconfdir)/charset.alias; \ ++ rm -f $(DESTDIR)$(sysconfdir)/t-charset.alias; \ + fi ; \ + fi + |