Update 1.069 --> 1.070

3 files changed, 47 insertions, 19 deletions

diff --git a/lang/dmd/Makefile b/lang/dmd/Makefile
index 59dc96e83bd1..31c2533d462a 100644
--- a/lang/dmd/Makefile
+++ b/lang/dmd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dmd
-PORTVERSION=	1.069
+PORTVERSION=	1.070
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.digitalmars.com/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -16,6 +16,7 @@ COMMENT=	Official compiler for the D 1.0 programming language
 
 NO_PACKAGE=	Packages are not validation-tested by the developer
 USE_ZIP=	yes
+USE_GMAKE=	yes
 MAN1=		dmd.1
 MAN5=		dmd.conf.5
 PORTDOCS=	*.txt html/ phobos/
@@ -36,10 +37,9 @@ OPTIONS=	SOURCE		"Compile dmd and phobos from source" off
 MODULEDIR=	${PREFIX}/include/d/phobos
 
 .if defined(WITH_SOURCE)
-MAKEFILE=	freebsd.mak
+MAKEFILE=	posix.mak
 .else
 NO_BUILD=	yes
-PLIST_FILES=	bin/dmd.conf
 .endif
 
 post-patch:
@@ -47,11 +47,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|gcc|${CC}|"			\
 		${WRKSRC}/../phobos/freebsd.mak			\
 		${WRKSRC}/../phobos/etc/c/zlib/freebsd.mak	\
-		${WRKSRC}/../phobos/internal/gc/freebsd.mak	\
-		${WRKSRC}/freebsd.mak
+		${WRKSRC}/../phobos/internal/gc/freebsd.mak
 	@${REINPLACE_CMD} -e "s|g++|${CXX}|"			\
-		${WRKSRC}/../phobos/freebsd.mak			\
-		${WRKSRC}/freebsd.mak
+		${WRKSRC}/../phobos/freebsd.mak
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|"	\
 		${WRKDIR}/dmd/man/man1/dmd.1		\
 		${WRKDIR}/dmd/man/man1/dmd.conf.5
@@ -67,8 +65,6 @@ post-patch:
 
 post-build:
 	@${REINPLACE_CMD} -e "s| etc/c/zlib/gzio.o||" ${WRKSRC}/../phobos/freebsd.mak
-	cd ${WRKSRC}/../phobos && \
-		${SETENV} PATH=${PATH}:${WRKSRC} ${MAKE} ${MAKE_FLAGS} freebsd.mak
 
 do-install:
 	${INSTALL_MAN} ${WRKDIR}/dmd/man/man1/dmd.1 ${MANPREFIX}/man/man1
@@ -76,14 +72,8 @@ do-install:
 .if !exists(${PREFIX}/etc/dmd.conf)
 	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf ${PREFIX}/etc
 .endif
-.if defined(WITH_SOURCE)
-	${INSTALL_PROGRAM} ${WRKSRC}/dmd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/../phobos/libphobos.a ${PREFIX}/lib
-.else
-	${INSTALL_PROGRAM} ${WRKDIR}/dmd/freebsd/bin/dmd ${PREFIX}/bin
-	${LN} -sf ${PREFIX}/etc/dmd.conf ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/lib/libphobos.a ${PREFIX}/lib
-.endif
+	${INSTALL_PROGRAM} ${WRKDIR}/dmd/freebsd/bin32/dmd ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/lib32/libphobos.a ${PREFIX}/lib
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/dmd/freebsd/bin32/dmd.conf.tango ${EXAMPLESDIR}
diff --git a/lang/dmd/distinfo b/lang/dmd/distinfo
index 919995711d13..cfa112a01579 100644
--- a/lang/dmd/distinfo
+++ b/lang/dmd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmd.1.069.zip) = e19ba79c98e1cc4d9acea1bbe4833f9820922aec310f404e856ee5154b59ac16
-SIZE (dmd.1.069.zip) = 10975065
+SHA256 (dmd.1.070.zip) = 639ecc96409296f4ac1f4870ef9b066440c79cbac528afac19f3bd0bc084c37c
+SIZE (dmd.1.070.zip) = 11112972
diff --git a/lang/dmd/files/patch-src-dmd-posix.mak b/lang/dmd/files/patch-src-dmd-posix.mak
new file mode 100644
index 000000000000..94ed5c4ce471
--- /dev/null
+++ b/lang/dmd/files/patch-src-dmd-posix.mak
@@ -0,0 +1,38 @@
+--- ../../src/dmd/posix.mak.orig	2011-09-07 20:10:32.000000000 -0700
++++ ../../src/dmd/posix.mak	2011-09-10 13:43:29.014432697 -0700
+@@ -29,8 +29,6 @@
+ TK=tk
+ ROOT=root
+ 
+-MODEL=32
+-
+ ifeq (OSX,$(TARGET))
+     ## See: http://developer.apple.com/documentation/developertools/conceptual/cross_development/Using/chapter_3_section_2.html#//apple_ref/doc/uid/20002000-1114311-BABGCAAB
+     ENVP= MACOSX_DEPLOYMENT_TARGET=10.3
+@@ -47,7 +45,7 @@
+     LDFLAGS=-lm -lstdc++ -lpthread
+ endif
+ 
+-CC=g++ -m$(MODEL) $(TARGET_CFLAGS)
++CC=g++ $(TARGET_CFLAGS)
+ 
+ #OPT=-g -g3
+ #OPT=-O2
+@@ -141,7 +139,7 @@
+ all: dmd
+ 
+ dmd: $(DMD_OBJS)
+-	$(ENVP) gcc -o dmd -m$(MODEL) $(COV) $(DMD_OBJS) $(LDFLAGS)
++	$(ENVP) gcc -o dmd $(COV) $(DMD_OBJS) $(LDFLAGS)
+ 
+ clean:
+ 	rm -f $(DMD_OBJS) dmd optab.o id.o impcnvgen idgen id.c id.h \
+@@ -511,7 +509,7 @@
+ 	$(CC) -c $(GFLAGS) -I$(ROOT) $<
+ 
+ strtold.o: $C/strtold.c
+-	gcc -m$(MODEL) -c $<
++	gcc -c $<
+ 
+ struct.o: struct.c
+ 	$(CC) -c $(CFLAGS) $<