diff options
-rw-r--r-- | converters/libiconv/Makefile | 2 | ||||
-rw-r--r-- | converters/libiconv/distinfo | 2 | ||||
-rw-r--r-- | converters/libiconv/files/patch-aa | 18 | ||||
-rw-r--r-- | converters/libiconv/files/patch-ab | 24 | ||||
-rw-r--r-- | converters/libiconv/files/patch-ac | 22 |
5 files changed, 34 insertions, 34 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index dc731d892677..31b218d54242 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libiconv -PORTVERSION= 1.3 +PORTVERSION= 1.4 CATEGORIES= converters devel MASTER_SITES= ftp://ftp.ilog.fr/pub/Users/haible/gnu/ diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index 614990f88c6b..53e1591633f8 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1 +1 @@ -MD5 (libiconv-1.3.tar.gz) = f9cfd787f89e1614c642e905f27f5891 +MD5 (libiconv-1.4.tar.gz) = c633bd31dc8a5e706504d715eae722b1 diff --git a/converters/libiconv/files/patch-aa b/converters/libiconv/files/patch-aa index c40a5613240f..f129ee2a06f0 100644 --- a/converters/libiconv/files/patch-aa +++ b/converters/libiconv/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Tue Jul 18 09:47:28 2000 -+++ Makefile.in Tue Jul 18 09:48:50 2000 +--- 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)' @@ -9,11 +9,11 @@ install : force cd src; $(MAKE) -r install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' - if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi - if [ ! -d $(exec_prefix) ] ; then mkdir $(exec_prefix) ; fi - if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi -- $(INSTALL_DATA) include/iconv.h $(includedir)/iconv.h -+ $(INSTALL_DATA) include/iconv.h $(includedir)/giconv.h + if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi + if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi + 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 @@ -21,8 +21,8 @@ uninstall : force cd src; $(MAKE) -r uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)' -- $(RM) $(includedir)/iconv.h -+ $(RM) $(includedir)/giconv.h +- $(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 diff --git a/converters/libiconv/files/patch-ab b/converters/libiconv/files/patch-ab index 721ef9cb4458..38408951f728 100644 --- a/converters/libiconv/files/patch-ab +++ b/converters/libiconv/files/patch-ab @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig Tue Jul 18 09:37:10 2000 -+++ src/Makefile.in Tue Jul 18 09:46:08 2000 +--- 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 = @@ -22,20 +22,20 @@ + $(LIBTOOL_INSTALL) $(INSTALL_DATA) libgiconv.la $(libdir)/libgiconv.la install : all force - if [ ! -d $(prefix) ] ; then mkdir $(prefix) ; fi - if [ ! -d $(exec_prefix) ] ; then mkdir $(exec_prefix) ; fi - 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 - if test -n "@PLUGLIB@"; then $(INSTALL_DATA) @PLUGLIB@ $(libdir)/@PLUGLIB@.new && mv $(libdir)/@PLUGLIB@.new $(libdir)/@PLUGLIB@ ; fi + 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 $(libdir) ] ; then mkdir $(libdir) ; fi + if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi uninstall : force -- $(LIBTOOL_UNINSTALL) $(RM) $(libdir)/libiconv.la -+ $(LIBTOOL_UNINSTALL) $(RM) $(libdir)/libgiconv.la - if test -n "@PLUGLIB@"; then $(RM) $(libdir)/@PLUGLIB@ ; fi +- $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libiconv.la ++ $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libgiconv.la + if test -n "@PLUGLIB@"; then $(RM) $(DESTDIR)$(libdir)/@PLUGLIB@ ; fi check : all diff --git a/converters/libiconv/files/patch-ac b/converters/libiconv/files/patch-ac index d05300b64ef0..2b689fc6029f 100644 --- a/converters/libiconv/files/patch-ac +++ b/converters/libiconv/files/patch-ac @@ -1,20 +1,20 @@ ---- man/Makefile.in.orig Tue Jul 18 09:52:08 2000 -+++ man/Makefile.in Tue Jul 18 09:53:20 2000 +--- 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 $(prefix) ] ; then mkdir $(prefix) ; fi - if [ ! -d $(mandir) ] ; then mkdir $(mandir) ; fi - if [ ! -d $(mandir)/man3 ] ; then mkdir $(mandir)/man3 ; fi -- cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(mandir)/man3/$$f ; $(INSTALL_DATA) $$f $(mandir)/man3/$$f ; done -+ cd $(srcdir) && for f in *.3 ; do echo $(INSTALL_DATA) $$f $(mandir)/man3/g$$f ; $(INSTALL_DATA) $$f $(mandir)/man3/g$$f ; done + if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi + if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi + 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 $(prefix) ] ; then mkdir $(prefix) ; fi + if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi @@ -38,7 +38,7 @@ - if [ ! -d $(mandir)/man3 ] ; then mkdir $(mandir)/man3 ; fi + if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi uninstall : force -- cd $(srcdir) && for f in *.3 ; do echo $(RM) $(mandir)/man3/$$f ; $(RM) $(mandir)/man3/$$f ; done -+ cd $(srcdir) && for f in *.3 ; do echo $(RM) $(mandir)/man3/g$$f ; $(RM) $(mandir)/man3/g$$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 : |