[55114] trunk/dports/audio/lame

[toby at macports.org]

Revision: 55114
          http://trac.macports.org/changeset/55114
Author:   toby at macports.org
Date:     2009-08-06 16:20:10 -0700 (Thu, 06 Aug 2009)
Log Message:
-----------
fix ncurses linking, also eliminate absolutely INSANE universal nonsense

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

Added Paths:
-----------
    trunk/dports/audio/lame/files/
    trunk/dports/audio/lame/files/config.h.ed

Modified: trunk/dports/audio/lame/Portfile
===================================================================
--- trunk/dports/audio/lame/Portfile	2009-08-06 23:19:21 UTC (rev 55113)
+++ trunk/dports/audio/lame/Portfile	2009-08-06 23:20:10 UTC (rev 55114)
@@ -4,6 +4,7 @@
 
 name              lame
 version           3.98.2
+revision          1
 categories        audio
 platforms         darwin freebsd
 maintainers       ram openmaintainer
@@ -26,67 +27,8 @@
                   rmd160 767dd94271eef221170469535db2bf388149715a
 
 configure.args    --mandir=${prefix}/share/man
+configure.cppflags-append -I${prefix}/include/ncurses
 
-set my_universal_archs {i386 ppc}
-set first_arch [lindex ${my_universal_archs} 0]
-
-set my_worksrcpaths ${worksrcpath}
-
-variant universal {
-  set my_worksrcpaths {}
-  foreach arch ${my_universal_archs} {
-    lappend my_worksrcpaths ${workpath}/${arch}
-  }
-
-  post-patch {
-    foreach arch ${my_universal_archs} {
-      if {[string equal ${arch} ${first_arch}]} {
-        move ${worksrcpath} ${workpath}/${first_arch}
-      } else {
-        copy ${workpath}/${first_arch} ${workpath}/${arch}
-      }
-    }
-  }
-
-  configure {
-    foreach arch ${my_universal_archs} {
-      set my_arch_flag "-arch ${arch}"
-      set my_cflags "${configure.cflags} ${my_arch_flag} -I${prefix}/include -L${prefix}/lib"
-      if {[info exists universal_sysroot]} {
-        set my_cflags "${my_cflags} -isysroot ${universal_sysroot}"
-      }
-      set my_ldflags "${configure.ldflags} ${my_arch_flag}"
-      set pcp "{prefix}/lib/pkgconfig"
-	    set my_configure_args "CC=\"gcc -arch ${arch}\""
-      system "cd ${workpath}/${arch} && CFLAGS=\"${my_cflags}\" CXXFLAGS=\"${my_cflags}\" LDFLAGS=\"${my_ldflags}\" PKG_CONFIG_PATH=\"${pcp}\" ${configure.cmd} ${configure.pre_args} ${configure.args} ${my_configure_args}"
-    }
-  }
-
-  build {
-    foreach arch ${my_universal_archs} {
-      system "cd ${workpath}/${arch} && ${build.cmd} ${build.pre_args}"
-    }
-  }
-
-  destroot {
-    system "cd ${workpath}/${first_arch} && ${destroot.cmd} ${destroot.pre_args} ${destroot.post_args}"
-    foreach lib [list [file readlink ${workpath}/${first_arch}/libmp3lame/.libs/libmp3lame.dylib] libmp3lame.a] {
-      set output_lib ${destroot}${prefix}/lib/${lib}
-      set lipo_args {}
-      foreach arch ${my_universal_archs} {
-        lappend lipo_args -arch ${arch} ${workpath}/${arch}/libmp3lame/.libs/${lib}
-      }
-      lappend lipo_args -create -output ${output_lib}
-      delete ${output_lib}
-      system "lipo ${lipo_args}"
-    }
-    set output_bin ${destroot}${prefix}/bin/lame
-    set lipo_args {}
-    foreach arch ${my_universal_archs} {
-      lappend lipo_args -arch ${arch} ${workpath}/${arch}/frontend/lame
-    }
-    lappend lipo_args -create -output ${output_bin}
-    delete ${output_bin}
-    system "lipo ${lipo_args}"
-  }
+post-configure {
+    system "ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed"
 }

Added: trunk/dports/audio/lame/files/config.h.ed
===================================================================
--- trunk/dports/audio/lame/files/config.h.ed	                        (rev 0)
+++ trunk/dports/audio/lame/files/config.h.ed	2009-08-06 23:20:10 UTC (rev 55114)
@@ -0,0 +1,43 @@
+/WORDS_BIGENDIAN/c
+#ifdef __BIG_ENDIAN__
+#define WORDS_BIGENDIAN 1
+#else
+/* #undef WORDS_BIGENDIAN */
+#endif
+.
+/define A_INT64_T/c
+#ifdef __LP64__
+#define A_INT64_T long
+#else
+#define A_INT64_T long long
+#endif
+.
+/define A_UINT64_T/c
+#ifdef __LP64__
+#define A_UINT64_T unsigned long
+#else
+#define A_UINT64_T unsigned long long
+#endif
+.
+/SIZEOF_LONG/c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/SIZEOF_UNSIGNED_LONG/c
+#ifdef __LP64__
+#define SIZEOF_UNSIGNED_LONG 8
+#else
+#define SIZEOF_UNSIGNED_LONG 4
+#endif
+.
+/HAVE_XMMINTRIN_H/c
+#ifdef __ppc__
+/* #undef HAVE_XMMINTRIN_H */
+#else
+#define HAVE_XMMINTRIN_H 1
+#endif
+.
+w
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090806/2251e9c9/attachment.html>