Update 2.054 --> 2.055

Submitted by:	nox

5 files changed, 22 insertions, 105 deletions

diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile
index c90c3755b758..83835f847c01 100644
--- a/lang/dmd2/Makefile
+++ b/lang/dmd2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dmd
 PKGNAMESUFFIX=	2
-PORTVERSION=	2.054
+PORTVERSION=	2.055
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.digitalmars.com/
 DISTNAME=	dmd.${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT=	D 2.0 compiler, not officially validated for FreeBSD
 
 USE_ZIP=	yes
 USE_GMAKE=	yes
-MAKEFILE=	freebsd.mak
+MAKEFILE=	posix.mak
 MAN1=		dmd2.1
 MAN5=		dmd2.conf.5
 EXAMPLESDIR=	${PREFIX}/share/examples/dmd2
@@ -40,15 +40,24 @@ BROKEN=		does not compile
 .endif
 
 .if ${ARCH} == "amd64"
-ARCH_ARGS+=	"MODEL=64"
+MAKE_ARGS+=	MODEL=64
+.else
+MAKE_ARGS+=	MODEL=32
+.endif
+
+.if defined(WITH_DEBUG)
+BUILD=		debug
+MAKE_ARGS+=	DEBUG_FLAGS=-g\ -DDEBUG=1\ -DUNITTEST
+.else
+BUILD=		release
 .endif
 
 MODULEDIR=	${PREFIX}/include/d/phobos2
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/freebsd.mak \
+	@${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/posix.mak \
 		${WRKSRC}/../phobos/etc/c/zlib/freebsd.mak
-	@${REINPLACE_CMD} -e "s|g++|${CXX}|" ${WRKSRC}/freebsd.mak
+	@${REINPLACE_CMD} -e "s|g++|${CXX}|" ${WRKSRC}/posix.mak
 	@${REINPLACE_CMD} -e "s|cc|${CC}|" ${WRKSRC}/../phobos/posix.mak
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|"	\
 			  -e "s|\(dmd\)|\12|gI"		\
@@ -64,9 +73,9 @@ post-patch:
 
 post-build:
 	cd ${WRKSRC}/../druntime && \
-		${SETENV} PATH=${WRKSRC}:${PATH} ${GMAKE} ${MAKE_FLAGS} posix.mak ${ARCH_ARGS}
+		${SETENV} PATH=${WRKSRC}:${PATH} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS}
 	cd ${WRKSRC}/../phobos && \
-		${SETENV} PATH=${WRKSRC}:${PATH} ${GMAKE} ${MAKE_FLAGS} posix.mak ${ARCH_ARGS}
+		${SETENV} PATH=${WRKSRC}:${PATH} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${BUILD}
 
 do-install:
 	${INSTALL_MAN} ${WRKDIR}/dmd2/man/man1/dmd.1 ${MANPREFIX}/man/man1/dmd2.1
@@ -76,9 +85,9 @@ do-install:
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/dmd ${PREFIX}/bin/dmd2
 .if ${ARCH} == "amd64"
-	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/release/64/libphobos2.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/64/libphobos2.a ${PREFIX}/lib
 .else
-	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/release/32/libphobos2.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/32/libphobos2.a ${PREFIX}/lib
 .endif
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${EXAMPLESDIR}/dmd2.conf
diff --git a/lang/dmd2/distinfo b/lang/dmd2/distinfo
index da462fbe93de..7736ed8f0f3d 100644
--- a/lang/dmd2/distinfo
+++ b/lang/dmd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmd.2.054.zip) = 3347dee91d8884b2f105666f085ba0b2c27b989967cf0001b284f3da922ca0c2
-SIZE (dmd.2.054.zip) = 16114301
+SHA256 (dmd.2.055.zip) = 11901f541ab3cce2ea245c1f609f456996eab1922c976483750c90d99c49816b
+SIZE (dmd.2.055.zip) = 17137571
diff --git a/lang/dmd2/files/patch-src-dmd-freebsd.mak b/lang/dmd2/files/patch-src-dmd-freebsd.mak
index 32409f3232ed..e69de29bb2d1 100644
--- a/lang/dmd2/files/patch-src-dmd-freebsd.mak
+++ b/lang/dmd2/files/patch-src-dmd-freebsd.mak
@@ -1,46 +0,0 @@
---- freebsd.mak.orig
-+++ freebsd.mak
-@@ -3,7 +3,7 @@
- TK=tk
- ROOT=root
- 
--MODEL=-m32
-+MODEL=
- 
- CC=c++ $(MODEL)
- 
-@@ -40,7 +40,7 @@ DMD_OBJS = \
- 	type.o typinf.o util.o var.o version.o strtold.o utf.o staticassert.o \
- 	unialpha.o toobj.o toctype.o toelfdebug.o entity.o doc.o macro.o \
- 	hdrgen.o delegatize.o aa.o ti_achar.o toir.o interpret.o traits.o \
--	builtin.o clone.o aliasthis.o \
-+	builtin.o clone.o aliasthis.o intrange.o \
- 	man.o arrayop.o port.o response.o async.o json.o speller.o aav.o unittests.o \
- 	imphint.o argtypes.o ti_pvoid.o \
- 	libelf.o elfobj.o
-@@ -53,7 +53,7 @@ SRC = win32.mak linux.mak osx.mak freebs
- 	inifile.c iasm.c module.c scope.c dump.c init.h init.c attrib.h \
- 	attrib.c opover.c class.c mangle.c bit.c tocsym.c func.c inline.c \
- 	access.c complex_t.h irstate.h irstate.c glue.c msc.c ph.c tk.c \
--	s2ir.c todt.c e2ir.c util.c identifier.h parse.h \
-+	s2ir.c todt.c e2ir.c util.c identifier.h parse.h intrange.h \
- 	scope.h enum.h import.h mars.h module.h mtype.h dsymbol.h \
- 	declaration.h lexer.h expression.h irstate.h statement.h eh.c \
- 	utf.h utf.c staticassert.h staticassert.c unialpha.c \
-@@ -62,7 +62,7 @@ SRC = win32.mak linux.mak osx.mak freebs
- 	delegatize.c toir.h toir.c interpret.c traits.c cppmangle.c \
- 	builtin.c clone.c lib.h libomf.c libelf.c libmach.c arrayop.c \
- 	aliasthis.h aliasthis.c json.h json.c unittests.c imphint.c \
--	argtypes.c \
-+	argtypes.c intrange.c \
- 	$C/cdef.h $C/cc.h $C/oper.h $C/ty.h $C/optabgen.c \
- 	$C/global.h $C/parser.h $C/code.h $C/type.h $C/dt.h $C/cgcv.h \
- 	$C/el.h $C/iasm.h $C/rtlsym.h $C/html.h \
-@@ -596,6 +596,7 @@ gcov:
- 	gcov utf.c
- 	gcov util.c
- 	gcov version.c
-+	gcov intrange.c
- 
- #	gcov hdrgen.c
- #	gcov tocvdebug.c
diff --git a/lang/dmd2/files/patch-src-druntime-posix.mak b/lang/dmd2/files/patch-src-druntime-posix.mak
index 9c2b61259160..e69de29bb2d1 100644
--- a/lang/dmd2/files/patch-src-druntime-posix.mak
+++ b/lang/dmd2/files/patch-src-druntime-posix.mak
@@ -1,47 +0,0 @@
---- ../../src/druntime/posix.mak.orig	2011-05-07 13:02:24.000000000 -0700
-+++ ../../src/druntime/posix.mak	2011-06-24 17:11:12.557237355 -0700
-@@ -25,12 +25,10 @@
- DOCDIR=doc
- IMPDIR=import
- 
--MODEL=32
-+DFLAGS=-O -release -inline -nofloat -w -d -Isrc -Iimport
-+UDFLAGS=-O -release -nofloat -w -d -Isrc -Iimport
- 
--DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport
--UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport
--
--CFLAGS=-m$(MODEL) -O
-+CFLAGS=-O
- 
- OBJDIR=obj
- DRUNTIME_BASE=druntime
-@@ -487,23 +485,23 @@
- doc: $(DOCS)
- 
- $(DOCDIR)/object.html : src/object_.d
--	$(DMD) -m$(MODEL) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
-+	$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
- 
- $(DOCDIR)/core_%.html : src/core/%.d
--	$(DMD) -m$(MODEL) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
-+	$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
- 
- $(DOCDIR)/core_sync_%.html : src/core/sync/%.d
--	$(DMD) -m$(MODEL) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
-+	$(DMD) -c -d -o- -Isrc -Iimport -Df$@ $(DOCFMT) $<
- 
- ######################## Header .di file generation ##############################
- 
- import: $(IMPORTS)
- 
- $(IMPDIR)/core/sys/windows/%.di : src/core/sys/windows/%.d
--	$(DMD) -m32 -c -d -o- -Isrc -Iimport -Hf$@ $<
-+	$(DMD) -c -d -o- -Isrc -Iimport -Hf$@ $<
- 
- $(IMPDIR)/core/%.di : src/core/%.d
--	$(DMD) -m$(MODEL) -c -d -o- -Isrc -Iimport -Hf$@ $<
-+	$(DMD) -c -d -o- -Isrc -Iimport -Hf$@ $<
- 
- ################### C/ASM Targets ############################
- 
diff --git a/lang/dmd2/pkg-plist b/lang/dmd2/pkg-plist
index 2d0b00035c2d..1b1eeb211a25 100644
--- a/lang/dmd2/pkg-plist
+++ b/lang/dmd2/pkg-plist
@@ -8,11 +8,11 @@ lib/libphobos2.a
 %%EXAMPLESDIR%%/samples/d/chello.d
 %%EXAMPLESDIR%%/samples/d/clean.bat
 %%EXAMPLESDIR%%/samples/d/d2html.d
-%%EXAMPLESDIR%%/samples/d/d2html.d.htm
 %%EXAMPLESDIR%%/samples/d/d2html.kwd
 %%EXAMPLESDIR%%/samples/d/dclient.d
 %%EXAMPLESDIR%%/samples/d/dhry.d
 %%EXAMPLESDIR%%/samples/d/dserver.d
+%%EXAMPLESDIR%%/samples/d/dserver.def
 %%EXAMPLESDIR%%/samples/d/hello.d
 %%EXAMPLESDIR%%/samples/d/htmlget.d
 %%EXAMPLESDIR%%/samples/d/listener.d
@@ -96,6 +96,7 @@ include/d/druntime/import/core/sys/posix/sys/stat.di
 include/d/druntime/import/core/sys/posix/sys/time.di
 include/d/druntime/import/core/sys/posix/sys/types.di
 include/d/druntime/import/core/sys/posix/sys/uio.di
+include/d/druntime/import/core/sys/posix/sys/un.di
 include/d/druntime/import/core/sys/posix/sys/wait.di
 include/d/druntime/import/core/sys/posix/termios.di
 include/d/druntime/import/core/sys/posix/time.di