Attachment #159192 for bug #201854




# $FreeBSD: head/textproc/xqilla/Makefile 382310 2015-03-26 14:01:57Z marino $

PORTNAME=	xqilla
PORTVERSION=	2.3.2
PORTREVISION=	3
PORTEPOCH=	1
CATEGORIES=	textproc
MASTER_SITES=	SF/${PORTNAME}
DISTNAME=	XQilla-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org

LICENSE=	APACHE20
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
		libtidy.so:${PORTSDIR}/www/tidy-lib

USES=		libtool
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-xerces=${LOCALBASE} \
		--with-faxpp=no \
		--with-tidy=${LOCALBASE}
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes

OPTIONS_DEFINE=		DOXYGEN

DOCYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
   			dot:${PORTSDIR}/graphics/graphviz
DOCYGEN_ALL_TARGET=	all docs

.include <bsd.port.options.mk>

post-patch:
	@${REINPLACE_CMD} -e \
		's|[[:blank:]]-R$$(xerces_lib)||' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e \
		's|[[:blank:]]-R$$with_.*"|"|' ${WRKSRC}/configure
	cd ${WRKSRC} && ${MAKE_CMD} docs

post-install:
.if ${PORT_OPTIONS:MDOXYGEN}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "*-api" \
		${STAGEDIR}${DOCSDIR})
	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S|${PREFIX}/||} \
		! -type d >> ${TMPPLIST})
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)textproc/xqilla/distinfo (-2 / +2 lines)
1	SHA256 (XQilla-2.3.0.tar.gz) = 60e163cbbbe2900f999ee863bfa5a63d913b1d6e2ea17376302d565d2e9e1bc7	1	SHA256 (XQilla-2.3.2.tar.gz) = 5ae0aed4091521d5c2f541093e02a81ebe55a9087ba735f80b110068584e217c
2	SIZE (XQilla-2.3.0.tar.gz) = 7409736	2	SIZE (XQilla-2.3.2.tar.gz) = 16163811




--- ./include/xqilla/runtime/ResultImpl.hpp.orig	2011-08-12 09:38:56.000000000 +0200
+++ ./include/xqilla/runtime/ResultImpl.hpp	2011-08-12 09:50:47.000000000 +0200
@@ -58,7 +58,7 @@
   Result *resultPointer_;
 
 private:
-  ResultImpl(const ResultImpl &) {};
+  ResultImpl(const ResultImpl &) : LocationInfo() {};
   ResultImpl &operator=(const ResultImpl &) { return *this; };
 };
 
--- include/xqilla/events/EventSerializer.hpp.orig	2011-08-12 09:54:35.000000000 +0200
+++ include/xqilla/events/EventSerializer.hpp	2011-08-12 09:54:51.000000000 +0200
@@ -37,7 +37,9 @@
                   XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager);
   ~EventSerializer();
 
-  virtual void setLocationInfo(const LocationInfo *location) {}
+  virtual void setLocationInfo(const LocationInfo *location) {
+	  (void) location;
+  }
 
   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding);
   virtual void endDocumentEvent();
--- ./include/xqilla/simple-api/XQillaConfiguration.hpp.orig	2011-08-12 09:56:32.000000000 +0200
+++ ./include/xqilla/simple-api/XQillaConfiguration.hpp	2011-08-12 09:56:51.000000000 +0200
@@ -52,9 +52,13 @@
 
   virtual URIResolver *createDefaultURIResolver(XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager *memMgr) = 0;
 
-  virtual void populateStaticContext(StaticContext *context) {}
+  virtual void populateStaticContext(StaticContext *context) {
+	  (void) context;
+  }
 
-  virtual void populateDynamicContext(DynamicContext *context) {}
+  virtual void populateDynamicContext(DynamicContext *context) {
+	  (void) context;
+  }
 
   virtual void testInterrupt() {}
 };
--- include/xqilla/events/EventHandler.hpp.orig	2010-01-13 16:40:36.000000000 +0100
+++ include/xqilla/events/EventHandler.hpp	2011-08-12 10:12:55.000000000 +0200
@@ -35,7 +35,9 @@
 
   /** Recieves a LocationInfo object that is owned by the caller, and will be
       updated with the current location information as the parse progresses. */
