From 8427e8108f1828baf866c5c0873b3045d245531d Mon Sep 17 00:00:00 2001
From: ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Wed, 12 Apr 2006 17:10:20 +0000
Subject: - Unbreak poppler-qt

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6059 df743ca5-7f9a-e211-a948-0013205c9059
---
 graphics/poppler/Makefile              |  8 ++++----
 graphics/poppler/files/patch-configure | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 graphics/poppler/files/patch-configure

(limited to 'graphics/poppler')

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index c9939fcd0..d914fa244 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.21 2006/02/25 09:58:48 marcus Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.22 2006/03/09 01:49:49 marcus Exp $
 #
 
 PORTNAME=	poppler
@@ -55,9 +55,9 @@ MAN1=	pdffonts.1 pdfimages.1 pdfinfo.1 \
 
 post-patch:
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
-#	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \
-#		s|/usr/local/qt/lib|${X11BASE}/lib|' \
-#		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \
+		s|/usr/local/qt/lib|${X11BASE}/lib|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$QTDIR|${X11BASE}|' ${WRKSRC}/configure
 .endif
 
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
new file mode 100644
index 000000000..72b0d9459
--- /dev/null
+++ b/graphics/poppler/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Apr 12 12:53:56 2006
++++ configure	Wed Apr 12 13:06:36 2006
+@@ -24849,7 +24849,7 @@
+     fi
+ fi
+ 
+-if test "x$have_qt" == "xyes"; then
++if test "x$have_qt" = "xyes"; then
+     POPPLER_QT_CXXFLAGS="-I$qt_incdir"
+     POPPLER_QT_LIBS="$qt_libdir/$qt_test_library"
+     :
-- 
cgit v1.2.3