- Update to newer gcc snapshot

- Fix socket problem
- Add missing USE_ICONV
- dirrmtry include/d as it may be used by other ports

PRs:		ports/124437 [1], ports/124567 [2]
Submitted by:	kevin <kevinxlinuz at 163 dot com> [1], myself [2]
Approved by:	miwi (mentor)

3 files changed, 12 insertions, 14 deletions

diff --git a/lang/gdc/Makefile b/lang/gdc/Makefile
index 02308d19a2fd..1bef6ab7b287 100644
--- a/lang/gdc/Makefile
+++ b/lang/gdc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdc
 PORTVERSION=	0.24
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/dgcc/g:S/$/:gdc/g}
@@ -25,6 +25,7 @@ USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_ICONV=	yes
 
 SRCDIR=		${WRKDIR}/gcc-${GCC_VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -48,11 +49,6 @@ GDC_INC=	${PREFIX}/include/d/${GCC_VERSION}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 502126
-# GDC required g++ version on the system of 3.4.x 4.0.1 and later.
-IGNORE=		it is supported on FreeBSD 5.3-R and later
-.endif
-
 .ifndef TARGET_GCC
 .if ${OSVERSION} >= 700000 || ${ARCH} == "amd64"
 TARGET_GCC=	4.1
@@ -65,7 +61,7 @@ TARGET_GCC=	3.4
 
 .if ${TARGET_GCC} == 4.1
 GCC_VERSION=	4.1.3
-GCC_REVISION=	20071105
+GCC_REVISION=	20080428
 GCC_VERSIONSTRING=	4.1-${GCC_REVISION}
 GCC_MASTER_SITE_SUBDIR=	snapshots/${GCC_VERSIONSTRING}
 .elif ${TARGET_GCC} == 4.0
@@ -106,6 +102,8 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^\(gcc_d_include_dir\).*|\1 = ${GDC_INC}|' \
 		${GCCDIR}/d/Make-lang.in
+	@${REINPLACE_CMD} -e 's, BsdSockets_salen, GNU_BsdSockets_salen,' \
+		${GCCDIR}/d/phobos/config/unix-mid
 
 pre-configure:
 	@(cd ${SRCDIR} && contrib/gcc_update --touch)
diff --git a/lang/gdc/distinfo b/lang/gdc/distinfo
index ce152f6b93b8..def0dbf47793 100644
--- a/lang/gdc/distinfo
+++ b/lang/gdc/distinfo
@@ -13,9 +13,9 @@ SIZE (gcc-core-4.0.4.tar.bz2) = 15583411
 MD5 (gcc-g++-4.0.4.tar.bz2) = 5c79e6af5b49dd9cfd22001f3856f447
 SHA256 (gcc-g++-4.0.4.tar.bz2) = c1ff47701a5dc77690fe9e687001546b54f03b7383a89d5b4b11178aaf31f76e
 SIZE (gcc-g++-4.0.4.tar.bz2) = 2698519
-MD5 (gcc-core-4.1-20071105.tar.bz2) = eccb54e2831844e08efae988e531c7dc
-SHA256 (gcc-core-4.1-20071105.tar.bz2) = 207a16c34d8fbf005132b1c76b7f67b075a7f641b3125e01961cc926124a382e
-SIZE (gcc-core-4.1-20071105.tar.bz2) = 15230961
-MD5 (gcc-g++-4.1-20071105.tar.bz2) = dbb1d74e94bbcad65baf67f85444727d
-SHA256 (gcc-g++-4.1-20071105.tar.bz2) = 379a6acb688ecedccd52a972dc7685c3fa1ab8254b15fc3758b5e9c26f498959
-SIZE (gcc-g++-4.1-20071105.tar.bz2) = 3847401
+MD5 (gcc-core-4.1-20080428.tar.bz2) = 812b8414c5a853c398fe1499487491f2
+SHA256 (gcc-core-4.1-20080428.tar.bz2) = 66b0020233b2c7655168c574b685e69579444383d7fe649bac606b5bf5d9ad87
+SIZE (gcc-core-4.1-20080428.tar.bz2) = 15218360
+MD5 (gcc-g++-4.1-20080428.tar.bz2) = ed1455e0b6490ef5f1602a25e4a30e2f
+SHA256 (gcc-g++-4.1-20080428.tar.bz2) = bfd0dc6bcd18272f2de20176bb009c85cb0cfa99e55186eebb6002fe0b12e935
+SIZE (gcc-g++-4.1-20080428.tar.bz2) = 3848158
diff --git a/lang/gdc/pkg-plist b/lang/gdc/pkg-plist
index c48830e6e35c..8cf347aaf92d 100644
--- a/lang/gdc/pkg-plist
+++ b/lang/gdc/pkg-plist
@@ -167,5 +167,5 @@ lib/libgphobos.a
 @dirrm include/d/%%GCC_VER%%/%%CONF_TARGET%%/gcc
 @dirrm include/d/%%GCC_VER%%/%%CONF_TARGET%%
 @dirrm include/d/%%GCC_VER%%
-@dirrm include/d
+@dirrmtry include/d
 %%PORTDOCS%%@dirrm %%DOCSDIR%%