Date: Tue, 17 Dec 2013 02:51:26 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184870: textproc/ssddiff: Fix build on -current Message-ID: <20131217025126.c9b1ddf5667f782829e773a6@yahoo.com> Resent-Message-ID: <201312161810.rBGIAJaL016372@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184870 >Category: ports >Synopsis: textproc/ssddiff: Fix build on -current >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 16 18:10:19 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Fix build on -current New file: files/patch-src__rel_count.h files/patch-src__ustring.h >How-To-Repeat: >Fix: diff -urN /usr/ports/textproc/ssddiff/Makefile textproc/ssddiff/Makefile --- /usr/ports/textproc/ssddiff/Makefile 2013-11-06 21:55:18.000000000 +0900 +++ textproc/ssddiff/Makefile 2013-12-17 00:00:00.000000000 +0900 @@ -8,23 +8,28 @@ 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> diff -urN /usr/ports/textproc/ssddiff/files/patch-src__rel_count.h textproc/ssddiff/files/patch-src__rel_count.h --- /usr/ports/textproc/ssddiff/files/patch-src__rel_count.h 1970-01-01 09:00:00.000000000 +0900 +++ textproc/ssddiff/files/patch-src__rel_count.h 2013-12-17 00:00:00.000000000 +0900 @@ -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> + diff -urN /usr/ports/textproc/ssddiff/files/patch-src__ustring.h textproc/ssddiff/files/patch-src__ustring.h --- /usr/ports/textproc/ssddiff/files/patch-src__ustring.h 1970-01-01 09:00:00.000000000 +0900 +++ textproc/ssddiff/files/patch-src__ustring.h 2013-12-17 00:00:00.000000000 +0900 @@ -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> >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217025126.c9b1ddf5667f782829e773a6>