cad/ghdl: Upgrade version 0.32 => 0.33

4 files changed, 14 insertions, 39 deletions

diff --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile
index 822b34db0b09..8ad8df7b4b8a 100644
--- a/cad/ghdl/Makefile
+++ b/cad/ghdl/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	ghdl
-PORTVERSION=	0.32
-PORTREVISION=	2
+PORTVERSION=	0.33
+DISTVERSIONPREFIX=	v
 CATEGORIES=	cad
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -19,9 +19,8 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
 
 USES=		ada gmake
 USE_GITHUB=	yes
-GH_ACCOUNT=	hanzer
-GH_PROJECT=	gVHDL
-GH_TAGNAME=	5adb2f6
+GH_ACCOUNT=	tgingold
+GH_PROJECT=	ghdl
 
 GNU_CONFIGURE=	yes
 GCCVER=		4.9.2
@@ -31,7 +30,7 @@ BUILDDIR=	${WRKDIR}/build
 GCCSRCDIR=	${WRKDIR}/gcc-${GCCVER}
 CFG_SCRIPT=	${GCCSRCDIR}/configure
 PKG_PREFIX=	${PREFIX}/ghdl
-LINKER_COMMAND=	${LOCALBASE}/gcc-aux/bin/gcc
+LINKER_COMMAND=	${LOCALBASE}/${ADAXX}-aux/bin/gcc
 
 GHDL_ARGS=	--enable-languages="c,vhdl" \
 		--build=${BLD_TARGET} \
@@ -68,9 +67,6 @@ PLIST_SUB=		DRAGONFLY="@comment " FREEBSD=""
 
 .if ${OPSYS} == FreeBSD
 MODERN_BINUTILS=	yes
-.  if ${OSREL:R} == 8 && ${ARCH} == i386
-BROKEN=		get_pc_thunk.cx errors
-.  endif
 .endif
 
 .if ${ARCH:S/amd64/x86_64/} == x86_64
@@ -100,7 +96,7 @@ PLIST_SUB+=	GLEX=ghdl/libexec/gcc/${BLD_TARGET}/${GCCVER} \
 		GLIB=ghdl/lib/gcc/${BLD_TARGET}/${GCCVER} \
 		TARGET=${BLD_TARGET}
 .  if ${OPSYS} == DragonFly
-IGNORE=		Not supported by GCC backend
+IGNORE=		not supported by GCC backend
 .  endif
 .endif
 
diff --git a/cad/ghdl/distinfo b/cad/ghdl/distinfo
index 5fc84f8d2a1b..5cdfab1653cc 100644
--- a/cad/ghdl/distinfo
+++ b/cad/ghdl/distinfo
@@ -1,4 +1,4 @@
-SHA256 (hanzer-gVHDL-0.32-5adb2f6_GH0.tar.gz) = 49ff21abe8f5a1d8b1fc2b874c7ff78287dd8fcab3a6fff184c96c1456e4ee3d
-SIZE (hanzer-gVHDL-0.32-5adb2f6_GH0.tar.gz) = 3089398
+SHA256 (tgingold-ghdl-v0.33_GH0.tar.gz) = aa1519e72e4537e69cefd18a212221a77ecac021f935b1c969532dfa3c7edb27
+SIZE (tgingold-ghdl-v0.33_GH0.tar.gz) = 3202198
 SHA256 (gcc-4.9.2.tar.bz2) = 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
 SIZE (gcc-4.9.2.tar.bz2) = 89939747
diff --git a/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb b/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb
index d42b08f2264a..40194ebe6418 100644
--- a/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb
+++ b/cad/ghdl/files/patch-src_ghdldrv_ghdldrv.adb
@@ -1,6 +1,6 @@
---- src/ghdldrv/ghdldrv.adb.orig	2015-05-30 07:12:42 UTC
+--- src/ghdldrv/ghdldrv.adb.orig	2015-10-23 05:51:44 UTC
 +++ src/ghdldrv/ghdldrv.adb
-@@ -43,8 +43,8 @@ package body Ghdldrv is
+@@ -42,8 +42,8 @@ package body Ghdldrv is
     --  Name of the tools used.
     Compiler_Cmd : String_Access := null;
     Post_Processor_Cmd : String_Access := null;
@@ -11,17 +11,10 @@
  
     --  Path of the tools.
     Compiler_Path : String_Access;
-@@ -467,15 +467,9 @@ package body Ghdldrv is
-          end if;
-       end if;
-       if Compile_Kind >= Compile_Gcc then
--         Assembler_Path := Locate_Exec_On_Path (Assembler_Cmd);
--         if Assembler_Path = null and not Flag_Asm then
--            Tool_Not_Found (Assembler_Cmd);
--         end if;
--      end if;
--      Linker_Path := Locate_Exec_On_Path (Linker_Cmd);
--      if Linker_Path = null then
+@@ -502,8 +502,9 @@ package body Ghdldrv is
+       --  Linker.
+       Linker_Path := Locate_Exec_On_Path (Linker_Cmd);
+       if Linker_Path = null then
 -         Tool_Not_Found (Linker_Cmd);
 +         Assembler_Path := Assembler_Cmd'Access;
        end if;
diff --git a/cad/ghdl/files/patch-src_grt_Makefile.inc b/cad/ghdl/files/patch-src_grt_Makefile.inc
deleted file mode 100644
index 174e72fa59a1..000000000000
--- a/cad/ghdl/files/patch-src_grt_Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/grt/Makefile.inc.orig	2015-06-01 05:56:40 UTC
-+++ src/grt/Makefile.inc
-@@ -71,6 +71,11 @@ ifeq ($(filter-out x86_64 freebsd%,$(arc
-   GRT_EXTRA_LIB=-lm $(GRT_ELF_OPTS)
-   ADAC=ada
- endif
-+ifeq ($(filter-out x86_64 dragonfly%,$(arch) $(osys)),)
-+  GRT_TARGET_OBJS=amd64.o linux.o times.o
-+  GRT_EXTRA_LIB=-lm $(GRT_ELF_OPTS)
-+  ADAC=ada
-+endif
- ifeq ($(filter-out i%86 darwin%,$(arch) $(osys)),)
-   GRT_TARGET_OBJS=i386.o linux.o times.o
-   GRT_EXTRA_LIB=