[52850] trunk/dports/www/neon/Portfile

[Ryan Schmidt]

On Jun 24, 2009, at 08:00, dluke at macports.org wrote:

> Revision: 52850
>           http://trac.macports.org/changeset/52850
> Author:   dluke at macports.org
> Date:     2009-06-24 06:00:40 -0700 (Wed, 24 Jun 2009)
> Log Message:
> -----------
> Don't reinplace if configure.universal_cppflags isn't set (like  
> #20017, r52830 - fix for trunk)
>
> Modified Paths:
> --------------
>     trunk/dports/www/neon/Portfile
>
> Modified: trunk/dports/www/neon/Portfile
> ===================================================================
> --- trunk/dports/www/neon/Portfile	2009-06-24 09:54:37 UTC (rev 52849)
> +++ trunk/dports/www/neon/Portfile	2009-06-24 13:00:40 UTC (rev 52850)
> @@ -56,12 +56,14 @@
>
>  post-destroot {
>  	if {[variant_isset universal]} {
> -		reinplace "s|${configure.universal_cppflags}||g" \
> -			${destroot}${prefix}/bin/neon-config \
> -			${destroot}${prefix}/lib/pkgconfig/neon.pc
> -		reinplace "s|${configure.universal_ldflags}||g" \
> -			${destroot}${prefix}/bin/neon-config \
> -			${destroot}${prefix}/lib/pkgconfig/neon.pc
> +		if {${configure.universal_cppflags} != ""} {
> +			reinplace "s|${configure.universal_cppflags}||g" \
> +				${destroot}${prefix}/bin/neon-config \
> +				${destroot}${prefix}/lib/pkgconfig/neon.pc
> +			reinplace "s|${configure.universal_ldflags}||g" \
> +				${destroot}${prefix}/bin/neon-config \
> +				${destroot}${prefix}/lib/pkgconfig/neon.pc
> +		}
>  	}
>  }

But the universal_ldflags reinplace should happen unconditionally,  
regardless of whether universal_cppflags is empty or not.  
universal_ldflags will still always have something in it which needs  
to be removed from the config script and the pkgconfig file.