View | Details | Raw Unified | Return to bug 207751
Collapse All | Expand All

(-)print/qpdf/Makefile (-11 / +7 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	qpdf
4
PORTNAME=	qpdf
5
PORTVERSION=	5.1.2
5
PORTVERSION=	6.0.0
6
PORTREVISION=	1
7
CATEGORIES=	print
6
CATEGORIES=	print
8
MASTER_SITES=	SF
7
MASTER_SITES=	SF
9
8
Lines 11-33 MAINTAINER= d.y.kazarov@mail.ru Link Here
11
COMMENT=	Command-line tools for transforming and inspecting PDF documents
10
COMMENT=	Command-line tools for transforming and inspecting PDF documents
12
11
13
LICENSE=	ART20
12
LICENSE=	ART20
13
LICENSE_FILE=	${WRKSRC}/Artistic-2.0
14
14
15
BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
16
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
15
LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
17
16
18
OPTIONS_DEFINE=	SDK
17
OPTIONS_DEFINE=	DOCS
19
OPTIONS_DEFAULT=	SDK
20
OPTIONS_SUB=	yes
21
22
SDK_DESC=	Install header files (required for cups-filters)
23
18
24
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
CPPFLAGS+=	-I${LOCALBASE}/include
21
LIBS+=		-L${LOCALBASE}/lib
25
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
26
USES=		gmake libtool
23
USES=		gmake libtool
27
24
28
post-patch:
25
post-patch:
29
	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
26
	@${REINPLACE_CMD} 's/make --version/${MAKE_CMD} --version/' \
30
		-e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
27
		${WRKSRC}/configure
31
		${WRKSRC}/make/libtool.mk
32
28
33
.include <bsd.port.mk>
29
.include <bsd.port.mk>
(-)print/qpdf/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qpdf-5.1.2.tar.gz) = e9dd8d5d0a322078ffd573f057f03d24a734cc5b7dd925b089ebcb0f6e867bfd
1
SHA256 (qpdf-6.0.0.tar.gz) = a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233
2
SIZE (qpdf-5.1.2.tar.gz) = 7664268
2
SIZE (qpdf-6.0.0.tar.gz) = 8344860
(-)print/qpdf/files/patch-configure (-66 lines)
Lines 1-66 Link Here
1
--- ./configure.orig	2012-09-06 23:48:38.000000000 +0400
2
+++ ./configure	2013-01-05 00:13:47.000000000 +0400
3
@@ -12,6 +12,12 @@
4
 ## M4sh Initialization. ##
5
 ## -------------------- ##
6
 
7
+CPPFLAGS="$CPPFLAGS -I/usr/local/include"
8
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
9
+CONFIG_SHELL=/usr/local/bin/bash
10
+
11
+ac_make=gmake
12
+
13
 # Be more Bourne compatible
14
 DUALCASE=1; export DUALCASE # for MKS sh
15
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
16
@@ -1333,7 +1339,7 @@
17
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
18
                           [PREFIX]
19
 
20
-By default, \`make install' will install all the files in
21
+By default, \`${ac_make} install' will install all the files in
22
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
23
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
24
 for instance \`--prefix=\$HOME'.
25
@@ -2381,7 +2387,7 @@
26
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
27
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
28
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
29
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
30
+  as_fn_error $? "run \`${ac_make} distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
31
 fi
32
 ## -------------------- ##
33
 ## Main body of script. ##
34
@@ -8663,8 +8669,8 @@
35
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
36
 $as_echo "$hard_links" >&6; }
37
   if test "$hard_links" = no; then
38
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
39
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
40
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&5
41
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&2;}
42
     need_locks=warn
43
   fi
44
 else
45
@@ -13795,8 +13801,8 @@
46
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
47
 $as_echo "$hard_links" >&6; }
48
   if test "$hard_links" = no; then
49
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
50
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
51
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&5
52
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`${ac_make} -j' may be unsafe" >&2;}
53
     need_locks=warn
54
   fi
55
 else
56
@@ -15399,8 +15405,8 @@
57
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu make >= 3.81" >&5
58
 $as_echo_n "checking for gnu make >= 3.81... " >&6; }
59
 make_okay=0
60
-if make --version >/dev/null 2>&1; then
61
-  v=`make --version | grep 'GNU Make' | sed -e 's/.*Make //'`
62
+if ${ac_make} --version >/dev/null 2>&1; then
63
+  v=`${ac_make} --version | grep 'GNU Make' | sed -e 's/.*Make //'`
64
   maj=`echo $v | cut -d. -f 1`
65
   min=`echo $v | cut -d. -f 2`
66
   if test $maj -gt 3 -o '(' $maj -eq 3 -a $min -ge 81 ')'; then
(-)print/qpdf/files/patch-include_QPDFExc.hh (-10 lines)
Lines 1-10 Link Here
1
--- include/qpdf/QPDFExc.hh.orig	2013-10-22 10:56:42.542484811 +0400
2
+++ include/qpdf/QPDFExc.hh	2013-10-22 10:57:02.738482806 +0400
3
@@ -13,6 +13,7 @@
4
 
5
 #include <qpdf/Constants.h>
6
 #include <stdexcept>
7
+#include <string>
8
 
9
 class QPDFExc: public std::runtime_error
