Attachment #189806 for bug #225226




# $FreeBSD$

PORTNAME=	qpdf
PORTVERSION=	7.1.0
PORTREVISION=	1
CATEGORIES=	print
MASTER_SITES=	SF


LICENSE=	ART20
LICENSE_FILE=	${WRKSRC}/Artistic-2.0

USES=		autoreconf gmake jpeg libtool localbase

OPTIONS_DEFINE=	DOCS

GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
USE_LDCONFIG=	yes
USES=		gmake libtool

OPTIONS_DEFINE=	DOCS
	@${REINPLACE_CMD} 's/make --version/${MAKE_CMD} --version/' \
		${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)print/qpdf/distinfo (-2 / +3 lines)
1	SHA256 (qpdf-6.0.0.tar.gz) = a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233	1	TIMESTAMP = 1516116745
2	SIZE (qpdf-6.0.0.tar.gz) = 8344860	2	SHA256 (qpdf-7.1.0.tar.gz) = 27054bfb83a4f4f70053c6d4c2de5e18ddf60c9a8edbce219ac1bdcf03f16a2e
		3	SIZE (qpdf-7.1.0.tar.gz) = 7097479




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>

Lines 1-8 Link Here

(-)print/qpdf/files/patch-libtests-build.mk (-8 lines)
1	--- libtests/build.mk.orig 2015-11-10 17:48:52 UTC
2	+++ libtests/build.mk
3	@@ -40,4 +40,4 @@ $(foreach B,$(BINS_libtests),$(eval \
4
5	$(foreach B,$(BINS_libtests),$(eval \
6	libtests/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
7	- $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS) $(LIBS_libqpdf))))
8	+ $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))))




--- 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




--- 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)




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

include/qpdf/qpdf-c.h
lib/libqpdf.a
lib/libqpdf.so
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

Return to bug 225226

Lines 2-9 Link Here

