View | Details | Raw Unified | Return to bug 218165 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 218165