sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build with clang

Browse source 
- Update MASTER_SITES
- Support staging

PR:		ports/184819
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
This commit is contained in:
Pawel Pekala 2013-12-19 16:06:34 +00:00
parent 90e7b3e6e0
commit e55a37ca1d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=336933
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
textproc/diffmark/Makefile
View file

@ -4,20 +4,25 @@
PORTNAME= diffmark PORTNAME= diffmark
PORTVERSION= 0.10 PORTVERSION= 0.10
CATEGORIES= textproc 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 MAINTAINER= ports@FreeBSD.org
COMMENT= XML diff and merge package COMMENT= XML diff and merge package
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
USES= pkgconfig USES= pkgconfig
USE_LDCONFIG= YES USE_GNOME= libxml2
GNU_CONFIGURE= YES GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libxml2-incldir=${LOCALBASE}/include/libxml2 USE_LDCONFIG= yes
CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib 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> .include <bsd.port.mk>

11
textproc/diffmark/files/patch-lib__diff.hh Normal file
View file

@ -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;
}