aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorehaupt <ehaupt@FreeBSD.org>2012-01-18 18:52:56 +0800
committerehaupt <ehaupt@FreeBSD.org>2012-01-18 18:52:56 +0800
commit24a55f9dff2c463453cd41e9dc66a1f7df352c78 (patch)
tree8028fbb849199d66778f708c389750c6f893c8cf
parent2833ead01544f2e72ed91e3f81fad13c4a8fc88d (diff)
downloadfreebsd-ports-gnome-24a55f9dff2c463453cd41e9dc66a1f7df352c78.tar.gz
freebsd-ports-gnome-24a55f9dff2c463453cd41e9dc66a1f7df352c78.tar.zst
freebsd-ports-gnome-24a55f9dff2c463453cd41e9dc66a1f7df352c78.zip
Explicit link against /usr/lib/libncurses.so instead of using -lncurses to
prevent a conflict with devel/ncurses. PR: 164244 Submitted by: Thomas Zander <thomas.e.zander@googlemail.com> (solution) Approved by: Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
-rw-r--r--multimedia/mencoder/Makefile1
-rw-r--r--multimedia/mplayer/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index e5314889f9ec..2b4e29435435 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -147,6 +147,7 @@ post-patch:
s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-e 's|/usr/local|${LOCALBASE}|' \
-e 's|-lbz2|/usr/lib/libbz2.so|' \
+ -e 's|-lncurses|/usr/lib/libncurses.so|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${FIND} -E ${WRKSRC} -type f \
-iregex ".*(configure|.sh|Makefile)" -print0 | \
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 0ffc75d844b1..97b090a11021 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -246,6 +246,7 @@ post-patch:
s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-e 's|/usr/local|${LOCALBASE}|' \
-e 's|-lbz2|/usr/lib/libbz2.so|' \
+ -e 's|-lncurses|/usr/lib/libncurses.so|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${FIND} -E ${WRKSRC} -type f \
-iregex ".*(configure|.sh|Makefile)" -print0 | \