- Fix build with clang - Update MASTER_SITES New file: files/patch-lib__diff.hh
Responsible Changed From-To: freebsd-ports-bugs->pawel I'll take it.
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 <tkato432@yahoo.com> 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 <bsd.port.mk> 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<xmlNodePtr> + { +- bool operator()(xmlNodePtr m, xmlNodePtr n) ++ bool operator()(xmlNodePtr m, xmlNodePtr n) const + { + return compare(m, n, true) < 0; + } _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!
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> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"