Date: Sun, 20 Mar 2016 11:26:09 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411436 - in head/print: cups-filters qpdf qpdf/files Message-ID: <201603201126.u2KBQ9lR087763@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Mar 20 11:26:09 2016 New Revision: 411436 URL: https://svnweb.freebsd.org/changeset/ports/411436 Log: - Update print/qpdf to 6.0.0. - Remove bash dependency. - Remove SDK option. It was added to prevent installation of headers because they sometimes cause build conflicts with newer versions of qpdf due to incorrect order of -I flags. This has been fixed now. - Add DOCS option. - Replace patch-configure with CPPFLAGS/LIBS and a post-patch command in the Makefile to take into account ${LOCALBASE} and ${MAKE_CMD}. - Remove patches that have been fixed upstream. - Add a patch for libtest/build.mk to change the order of LIBS and LIBS_libqpdf. LIBS may contain user supplied -L flags like -L/usr/local/lib which have to appear after upstream -L flags so programs are linked against freshly built libraries on not an older version in /usr/local/lib. The other build.mk files already do this right. - Add a patch for make/libtool.mk to change the order of $ldflags and $libs. Upstream puts -L flags in $ldflags. PR: 207751 Approved by: d.y.kazarov@mail.ru (maintainer) Added: head/print/qpdf/files/patch-libtests-build.mk (contents, props changed) head/print/qpdf/files/patch-make-libtool.mk (contents, props changed) Deleted: head/print/qpdf/files/patch-configure head/print/qpdf/files/patch-include_QPDFExc.hh head/print/qpdf/files/patch-include_QUtil.hh head/print/qpdf/files/patch-include_qpdf_QPDF.hh Modified: head/print/cups-filters/Makefile head/print/qpdf/Makefile head/print/qpdf/distinfo head/print/qpdf/pkg-plist Modified: head/print/cups-filters/Makefile ============================================================================== --- head/print/cups-filters/Makefile Sun Mar 20 11:20:43 2016 (r411435) +++ head/print/cups-filters/Makefile Sun Mar 20 11:26:09 2016 (r411436) @@ -2,7 +2,7 @@ PORTNAME= cups-filters PORTVERSION= 1.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/cups-filters/ Modified: head/print/qpdf/Makefile ============================================================================== --- head/print/qpdf/Makefile Sun Mar 20 11:20:43 2016 (r411435) +++ head/print/qpdf/Makefile Sun Mar 20 11:26:09 2016 (r411436) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qpdf -PORTVERSION= 5.1.2 -PORTREVISION= 2 +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> Modified: head/print/qpdf/distinfo ============================================================================== --- head/print/qpdf/distinfo Sun Mar 20 11:20:43 2016 (r411435) +++ head/print/qpdf/distinfo Sun Mar 20 11:26:09 2016 (r411436) @@ -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 Added: head/print/qpdf/files/patch-libtests-build.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/qpdf/files/patch-libtests-build.mk Sun Mar 20 11:26:09 2016 (r411436) @@ -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)))) Added: head/print/qpdf/files/patch-make-libtool.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/qpdf/files/patch-make-libtool.mk Sun Mar 20 11:26:09 2016 (r411436) @@ -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 Modified: head/print/qpdf/pkg-plist ============================================================================== --- head/print/qpdf/pkg-plist Sun Mar 20 11:20:43 2016 (r411435) +++ head/print/qpdf/pkg-plist Sun Mar 20 11:26:09 2016 (r411436) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603201126.u2KBQ9lR087763>