-  virtual void setLocationInfo(const LocationInfo *location) {}
+  virtual void setLocationInfo(const LocationInfo *location) {
+	  (void) location;
+  }
 
   /** Handles a document node as an event */
   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding) = 0;
@@ -61,7 +63,12 @@
   virtual void namespaceEvent(const XMLCh *prefix, const XMLCh *uri) = 0;
   /** Handles an atomic item as an event */
   virtual void atomicItemEvent(AnyAtomicType::AtomicObjectType type, const XMLCh *value,
-                               const XMLCh *typeURI, const XMLCh *typeName) {}
+                               const XMLCh *typeURI, const XMLCh *typeName) {
+	  (void) type;
+	  (void) value;
+	  (void) typeURI;
+	  (void) typeName;
+  }
   /** Called when all events have been reported */
   virtual void endEvent() = 0;
 };




--- include/xqilla/events/EventHandler.hpp.orig	2015-05-18 17:38:59 UTC
+++ include/xqilla/events/EventHandler.hpp
@@ -33,7 +33,9 @@ public:
 
   /** Recieves a LocationInfo object that is owned by the caller, and will be
       updated with the current location information as the parse progresses. */
-  virtual void setLocationInfo(const LocationInfo *location) {}
+  virtual void setLocationInfo(const LocationInfo *location) {
+	  (void) location;
+  }
 
   /** Handles a document node as an event */
   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding) = 0;
@@ -59,7 +61,12 @@ public:
   virtual void namespaceEvent(const XMLCh *prefix, const XMLCh *uri) = 0;
   /** Handles an atomic item as an event */
   virtual void atomicItemEvent(AnyAtomicType::AtomicObjectType type, const XMLCh *value,
-                               const XMLCh *typeURI, const XMLCh *typeName) {}
+                               const XMLCh *typeURI, const XMLCh *typeName) {
+	  (void) type;
+	  (void) value;
+	  (void) typeURI;
+	  (void) typeName;
+  }
   /** Called when all events have been reported */
   virtual void endEvent() = 0;
 };




--- include/xqilla/events/EventSerializer.hpp.orig	2015-05-18 17:38:59 UTC
+++ include/xqilla/events/EventSerializer.hpp
@@ -35,7 +35,9 @@ public:
                   XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager);
   ~EventSerializer();
 
-  virtual void setLocationInfo(const LocationInfo *location) {}
+  virtual void setLocationInfo(const LocationInfo *location) {
+	  (void) location;
+  }
 
   virtual void startDocumentEvent(const XMLCh *documentURI, const XMLCh *encoding);
   virtual void endDocumentEvent();

Line 0 Link Here

(-)textproc/xqilla/files/patch-include__xqilla__runtime__ResultImpl.hpp (+11 lines)
	1	--- include/xqilla/runtime/ResultImpl.hpp.orig 2015-05-18 17:38:59 UTC
	2	+++ include/xqilla/runtime/ResultImpl.hpp
	3	@@ -59,7 +59,7 @@ protected:
	4	Result *resultPointer_;
	5
	6	private:
	7	- ResultImpl(const ResultImpl &) {};
	8	+ ResultImpl(const ResultImpl &) : LocationInfo() {};
	9	ResultImpl &operator=(const ResultImpl &) { return *this; };
	10	};
	11




--- include/xqilla/simple-api/XQillaConfiguration.hpp.orig	2015-05-18 17:38:59 UTC
+++ include/xqilla/simple-api/XQillaConfiguration.hpp
@@ -53,9 +53,13 @@ public:
 
   virtual ASTToXML *createASTToXML() = 0;
 
-  virtual void populateStaticContext(StaticContext *context) {}
+  virtual void populateStaticContext(StaticContext *context) {
+	  (void) context;
+  }
 
-  virtual void populateDynamicContext(DynamicContext *context) {}
+  virtual void populateDynamicContext(DynamicContext *context) {
+	  (void) context;
+  }
 
   virtual void testInterrupt() {}
 };

