Date: Thu, 13 Mar 2008 18:01:39 GMT From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gnome@FreeBSD.org Subject: [PATCH] Update libiconv to 1.12 Message-ID: <200803131801.m2DI1dJw097501@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users
>Originator: Xin LI
>Organization: The FreeBSD Project
>Confidential: no
>Synopsis: [PATCH] Update libiconv to 1.12
>Severity: non-critical
>Priority: low
>Category: ports
>Class: update
>Release: FreeBSD 7.0-STABLE i386
>Environment:
System: FreeBSD freefall.freebsd.org 7.0-STABLE FreeBSD 7.0-STABLE #33: Fri Feb 29 00:53:41 UTC 2008 simon@freefall.freebsd.org:/usr/src/sys/i386/compile/FREEFALL i386
>Description:
Attached patch updates libiconv to 1.12.
>How-To-Repeat:
>Fix:
--- libiconv-1.12.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 27 Oct 2007 15:31:50 -0000 1.43
+++ Makefile 13 Mar 2008 17:27:54 -0000
@@ -6,11 +6,9 @@
#
PORTNAME= libiconv
-PORTVERSION= 1.11
-PORTREVISION= 1
+PORTVERSION= 1.12
CATEGORIES= converters devel
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= gnome@FreeBSD.org
COMMENT= A character set conversion library
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 27 Oct 2007 15:31:50 -0000 1.14
+++ distinfo 13 Mar 2008 17:28:53 -0000
@@ -1,6 +1,6 @@
-MD5 (libiconv-1.11.tar.gz) = b77a17e4a5a817100ad4b2613935055e
-SHA256 (libiconv-1.11.tar.gz) = fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
-SIZE (libiconv-1.11.tar.gz) = 4430930
-MD5 (libiconv-1.11-cp932.patch.gz) = 1d6c7711b6ec76c9c42230d8e097baa0
-SHA256 (libiconv-1.11-cp932.patch.gz) = 48ed20ab2bd59d9af9fa6d4328b363849bf0e155b70bdbe137dc8973341b65d1
-SIZE (libiconv-1.11-cp932.patch.gz) = 112830
+MD5 (libiconv-1.12.tar.gz) = c2be282595751535a618ae0edeb8f648
+SHA256 (libiconv-1.12.tar.gz) = a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd
+SIZE (libiconv-1.12.tar.gz) = 4513309
+MD5 (libiconv-1.12-cp932.patch.gz) = b9c8ba86247f21d1a344e743bf025126
+SHA256 (libiconv-1.12-cp932.patch.gz) = 1f23a91ebb687d5283d7ca00000b09f0fd59466d40fa0aafc19b9b36ce523714
+SIZE (libiconv-1.12-cp932.patch.gz) = 107962
Index: files/patch-src::Makefile.in
===================================================================
RCS file: /home/ncvs/ports/converters/libiconv/files/patch-src::Makefile.in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src::Makefile.in
--- files/patch-src::Makefile.in 24 Oct 2007 23:35:01 -0000 1.2
+++ files/patch-src::Makefile.in 13 Mar 2008 17:55:40 -0000
@@ -1,10 +1,10 @@
---- src/Makefile.in.orig Fri Jul 14 09:19:07 2006
-+++ src/Makefile.in Fri Jun 29 18:31:59 2007
-@@ -96,6 +96,7 @@ install : all force
+--- src/Makefile.in.orig 2007-05-27 15:15:52.000000000 -0700
++++ src/Makefile.in 2008-03-13 10:55:15.753027701 -0700
+@@ -104,6 +104,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$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -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;; \
+ 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;; \
++ freebsd*) $(LIBTOOL_LINK) $(CC) ${CFLAGS} $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv $(OBJECTS_RES_@WOE32@) @LTLIBINTL@ -o iconv;; \
+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv;; \
esac
$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
--- libiconv-1.12.diff ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803131801.m2DI1dJw097501>