Update 2.065.0 --> 2.066.0

5 files changed, 36 insertions, 28 deletions

diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile
index 681a171b7998..ce88c7d4bfd4 100644
--- a/lang/dmd2/Makefile
+++ b/lang/dmd2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dmd
 PKGNAMESUFFIX=	2
-PORTVERSION=	2.065.0
+PORTVERSION=	2.066.0
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.digitalmars.com/
 DISTNAME=	dmd.${PORTVERSION}
@@ -15,7 +15,7 @@ USES=		gmake zip
 MAKEFILE=	posix.mak
 EXAMPLESDIR=	${PREFIX}/share/examples/dmd2
 DOCSDIR=	${PREFIX}/share/doc/dmd2
-PORTDOCS=	*.txt druntime/ html/
+PORTDOCS=	*.txt html/
 WRKSRC=		${WRKDIR}/dmd2/src/${PORTNAME}
 LICENSE_COMB=	multi
 LICENSE=	ART10 DMD BSL
@@ -47,8 +47,6 @@ MAKE_ARGS+=	MODEL=32
 .if defined(WITH_DEBUG)
 BUILD=		debug
 MAKE_ARGS+=	DEBUG_FLAGS=-g\ -DDEBUG=1\ -DUNITTEST
-.else
-BUILD=		release
 .endif
 
 MODULEDIR=	${PREFIX}/include/d/phobos2
@@ -69,12 +67,6 @@ post-patch:
 	@${ECHO_CMD} >> ${WRKDIR}/dmd2/linux/bin32/dmd.conf
 	@${SED} -e "s|Environment32|Environment64|" ${WRKDIR}/dmd2/linux/bin32/dmd.conf >>${WRKDIR}/dmd2/linux/bin32/dmd.conf
 
-post-build:
-	cd ${WRKSRC}/../druntime && \
-		${SETENV} PATH=${WRKSRC}:${PATH} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS}
-	cd ${WRKSRC}/../phobos && \
-		${SETENV} PATH=${WRKSRC}:${PATH} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${BUILD}
-
 do-install:
 	${INSTALL_MAN} ${WRKDIR}/dmd2/man/man1/dmd.1 ${STAGEDIR}${MANPREFIX}/man/man1/dmd.1
 	${INSTALL_MAN} ${WRKDIR}/dmd2/man/man5/dmd.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/dmd.conf.5
@@ -83,9 +75,9 @@ do-install:
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd
 .if ${ARCH} == "amd64"
-	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/64/libphobos2.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib64/libphobos2.a ${STAGEDIR}${PREFIX}/lib
 .else
-	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/32/libphobos2.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib32/libphobos2.a ${STAGEDIR}${PREFIX}/lib
 .endif
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd.conf
@@ -101,9 +93,5 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/druntime
-	${INSTALL_DATA} ${WRKSRC}/../druntime/LICENSE ${STAGEDIR}${DOCSDIR}/druntime
-	${INSTALL_DATA} ${WRKSRC}/../druntime/README.md ${STAGEDIR}${DOCSDIR}/druntime
-	cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}/druntime
 
 .include <bsd.port.post.mk>
diff --git a/lang/dmd2/distinfo b/lang/dmd2/distinfo
index a0f2e8b6a1e7..015309f7ffbd 100644
--- a/lang/dmd2/distinfo
+++ b/lang/dmd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmd.2.065.0.zip) = f3f4c8f6c2e5cdd0ac335e56613663bee075a1e797ffbb55035d6c767d7bc585
-SIZE (dmd.2.065.0.zip) = 50532001
+SHA256 (dmd.2.066.0.zip) = f13db9ed3bdc8740deb5903991e9e499fac708c8a1759050f1bfae624528df20
+SIZE (dmd.2.066.0.zip) = 53523060
diff --git a/lang/dmd2/files/patch-linux-bin32-dmd.conf b/lang/dmd2/files/patch-linux-bin32-dmd.conf
index 4d18d4e06f8d..610823a42986 100644
--- a/lang/dmd2/files/patch-linux-bin32-dmd.conf
+++ b/lang/dmd2/files/patch-linux-bin32-dmd.conf
@@ -1,8 +1,8 @@
 --- ../../linux/bin32/dmd.conf.orig	2012-04-15 22:12:01.771713192 -0700
 +++ ../../linux/bin32/dmd.conf	2012-04-15 22:17:51.647954697 -0700
 @@ -1,4 +1,4 @@
- 

- [Environment]

- 

--DFLAGS=-I/usr/local/include/d/phobos2 -I/usr/local/include/d/druntime/import -L-L/usr/local/lib32 -L-L%@P%/../lib64 -L--no-warn-search-mismatch -L--export-dynamic

-+DFLAGS=-I/usr/local/include/d/phobos2 -I/usr/local/include/d/druntime/import -L-L/usr/local/lib -L--no-warn-search-mismatch -L--export-dynamic

+ 
+ [Environment]
+ 
+-DFLAGS=-I/usr/local/include/d/phobos2 -I/usr/local/include/d/druntime/import -L-L/usr/local/lib32 -L-L%@P%/../lib64 -L--no-warn-search-mismatch -L--export-dynamic
++DFLAGS=-I/usr/local/include/d/phobos2 -I/usr/local/include/d/druntime/import -L-L/usr/local/lib -L--no-warn-search-mismatch -L--export-dynamic
diff --git a/lang/dmd2/files/patch-src__dmd__posix.mak b/lang/dmd2/files/patch-src__dmd__posix.mak
new file mode 100644
index 000000000000..ae0a06c0b67a
--- /dev/null
+++ b/lang/dmd2/files/patch-src__dmd__posix.mak
@@ -0,0 +1,11 @@
+--- ../../src/dmd/posix.mak.orig	2014-08-17 22:37:03.394883855 -0700
++++ ../../src/dmd/posix.mak	2014-08-17 22:37:43.775123006 -0700
+@@ -373,7 +373,7 @@
+ 	$(eval bin_dir=$(if $(filter $(OS),osx), bin, bin$(MODEL)))
+ 	mkdir -p $(INSTALL_DIR)/$(OS)/$(bin_dir)
+ 	cp dmd $(INSTALL_DIR)/$(OS)/$(bin_dir)/dmd
+-	cp ../ini/$(OS)/$(bin_dir)/dmd.conf $(INSTALL_DIR)/$(OS)/$(bin_dir)/dmd.conf
++	cp ../../$(OS)/$(bin_dir)/dmd.conf $(INSTALL_DIR)/$(OS)/$(bin_dir)/dmd.conf
+ 	cp backendlicense.txt $(INSTALL_DIR)/dmd-backendlicense.txt
+ 	cp artistic.txt $(INSTALL_DIR)/dmd-artistic.txt
+ 
diff --git a/lang/dmd2/pkg-plist b/lang/dmd2/pkg-plist
index 02641e0a0662..98fe35fe7dc0 100644
--- a/lang/dmd2/pkg-plist
+++ b/lang/dmd2/pkg-plist
@@ -31,15 +31,18 @@ lib/libphobos2.a
 %%EXAMPLESDIR%%/samples/d/winsamp.def
 include/d/druntime/import/core/atomic.d
 include/d/druntime/import/core/bitop.d
+include/d/druntime/import/core/checkedint.d
 include/d/druntime/import/core/cpuid.d
 include/d/druntime/import/core/demangle.d
 include/d/druntime/import/core/internal/convert.d
 include/d/druntime/import/core/internal/hash.d
+include/d/druntime/import/core/internal/traits.d
 include/d/druntime/import/core/exception.d
 include/d/druntime/import/core/math.d
 include/d/druntime/import/core/memory.d
 include/d/druntime/import/core/runtime.d
 include/d/druntime/import/core/simd.d
+include/d/druntime/import/core/thread.d
 include/d/druntime/import/core/stdc/complex.d
 include/d/druntime/import/core/stdc/config.d
 include/d/druntime/import/core/stdc/ctype.d
@@ -139,7 +142,6 @@ include/d/druntime/import/core/sys/windows/dll.d
 include/d/druntime/import/core/sys/windows/stacktrace.d
 include/d/druntime/import/core/sys/windows/threadaux.d
 include/d/druntime/import/core/sys/windows/windows.d
-include/d/druntime/import/core/thread.di
 include/d/druntime/import/core/time.d
 include/d/druntime/import/core/vararg.d
 include/d/druntime/import/etc/linux/memoryerror.d
@@ -180,7 +182,13 @@ include/d/phobos2/std/c/windows/winsock.d
 include/d/phobos2/std/compiler.d
 include/d/phobos2/std/complex.d
 include/d/phobos2/std/concurrency.d
-include/d/phobos2/std/container.d
+include/d/phobos2/std/container/array.d
+include/d/phobos2/std/container/binaryheap.d
+include/d/phobos2/std/container/dlist.d
+include/d/phobos2/std/container/package.d
+include/d/phobos2/std/container/rbtree.d
+include/d/phobos2/std/container/slist.d
+include/d/phobos2/std/container/util.d
 include/d/phobos2/std/conv.d
 include/d/phobos2/std/cstream.d
 include/d/phobos2/std/csv.d
@@ -193,6 +201,7 @@ include/d/phobos2/std/digest/ripemd.d
 include/d/phobos2/std/digest/sha.d
 include/d/phobos2/std/encoding.d
 include/d/phobos2/std/exception.d
+include/d/phobos2/std/experimental/note.md
 include/d/phobos2/std/file.d
 include/d/phobos2/std/format.d
 include/d/phobos2/std/functional.d
@@ -204,8 +213,7 @@ include/d/phobos2/std/internal/math/biguintx86.d
 include/d/phobos2/std/internal/math/errorfunction.d
 include/d/phobos2/std/internal/math/gammafunction.d
 include/d/phobos2/std/internal/processinit.d
-include/d/phobos2/std/internal/uni.d
-include/d/phobos2/std/internal/uni_tab.d
+include/d/phobos2/std/internal/scopebuffer.d
 include/d/phobos2/std/internal/unicode_comp.d
 include/d/phobos2/std/internal/unicode_decomp.d
 include/d/phobos2/std/internal/unicode_grapheme.d
@@ -215,7 +223,6 @@ include/d/phobos2/std/internal/windows/advapi32.d
 include/d/phobos2/std/json.d
 include/d/phobos2/std/math.d
 include/d/phobos2/std/mathspecial.d
-include/d/phobos2/std/metastrings.d
 include/d/phobos2/std/mmfile.d
 include/d/phobos2/std/net/curl.d
 include/d/phobos2/std/net/isemail.d
@@ -266,7 +273,9 @@ man/man5/dmd.conf.5.gz
 @dirrm include/d/phobos2/std/internal/math
 @dirrm include/d/phobos2/std/internal/digest
 @dirrm include/d/phobos2/std/internal
+@dirrm include/d/phobos2/std/experimental
 @dirrm include/d/phobos2/std/digest
+@dirrm include/d/phobos2/std/container
 @dirrm include/d/phobos2/std/c/windows
 @dirrm include/d/phobos2/std/c/osx
 @dirrm include/d/phobos2/std/c/linux