Attachment 196663 Details for Bug 218165 – Update; Clean up

[patch] Update; Clean up

libxml++ (text/plain), 8.54 KB, created by Nathan on 2018-08-29 04:05:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-08-29 04:05:53 UTC

Size: 8.54 KB

patch

obsolete

>textproc/libxml++26:
>
>* Update to 2.91.3
>* Cleaned up Makefile
>* Removed compiler: and CXXSTD
>  -- built fine without
>
>Changelog: http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.91/libxml++-2.91.1.changes
>
>Index: textproc/libxml++26/Makefile
>===================================================================
>--- textproc/libxml++26/Makefile	(revision 478337)
>+++ textproc/libxml++26/Makefile	(working copy)
>@@ -3,8 +3,7 @@
> #   $MCom: ports/textproc/libxml++26/Makefile,v 1.43 2011/04/18 19:58:29 kwm Exp $
> 
> PORTNAME=	libxml++
>-PORTVERSION=	2.34.2
>-PORTREVISION?=	2
>+PORTVERSION=	2.91.3
> PORTEPOCH=	1
> CATEGORIES=	textproc
> MASTER_SITES=	GNOME
>@@ -12,16 +11,12 @@
> MAINTAINER=	bland@FreeBSD.org
> COMMENT=	XML API for C++
> 
>-USES+=		tar:xz compiler:c++11-lang
>-USE_CXXSTD=	c++11
>+LICENSE=	LGPL21
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
>-
>-.if !defined(REFERENCE_PORT)
>-
> BUILD_DEPENDS=	gm4:devel/m4
> 
>-USES+=		gmake libtool pathfix pkgconfig
>+USES+=		gmake libtool gnome pathfix pkgconfig tar:xz
> USE_GNOME=	glibmm libxml2
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>@@ -28,14 +23,14 @@
> CONFIGURE_ARGS=	--enable-static --disable-documentation
> INSTALL_TARGET=	install-strip
> 
>+PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
>+
>+
>+
> post-patch:
> 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
> 		${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e '/^library_configdir =/s/libdir/includedir/' \
> 		${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e '/^Cflags:/s/libdir/includedir/' \
>-		${WRKSRC}/libxml++-2.6.pc.in
> 
> .include <bsd.port.mk>
>-
>-.endif
>Index: textproc/libxml++26/distinfo
>===================================================================
>--- textproc/libxml++26/distinfo	(revision 478337)
>+++ textproc/libxml++26/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (libxml++-2.34.2.tar.xz) = 77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa
>-SIZE (libxml++-2.34.2.tar.xz) = 1070956
>+TIMESTAMP = 1535514515
>+SHA256 (libxml++-2.91.3.tar.xz) = f9f910cacd1d07c71679eeea36ae018189b72b4b7dd11511a76562377ed4d06a
>+SIZE (libxml++-2.91.3.tar.xz) = 934428
>Index: textproc/libxml++26/files/patch-c++11
>===================================================================
>--- textproc/libxml++26/files/patch-c++11	(revision 478337)
>+++ textproc/libxml++26/files/patch-c++11	(nonexistent)
>@@ -1,46 +0,0 @@
>-From 7dbfb0aed508451e8237c34472815e44925a545c Mon Sep 17 00:00:00 2001
>-From: Mikhail Titov <mlt@gmx.us>
>-Date: Thu, 30 Apr 2015 17:51:20 +0200
>-Subject: Fix the build with C++11 compilers, such as MS Visual C++ 2013.
>-
>-Implicit conversions from streams to bool are no longer allowed.
>----
>- libxml++/io/istreamparserinputbuffer.cc | 2 +-
>- libxml++/io/ostreamoutputbuffer.cc      | 4 ++--
>- 2 files changed, 3 insertions(+), 3 deletions(-)
>-
>-diff --git a/libxml++/io/istreamparserinputbuffer.cc b/libxml++/io/istreamparserinputbuffer.cc
>-index b1d6e5b..7a7f283 100644
>---- libxml++/io/istreamparserinputbuffer.cc
>-+++ libxml++/io/istreamparserinputbuffer.cc
>-@@ -39,6 +39,6 @@ namespace xmlpp
>- 
>-   bool IStreamParserInputBuffer::do_close()
>-   {
>--    return input_;
>-+    return input_.good();
>-   }
>- }
>-diff --git a/libxml++/io/ostreamoutputbuffer.cc b/libxml++/io/ostreamoutputbuffer.cc
>-index 0a3e6db..b23a8b6 100644
>---- libxml++/io/ostreamoutputbuffer.cc
>-+++ libxml++/io/ostreamoutputbuffer.cc
>-@@ -29,13 +29,13 @@ namespace xmlpp
>-     // here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded.
>-     if(output_)
>-       output_.write(buffer, len);
>--    return output_;
>-+    return output_.good();
>-   }
>- 
>-   bool OStreamOutputBuffer::do_close()
>-   {
>-     if(output_)
>-         output_.flush();
>--    return output_;
>-+    return output_.good();
>-   }
>- }
>--- 
>-cgit v0.12
>-
>
>Property changes on: textproc/libxml++26/files/patch-c++11
>___________________________________________________________________
>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: textproc/libxml++26/pkg-plist
>===================================================================
>--- textproc/libxml++26/pkg-plist	(revision 478337)
>+++ textproc/libxml++26/pkg-plist	(working copy)
>@@ -1,36 +1,46 @@
>-include/libxml++-%%API_VERSION%%/include/libxml++config.h
>-include/libxml++-%%API_VERSION%%/libxml++/attribute.h
>-include/libxml++-%%API_VERSION%%/libxml++/document.h
>-include/libxml++-%%API_VERSION%%/libxml++/dtd.h
>-include/libxml++-%%API_VERSION%%/libxml++/exceptions/exception.h
>-include/libxml++-%%API_VERSION%%/libxml++/exceptions/internal_error.h
>-include/libxml++-%%API_VERSION%%/libxml++/exceptions/parse_error.h
>-include/libxml++-%%API_VERSION%%/libxml++/exceptions/validity_error.h
>-include/libxml++-%%API_VERSION%%/libxml++/io/istreamparserinputbuffer.h
>-include/libxml++-%%API_VERSION%%/libxml++/io/ostreamoutputbuffer.h
>-include/libxml++-%%API_VERSION%%/libxml++/io/outputbuffer.h
>-include/libxml++-%%API_VERSION%%/libxml++/io/parserinputbuffer.h
>-include/libxml++-%%API_VERSION%%/libxml++/keepblanks.h
>-include/libxml++-%%API_VERSION%%/libxml++/libxml++.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/cdatanode.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/commentnode.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/contentnode.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/element.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/entityreference.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/node.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/processinginstructionnode.h
>-include/libxml++-%%API_VERSION%%/libxml++/nodes/textnode.h
>-include/libxml++-%%API_VERSION%%/libxml++/noncopyable.h
>-include/libxml++-%%API_VERSION%%/libxml++/parsers/domparser.h
>-include/libxml++-%%API_VERSION%%/libxml++/parsers/parser.h
>-include/libxml++-%%API_VERSION%%/libxml++/parsers/saxparser.h
>-include/libxml++-%%API_VERSION%%/libxml++/parsers/textreader.h
>-include/libxml++-%%API_VERSION%%/libxml++/schema.h
>-include/libxml++-%%API_VERSION%%/libxml++/validators/dtdvalidator.h
>-include/libxml++-%%API_VERSION%%/libxml++/validators/schemavalidator.h
>-include/libxml++-%%API_VERSION%%/libxml++/validators/validator.h
>-lib/libxml++-%%VERSION%%.a
>-lib/libxml++-%%VERSION%%.so
>-lib/libxml++-%%VERSION%%.so.2
>-lib/libxml++-%%VERSION%%.so.2.0.7
>-libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
>+include/libxml++-3.0/include/libxml++config.h
>+include/libxml++-3.0/libxml++/attribute.h
>+include/libxml++-3.0/libxml++/attributedeclaration.h
>+include/libxml++-3.0/libxml++/attributenode.h
>+include/libxml++-3.0/libxml++/document.h
>+include/libxml++-3.0/libxml++/dtd.h
>+include/libxml++-3.0/libxml++/exceptions/exception.h
>+include/libxml++-3.0/libxml++/exceptions/internal_error.h
>+include/libxml++-3.0/libxml++/exceptions/parse_error.h
>+include/libxml++-3.0/libxml++/exceptions/validity_error.h
>+include/libxml++-3.0/libxml++/exceptions/wrapped_exception.h
>+include/libxml++-3.0/libxml++/io/istreamparserinputbuffer.h
>+include/libxml++-3.0/libxml++/io/ostreamoutputbuffer.h
>+include/libxml++-3.0/libxml++/io/outputbuffer.h
>+include/libxml++-3.0/libxml++/io/parserinputbuffer.h
>+include/libxml++-3.0/libxml++/keepblanks.h
>+include/libxml++-3.0/libxml++/libxml++.h
>+include/libxml++-3.0/libxml++/nodes/cdatanode.h
>+include/libxml++-3.0/libxml++/nodes/commentnode.h
>+include/libxml++-3.0/libxml++/nodes/contentnode.h
>+include/libxml++-3.0/libxml++/nodes/element.h
>+include/libxml++-3.0/libxml++/nodes/entitydeclaration.h
>+include/libxml++-3.0/libxml++/nodes/entityreference.h
>+include/libxml++-3.0/libxml++/nodes/node.h
>+include/libxml++-3.0/libxml++/nodes/processinginstructionnode.h
>+include/libxml++-3.0/libxml++/nodes/textnode.h
>+include/libxml++-3.0/libxml++/nodes/xincludeend.h
>+include/libxml++-3.0/libxml++/nodes/xincludestart.h
>+include/libxml++-3.0/libxml++/noncopyable.h
>+include/libxml++-3.0/libxml++/parsers/domparser.h
>+include/libxml++-3.0/libxml++/parsers/parser.h
>+include/libxml++-3.0/libxml++/parsers/saxparser.h
>+include/libxml++-3.0/libxml++/parsers/textreader.h
>+include/libxml++-3.0/libxml++/relaxngschema.h
>+include/libxml++-3.0/libxml++/schemabase.h
>+include/libxml++-3.0/libxml++/validators/dtdvalidator.h
>+include/libxml++-3.0/libxml++/validators/relaxngvalidator.h
>+include/libxml++-3.0/libxml++/validators/schemavalidatorbase.h
>+include/libxml++-3.0/libxml++/validators/validator.h
>+include/libxml++-3.0/libxml++/validators/xsdvalidator.h
>+include/libxml++-3.0/libxml++/xsdschema.h
>+lib/libxml++-3.0.a
>+lib/libxml++-3.0.so
>+lib/libxml++-3.0.so.0
>+lib/libxml++-3.0.so.0.0.0
>+libdata/pkgconfig/libxml++-3.0.pc

Flags:

ndowens04: maintainer-approval? (bland)

Actions: View | Diff

Attachments on bug 218165: 181233 | 196663