svn commit: r362188 - in head/cad/freehdl: . files

[John Marino]

Author: marino
Date: Fri Jul 18 08:09:53 2014
New Revision: 362188
URL: http://svnweb.freebsd.org/changeset/ports/362188
QAT: https://qat.redports.org/buildarchive/r362188/

Log:
  cad/freehdl: Unbreak on F10+ and stage
  
  I could not fix this port on clang.  It finds the double argument to the
  "to_string" function ambiguious and nothing I tried resolved the
  ambiguity.  In the end, I cheated by setting USE_GCC=any and I'll leave
  the clang fix to a C++ expert.

Added:
  head/cad/freehdl/files/patch-kernel_fhdl__stream.cc   (contents, props changed)
  head/cad/freehdl/files/patch-vaul_dunit.cc   (contents, props changed)
  head/cad/freehdl/files/patch-vaul_pool.cc   (contents, props changed)
Modified:
  head/cad/freehdl/Makefile
  head/cad/freehdl/pkg-plist

Modified: head/cad/freehdl/Makefile
==============================================================================
--- head/cad/freehdl/Makefile	Fri Jul 18 08:07:18 2014	(r362187)
+++ head/cad/freehdl/Makefile	Fri Jul 18 08:09:53 2014	(r362188)
@@ -11,20 +11,13 @@ COMMENT=	Free VHDL simulator
 
 USE_LDCONFIG=	yes
 USES=		gmake perl5 pkgconfig
+USE_GCC=	any
 USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
 HAS_CONFIGURE=	yes
 
-MAN1=		freehdl-config.1 \
-		freehdl-gennodes.1 \
-		freehdl-v2cc.1 \
-		gvhdl.1
-MAN5=		v2cc.libs.5
-
 INFO=		fire
 
-MANCOMPRESSED=	no
-
 PLIST_TMP=	${WRKDIR}/plist_tmp/
 
 PLIST_REPL=	${SED} "s|share/${PORTNAME}|%%DATADIR%%|1"
@@ -53,5 +46,4 @@ plist: build
 		| ${GREP} -vE '%%DATADIR%%|freehdl' >> ${PLIST}
 	@${RM} -rf ${PLIST_TMP}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>

Added: head/cad/freehdl/files/patch-kernel_fhdl__stream.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/freehdl/files/patch-kernel_fhdl__stream.cc	Fri Jul 18 08:09:53 2014	(r362188)
@@ -0,0 +1,10 @@
+--- kernel/fhdl_stream.cc.orig	2006-01-12 08:05:01.000000000 +0000
++++ kernel/fhdl_stream.cc
+@@ -2,6 +2,7 @@
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <cstring>
+ #include <sstream>
+ #include <assert.h>
+ #include <freehdl/kernel-error.hh>

Added: head/cad/freehdl/files/patch-vaul_dunit.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/freehdl/files/patch-vaul_dunit.cc	Fri Jul 18 08:09:53 2014	(r362188)
@@ -0,0 +1,10 @@
+--- vaul/dunit.cc.orig	2005-12-14 08:23:06.000000000 +0000
++++ vaul/dunit.cc
+@@ -27,6 +27,7 @@
+ 
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif

Added: head/cad/freehdl/files/patch-vaul_pool.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/freehdl/files/patch-vaul_pool.cc	Fri Jul 18 08:09:53 2014	(r362188)
@@ -0,0 +1,10 @@
+--- vaul/pool.cc.orig	2005-12-14 08:23:06.000000000 +0000
++++ vaul/pool.cc
+@@ -24,6 +24,7 @@
+ #include <freehdl/vaul-lexer.h>
+ #include <freehdl/vaul-util.h>
+ 
++#include <stdlib.h>
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif

Modified: head/cad/freehdl/pkg-plist
==============================================================================
--- head/cad/freehdl/pkg-plist	Fri Jul 18 08:07:18 2014	(r362187)
+++ head/cad/freehdl/pkg-plist	Fri Jul 18 08:09:53 2014	(r362188)
@@ -91,6 +91,11 @@ lib/libfreehdl-cdfggen.so.0
 lib/libfreehdl-cdfggen.so
 lib/libfreehdl-cdfggen.la
 lib/libfreehdl-cdfggen.a
+man/man1/freehdl-config.1.gz
+man/man1/freehdl-gennodes.1.gz
+man/man1/freehdl-v2cc.1.gz
+man/man1/gvhdl.1.gz
+man/man5/v2cc.libs.5.gz
 %%DATADIR%%/lib/std/standard.vhdl
 %%DATADIR%%/lib/std/textio.vhdl
 %%DATADIR%%/lib/ieee/std_logic_1164.vhdl