From 5695677cb5e3dbf95e14b717a486e04de41b21d8 Mon Sep 17 00:00:00 2001 From: Emanuel Haupt Date: Sat, 2 Jun 2007 15:44:10 +0000 Subject: Forget about X11BASE --- audio/gbsplay/Makefile | 6 ++++-- audio/xmms-gbsplay/Makefile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'audio') diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile index 75ea0690234f..0e1766ac7350 100644 --- a/audio/gbsplay/Makefile +++ b/audio/gbsplay/Makefile @@ -54,8 +54,10 @@ post-patch: gbsplay-post-patch @${REINPLACE_CMD} -e \ 's|/usr/local/include|${LOCALBASE}/include|; \ s|/usr/local/lib|${LOCALBASE}/lib|; \ - s|/usr/X11R6/include|${X11BASE}/include|; \ - s|/usr/X11R6/lib|${X11BASE}/lib|; \ + s|/usr/X11R6/include||; \ + s|/usr/X11R6/lib||; \ + s|/usr/X11/lib|${LOCALBASE}/lib|; \ + s|/usr/lib/X11|${LOCALBASE}/lib/X11|; \ s|-Os||; s|-pipe||; s|-fomit-frame-pointer||; \ s|-march=$$ARCH||' ${WRKSRC}/configure diff --git a/audio/xmms-gbsplay/Makefile b/audio/xmms-gbsplay/Makefile index 87c6a5cdfcb1..bd426168a3ab 100644 --- a/audio/xmms-gbsplay/Makefile +++ b/audio/xmms-gbsplay/Makefile @@ -31,7 +31,7 @@ post-extract: gbsplay-post-patch: @${REINPLACE_CMD} -e \ 's|`which xmms-config`||; \ - s|\(xmms-config\)|${X11BASE}/bin/\1|g; \ + s|\(xmms-config\)|${LOCALBASE}/bin/\1|g; \ s|`which glib-config`||; \ s|glib-config|${GLIB_CONFIG}|g; \ /LOCALE_PREFIX/ s|$$localedir|${LOCALBASE}/share/locale|' \ -- cgit v1.2.3