From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 16:46:41 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D901CF29;
 Sat, 25 Jan 2014 16:46:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id ABE481FC3;
 Sat, 25 Jan 2014 16:46:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PGkfsr097584;
 Sat, 25 Jan 2014 16:46:41 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PGkf1R097581;
 Sat, 25 Jan 2014 16:46:41 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201401251646.s0PGkf1R097581@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 25 Jan 2014 16:46:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341052 - in head/textproc/ssddiff: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 16:46:41 -0000

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>