From d6a805b2291963d96661d71451575cdee2f919d8 Mon Sep 17 00:00:00 2001 From: Rong-En Fan Date: Mon, 11 Dec 2006 16:48:43 +0000 Subject: - Respect X11BASE mplayer's configure only accepts the last --with-extraincdir, and --with-x11libdir is removed in the next version. Therefore, directly change hardcoded /usr/X11R6 in configure. Approved by: portmgr (linimon), Thomas E. Zander (maintainer) --- multimedia/mplayer/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'multimedia/mplayer') diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 62ae81f45969..f24552eb2593 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -243,9 +243,6 @@ CFLAGS+= -fno-force-addr .if !defined(WITHOUT_X11) USE_XLIB= yes -#CFLAGS+= -I${X11BASE}/include -CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \ - --with-extraincdir=${X11BASE}/include .else WITHOUT_GUI= yes CONFIGURE_ARGS+=--disable-x11 \ @@ -617,7 +614,8 @@ post-patch: ${REINPLACE_CMD} -E \ -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ - -e 's|\$$\(CC\)|${CC}|' + -e 's|\$$\(CC\)|${CC}|' \ + -e 's|/usr/X11R6|${X11BASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ -- cgit