--- print/qpdf/Makefile	(revision 459173)
+++ print/qpdf/Makefile	(working copy)
@@ -2,8 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	qpdf
-PORTVERSION=	6.0.0
-PORTREVISION=	1
+PORTVERSION=	7.1.0
 CATEGORIES=	print
 MASTER_SITES=	SF
 
@@ -13,18 +12,10 @@ 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/Artistic-2.0
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
-
-OPTIONS_DEFINE=	DOCS
-
+USES=		autoreconf gmake jpeg libtool localbase
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USES=		gmake libtool
 
-post-patch:
-	@${REINPLACE_CMD} 's/make --version/${MAKE_CMD} --version/' \
-		${WRKSRC}/configure
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
--- print/qpdf/distinfo	(revision 459173)
+++ print/qpdf/distinfo	(working copy)
@@ -1,2 +1,3 @@ 
-SHA256 (qpdf-6.0.0.tar.gz) = a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233
-SIZE (qpdf-6.0.0.tar.gz) = 8344860
+TIMESTAMP = 1516116745
+SHA256 (qpdf-7.1.0.tar.gz) = 27054bfb83a4f4f70053c6d4c2de5e18ddf60c9a8edbce219ac1bdcf03f16a2e
+SIZE (qpdf-7.1.0.tar.gz) = 7097479
--- print/qpdf/files/patch-libqpdf_Pl__PNGFilter.cc	(nonexistent)
+++ print/qpdf/files/patch-libqpdf_Pl__PNGFilter.cc	(working copy)
@@ -0,0 +1,12 @@ 
+Needed on 10.4 only.
+Upstream is aware of the issue: https://github.com/qpdf/qpdf/pull/172
+
+--- libqpdf/Pl_PNGFilter.cc.orig	2018-01-15 01:09:20 UTC
++++ libqpdf/Pl_PNGFilter.cc
+@@ -1,5 +1,6 @@
+ #include <qpdf/Pl_PNGFilter.hh>
+ #include <qpdf/QTC.hh>
++#include <cstdlib>
+ #include <stdexcept>
+ #include <string.h>
+ #include <limits.h>
--- print/qpdf/files/patch-libtests-build.mk	(revision 459173)
+++ print/qpdf/files/patch-libtests-build.mk	(nonexistent)
@@ -1,8 +0,0 @@ 
---- libtests/build.mk.orig	2015-11-10 17:48:52 UTC
-+++ libtests/build.mk
-@@ -40,4 +40,4 @@ $(foreach B,$(BINS_libtests),$(eval \
- 
- $(foreach B,$(BINS_libtests),$(eval \
-   libtests/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
--	$(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS) $(LIBS_libqpdf))))
-+	$(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))))
--- print/qpdf/files/patch-make-libtool.mk	(revision 459173)
+++ print/qpdf/files/patch-make-libtool.mk	(nonexistent)
@@ -1,42 +0,0 @@ 
---- make/libtool.mk.orig	2015-11-10 17:48:52 UTC
-+++ make/libtool.mk
-@@ -1,7 +1,7 @@
- # --- Required interface definitions ---
- 
--# LIBTOOL needs bash
--SHELL=/bin/bash
-+# LIBTOOL needs sh
-+SHELL=/bin/sh
- 
- OBJ=o
- LOBJ=lo
-@@ -94,20 +94,20 @@ endef
- define makelib
- 	$(LIBTOOL) --mode=link \
- 		$(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \
--		 -o $(2) $(1) $(4) $(3) \
-+		 -o $(2) $(1) $(3) $(4) \
- 		 -rpath $(libdir) -version-info $(5):$(6):$(7)
- endef
- 
- #                       1    2      3       4
- # Usage: $(call makebin,objs,binary,ldflags,libs)
- define makebin
--	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(4) $(3)
-+	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4)
- endef
- 
- # Install target
- 
- install: all
--	./mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
-+	./mkinstalldirs $(DESTDIR)$(prefix)/libdata/pkgconfig
- 	./mkinstalldirs $(DESTDIR)$(bindir)
- 	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
- 	./mkinstalldirs $(DESTDIR)$(docdir)
-@@ -129,4 +129,4 @@ install: all
- 	cp doc/qpdf-manual.html $(DESTDIR)$(docdir)
- 	cp doc/qpdf-manual.pdf $(DESTDIR)$(docdir)
- 	cp doc/*.1 $(DESTDIR)$(mandir)/man1
--	cp libqpdf.pc $(DESTDIR)$(libdir)/pkgconfig
-+	cp libqpdf.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
--- print/qpdf/files/patch-make_libtool.mk	(nonexistent)
+++ print/qpdf/files/patch-make_libtool.mk	(working copy)
@@ -0,0 +1,30 @@ 
+--- make/libtool.mk.orig	2018-01-15 01:09:20 UTC
++++ make/libtool.mk
+@@ -1,7 +1,7 @@
+ # --- Required interface definitions ---
+ 
+-# LIBTOOL needs bash
+-SHELL=/bin/bash
++# LIBTOOL needs sh
++SHELL?=/bin/sh
+ 
+ OBJ=o
+ LOBJ=lo
+@@ -112,14 +112,14 @@ install: all
+ 	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
+ 	./mkinstalldirs $(DESTDIR)$(docdir)
+ 	./mkinstalldirs $(DESTDIR)$(mandir)/man1
+-	$(LIBTOOL) --mode=install ./install-sh \
++	$(LIBTOOL) --mode=install ./install-sh -s \
+ 		libqpdf/$(OUTPUT_DIR)/libqpdf.la \
+ 		$(DESTDIR)$(libdir)/libqpdf.la
+ 	$(LIBTOOL) --finish $(DESTDIR)$(libdir)
+-	$(LIBTOOL) --mode=install ./install-sh \
++	$(LIBTOOL) --mode=install ./install-sh -s \
+ 		qpdf/$(OUTPUT_DIR)/qpdf \
+ 		$(DESTDIR)$(bindir)/qpdf
+-	$(LIBTOOL) --mode=install ./install-sh \
++	$(LIBTOOL) --mode=install ./install-sh -s \
+ 		zlib-flate/$(OUTPUT_DIR)/zlib-flate \
+ 		$(DESTDIR)$(bindir)/zlib-flate
+ 	cp qpdf/fix-qdf $(DESTDIR)$(bindir)
--- print/qpdf/pkg-plist	(revision 459173)
+++ print/qpdf/pkg-plist	(working copy)
@@ -11,8 +11,10 @@ 
 include/qpdf/Pl_Buffer.hh
 include/qpdf/Pl_Concatenate.hh
 include/qpdf/Pl_Count.hh
+include/qpdf/Pl_DCT.hh
 include/qpdf/Pl_Discard.hh
 include/qpdf/Pl_Flate.hh
+include/qpdf/Pl_RunLength.hh
 include/qpdf/Pl_StdioFile.hh
 include/qpdf/PointerHolder.hh
 include/qpdf/QPDF.hh
@@ -30,8 +32,8 @@ 
 include/qpdf/qpdf-c.h
 lib/libqpdf.a
 lib/libqpdf.so
-lib/libqpdf.so.17
-lib/libqpdf.so.17.0.0
+lib/libqpdf.so.18
+lib/libqpdf.so.18.2.0
 libdata/pkgconfig/libqpdf.pc
 man/man1/fix-qdf.1.gz
 man/man1/qpdf.1.gz