Lines 394-398 Link Here

(-)textproc/xqilla/pkg-plist (-2 / +2 lines)
394	include/xqilla/xqts/TestSuiteRunner.hpp	394	include/xqilla/xqts/TestSuiteRunner.hpp
395	lib/libxqilla.a	395	lib/libxqilla.a
396	lib/libxqilla.so	396	lib/libxqilla.so
397	lib/libxqilla.so.6	397	lib/libxqilla.so.4
398	lib/libxqilla.so.6.0.0	398	lib/libxqilla.so.4.2.0

Return to bug 201854

Lines 2-12 Link Here

(-)textproc/xqilla/Makefile (-18 / +24 lines)
2	# $FreeBSD: head/textproc/xqilla/Makefile 382310 2015-03-26 14:01:57Z marino $	2	# $FreeBSD: head/textproc/xqilla/Makefile 382310 2015-03-26 14:01:57Z marino $
3		3
4	PORTNAME= xqilla	4	PORTNAME= xqilla
5	PORTVERSION= 2.3.0	5	PORTVERSION= 2.3.2
6	PORTREVISION= 3
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= textproc	7	CATEGORIES= textproc
9	MASTER_SITES= SF	8	MASTER_SITES= SF/${PORTNAME}
10	DISTNAME= XQilla-${PORTVERSION}	9	DISTNAME= XQilla-${PORTVERSION}
11		10
12	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
Lines 15-45 Link Here
15	LICENSE= APACHE20	14	LICENSE= APACHE20
16	LICENSE_FILE= ${WRKSRC}/LICENSE	15	LICENSE_FILE= ${WRKSRC}/LICENSE
17		16
18	LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3	17	LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
		18	libtidy.so:${PORTSDIR}/www/tidy-lib
19		19
20	USES= gmake libtool	20	USES= libtool
21	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	CPPFLAGS+= -I${LOCALBASE}/include	22	CONFIGURE_ARGS= --with-xerces=${LOCALBASE} \
24	PORTDOCS= *	23	--with-faxpp=no \
		24	--with-tidy=${LOCALBASE}
25	INSTALL_TARGET= install-strip	25	INSTALL_TARGET= install-strip
		26	USE_LDCONFIG= yes
26		27
27	OPTIONS_DEFINE= DOCS	28	OPTIONS_DEFINE= DOXYGEN
28		29
29	MAKE_JOBS_UNSAFE= yes	30	DOCYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \
		31	dot:${PORTSDIR}/graphics/graphviz
		32	DOCYGEN_ALL_TARGET= all docs
30		33
31	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
32		35
33	.if ${PORT_OPTIONS:MDOCS}	36	post-patch:
34	BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \	37	@${REINPLACE_CMD} -e \
35	dot:${PORTSDIR}/graphics/graphviz	38	's\|[[:blank:]]-R$$(xerces_lib)\|\|' ${WRKSRC}/Makefile.in
36		39	@${REINPLACE_CMD} -e \
37	post-build:	40	's\|[[:blank:]]-R$$with_.*"\|"\|' ${WRKSRC}/configure
38	cd ${WRKSRC} && ${MAKE_CMD} docs
39		41
40	post-install:	42	post-install:
41	${MKDIR} ${STAGEDIR}${DOCSDIR}	43	.if ${PORT_OPTIONS:MDOXYGEN}
42	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \*-api ${STAGEDIR}${DOCSDIR}	44	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		45	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "*-api" \
		46	${STAGEDIR}${DOCSDIR})
		47	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${DOCSDIR:S\|${PREFIX}/\|\|} \
		48	! -type d >> ${TMPPLIST})
43	.endif	49	.endif
44		50
45	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Lines 1-69 Link Here

