Bug 184819 - textproc/diffmark: Fix build with clang
Summary: textproc/diffmark: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2013-12-20 08:00 UTC (History)
0 users

See Also:


Attachments
file.diff (1.56 KB, patch)
2013-12-16 18:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-16 18:10:03 UTC
- Fix build with clang
- Update MASTER_SITES

New file:
files/patch-lib__diff.hh
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-19 15:57:33 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-19 16:06:42 UTC
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"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-19 16:06:48 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-20 07:55:35 UTC
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"