Attachment 167775 Details for Bug 207751 – patch

[patch] patch

qpdf.patch (text/plain), 13.13 KB, created by Tijl Coosemans on 2016-03-06 20:06:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-03-06 20:06:09 UTC

Size: 13.13 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 207751: 167775