[47559] trunk/dports/x11/desklaunch/Portfile

[jeremyhu at macports.org]

Revision: 47559
          http://trac.macports.org/changeset/47559
Author:   jeremyhu at macports.org
Date:     2009-02-28 16:57:16 -0800 (Sat, 28 Feb 2009)
Log Message:
-----------
desklaunch: Fix X11 linking

Modified Paths:
--------------
    trunk/dports/x11/desklaunch/Portfile

Modified: trunk/dports/x11/desklaunch/Portfile
===================================================================
--- trunk/dports/x11/desklaunch/Portfile	2009-03-01 00:55:14 UTC (rev 47558)
+++ trunk/dports/x11/desklaunch/Portfile	2009-03-01 00:57:16 UTC (rev 47559)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name	 	desklaunch	
 version	       	1.1.5
-revision	2
+revision	3
 description     DeskLaunch is a small utility for creating desktop icons.	
 long_description	DeskLaunch is a small utility for creating desktop icons using pixmaps.  A simple click will launch the desired application.  DeskLaunch itself runs unter X11 and uses a small configuration file to decide which icons to create.  It is meant to supplement the Oroborus \"minimalistic window manager\".
 homepage	http://www.oroborus.org/
@@ -23,12 +23,18 @@
 use_configure no
 destroot.destdir	DESTDIR=${destroot}${prefix}
 
-build.target-append CFLAGS="${configure.cflags}" \
-                    LDPATH="${configure.ldflags}"
+pre-configure {
+    if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+        build.args-append XROOT=${prefix}
+    } else {
+        build.args-append XROOT=${x11prefix}
+    }
+}
 
+build.args-append CFLAGS="${configure.cflags}"
+
 variant universal {
-	build.target-append CFLAGS="${configure.cflags} ${configure.universal_cflags} -I${x11prefix}/include" \
-	                    LDPATH="${configure.ldflags} ${configure.universal_ldflags} -L${x11prefix}/lib"
+	build.args-append CFLAGS="${configure.cflags} ${configure.universal_cflags}"
 }
 
 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090228/e1e9da6e/attachment.html>