From owner-svn-ports-all@FreeBSD.ORG Thu Dec 19 16:06:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4A7577B1; Thu, 19 Dec 2013 16:06:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1C6731F00; Thu, 19 Dec 2013 16:06:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJG6YpQ095573; Thu, 19 Dec 2013 16:06:34 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJG6YGl095571; Thu, 19 Dec 2013 16:06:34 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312191606.rBJG6YGl095571@svn.freebsd.org> From: Pawel Pekala Date: Thu, 19 Dec 2013 16:06:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336933 - in head/textproc/diffmark: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Dec 2013 16:06:35 -0000 Author: pawel Date: Thu Dec 19 16:06:34 2013 New Revision: 336933 URL: http://svnweb.freebsd.org/changeset/ports/336933 Log: - Fix build with clang - Update MASTER_SITES - Support staging PR: ports/184819 Submitted by: KATO Tsuguru Added: head/textproc/diffmark/files/ head/textproc/diffmark/files/patch-lib__diff.hh (contents, props changed) Modified: head/textproc/diffmark/Makefile (contents, props changed) Modified: head/textproc/diffmark/Makefile ============================================================================== --- head/textproc/diffmark/Makefile Thu Dec 19 16:01:34 2013 (r336932) +++ head/textproc/diffmark/Makefile Thu Dec 19 16:06:34 2013 (r336933) @@ -4,20 +4,25 @@ 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@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 + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdiffmark.so.2 + .include Added: head/textproc/diffmark/files/patch-lib__diff.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/diffmark/files/patch-lib__diff.hh Thu Dec 19 16:06:34 2013 (r336933) @@ -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 + { +- bool operator()(xmlNodePtr m, xmlNodePtr n) ++ bool operator()(xmlNodePtr m, xmlNodePtr n) const + { + return compare(m, n, true) < 0; + }