2 files changed, 19 insertions, 41 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 02329f056716..532285edf2fe 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -41,30 +41,42 @@ CONFIGURE_ARGS+=--enable-poppler-glib
 USE_GNOME+=	gtk20
 BUILD_WRKSRC=	${WRKSRC}/glib
 INSTALL_WRKSRC=	${WRKSRC}/glib
-.elif ${SLAVEPORT}=="qt"
+.else
+CONFIGURE_ARGS+=--disable-poppler-glib
+.endif
+
+.if ${SLAVEPORT}=="qt"
 CONFIGURE_ARGS+=--enable-poppler-qt
 USE_QT_VER+=	3
 BUILD_WRKSRC=	${WRKSRC}/qt
 INSTALL_WRKSRC=	${WRKSRC}/qt
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
-.elif ${SLAVEPORT}=="qt4"
+.else
+CONFIGURE_ARGS+=--disable-poppler-qt
+.endif
+
+.if ${SLAVEPORT}=="qt4"
 CONFIGURE_ARGS+=--enable-poppler-qt4
 USE_QT_VER+=	4
 QT_COMPONENTS=	gui corelib xml qtestlib
-BUILD_WRKSRC=	${WRKSRC}/qt4
+#BUILD_WRKSRC=	${WRKSRC}/qt4
 INSTALL_WRKSRC=	${WRKSRC}/qt4
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
-.elif ${SLAVEPORT}=="utils"
+.else
+CONFIGURE_ARGS+=--disable-poppler-qt4
+.endif
+
+.if ${SLAVEPORT}=="utils"
 CONFIGURE_ARGS+=--enable-utils
 CONFLICTS=	xpdf-[0-9]*
 BUILD_WRKSRC=	${WRKSRC}/utils
 INSTALL_WRKSRC=	${WRKSRC}/utils
 MAN1=	pdffonts.1 pdfimages.1 pdfinfo.1 \
 	pdftohtml.1  pdftops.1 pdftotext.1 pdftoppm.1
-.endif
 .else
-CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
-		--disable-poppler-qt4 --disable-utils
+CONFIGURE_ARGS+=--disable-utils
+.endif
+
 .if defined(WITHOUT_CAIRO)
 CONFIGURE_ARGS+=	--disable-cairo-output
 .else
diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in
deleted file mode 100644
index 316d56611bd3..000000000000
--- a/graphics/poppler/files/patch-qt4_src_Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- qt4/src/Makefile.in.orig	Tue Jun 26 10:39:41 2007
-+++ qt4/src/Makefile.in	Tue Jun 26 10:44:32 2007
-@@ -37,8 +37,8 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@BUILD_SPLASH_OUTPUT_TRUE@am__append_1 = \
--@BUILD_SPLASH_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-arthur.la
-+@BUILD_SPLASH_OUTPUT_TRUE@am__append_1 =
-+@BUILD_SPLASH_OUTPUT_TRUE@
- 
- subdir = qt4/src
- DIST_COMMON = $(poppler_include_HEADERS) $(srcdir)/Makefile.am \
-@@ -64,9 +64,9 @@
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--@BUILD_SPLASH_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-arthur.la
-+@BUILD_SPLASH_OUTPUT_TRUE@am__DEPENDENCIES_2 = 
- libpoppler_qt4_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
- 	poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
-@@ -295,7 +295,7 @@
- 	poppler-link-extractor-private.h	\
- 	poppler-private.h
- 
--libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
-+libpoppler_qt4_la_LIBADD = -lpoppler -lm \
- 	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
- libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0
- all: all-am