[63299] trunk/dports/textproc/libiconv

ryandesign at macports.org ryandesign at macports.org
Mon Feb 1 04:25:21 PST 2010 

Revision: 63299
          http://trac.macports.org/changeset/63299
Author:   ryandesign at macports.org
Date:     2010-02-01 04:25:17 -0800 (Mon, 01 Feb 2010)
Log Message:
-----------
libiconv:

 * update to 1.13.1
 * simplify enable_cp932fix variant to just add a patchfile
 * remove disable_utf8mac variant; utf8mac support is now always on
 * remove unnecessary mandir configure arg
 * don't put the version number in the doc directory name

Modified Paths:
--------------
    trunk/dports/textproc/libiconv/Portfile
    trunk/dports/textproc/libiconv/files/patch-Makefile.devel
    trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff
    trunk/dports/textproc/libiconv/files/patch-utf8mac.diff

Modified: trunk/dports/textproc/libiconv/Portfile
===================================================================
--- trunk/dports/textproc/libiconv/Portfile	2010-02-01 11:55:03 UTC (rev 63298)
+++ trunk/dports/textproc/libiconv/Portfile	2010-02-01 12:25:17 UTC (rev 63299)
@@ -4,19 +4,17 @@
 PortGroup               muniversal 1.0
 
 name                    libiconv
-version                 1.13
+version                 1.13.1
+set cp932fix_version    1.13
+set cp932fix_patchfile  ${name}-${cp932fix_version}-cp932-devel.patch.gz
 categories              textproc
 maintainers             ryandesign
 platforms               darwin freebsd linux
 homepage                http://www.gnu.org/software/libiconv/
-distfiles               ${distname}${extract.suffix}:gnu
-extract.only            ${distname}${extract.suffix}
+master_sites            gnu
+patch_sites             http://www2d.biglobe.ne.jp/~msyk/software/libiconv/
 use_parallel_build      yes
 
-master_sites \
-    gnu::gnu \
-    http://www2d.biglobe.ne.jp/~msyk/software/libiconv/:cp932fix
-
 description \
     Character set conversion library
 
@@ -27,10 +25,10 @@
 
 checksums \
     ${distname}${extract.suffix} \
-        md5     048032a3032ebd182150bdee30a5d533 \
-        sha1    10e5f7d26a59430a9a88a3d0b557634e6f72c859 \
-        rmd160  695b90c0830ee457213a9b46ae7da70f2e962c43 \
-    ${distname}-cp932-devel.patch.gz \
+        md5     7ab33ebd26687c744a37264a330bbe9a \
+        sha1    5b0524131cf0d7abd50734077f13aaa5508f6bbe \
+        rmd160  a3e4b4d419006447045fde50fef0fe39bed9d501 \
+    ${cp932fix_patchfile} \
         md5     07610e708d664627b83f905832f671d4 \
         sha1    8384da4114d62018b6bed2d8973237a423c1cbf1 \
         rmd160  62852bd1cd22f0be0280c4f64bd6d256b4b00917
@@ -38,6 +36,8 @@
 depends_build \
     port:gperf
 
+# Use -p1 to accommodate the cp932fix patch
+patch.pre_args -p1
 patchfiles \
     patch-utf8mac.diff \
     patch-src-Makefile.in-darwin.diff
@@ -46,48 +46,31 @@
 configure.ldflags
 configure.args \
     --enable-static \
-    --mandir=${prefix}/share/man \
-    --docdir=${prefix}/share/doc/${name}-${version} \
+    --docdir=${prefix}/share/doc/${name} \
     --without-libiconv-prefix \
     --without-libintl-prefix \
     --disable-nls \
     --enable-extra-encodings
 
-if {![variant_isset disable_utf8mac] || [variant_isset enable_cp932fix]} {
-    build.cmd ${build.cmd} CC=${configure.cc} -f Makefile.devel && ${build.cmd}
-}
+build.cmd               ${build.cmd} CC=${configure.cc} -f Makefile.devel && ${build.cmd}
 
 test.run                yes
 test.target             check
 
 platform freebsd {
     patchfiles-append patch-Makefile.devel
-    pre-fetch { variant_set disable_utf8mac }
 }
 
-platform linux {
-    pre-fetch { variant_set disable_utf8mac }
-}
-
 post-destroot {
     if {[file exists ${destroot}${prefix}/lib/charset.alias]} {
         delete ${destroot}${prefix}/lib/charset.alias
     }
 }
 
