Use motif-config, drop /usr/X11R6 paths, that fixes bug 104854.

Package-Manager: portage-2.0.52-r1

diff --git a/x11-misc/xmbdfed/ChangeLog b/x11-misc/xmbdfed/ChangeLog
index a9a378f48e3f61d1857d6ca6b8c73c16d497caca..b008f0f67df9a99ce2a646a88be3e8c42b99787d 100644 (file)
--- a/x11-misc/xmbdfed/ChangeLog
+++ b/x11-misc/xmbdfed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xmbdfed
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.14 2004/10/02 15:43:24 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/ChangeLog,v 1.15 2005/10/01 08:52:09 nelchael Exp $
+
+  01 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> xmbdfed-4.7_p1.ebuild:
+  Use motif-config, drop /usr/X11R6 paths, that fixes bug 104854.
 
   29 Sep 2004; <pyrania@gentoo.org> xmbdfed-4.7_p1.ebuild:
   Stable on x86.

diff --git a/x11-misc/xmbdfed/Manifest b/x11-misc/xmbdfed/Manifest
index 6cab167f872eefac2db09a3dea1394bbae66cc23..211439cfa67a94e48c3b369d700379343a1c0cf8 100644 (file)
--- a/x11-misc/xmbdfed/Manifest
+++ b/x11-misc/xmbdfed/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1a9fc59ea0c8a8ac38ebc239fd2e5149 ChangeLog 1830
-MD5 b1f688ff3e6c85c5e4d8e5ef35807192 metadata.xml 186
 MD5 3240560dc342ba15df849c2c332095d4 xmbdfed-4.5.ebuild 1458
-MD5 12deb6a9b96158d05f2af788541f0562 xmbdfed-4.7_p1.ebuild 1313
-MD5 fda2a635d6d99c2ff0c699725fd7d301 files/digest-xmbdfed-4.5 133
+MD5 ab12a1f3674fe99f90bd21bc8ae11920 xmbdfed-4.7_p1.ebuild 1322
+MD5 2cb6be316e1b0bc4ae74a596ddacfd6b ChangeLog 1973
+MD5 b1f688ff3e6c85c5e4d8e5ef35807192 metadata.xml 186
 MD5 b44b0fb9e8281e2652b43bf0c6db7e72 files/digest-xmbdfed-4.7_p1 124
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBXsyiI1lqEGTUzyQRAkScAJ0cnJD2g4PMybsKznfvUkAKm9luHACcD7nw
-ammigvbCE0o5wNu9d7mlWdI=
-=UyKw
------END PGP SIGNATURE-----
+MD5 fda2a635d6d99c2ff0c699725fd7d301 files/digest-xmbdfed-4.5 133

diff --git a/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild b/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
index 653600b4ba7908a2bd184bdf8817de7cbf2197f6..882d604bfd8f2882ed43cc59432c256b4ffa9ea9 100644 (file)
--- a/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
+++ b/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild,v 1.5 2004/09/29 08:12:47 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmbdfed/xmbdfed-4.7_p1.ebuild,v 1.6 2005/10/01 08:52:09 nelchael Exp $
 
 inherit eutils
 MY_P=${P/_p*}
@@ -32,8 +32,8 @@ src_compile() {
        # specifying the correct options for Gentoo.
 
        local flags=""
-       local incs="-I/usr/X11R6/include"
-       local libs="-L/usr/X11R6/lib -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE"
+       local incs="`motif-config --cflags`"
+       local libs="`motif-config --libs` -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE"
 
        if use truetype ; then
                flags="FTYPE_DEFS=\"-DHAVE_FREETYPE\""