[46660] trunk/dports/audio/flac

[jmr at macports.org]

Revision: 46660
          http://trac.macports.org/changeset/46660
Author:   jmr at macports.org
Date:     2009-02-09 14:11:31 -0800 (Mon, 09 Feb 2009)
Log Message:
-----------
flac: add missing dep on libiconv, fix 32/64-bit universal issue in config.h, don't use "-flat_namespace -undefined suppress"

Modified Paths:
--------------
    trunk/dports/audio/flac/Portfile

Added Paths:
-----------
    trunk/dports/audio/flac/files/config.h.ed
    trunk/dports/audio/flac/files/patch-build_lib.mk.diff

Modified: trunk/dports/audio/flac/Portfile
===================================================================
--- trunk/dports/audio/flac/Portfile	2009-02-09 21:52:16 UTC (rev 46659)
+++ trunk/dports/audio/flac/Portfile	2009-02-09 22:11:31 UTC (rev 46660)
@@ -21,10 +21,11 @@
 
 checksums       md5 153c8b15a54da428d1f0fadc756c22c7
 
-depends_lib     port:libogg
+depends_lib     port:libogg port:libiconv
 
 patchfiles      patch-ltmain.sh.diff \
-                patch-nasm.h.diff
+                patch-nasm.h.diff \
+                patch-build_lib.mk.diff
 
 configure.args  --mandir=${prefix}/share/man \
                 --disable-xmms-plugin
@@ -32,6 +33,7 @@
 post-configure {
     if {[variant_isset universal]} {
         reinplace "s|CC -dynamiclib|CC -dynamiclib ${configure.universal_ldflags}|g" ${worksrcpath}/libtool
+        system "cd ${worksrcpath} && ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed && touch stamp-h1"
     }
 }
 

Added: trunk/dports/audio/flac/files/config.h.ed
===================================================================
--- trunk/dports/audio/flac/files/config.h.ed	                        (rev 0)
+++ trunk/dports/audio/flac/files/config.h.ed	2009-02-09 22:11:31 UTC (rev 46660)
@@ -0,0 +1,8 @@
+/#define SIZEOF_VOIDP/c
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+.
+w

Added: trunk/dports/audio/flac/files/patch-build_lib.mk.diff
===================================================================
--- trunk/dports/audio/flac/files/patch-build_lib.mk.diff	                        (rev 0)
+++ trunk/dports/audio/flac/files/patch-build_lib.mk.diff	2009-02-09 22:11:31 UTC (rev 46660)
@@ -0,0 +1,11 @@
+--- build/lib.mk.orig	2007-09-13 10:51:25.000000000 +1000
++++ build/lib.mk	2009-02-10 08:27:43.000000000 +1100
+@@ -51,7 +51,7 @@
+ RELEASE_STATIC_LIB  = $(RELEASE_LIBPATH)/$(STATIC_LIB_NAME)
+ RELEASE_DYNAMIC_LIB = $(RELEASE_LIBPATH)/$(DYNAMIC_LIB_NAME)
+ ifeq ($(DARWIN_BUILD),yes)
+-LINKD       = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB)
++LINKD       = $(CC) -dynamiclib -undefined dynamic_lookup -install_name $(DYNAMIC_LIB)
+ else
+ LINKD       = $(CC) -shared
+ endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090209/0e13f2e8/attachment-0001.html>