ports/184819: textproc/diffmark: Fix build with clang

[KATO Tsuguru]

>Number:         184819
>Category:       ports
>Synopsis:       textproc/diffmark: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Update MASTER_SITES

New file:
files/patch-lib__diff.hh

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/diffmark/Makefile textproc/diffmark/Makefile
--- /usr/ports/textproc/diffmark/Makefile	2013-11-06 21:55:42.000000000 +0900
+++ textproc/diffmark/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -4,20 +4,22 @@
 PORTNAME=	diffmark
 PORTVERSION=	0.10
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.mangrove.cz/diffmark/
+MASTER_SITES=	http://www.mangrove.cz/diffmark/ \
+		http://penguin.cz/~vbarta/diffmark/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	XML diff and merge package
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-
 USES=		pkgconfig
-USE_LDCONFIG=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-libxml2-incldir=${LOCALBASE}/include/libxml2
+USE_GNOME=	libxml2
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-lstdc++||' ${WRKSRC}/lib/Makefile.in
+
 .include <bsd.port.mk>
diff -urN /usr/ports/textproc/diffmark/files/patch-lib__diff.hh textproc/diffmark/files/patch-lib__diff.hh
--- /usr/ports/textproc/diffmark/files/patch-lib__diff.hh	1970-01-01 09:00:00.000000000 +0900
+++ textproc/diffmark/files/patch-lib__diff.hh	2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- lib/diff.hh.orig	2013-12-07 05:09:56.000000000 +0900
++++ lib/diff.hh	2013-12-07 05:10:09.000000000 +0900
+@@ -13,7 +13,7 @@
+ template<>
+ struct less<xmlNodePtr>
+ {
+-    bool operator()(xmlNodePtr m, xmlNodePtr n)
++    bool operator()(xmlNodePtr m, xmlNodePtr n) const
+     {
+ 	return compare(m, n, true) < 0;
+     }
>Release-Note:
>Audit-Trail:
>Unformatted: