3 files changed, 50 insertions, 43 deletions

diff --git a/lang/gdc/Makefile b/lang/gdc/Makefile
index 4fc5d773e52b..f84f940282b5 100644
--- a/lang/gdc/Makefile
+++ b/lang/gdc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdc
-PORTVERSION=	0.21
+PORTVERSION=	0.23
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/dgcc/g:S/$/:gdc/g}
@@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}:gdc \
 MAINTAINER=	ozawa@ongs.co.jp
 COMMENT=	D Front End for GCC
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -42,23 +42,6 @@ PLIST_SUB=	GCC_VER=${GCC_VERSION} CONF_TARGET=${CONFIGURE_TARGET}
 
 MAN1=		gdc.1 gdmd.1
 
-.ifndef TARGET_GCC
-TARGET_GCC=	3.4	# default
-.elif ${TARGET_GCC} != 3.4 && ${TARGET_GCC} != 4.0
-.error it cannot be specified as TARGET_GCC other than 3.4 or 4.0
-.endif
-
-.if ${TARGET_GCC} == 4.0
-GCC_VERSION=	4.0.4
-GCC_REVISION=	20061228
-GCC_VERSIONSTRING=	4.0-${GCC_REVISION}
-GCC_MASTER_SITE_SUBDIR=	snapshots/${GCC_VERSIONSTRING}
-.else
-GCC_VERSION=	3.4.6
-GCC_VERSIONSTRING=	${GCC_VERSION}
-GCC_MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSIONSTRING}
-.endif
-
 GCCDIR=		${SRCDIR}/gcc
 GDC_INC=	${PREFIX}/include/d/${GCC_VERSION}
 
@@ -69,20 +52,46 @@ GDC_INC=	${PREFIX}/include/d/${GCC_VERSION}
 IGNORE=		it is supported on FreeBSD 5.x and later
 .endif
 
+.ifndef TARGET_GCC
+.if ${OSVERSION} >= 700000
+TARGET_GCC=	4.1
+.else
+TARGET_GCC=	3.4
+.endif
+.elif ${TARGET_GCC} != 3.4 && ${TARGET_GCC} != 4.0 && ${TARGET_GCC} != 4.1
+.error it cannot be specified as TARGET_GCC other than 3.4, 4.0 or 4.1
+.endif
+
+.if ${TARGET_GCC} == 4.1
+GCC_VERSION=	4.1.3
+GCC_REVISION=	20070312
+GCC_VERSIONSTRING=	4.1-${GCC_REVISION}
+GCC_MASTER_SITE_SUBDIR=	snapshots/gcc-${GCC_VERSIONSTRING}
+.elif ${TARGET_GCC} == 4.0
+GCC_VERSION=	4.0.4
+GCC_VERSIONSTRING=	${GCC_VERSION}
+GCC_MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSIONSTRING}
+.else
+GCC_VERSION=	3.4.6
+GCC_VERSIONSTRING=	${GCC_VERSION}
+GCC_MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSIONSTRING}
+.endif
+
 .if ${ARCH} == "amd64"
-# I hope the GDC will support amd64.
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 pre-fetch:
 	@${ECHO_CMD}
-	@${ECHO_CMD} "======================================================="
+	@${ECHO_CMD} "========================================================="
 	@${ECHO_CMD}
 	@${ECHO_CMD} "GDC is built with GCC version '${TARGET_GCC}'."
 	@${ECHO_CMD}
-	@${ECHO_CMD} "You can set 'TARGET_GCC' variable to '3.4' or '4.0'."
+	@${ECHO_CMD} "You can set one of the following variables as TARGET_GCC."
+	@${ECHO_CMD}
+	@${ECHO_CMD} " '3.4' , '4.0' , '4.1'"
 	@${ECHO_CMD}
-	@${ECHO_CMD} "======================================================="
+	@${ECHO_CMD} "========================================================="
 	@${ECHO_CMD}
 
 post-extract:
@@ -104,13 +113,13 @@ pre-configure:
 
 post-build:
 	@${ECHO_CMD}
-	@${ECHO_CMD} "======================================================="
+	@${ECHO_CMD} "========================================================="
 	@${ECHO_CMD}
 	@${ECHO_CMD} "To test the Phobos run-time library run 'make check'."
 	@${ECHO_CMD}
 	@${ECHO_CMD} "Note that some tests will fail."
 	@${ECHO_CMD}
-	@${ECHO_CMD} "======================================================="
+	@${ECHO_CMD} "========================================================="
 	@${ECHO_CMD}
 
 do-install:
diff --git a/lang/gdc/distinfo b/lang/gdc/distinfo
index 1e6e00460ddd..6af566c5131a 100644
--- a/lang/gdc/distinfo
+++ b/lang/gdc/distinfo
@@ -1,15 +1,21 @@
-MD5 (gdc-0.21-src.tar.bz2) = 32098080a6ef7dfa19a4223ea9cb05ca
-SHA256 (gdc-0.21-src.tar.bz2) = c5bef02fb94d508e56990d86ded13da447d4e0664c2c41b037eefae96cd97425
-SIZE (gdc-0.21-src.tar.bz2) = 978636
+MD5 (gdc-0.23-src.tar.bz2) = facee49bd9f7b3c586d4ed96e9682ead
+SHA256 (gdc-0.23-src.tar.bz2) = 4f642904f93973dc791c93125d1d227cefe0eb47fc39e364d03cda4784c0a38d
+SIZE (gdc-0.23-src.tar.bz2) = 1001644
 MD5 (gcc-core-3.4.6.tar.bz2) = 5324ace5145b12afd9ca867af7ec084d
 SHA256 (gcc-core-3.4.6.tar.bz2) = 3aab171d86e5a6c14cb9de35467a0472a7d5ef1d5b79a1df72ca533f8e82a133
 SIZE (gcc-core-3.4.6.tar.bz2) = 13366790
 MD5 (gcc-g++-3.4.6.tar.bz2) = ef81fd74bc9fd964120af47243a1360f
 SHA256 (gcc-g++-3.4.6.tar.bz2) = f186937402752d25317adf2832b0b1d316334e158ae380471ab62509e4ea90b1
 SIZE (gcc-g++-3.4.6.tar.bz2) = 2511332
-MD5 (gcc-core-4.0-20061228.tar.bz2) = 395ea3b0c07b42a6eeb41112dd54ea89
-SHA256 (gcc-core-4.0-20061228.tar.bz2) = cf9c479a1ec99a4dac71f243e5d2d58f556e8e88aac912e51fa5571e516637eb
-SIZE (gcc-core-4.0-20061228.tar.bz2) = 13787783
-MD5 (gcc-g++-4.0-20061228.tar.bz2) = a03201faeeaceb2188125c87404fc560
-SHA256 (gcc-g++-4.0-20061228.tar.bz2) = 280297708243d2a3d9f36c0729d4c1267ad9c7390248d3ca0c00832c090816ff
-SIZE (gcc-g++-4.0-20061228.tar.bz2) = 2721301
+MD5 (gcc-core-4.0.4.tar.bz2) = 193e0a7a471cca70e374974bc5a60137
+SHA256 (gcc-core-4.0.4.tar.bz2) = e9bf58c761a4f988311aef6b41f12fd5c7e51d09477468fb73826aecc1be32e7
+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-20070312.tar.bz2) = e2e0c66574f326928a9b4b91aecf4cdc
+SHA256 (gcc-core-4.1-20070312.tar.bz2) = 5536c8eaab51189d1e8c01ef021967f6b2dd6c75969bbc14da95a0625edd63fb
+SIZE (gcc-core-4.1-20070312.tar.bz2) = 15252404
+MD5 (gcc-g++-4.1-20070312.tar.bz2) = dbe6492cb3818f514820be199bb9818f
+SHA256 (gcc-g++-4.1-20070312.tar.bz2) = 628350c03e00df3b38edd7bbc11db0c9544af05173b54d6394b494397a8d3a12
+SIZE (gcc-g++-4.1-20070312.tar.bz2) = 3845448
diff --git a/lang/gdc/pkg-plist b/lang/gdc/pkg-plist
index 012d6e5ffb71..c48830e6e35c 100644
--- a/lang/gdc/pkg-plist
+++ b/lang/gdc/pkg-plist
@@ -45,6 +45,7 @@ include/d/%%GCC_VER%%/std/loader.d
 include/d/%%GCC_VER%%/std/math.d
 include/d/%%GCC_VER%%/std/math2.d
 include/d/%%GCC_VER%%/std/md5.d
+include/d/%%GCC_VER%%/std/metastrings.d
 include/d/%%GCC_VER%%/std/mmfile.d
 include/d/%%GCC_VER%%/std/moduleinit.d
 include/d/%%GCC_VER%%/std/openrj.d
@@ -85,7 +86,6 @@ include/d/%%GCC_VER%%/std/c/stdio.d
 include/d/%%GCC_VER%%/std/c/stdlib.d
 include/d/%%GCC_VER%%/std/c/string.d
 include/d/%%GCC_VER%%/std/c/time.d
-include/d/%%GCC_VER%%/std/c/darwin/darwin.d
 include/d/%%GCC_VER%%/std/c/darwin/ldblcompat.d
 include/d/%%GCC_VER%%/std/c/linux/ldblcompat.d
 include/d/%%GCC_VER%%/std/c/linux/linux.d
@@ -101,12 +101,10 @@ include/d/%%GCC_VER%%/std/c/windows/stat.d
 include/d/%%GCC_VER%%/std/c/windows/windows.d
 include/d/%%GCC_VER%%/std/c/windows/winsock.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_AC.d
-include/d/%%GCC_VER%%/std/typeinfo/ti_Aa.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Abit.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Acdouble.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Acfloat.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Acreal.d
-include/d/%%GCC_VER%%/std/typeinfo/ti_Adchar.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Adouble.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Afloat.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Ag.d
@@ -114,11 +112,6 @@ include/d/%%GCC_VER%%/std/typeinfo/ti_Aint.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Along.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Areal.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_Ashort.d
-include/d/%%GCC_VER%%/std/typeinfo/ti_Aubyte.d
-include/d/%%GCC_VER%%/std/typeinfo/ti_Auint.d
-include/d/%%GCC_VER%%/std/typeinfo/ti_Aulong.d
-include/d/%%GCC_VER%%/std/typeinfo/ti_Aushort.d
-include/d/%%GCC_VER%%/std/typeinfo/ti_Awchar.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_C.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_bit.d
 include/d/%%GCC_VER%%/std/typeinfo/ti_byte.d
@@ -155,7 +148,6 @@ include/d/%%GCC_VER%%/%%CONF_TARGET%%/gcc/config.d
 include/d/%%GCC_VER%%/%%CONF_TARGET%%/gcc/configunix.d
 include/d/%%GCC_VER%%/%%CONF_TARGET%%/phobos-ver-syms
 lib/libgphobos.a
-lib/libgphobos.spec
 %%PORTDOCS%%%%DOCSDIR%%/GDC.html
 %%PORTDOCS%%%%DOCSDIR%%/README.gdc
 @dirrm include/d/%%GCC_VER%%/etc/c/zlib