diff options
author | bland <bland@FreeBSD.org> | 2004-07-09 19:14:39 +0000 |
---|---|---|
committer | bland <bland@FreeBSD.org> | 2004-07-09 19:14:39 +0000 |
commit | d876210ac8dd43b10b0fa8479256f325212f2c74 (patch) | |
tree | 2012152f1cfd9699b9ce47d05c69b67f73b819e2 /converters | |
parent | dc141d3708a748c3729f1aa1b8d65b4faa25c219 (diff) | |
download | FreeBSD-ports-d876210ac8dd43b10b0fa8479256f325212f2c74.zip FreeBSD-ports-d876210ac8dd43b10b0fa8479256f325212f2c74.tar.gz |
Update to 1.9.2
Diffstat (limited to 'converters')
-rw-r--r-- | converters/libiconv/Makefile | 5 | ||||
-rw-r--r-- | converters/libiconv/distinfo | 4 | ||||
-rw-r--r-- | converters/libiconv/files/patch-ae | 13 | ||||
-rw-r--r-- | converters/libiconv/files/patch-configure | 8 | ||||
-rw-r--r-- | converters/libiconv/files/patch-libcharset::configure | 13 | ||||
-rw-r--r-- | converters/libiconv/files/patch-src::Makefile.in | 10 |
6 files changed, 25 insertions, 28 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 25e1e56..4fd15c2 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libiconv -PORTVERSION= 1.9.1 -PORTREVISION= 3 +PORTVERSION= 1.9.2 CATEGORIES= converters devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +15,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A character set conversion library USE_REINPLACE= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER= 15 USE_GNOME= gnometarget LIBTOOLFILES= configure libcharset/configure CONFIGURE_ARGS= --enable-static \ diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo index c32688f..6ce76e6 100644 --- a/converters/libiconv/distinfo +++ b/converters/libiconv/distinfo @@ -1,2 +1,2 @@ -MD5 (libiconv-1.9.1.tar.gz) = 0c99a05e0c3c153bac1c960f78711155 -SIZE (libiconv-1.9.1.tar.gz) = 3907735 +MD5 (libiconv-1.9.2.tar.gz) = 6bc300365053c815b10b800a21e0bc7e +SIZE (libiconv-1.9.2.tar.gz) = 3919945 diff --git a/converters/libiconv/files/patch-ae b/converters/libiconv/files/patch-ae index e067d64..196d153 100644 --- a/converters/libiconv/files/patch-ae +++ b/converters/libiconv/files/patch-ae @@ -1,5 +1,5 @@ ---- libcharset/lib/Makefile.in.orig Mon Apr 14 09:51:06 2003 -+++ libcharset/lib/Makefile.in Fri Jun 13 02:32:13 2003 +--- libcharset/lib/Makefile.in.orig Mon Apr 14 22:51:06 2003 ++++ libcharset/lib/Makefile.in Sat Jul 10 02:37:15 2004 @@ -10,6 +10,7 @@ local_prefix = /usr/local exec_prefix = @exec_prefix@ @@ -26,6 +26,15 @@ relocatable.lo : $(srcdir)/relocatable.c $(srcdir)/relocatable.h $(LIBTOOL_COMPILE) $(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $(srcdir)/relocatable.c +@@ -78,7 +79,7 @@ + # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. + install-lib : all force + $(mkinstalldirs) $(libdir) +- $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcharset.la $(libdir)/libcharset.la ++ $(LIBTOOL_INSTALL) cp libcharset.la $(libdir)/libcharset.la + test -f $(libdir)/charset.alias && orig=$(libdir)/charset.alias \ + || orig=charset.alias; \ + sed -f ref-add.sed $$orig > $(libdir)/t-charset.alias; \ @@ -95,15 +96,16 @@ install : all force $(mkinstalldirs) $(DESTDIR)$(libdir) diff --git a/converters/libiconv/files/patch-configure b/converters/libiconv/files/patch-configure index 9774698..1211928 100644 --- a/converters/libiconv/files/patch-configure +++ b/converters/libiconv/files/patch-configure @@ -11,11 +11,3 @@ $FreeBSD$ ac_ext=c -@@ -19236,6 +19235,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/converters/libiconv/files/patch-libcharset::configure b/converters/libiconv/files/patch-libcharset::configure deleted file mode 100644 index 2ea39a6..0000000 --- a/converters/libiconv/files/patch-libcharset::configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- libcharset/configure 2002/04/30 07:59:47 1.1 -+++ libcharset/configure 2002/04/30 08:00:27 -@@ -5067,6 +5067,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/converters/libiconv/files/patch-src::Makefile.in b/converters/libiconv/files/patch-src::Makefile.in new file mode 100644 index 0000000..2f2b51c --- /dev/null +++ b/converters/libiconv/files/patch-src::Makefile.in @@ -0,0 +1,10 @@ +--- src/Makefile.in.orig Sat Jul 10 03:03:28 2004 ++++ src/Makefile.in Sat Jul 10 03:04:15 2004 +@@ -92,6 +92,7 @@ + if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi + case "@host_os@" in \ + hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(libdir) -liconv @LIBINTL@ -o iconv;; \ ++ freebsd*) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib//libiconv.la @LTLIBINTL@ -o iconv;; \ + *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \ + esac + $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv |