From owner-svn-ports-branches@FreeBSD.ORG  Fri Dec 20 07:55:27 2013
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@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 70E1BDD2;
 Fri, 20 Dec 2013 07:55:27 +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 5CF7F17FA;
 Fri, 20 Dec 2013 07:55:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBK7tRNK042506;
 Fri, 20 Dec 2013 07:55:27 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBK7tRqw042505;
 Fri, 20 Dec 2013 07:55:27 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312200755.rBK7tRqw042505@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 20 Dec 2013 07:55:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r336974 - in branches/2014Q1/textproc/diffmark: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Dec 2013 07:55:27 -0000

Author: bapt
Date: Fri Dec 20 07:55:26 2013
New Revision: 336974
URL: http://svnweb.freebsd.org/changeset/ports/336974

Log:
  MFH: r336933
  
  - Fix build with clang
  - Update MASTER_SITES
  - Support staging
  
  PR:		ports/184819
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  branches/2014Q1/textproc/diffmark/files/
     - copied from r336933, head/textproc/diffmark/files/
Modified:
  branches/2014Q1/textproc/diffmark/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/diffmark/Makefile
==============================================================================
--- branches/2014Q1/textproc/diffmark/Makefile	Fri Dec 20 07:54:38 2013	(r336973)
+++ branches/2014Q1/textproc/diffmark/Makefile	Fri Dec 20 07:55:26 2013	(r336974)
@@ -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 <bsd.port.mk>