[46078] trunk/dports/textproc/libiconv

[ryandesign at macports.org]

Revision: 46078
          http://trac.macports.org/changeset/46078
Author:   ryandesign at macports.org
Date:     2009-01-28 10:46:04 -0800 (Wed, 28 Jan 2009)
Log Message:
-----------
libiconv: use muniversal portgroup to simplify universal build; closes #18190

Modified Paths:
--------------
    trunk/dports/textproc/libiconv/Portfile

Removed Paths:
-------------
    trunk/dports/textproc/libiconv/files/config.h.ed
    trunk/dports/textproc/libiconv/files/patch-stdint.in.h.diff

Modified: trunk/dports/textproc/libiconv/Portfile
===================================================================
--- trunk/dports/textproc/libiconv/Portfile	2009-01-28 17:52:33 UTC (rev 46077)
+++ trunk/dports/textproc/libiconv/Portfile	2009-01-28 18:46:04 UTC (rev 46078)
@@ -1,6 +1,7 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               muniversal 1.0
 
 name                    libiconv
 version                 1.12
@@ -36,7 +37,6 @@
         rmd160 2042116888ee28572c1f7bcc2756e4a29edfbad0
 
 depends_build \
-    bin:ed:ed \
     port:gperf
 
 patchfiles \
@@ -54,29 +54,13 @@
     --disable-nls \
     --enable-extra-encodings
 
-platform darwin {
-    patchfiles-append   patch-stdint.in.h.diff
-    post-configure {
-        system "cd ${worksrcpath} && ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed && touch stamp-h1"
-    }
+if {![variant_isset disable_utf8mac] || [variant_isset enable_cp932fix]} {
+    build.cmd ${build.cmd} CC=${configure.cc} -f Makefile.devel && ${build.cmd}
 }
 
-pre-build {
-    if {![variant_isset disable_utf8mac] || [variant_isset enable_cp932fix]} {
-        system "cd ${worksrcpath} && make -f Makefile.devel"
-    }
-}
-
 test.run                yes
 test.target             check
 
-platform darwin 8 {
-    if {[variant_isset universal]} {
-        # Fix universal build on PowerPC
-        configure.ldflags-append "-isysroot ${sysroot}"
-    }
-}
-
 platform freebsd {
     patchfiles-append patch-Makefile.devel
     pre-fetch { variant_set disable_utf8mac }

Deleted: trunk/dports/textproc/libiconv/files/config.h.ed
===================================================================
--- trunk/dports/textproc/libiconv/files/config.h.ed	2009-01-28 17:52:33 UTC (rev 46077)
+++ trunk/dports/textproc/libiconv/files/config.h.ed	2009-01-28 18:46:04 UTC (rev 46078)
@@ -1,22 +0,0 @@
-/BITSIZEOF_PTRDIFF_T/c
-#ifdef __LP64__
-#define BITSIZEOF_PTRDIFF_T 64
-#else
-#define BITSIZEOF_PTRDIFF_T 32
-#endif
-.
-/BITSIZEOF_SIZE_T/c
-#ifdef __LP64__
-#define BITSIZEOF_SIZE_T 64
-#else
-#define BITSIZEOF_SIZE_T 32
-#endif
-.
-/PTRDIFF_T_SUFFIX/c
-#ifdef __LP64__
-#define PTRDIFF_T_SUFFIX l
-#else
-#define PTRDIFF_T_SUFFIX 
-#endif
-.
-w

Deleted: trunk/dports/textproc/libiconv/files/patch-stdint.in.h.diff
===================================================================
--- trunk/dports/textproc/libiconv/files/patch-stdint.in.h.diff	2009-01-28 17:52:33 UTC (rev 46077)
+++ trunk/dports/textproc/libiconv/files/patch-stdint.in.h.diff	2009-01-28 18:46:04 UTC (rev 46078)
@@ -1,33 +0,0 @@
---- srclib/stdint.in.h.orig 2007-11-11 10:00:02.000000000 -0600
-+++ srclib/stdint.in.h 2009-01-16 01:49:06.000000000 -0600
-@@ -410,10 +410,13 @@
- /* ptrdiff_t limits */
- #undef PTRDIFF_MIN
- #undef PTRDIFF_MAX
--#define PTRDIFF_MIN  \
--   _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0 at PTRDIFF_T_SUFFIX@)
--#define PTRDIFF_MAX  \
--   _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0 at PTRDIFF_T_SUFFIX@)
-+#ifdef __LP64__
-+#define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
-+#define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
-+#else
-+#define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
-+#define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
-+#endif
- 
- /* sig_atomic_t limits */
- #undef SIG_ATOMIC_MIN
-@@ -428,7 +431,11 @@
- 
- /* size_t limit */
- #undef SIZE_MAX
--#define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0 at SIZE_T_SUFFIX@)
-+#ifdef __LP64__
-+#define SIZE_MAX  _STDINT_MIN (0, 64, 0 at SIZE_T_SUFFIX@)
-+#else
-+#define SIZE_MAX  _STDINT_MIN (0, 32, 0 at SIZE_T_SUFFIX@)
-+#endif
- 
- /* wchar_t limits */
- #undef WCHAR_MIN
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090128/c5313162/attachment.html>