Bug 184870 - textproc/ssddiff: Fix build on -current
Summary: textproc/ssddiff: Fix build on -current
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: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2014-01-25 16:50 UTC (History)
0 users

See Also:


Attachments
file.diff (2.22 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:19 UTC
- Fix build on -current

New file:
files/patch-src__rel_count.h
files/patch-src__ustring.h
Comment 1 Martin Wilke freebsd_committer freebsd_triage 2014-01-23 15:45:52 UTC
Responsible Changed
From-To: freebsd-ports-bugs->miwi

I'll take it.
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2014-01-25 16:46:50 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-25 16:46:53 UTC
Author: miwi
Date: Sat Jan 25 16:46:40 2014
New Revision: 341052
URL: http://svnweb.freebsd.org/changeset/ports/341052
QAT: https://qat.redports.org/buildarchive/r341052/

Log:
  - Fix build
  
  PR:		184870
  Submitted by:	Ports Fury

Added:
  head/textproc/ssddiff/files/
  head/textproc/ssddiff/files/patch-src__rel_count.h   (contents, props changed)
  head/textproc/ssddiff/files/patch-src__ustring.h   (contents, props changed)
Modified:
  head/textproc/ssddiff/Makefile

Modified: head/textproc/ssddiff/Makefile
==============================================================================
--- head/textproc/ssddiff/Makefile	Sat Jan 25 16:45:01 2014	(r341051)
+++ head/textproc/ssddiff/Makefile	Sat Jan 25 16:46:40 2014	(r341052)
@@ -8,23 +8,28 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/1469/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A diff application for semistructured data such as XML files
+COMMENT=	Diff application for semistructured data such as XML files
+
+LICENSE=	GPLv2 # (or later)
 
-USE_AUTOTOOLS=	automake14
 USE_BZIP2=	yes
 USES=		pkgconfig
-USE_GNOME=	libxml2
-MAKE_ARGS=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
-		CPPFLAGS="-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libxml2"
+USE_GNOME=	libxml2 
+USE_GCC=	any
+USE_AUTOTOOLS=	automake14
+
 PLIST_FILES=	bin/xmldiff
 
-NO_STAGE=	yes
 post-extract:
+	@${FIND} ${WRKSRC} -type l -delete
+
+post-patch:
 .for f in config.guess config.sub install-sh missing mkinstalldirs
 	@${LN} -sf ${AUTOMAKE_DIR}/${f} ${WRKSRC}/${f}
 .endfor
-	@${REINPLACE_CMD} -e 's,"getopt\.h",<unistd.h>,' \
-		${WRKSRC}/src/main.cc
+	@${REINPLACE_CMD} -e \
+		's|^CXXFLAGS|AM_CPPFLAGS|' ${WRKSRC}/src/Makefile.am
+	@${REINPLACE_CMD} -e \
+		's|"getopt\.h"|<unistd.h>|' ${WRKSRC}/src/main.cc
 
 .include <bsd.port.mk>

Added: head/textproc/ssddiff/files/patch-src__rel_count.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/ssddiff/files/patch-src__rel_count.h	Sat Jan 25 16:46:40 2014	(r341052)
@@ -0,0 +1,10 @@
+--- src/rel_count.h.orig
++++ src/rel_count.h
+@@ -13,6 +13,7 @@
+ #define  SSD_REL_COUNT_H
+ #include "config.h"
+ #include "rel_eqclass.h"
++#include <climits>
+ #include <vector>
+ #include <ext/hash_map>
+ 

Added: head/textproc/ssddiff/files/patch-src__ustring.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/ssddiff/files/patch-src__ustring.h	Sat Jan 25 16:46:40 2014	(r341052)
@@ -0,0 +1,10 @@
+--- src/ustring.h.orig
++++ src/ustring.h
+@@ -14,6 +14,7 @@
+ 
+ #include "config.h"
+ 
++#include <cstring>
+ #include <iostream>
+ #include <map>
+ #include <ext/hash_map>
_______________________________________________
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"