(-)textproc/xqilla/files/patch-gcc-werror (-69 lines)
1	--- ./include/xqilla/runtime/ResultImpl.hpp.orig 2011-08-12 09:38:56.000000000 +0200
2	+++ ./include/xqilla/runtime/ResultImpl.hpp 2011-08-12 09:50:47.000000000 +0200
3	@@ -58,7 +58,7 @@
4	Result *resultPointer_;
5
6	private:
7	- ResultImpl(const ResultImpl &) {};
8	+ ResultImpl(const ResultImpl &) : LocationInfo() {};
9	ResultImpl &operator=(const ResultImpl &) { return *this; };
10	};
11
12	--- include/xqilla/events/EventSerializer.hpp.orig 2011-08-12 09:54:35.000000000 +0200
13	+++ include/xqilla/events/EventSerializer.hpp 2011-08-12 09:54:51.000000000 +0200
14	@@ -37,7 +37,9 @@
15	XERCES_CPP_NAMESPACE_QUALIFIER XMLPlatformUtils::fgMemoryManager);
16	~EventSerializer();
17
18	- virtual void setLocationInfo(const LocationInfo *location) {}
19	+ virtual void setLocationInfo(const LocationInfo *location) {
20	+ (void) location;
21	+ }
22
23	virtual void startDocumentEvent(const XMLCh documentURI, const XMLCh encoding);
24	virtual void endDocumentEvent();
25	--- ./include/xqilla/simple-api/XQillaConfiguration.hpp.orig 2011-08-12 09:56:32.000000000 +0200
26	+++ ./include/xqilla/simple-api/XQillaConfiguration.hpp 2011-08-12 09:56:51.000000000 +0200
27	@@ -52,9 +52,13 @@
28
29	virtual URIResolver createDefaultURIResolver(XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager memMgr) = 0;
30
31	- virtual void populateStaticContext(StaticContext *context) {}
32	+ virtual void populateStaticContext(StaticContext *context) {
33	+ (void) context;
34	+ }
35
36	- virtual void populateDynamicContext(DynamicContext *context) {}
37	+ virtual void populateDynamicContext(DynamicContext *context) {
38	+ (void) context;
39	+ }
40
41	virtual void testInterrupt() {}
42	};
43	--- include/xqilla/events/EventHandler.hpp.orig 2010-01-13 16:40:36.000000000 +0100
44	+++ include/xqilla/events/EventHandler.hpp 2011-08-12 10:12:55.000000000 +0200
45	@@ -35,7 +35,9 @@
46
47	/** Recieves a LocationInfo object that is owned by the caller, and will be
48	updated with the current location information as the parse progresses. */
49	- virtual void setLocationInfo(const LocationInfo *location) {}
50	+ virtual void setLocationInfo(const LocationInfo *location) {
51	+ (void) location;
52	+ }
53
54	/** Handles a document node as an event */
55	virtual void startDocumentEvent(const XMLCh documentURI, const XMLCh encoding) = 0;
56	@@ -61,7 +63,12 @@
57	virtual void namespaceEvent(const XMLCh prefix, const XMLCh uri) = 0;
58	/** Handles an atomic item as an event */
59	virtual void atomicItemEvent(AnyAtomicType::AtomicObjectType type, const XMLCh *value,
60	- const XMLCh typeURI, const XMLCh typeName) {}
61	+ const XMLCh typeURI, const XMLCh typeName) {
62	+ (void) type;
63	+ (void) value;
64	+ (void) typeURI;
65	+ (void) typeName;
66	+ }
67	/** Called when all events have been reported */
68	virtual void endEvent() = 0;
69	};

Line 0 Link Here

(-)textproc/xqilla/files/patch-include__xqilla__simple-api__XQillaConfiguration.hpp (+18 lines)
	1	--- include/xqilla/simple-api/XQillaConfiguration.hpp.orig 2015-05-18 17:38:59 UTC
	2	+++ include/xqilla/simple-api/XQillaConfiguration.hpp
	3	@@ -53,9 +53,13 @@ public:
	4
	5	virtual ASTToXML *createASTToXML() = 0;
	6
	7	- virtual void populateStaticContext(StaticContext *context) {}
	8	+ virtual void populateStaticContext(StaticContext *context) {
	9	+ (void) context;
	10	+ }
	11
	12	- virtual void populateDynamicContext(DynamicContext *context) {}
	13	+ virtual void populateDynamicContext(DynamicContext *context) {
	14	+ (void) context;
	15	+ }
	16
	17	virtual void testInterrupt() {}
	18	};