10
 {
(-)print/qpdf/files/patch-include_QUtil.hh (-10 lines)
Lines 1-10 Link Here
1
--- include/qpdf/QUtil.hh.orig	2013-10-22 10:53:22.013499403 +0400
2
+++ include/qpdf/QUtil.hh	2013-10-22 10:53:41.216497407 +0400
3
@@ -14,6 +14,7 @@
4
 #include <list>
5
 #include <stdexcept>
6
 #include <stdio.h>
7
+#include <ctime>
8
 
9
 namespace QUtil
10
 {
(-)print/qpdf/files/patch-include_qpdf_QPDF.hh (-10 lines)
Lines 1-10 Link Here
1
--- include/qpdf/QPDF.hh.orig	2013-10-22 10:30:42.941592225 +0400
2
+++ include/qpdf/QPDF.hh	2013-10-22 10:30:54.303595364 +0400
3
@@ -16,6 +16,7 @@
4
 #include <map>
5
 #include <list>
6
 #include <iostream>
7
+#include <ctime>
8
 
9
 #include <qpdf/QPDFObjGen.hh>
10
 #include <qpdf/QPDFXRefEntry.hh>
(-)print/qpdf/files/patch-libtests-build.mk (+8 lines)
Line 0 Link Here
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))))
(-)print/qpdf/files/patch-make-libtool.mk (+42 lines)
Line 0 Link Here
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
(-)print/qpdf/pkg-plist (-32 / +32 lines)
Lines 1-41 Link Here
1
bin/fix-qdf
1
bin/fix-qdf
2
bin/qpdf
2
bin/qpdf
3
bin/zlib-flate
3
bin/zlib-flate
4
%%SDK%%include/qpdf/Buffer.hh
4
include/qpdf/Buffer.hh
5
%%SDK%%include/qpdf/BufferInputSource.hh
5
include/qpdf/BufferInputSource.hh
6
%%SDK%%include/qpdf/Constants.h
6
include/qpdf/Constants.h
7
%%SDK%%include/qpdf/DLL.h
7
include/qpdf/DLL.h
8
%%SDK%%include/qpdf/FileInputSource.hh
8
include/qpdf/FileInputSource.hh
9
%%SDK%%include/qpdf/InputSource.hh
9
include/qpdf/InputSource.hh
10
%%SDK%%include/qpdf/Pipeline.hh
10
include/qpdf/Pipeline.hh
11
%%SDK%%include/qpdf/Pl_Buffer.hh
11
include/qpdf/Pl_Buffer.hh
12
%%SDK%%include/qpdf/Pl_Concatenate.hh
12
include/qpdf/Pl_Concatenate.hh
13
%%SDK%%include/qpdf/Pl_Count.hh
13
include/qpdf/Pl_Count.hh
14
%%SDK%%include/qpdf/Pl_Discard.hh
14
include/qpdf/Pl_Discard.hh
15
%%SDK%%include/qpdf/Pl_Flate.hh
15
include/qpdf/Pl_Flate.hh
16
%%SDK%%include/qpdf/Pl_StdioFile.hh
16
include/qpdf/Pl_StdioFile.hh
17
%%SDK%%include/qpdf/PointerHolder.hh
17
include/qpdf/PointerHolder.hh
18
%%SDK%%include/qpdf/QPDF.hh
18
include/qpdf/QPDF.hh
19
%%SDK%%include/qpdf/QPDFExc.hh
19
include/qpdf/QPDFExc.hh
20
%%SDK%%include/qpdf/QPDFObjGen.hh
20
include/qpdf/QPDFObjGen.hh
21
%%SDK%%include/qpdf/QPDFObject.hh
21
include/qpdf/QPDFObject.hh
22
%%SDK%%include/qpdf/QPDFObjectHandle.hh
22
include/qpdf/QPDFObjectHandle.hh
23
%%SDK%%include/qpdf/QPDFTokenizer.hh
23
include/qpdf/QPDFTokenizer.hh
24
%%SDK%%include/qpdf/QPDFWriter.hh
24
include/qpdf/QPDFWriter.hh
25
%%SDK%%include/qpdf/QPDFXRefEntry.hh
25
include/qpdf/QPDFXRefEntry.hh
26
%%SDK%%include/qpdf/QTC.hh
26
include/qpdf/QTC.hh
27
%%SDK%%include/qpdf/QUtil.hh
27
include/qpdf/QUtil.hh
28
%%SDK%%include/qpdf/RandomDataProvider.hh
28
include/qpdf/RandomDataProvider.hh
29
%%SDK%%include/qpdf/Types.h
29
include/qpdf/Types.h
30
%%SDK%%include/qpdf/qpdf-c.h
30
include/qpdf/qpdf-c.h
31
lib/libqpdf.a
31
lib/libqpdf.a
32
lib/libqpdf.so
32
lib/libqpdf.so
33
lib/libqpdf.so.13
33
lib/libqpdf.so.17
34
lib/libqpdf.so.13.1.2
34
lib/libqpdf.so.17.0.0
35
libdata/pkgconfig/libqpdf.pc
35
libdata/pkgconfig/libqpdf.pc
36
man/man1/fix-qdf.1.gz
36
man/man1/fix-qdf.1.gz
37
man/man1/qpdf.1.gz
37
man/man1/qpdf.1.gz
38
man/man1/zlib-flate.1.gz
38
man/man1/zlib-flate.1.gz
39
share/doc/qpdf/qpdf-manual.html
39
%%PORTDOCS%%%%DOCSDIR%%/qpdf-manual.html
40
share/doc/qpdf/qpdf-manual.pdf
40
%%PORTDOCS%%%%DOCSDIR%%/qpdf-manual.pdf
41
share/doc/qpdf/stylesheet.css
41
%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css

Return to bug 207751