Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Dec 2013 07:55:27 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
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
Message-ID:  <201312200755.rBK7tRqw042505@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312200755.rBK7tRqw042505>