[57548] trunk/dports/devel/nspr/Portfile

[jeremyhu at macports.org]

Revision: 57548
          http://trac.macports.org/changeset/57548
Author:   jeremyhu at macports.org
Date:     2009-09-12 13:54:26 -0700 (Sat, 12 Sep 2009)
Log Message:
-----------
nspr: Build universal and work around muniversal quirks

Modified Paths:
--------------
    trunk/dports/devel/nspr/Portfile

Modified: trunk/dports/devel/nspr/Portfile
===================================================================
--- trunk/dports/devel/nspr/Portfile	2009-09-12 20:18:13 UTC (rev 57547)
+++ trunk/dports/devel/nspr/Portfile	2009-09-12 20:54:26 UTC (rev 57548)
@@ -1,10 +1,11 @@
 # $Id$
 
 PortSystem	1.0
+PortGroup       muniversal 1.0
 
 name		nspr
 version		4.8
-revision        1
+revision        2
 categories	devel
 maintainers	jeremyhu openmaintainer
 platforms	darwin
@@ -27,19 +28,14 @@
 		${worksrcpath}/configure
 }
 
-universal_variant no
-
 configure.args \
 	--disable-debug \
 	--enable-optimize='-O2' \
 	--enable-strip \
 	--libdir=${prefix}/lib/nspr
 
-pre-configure {
-	if {[info exists build_arch] && (${build_arch} == "x86_64" || $build_arch == "ppc64")} {
-		configure.args-append --enable-64bit
-	}
-}
+set merger_configure_args(ppc64)  "--enable-64bit"
+set merger_configure_args(x86_64) "--enable-64bit"
 
 variant debug description "build with debugging symbols" {
     configure.args-delete   --disable-debug \
@@ -53,7 +49,19 @@
     configure.cflags ""
 }
 
+set merger_dont_diff ${prefix}/bin/nspr-config
+
 post-destroot {
+	# muniversal really needs to do something better about this...
+	if {[variant_isset universal]} {
+		copy ${destroot}${prefix}/bin/${build_arch}-nspr-config ${destroot}${prefix}/bin/bak-config
+		foreach file [glob ${destroot}${prefix}/bin/*nspr-config] {
+			delete $file
+		}
+		move ${destroot}${prefix}/bin/bak-config ${destroot}${prefix}/bin/nspr-config
+		reinplace "s|-arch ${build_arch}||g" ${destroot}${prefix}/bin/nspr-config
+	}
+
 	file mkdir ${destroot}${prefix}/lib/pkgconfig
 	copy ${filespath}/nspr.pc ${destroot}${prefix}/lib/pkgconfig
 	reinplace "s|@@prefix@@|${prefix}|" ${destroot}${prefix}/lib/pkgconfig/nspr.pc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090912/57eebf84/attachment.html>