(-)print/qpdf/Makefile (-12 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qpdf	4	PORTNAME= qpdf
5	PORTVERSION= 6.0.0	5	PORTVERSION= 7.1.0
6	PORTREVISION= 1
7	CATEGORIES= print	6	CATEGORIES= print
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 13-30 Link Here
13	LICENSE= ART20	12	LICENSE= ART20
14	LICENSE_FILE= ${WRKSRC}/Artistic-2.0	13	LICENSE_FILE= ${WRKSRC}/Artistic-2.0
15		14
16	LIB_DEPENDS= libpcre.so:devel/pcre	15	USES= autoreconf gmake jpeg libtool localbase
17
18	OPTIONS_DEFINE= DOCS
19
20	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
21	CPPFLAGS+= -I${LOCALBASE}/include
22	LIBS+= -L${LOCALBASE}/lib
23	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
24	USES= gmake libtool
25		18
26	post-patch:	19	OPTIONS_DEFINE= DOCS
27	@${REINPLACE_CMD} 's/make --version/${MAKE_CMD} --version/' \
28	${WRKSRC}/configure
29		20
30	.include <bsd.port.mk>	21	.include <bsd.port.mk>

Line 0 Link Here

(-)print/qpdf/files/patch-libqpdf_Pl__PNGFilter.cc (+12 lines)
	1	Needed on 10.4 only.
	2	Upstream is aware of the issue: https://github.com/qpdf/qpdf/pull/172
	3
	4	--- libqpdf/Pl_PNGFilter.cc.orig 2018-01-15 01:09:20 UTC
	5	+++ libqpdf/Pl_PNGFilter.cc
	6	@@ -1,5 +1,6 @@
	7	#include <qpdf/Pl_PNGFilter.hh>
	8	#include <qpdf/QTC.hh>
	9	+#include <cstdlib>
	10	#include <stdexcept>
	11	#include <string.h>
	12	#include <limits.h>

Lines 1-42 Link Here

(-)print/qpdf/files/patch-make-libtool.mk (-42 lines)
1	--- make/libtool.mk.orig 2015-11-10 17:48:52 UTC
2	+++ make/libtool.mk
3	@@ -1,7 +1,7 @@
4	# --- Required interface definitions ---
5
6	-# LIBTOOL needs bash
7	-SHELL=/bin/bash
8	+# LIBTOOL needs sh
9	+SHELL=/bin/sh
10
11	OBJ=o
12	LOBJ=lo
13	@@ -94,20 +94,20 @@ endef
14	define makelib
15	$(LIBTOOL) --mode=link \
16	$(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \
17	- -o $(2) $(1) $(4) $(3) \
18	+ -o $(2) $(1) $(3) $(4) \
19	-rpath $(libdir) -version-info $(5):$(6):$(7)
20	endef
21
22	# 1 2 3 4
23	# Usage: $(call makebin,objs,binary,ldflags,libs)
24	define makebin
25	- $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(4) $(3)
26	+ $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4)
27	endef
28
29	# Install target
30
31	install: all
32	- ./mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
33	+ ./mkinstalldirs $(DESTDIR)$(prefix)/libdata/pkgconfig
34	./mkinstalldirs $(DESTDIR)$(bindir)
35	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
36	./mkinstalldirs $(DESTDIR)$(docdir)
37	@@ -129,4 +129,4 @@ install: all
38	cp doc/qpdf-manual.html $(DESTDIR)$(docdir)
39	cp doc/qpdf-manual.pdf $(DESTDIR)$(docdir)
40	cp doc/*.1 $(DESTDIR)$(mandir)/man1
41	- cp libqpdf.pc $(DESTDIR)$(libdir)/pkgconfig
42	+ cp libqpdf.pc $(DESTDIR)$(prefix)/libdata/pkgconfig

Line 0 Link Here

(-)print/qpdf/files/patch-make_libtool.mk (+30 lines)
	1	--- make/libtool.mk.orig 2018-01-15 01:09:20 UTC
	2	+++ make/libtool.mk
	3	@@ -1,7 +1,7 @@
	4	# --- Required interface definitions ---
	5
	6	-# LIBTOOL needs bash
	7	-SHELL=/bin/bash
	8	+# LIBTOOL needs sh
	9	+SHELL?=/bin/sh
	10
	11	OBJ=o
	12	LOBJ=lo
	13	@@ -112,14 +112,14 @@ install: all
	14	./mkinstalldirs $(DESTDIR)$(includedir)/qpdf
	15	./mkinstalldirs $(DESTDIR)$(docdir)
	16	./mkinstalldirs $(DESTDIR)$(mandir)/man1
	17	- $(LIBTOOL) --mode=install ./install-sh \
	18	+ $(LIBTOOL) --mode=install ./install-sh -s \
	19	libqpdf/$(OUTPUT_DIR)/libqpdf.la \
	20	$(DESTDIR)$(libdir)/libqpdf.la
	21	$(LIBTOOL) --finish $(DESTDIR)$(libdir)
	22	- $(LIBTOOL) --mode=install ./install-sh \
	23	+ $(LIBTOOL) --mode=install ./install-sh -s \
	24	qpdf/$(OUTPUT_DIR)/qpdf \
	25	$(DESTDIR)$(bindir)/qpdf
	26	- $(LIBTOOL) --mode=install ./install-sh \
	27	+ $(LIBTOOL) --mode=install ./install-sh -s \
	28	zlib-flate/$(OUTPUT_DIR)/zlib-flate \
	29	$(DESTDIR)$(bindir)/zlib-flate
	30	cp qpdf/fix-qdf $(DESTDIR)$(bindir)

Lines 11-18 Link Here

(-)print/qpdf/pkg-plist (-2 / +4 lines)
11	include/qpdf/Pl_Buffer.hh	11	include/qpdf/Pl_Buffer.hh
12	include/qpdf/Pl_Concatenate.hh	12	include/qpdf/Pl_Concatenate.hh
13	include/qpdf/Pl_Count.hh	13	include/qpdf/Pl_Count.hh
		14	include/qpdf/Pl_DCT.hh
14	include/qpdf/Pl_Discard.hh	15	include/qpdf/Pl_Discard.hh
15	include/qpdf/Pl_Flate.hh	16	include/qpdf/Pl_Flate.hh
		17	include/qpdf/Pl_RunLength.hh
16	include/qpdf/Pl_StdioFile.hh	18	include/qpdf/Pl_StdioFile.hh
17	include/qpdf/PointerHolder.hh	19	include/qpdf/PointerHolder.hh
18	include/qpdf/QPDF.hh	20	include/qpdf/QPDF.hh
Lines 30-37 Link Here
30	include/qpdf/qpdf-c.h	32	include/qpdf/qpdf-c.h
31	lib/libqpdf.a	33	lib/libqpdf.a
32	lib/libqpdf.so	34	lib/libqpdf.so
33	lib/libqpdf.so.17	35	lib/libqpdf.so.18
34	lib/libqpdf.so.17.0.0	36	lib/libqpdf.so.18.2.0
35	libdata/pkgconfig/libqpdf.pc	37	libdata/pkgconfig/libqpdf.pc
36	man/man1/fix-qdf.1.gz	38	man/man1/fix-qdf.1.gz
37	man/man1/qpdf.1.gz	39	man/man1/qpdf.1.gz