-# Do not support UTF-8-MAC encoding
-variant disable_utf8mac {
-    patchfiles-delete patch-utf8mac.diff
+variant enable_cp932fix description {Apply a patch to fix the conversion problem between Shift-JIS and Unicode (See Microsoft KB Q170559)} {
+    patchfiles-append ${cp932fix_patchfile}
 }
 
-# Apply a patch to fix the conversion problem between Shift-JIS and Unicode (See Microsoft KB Q170559)
-variant enable_cp932fix {
-    distfiles-append ${distname}-cp932-devel.patch.gz:cp932fix
-    post-patch {
-        system "cd ${worksrcpath} && gzip -dc '${distpath}/${distname}-cp932-devel.patch.gz' | patch -p1"
-    }
-}
-
 if { [variant_isset universal] } {
     # When cross-compiling, can guess wrong endian value.
     if { ${os.arch}=="i386" } {

Modified: trunk/dports/textproc/libiconv/files/patch-Makefile.devel
===================================================================
--- trunk/dports/textproc/libiconv/files/patch-Makefile.devel	2010-02-01 11:55:03 UTC (rev 63298)
+++ trunk/dports/textproc/libiconv/files/patch-Makefile.devel	2010-02-01 12:25:17 UTC (rev 63299)
@@ -1,6 +1,6 @@
---- Makefile.devel.orig	Tue Jun 27 14:38:56 2006
-+++ Makefile.devel	Tue Jun 26 15:11:15 2007
-@@ -188,7 +188,7 @@
+--- a/Makefile.devel.orig	2009-06-21 06:17:33.000000000 -0500
++++ b/Makefile.devel	2010-01-20 19:17:55.000000000 -0600
+@@ -105,7 +105,7 @@
  	$(CC) $(CFLAGS) lib/genaliases.c -o genaliases
  	./genaliases > lib/aliases.gperf 3> canonical.sh 4> canonical_local.sh
  	$(RM) genaliases

Modified: trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff
===================================================================
--- trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff	2010-02-01 11:55:03 UTC (rev 63298)
+++ trunk/dports/textproc/libiconv/files/patch-src-Makefile.in-darwin.diff	2010-02-01 12:25:17 UTC (rev 63299)
@@ -1,10 +1,10 @@
---- src/Makefile.in.orig	2007-11-21 22:52:22.000000000 +0100
-+++ src/Makefile.in	2007-11-21 22:58:15.000000000 +0100
-@@ -104,6 +104,7 @@
+--- a/src/Makefile.in.orig	2009-06-21 06:17:33.000000000 -0500
++++ b/src/Makefile.in	2010-01-20 19:07:40.000000000 -0600
+@@ -113,6 +113,7 @@
  	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
  	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
-+	  darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv;; \
- 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv;; \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
++	  darwin*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
+ 	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv. at OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_ at WOE32@) -o iconv$(EXEEXT);; \
  	esac
- 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)

Modified: trunk/dports/textproc/libiconv/files/patch-utf8mac.diff
===================================================================
--- trunk/dports/textproc/libiconv/files/patch-utf8mac.diff	2010-02-01 11:55:03 UTC (rev 63298)
+++ trunk/dports/textproc/libiconv/files/patch-utf8mac.diff	2010-02-01 12:25:17 UTC (rev 63299)
@@ -1,6 +1,6 @@
---- lib/converters.h	2007-05-26 08:18:25.000000000 +0900
-+++ lib/converters.h	2007-11-13 17:41:10.000000000 +0900
-@@ -113,6 +113,7 @@
+--- a/lib/converters.h	2009-06-21 06:17:33.000000000 -0500
++++ b/lib/converters.h	2010-01-20 19:54:37.000000000 -0600
+@@ -119,6 +119,7 @@
  /* General multi-byte encodings */
  #include "utf8.h"
  #include "ucs2.h"
@@ -8,8 +8,8 @@
  #include "ucs2be.h"
  #include "ucs2le.h"
  #include "ucs4.h"
---- lib/encodings.def	2009-06-12 01:19:03.000000000 +0200
-+++ lib/encodings.def	2009-06-12 01:20:39.000000000 +0200
+--- a/lib/encodings.def	2009-06-12 01:19:03.000000000 +0200
++++ b/lib/encodings.def	2009-06-12 01:20:39.000000000 +0200
 @@ -69,6 +69,12 @@
              utf8)
  #endif
@@ -23,8 +23,8 @@
  DEFENCODING(( "UCS-2",                  /* glibc */
                "ISO-10646-UCS-2",        /* IANA */
                "csUnicode",              /* IANA */
---- lib/utf8mac.h	1970-01-01 09:00:00.000000000 +0900
-+++ lib/utf8mac.h	2007-11-13 17:42:39.000000000 +0900
+--- a/lib/utf8mac.h	1970-01-01 09:00:00.000000000 +0900
++++ b/lib/utf8mac.h	2007-11-13 17:42:39.000000000 +0900
 @@ -0,0 +1,1608 @@
 +/*
 + * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100201/f01fd96d/attachment.html>

More information about the macports-changes mailing list