poppler016: remove, no users left in pkgsrc

19 files changed, 1 insertions, 461 deletions

diff --git a/print/Makefile b/print/Makefile
index deb665fb319..f612748eb11 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.697 2017/09/26 10:27:11 wiz Exp $
+# $NetBSD: Makefile,v 1.698 2017/09/26 10:30:20 wiz Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -125,7 +125,6 @@ SUBDIR+=	poppler-includes
 SUBDIR+=	poppler-qt4
 SUBDIR+=	poppler-qt5
 SUBDIR+=	poppler-utils
-SUBDIR+=	poppler016
 SUBDIR+=	poster
 SUBDIR+=	pscal
 SUBDIR+=	psify
diff --git a/print/poppler016/DESCR b/print/poppler016/DESCR
deleted file mode 100644
index 84d6d75035d..00000000000
--- a/print/poppler016/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-This is poppler, a PDF rendering library. It is a fork of the xpdf
-3.0 PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC.
-
-Poppler provides PDF rendering functionality as a shared library,
-to centralize the maintenence effort and to reduce duplicated
-effort. And the poppler developers would like to move libpoppler
-forward in a number of areas that doesn't fit within the goals of
-xpdf.
diff --git a/print/poppler016/MESSAGE b/print/poppler016/MESSAGE
deleted file mode 100644
index ba7ee6b7e6d..00000000000
--- a/print/poppler016/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2012/07/04 20:15:45 drochner Exp $
-
-To change the default paper size to US Letter, make sure that
-
-	LC_MESSAGES=en_US.UTF-8
-
-is in your environment.
-===========================================================================
diff --git a/print/poppler016/Makefile b/print/poppler016/Makefile
deleted file mode 100644
index 30a268233ec..00000000000
--- a/print/poppler016/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2014/04/29 07:57:13 wiz Exp $
-#
-
-PKGREVISION=		8
-
-.include "../../print/poppler016/Makefile.common"
-
-COMMENT=		PDF rendering library
-MAINTAINER=		reed@reedmedia.net
-
-USE_TOOLS+=		gmake
-
-#PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-cairo.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-splash.pc.in
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler.pc.in
-GNU_CONFIGURE=		yes
-
-INSTALLATION_DIRS+=	include/poppler share/doc/poppler
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-# TODO: Later add an option to choose Splash versus Cairo backend.
-# Build the Splash graphics backend.
-CONFIGURE_ARGS+=	--enable-splash-output
-# Don't build the cairo graphics backend.
-CONFIGURE_ARGS+=	--disable-cairo-output
-# Don't compile poppler qt wrapper.
-CONFIGURE_ARGS+=	--disable-poppler-qt
-# Don't compile GTK+ test program.
-CONFIGURE_ARGS+=	--disable-gtk-test
-# Don't compile GLib wrapper which also needs gtk2
-CONFIGURE_ARGS+=	--disable-poppler-glib
-# Don't build and install the tools
-CONFIGURE_ARGS+=	--disable-utils
-CONFIGURE_ARGS+=	--disable-poppler-cpp
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.poppler
-PKG_SUPPORTED_OPTIONS=	poppler-cms
-PKG_SUGGESTED_OPTIONS=	poppler-cms
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mpoppler-cms)
-CONFIGURE_ARGS+=	--enable-cms
-.include "../../graphics/lcms/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-cms
-.endif
-
-.include "../../mk/bsd.prefs.mk"
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/poppler/
-	${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/
-	${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
-
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/poppler016/Makefile.common b/print/poppler016/Makefile.common
deleted file mode 100644
index 4af6e742062..00000000000
--- a/print/poppler016/Makefile.common
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2017/09/26 10:27:11 wiz Exp $
-#
-# used by print/poppler016/Makefile
-
-POPPLER_VERS=		0.16.7
-DISTNAME=		poppler-${POPPLER_VERS}
-CATEGORIES=		print
-MASTER_SITES=		https://poppler.freedesktop.org/
-
-HOMEPAGE=		https://poppler.freedesktop.org/
-LICENSE=		gnu-gpl-v2
-
-DISTINFO_FILE=		${.CURDIR}/../../print/poppler016/distinfo
-PATCHDIR=		${.CURDIR}/../../print/poppler016/patches
-
-USE_TOOLS+=		pkg-config
-USE_LIBTOOL=		yes
-USE_LANGUAGES=		c c++
diff --git a/print/poppler016/PLIST b/print/poppler016/PLIST
deleted file mode 100644
index bb520ec6857..00000000000
--- a/print/poppler016/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/04 20:15:46 drochner Exp $
-lib/libpoppler.la
-lib/pkgconfig/poppler-splash.pc
-lib/pkgconfig/poppler.pc
-share/doc/poppler/README
-share/doc/poppler/README-XPDF
diff --git a/print/poppler016/buildlink3.mk b/print/poppler016/buildlink3.mk
deleted file mode 100644
index 2a70f0ba374..00000000000
--- a/print/poppler016/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2015/09/12 16:47:24 joerg Exp $
-
-BUILDLINK_TREE+=	poppler
-
-.if !defined(POPPLER_BUILDLINK3_MK)
-POPPLER_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.5.1<0.34
-BUILDLINK_ABI_DEPENDS.poppler+=	poppler>=0.16.7nb8<0.34
-BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler016
-
-pkgbase := poppler
-.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.poppler:Mpoppler-cms)
-.include "../../graphics/lcms/buildlink3.mk"
-.endif
-
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.endif # POPPLER_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-poppler
diff --git a/print/poppler016/distinfo b/print/poppler016/distinfo
deleted file mode 100644
index 1adf6cf9bd8..00000000000
--- a/print/poppler016/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:01:38 agc Exp $
-
-SHA1 (poppler-0.16.7.tar.gz) = 26c735f863688f62b57d5159863fdad4272be89f
-RMD160 (poppler-0.16.7.tar.gz) = 279330e6feaf97a207f3396eab1af836d3d1f16c
-SHA512 (poppler-0.16.7.tar.gz) = a0f16f392f9f5703eef00b6c11e78e8cf21bf596c27d621fe824efe75cc0cf0637c4175469cb9214d5ba7de666c3131a5ef6040ba8ea9185e6120f92a59aaccc
-Size (poppler-0.16.7.tar.gz) = 1952179 bytes
-SHA1 (patch-aa) = b8c24eb7358410069f7ce6ad62576bc288cd55bb
-SHA1 (patch-ab) = 145cd675a46d56455021660b0a732daf4ec52ec2
-SHA1 (patch-ac) = c343775da48a1d86dea1451b74355d117e30f6c5
-SHA1 (patch-ag) = 4b914e85bb08ce83305d20de9c0a3e74d3cabdd2
-SHA1 (patch-ai) = a51dba3fb0e7131873ef82ae5e256fb1d17cee53
-SHA1 (patch-ao) = cf7e0f086522147a91f59b1b26ca510d1971ac74
-SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63
-SHA1 (patch-ar) = d24b92939deaccde42bbb0be48930b37d0f1a87f
-SHA1 (patch-as) = f0f4f8d9f5a49173a27e2349be4b7536ed77eaae
-SHA1 (patch-configure) = c68bfab40559dcffd981f77226ceee4b8df87eb1
-SHA1 (patch-poppler-qt.pc.in) = e4449465d05dd517efb600101e4de3d9d8478698
diff --git a/print/poppler016/patches/patch-aa b/print/poppler016/patches/patch-aa
deleted file mode 100644
index 025be314f50..00000000000
--- a/print/poppler016/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- glib/Makefile.in.orig	2010-07-08 18:57:56.000000000 +0000
-+++ glib/Makefile.in
-@@ -82,7 +82,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libpoppler_glib_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la \
-+	$(prefix)/lib/libpoppler.la \
- 	$(top_builddir)/poppler/libpoppler-cairo.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-@@ -105,7 +105,7 @@ am__test_poppler_glib_SOURCES_DIST = tes
- @BUILD_WITH_GDK_TRUE@	test-poppler-glib.$(OBJEXT)
- test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
- @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES =  \
--@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la \
-+@BUILD_WITH_GDK_TRUE@	$(prefix)/lib/libpoppler.la \
- @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la $(am__DEPENDENCIES_1) \
- @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1)
-@@ -438,7 +438,7 @@ libpoppler_glib_la_SOURCES = \
- 	poppler-private.h
- 
- libpoppler_glib_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la		\
-+	$(prefix)/lib/libpoppler.la		\
- 	$(top_builddir)/poppler/libpoppler-cairo.la	\
- 	$(POPPLER_GLIB_LIBS)				\
- 	$(GDK_LIBS)					\
-@@ -450,7 +450,7 @@ libpoppler_glib_la_LDFLAGS = -version-in
- @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
- 
- @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
--@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la	\
-+@BUILD_WITH_GDK_TRUE@	$(prefix)/lib/libpoppler.la	\
- @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la			\
- @BUILD_WITH_GDK_TRUE@	$(POPPLER_GLIB_LIBS)			\
- @BUILD_WITH_GDK_TRUE@	$(GDK_LIBS)				\
diff --git a/print/poppler016/patches/patch-ab b/print/poppler016/patches/patch-ab
deleted file mode 100644
index 63db5f51ff7..00000000000
--- a/print/poppler016/patches/patch-ab
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- utils/Makefile.in.orig	2011-01-27 19:32:04.000000000 +0000
-+++ utils/Makefile.in
-@@ -55,7 +55,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
- 	$(top_builddir)/poppler/poppler-config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
--@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
-+am__EXEEXT_1 = pdftoppm$(EXEEXT)
- @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
- am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
- PROGRAMS = $(bin_PROGRAMS)
-@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
- pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
- pdffonts_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_$(V))
- am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
- 	$(am__objects_1)
- pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
- pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
- 	$(am__objects_1)
- pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
- pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.cc parseargs.h
- @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
- @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
- pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
--am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
-+am__DEPENDENCIES_2 = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES =  \
- @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
-@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
- 	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
- pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
- pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h
--@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
--@BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
-+am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
-+	$(am__objects_1)
- pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
- pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
- pdftops_OBJECTS = $(am_pdftops_OBJECTS)
- pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
- 	$(am__objects_1)
- pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
- pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -389,12 +389,12 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- win32_libs = @win32_libs@
--@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
--@BUILD_SPLASH_OUTPUT_TRUE@	pdftoppm.cc				\
--@BUILD_SPLASH_OUTPUT_TRUE@	$(common)
-+pdftoppm_SOURCES = \
-+	pdftoppm.cc				\
-+	$(common)
- 
--@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_binary = pdftoppm
--@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
-+pdftoppm_binary = pdftoppm
-+pdftoppm_manpage = pdftoppm.1
- INCLUDES = \
- 	-I$(top_srcdir)				\
- 	-I$(top_srcdir)/goo			\
-@@ -405,9 +405,10 @@ INCLUDES = \
- 	$(ABIWORD_CFLAGS)
- 
- LDADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	$(UTILS_LIBS)				\
--	$(FONTCONFIG_LIBS)
-+	$(FONTCONFIG_LIBS) \
-+	$(PTHREAD_STUBLIB)
- 
- @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_SOURCES = \
- @BUILD_ABIWORD_OUTPUT_TRUE@	pdftoabw.cc				\
diff --git a/print/poppler016/patches/patch-ac b/print/poppler016/patches/patch-ac
deleted file mode 100644
index 27de3366710..00000000000
--- a/print/poppler016/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
-Fix build with Sun Studio C++.
-
---- goo/gstrtod.cc.orig	Wed Sep  9 23:22:31 2009
-+++ goo/gstrtod.cc	Sat Jan  9 21:24:38 2010
-@@ -27,6 +27,10 @@
- #include <cstdlib>
- #include <cstring>
- 
-+#if defined(sun) && !defined(__GNUC__)
-+using namespace std;
-+#endif
-+
- #define ascii_isspace(c) \
-   (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')
- #define ascii_isdigit(c) \
diff --git a/print/poppler016/patches/patch-ag b/print/poppler016/patches/patch-ag
deleted file mode 100644
index 34c091775e1..00000000000
--- a/print/poppler016/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- qt4/src/Makefile.in.orig	2010-08-10 18:02:11.000000000 +0000
-+++ qt4/src/Makefile.in
-@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libpoppler_qt4_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la \
-+	$(prefix)/lib/libpoppler.la \
- 	$(top_builddir)/poppler/libpoppler-arthur.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
-@@ -397,7 +397,7 @@ libpoppler_qt4_la_CXXFLAGS = \
- 	-Dpoppler_qt4_EXPORTS
- 
- libpoppler_qt4_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	$(top_builddir)/poppler/libpoppler-arthur.la	\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
diff --git a/print/poppler016/patches/patch-ai b/print/poppler016/patches/patch-ai
deleted file mode 100644
index 7f0d1ca6762..00000000000
--- a/print/poppler016/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- configure.orig	2009-10-18 01:28:46.000000000 +0200
-+++ configure
-@@ -20647,7 +20647,7 @@ fi
- if test x$enable_poppler_qt4 = xyes; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 moc" >&5
- $as_echo_n "checking for Qt4 moc... " >&6; }
--  MOCQT4=`which moc`
-+  MOCQT4=${QTDIR}/bin/moc
-   mocversion=`$MOCQT4 -v 2>&1`
-   mocversiongrep=`echo $mocversion | grep "Qt 4"`
-   if test x"$mocversiongrep" != x"$mocversion"; then
diff --git a/print/poppler016/patches/patch-ao b/print/poppler016/patches/patch-ao
deleted file mode 100644
index 66ce06bc01d..00000000000
--- a/print/poppler016/patches/patch-ao
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- qt/Makefile.in.orig	2009-10-18 01:28:47.000000000 +0200
-+++ qt/Makefile.in
-@@ -80,7 +80,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- 	"$(DESTDIR)$(poppler_includedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+libpoppler_qt_la_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
-@@ -349,7 +349,7 @@ libpoppler_qt_la_SOURCES = \
- 	poppler-private.h
- 
- libpoppler_qt_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(FONTCONFIG_LIBS)
diff --git a/print/poppler016/patches/patch-aq b/print/poppler016/patches/patch-aq
deleted file mode 100644
index b1060534d5a..00000000000
--- a/print/poppler016/patches/patch-aq
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- poppler/TextOutputDev.cc.orig	Mon Jan 24 19:06:00 2011
-+++ poppler/TextOutputDev.cc
-@@ -64,6 +64,14 @@
- #include "ICSupport.h"
- #endif
- 
-+#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__MirBSD__)
-+#include <sys/param.h>
-+#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000)))
-+static double fmax(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x > y ? x : y);}
-+static double fmin(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x < y ? x : y);}
-+#endif
-+#endif
-+
- //------------------------------------------------------------------------
- // parameters
- //------------------------------------------------------------------------
diff --git a/print/poppler016/patches/patch-ar b/print/poppler016/patches/patch-ar
deleted file mode 100644
index a132c8366aa..00000000000
--- a/print/poppler016/patches/patch-ar
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- cpp/Makefile.in.orig	2011-06-27 18:45:13.000000000 +0000
-+++ cpp/Makefile.in
-@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libpoppler_cpp_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
-+	$(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1)
- am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-poppler-document.lo \
- 	libpoppler_cpp_la-poppler-embedded-file.lo \
- 	libpoppler_cpp_la-poppler-font.lo \
-@@ -430,7 +430,7 @@ libpoppler_cpp_la_CXXFLAGS = \
- 	-Dpoppler_cpp_EXPORTS
- 
- libpoppler_cpp_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	$(LIBICONV)
- 
- libpoppler_cpp_la_LDFLAGS = -version-info 2:0:2 @create_shared_lib@ @auto_import_flags@
diff --git a/print/poppler016/patches/patch-as b/print/poppler016/patches/patch-as
deleted file mode 100644
index 0de1090c2cf..00000000000
--- a/print/poppler016/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2012/07/04 20:15:46 drochner Exp $
-
---- cpp/tests/Makefile.in.orig	2011-06-27 18:45:14.000000000 +0000
-+++ cpp/tests/Makefile.in
-@@ -300,7 +300,7 @@ INCLUDES = \
- 	-I$(top_srcdir)/cpp
- 
- LDADDS = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	$(prefix)/lib/libpoppler.la	\
- 	$(top_builddir)/cpp/libpoppler-cpp.la
- 
- poppler_dump_SOURCES = \
diff --git a/print/poppler016/patches/patch-configure b/print/poppler016/patches/patch-configure
deleted file mode 100644
index fa3958c8e7a..00000000000
--- a/print/poppler016/patches/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/10/27 20:38:25 joerg Exp $
-
---- configure.orig	2013-10-17 17:09:02.000000000 +0000
-+++ configure
-@@ -23193,12 +23193,12 @@ if test "x$GCC" != xyes; then
- fi
- case "$enable_compile_warnings" in
-   no)	;;
--  yes)	CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS" ;;
-+  yes)	CXXFLAGS="-Wall -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-common $CXXFLAGS" ;;
-   kde)	CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
- 		-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
- 		-Wconversion -Wall -W -Wpointer-arith \
- 		-Wwrite-strings -O2 -Wformat-security \
--		-Wmissing-format-attribute -fno-exceptions -fno-check-new \
-+		-Wmissing-format-attribute -fno-exceptions \
- 		-fno-common $CXXFLAGS" ;;
- esac
- 
diff --git a/print/poppler016/patches/patch-poppler-qt.pc.in b/print/poppler016/patches/patch-poppler-qt.pc.in
deleted file mode 100644
index 1c16f7c3152..00000000000
--- a/print/poppler016/patches/patch-poppler-qt.pc.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-poppler-qt.pc.in,v 1.1 2012/08/13 16:15:21 marino Exp $
-
-Remove a dependency to poppler-0.16 in the poppler-qt.pc file so
-that pkg-config --cflags "poppler-qt >= 0.3.1" returns valid information.
-
-Default poppler version is now 0.20.x.
-Since this package explicitely uses 0.16.x, @PC_REQUIRES_PRIVATE@
-introduces a dependency to poppler-0.16.x in the .pc file;
-pkg-config will then print messages such as
-"Package 'poppler-qt' requires 'poppler = 0.16.7' but version of poppler is 0.20.2"
-instead of the required information.
-
-Removing the Requires.private line entirely fixes the issue.
-
---- poppler-qt.pc.in.orig	2010-12-27 20:44:27.000000000 +0000
-+++ poppler-qt.pc.in
-@@ -7,7 +7,6 @@ Name: poppler-qt
- Description: Qt bindings for poppler
- Version: @VERSION@
- Requires: @PC_REQUIRES@
--@PC_REQUIRES_PRIVATE@
- 
- Libs: -L${libdir} -lpoppler-qt
- Cflags: -I${includedir}/poppler/qt3