From 0447fa785e1dffb547a46cb78409e8bab1b059cb Mon Sep 17 00:00:00 2001
From: Jean-Marc Zucconi <jmz@FreeBSD.org>
Date: Wed, 13 Jun 2001 19:51:00 +0000
Subject: Add a test to instruct the user to rename ${PREFIX}/lib/libXft.so.1
 if it is an incompatible version.

---
 x11/XFree86-4/Makefile          |  2 +-
 x11/XFree86-4/scripts/configure | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'x11/XFree86-4')

diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 828883406b89..5bf5b2329a13 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XFree86
 PORTVERSION=	4.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.1.0
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 8f931ceed535..03699ecb2348 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -24,6 +24,16 @@ yesno () {
     esac
   done
 }
+# workaround for compilation problems if XFree-4.0.x is installed
+if [ -e ${PREFIX}/lib/libXft.so.1 ]; then
+  r=`nm  ${PREFIX}/lib/libXft.so.1 | grep XftDirSave`
+  if [ "X$r" = X ]; then 
+    echo "you seem to have an installed XFree-4.0.x port"
+    echo "please rename or remove ${PREFIX}/lib/libXft.so.1"
+    echo "in order to avoid compilation problems"
+    exit 1
+  fi
+fi
 F=$WRKDIR/.config
 configure () {
 rm -f $F
-- 
cgit v1.2.3