Update 1.068 --> 1.069.

Remove 32-bit only build restriction.

5 files changed, 80 insertions, 4 deletions

diff --git a/lang/dmd/Makefile b/lang/dmd/Makefile
index 3b73f0c58b89..59dc96e83bd1 100644
--- a/lang/dmd/Makefile
+++ b/lang/dmd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dmd
-PORTVERSION=	1.068
+PORTVERSION=	1.069
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.digitalmars.com/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -15,7 +15,6 @@ MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Official compiler for the D 1.0 programming language
 
 NO_PACKAGE=	Packages are not validation-tested by the developer
-ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
 MAN1=		dmd.1
 MAN5=		dmd.conf.5
diff --git a/lang/dmd/distinfo b/lang/dmd/distinfo
index 04882877f6b5..919995711d13 100644
--- a/lang/dmd/distinfo
+++ b/lang/dmd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmd.1.068.zip) = adbefa6845425f54af56335e98e9e95a25e02a991e98e96895f2ae75d35e2bea
-SIZE (dmd.1.068.zip) = 10445213
+SHA256 (dmd.1.069.zip) = e19ba79c98e1cc4d9acea1bbe4833f9820922aec310f404e856ee5154b59ac16
+SIZE (dmd.1.069.zip) = 10975065
diff --git a/lang/dmd/files/patch-src-dmd-freebsd.mak b/lang/dmd/files/patch-src-dmd-freebsd.mak
new file mode 100644
index 000000000000..46f88cfbbefe
--- /dev/null
+++ b/lang/dmd/files/patch-src-dmd-freebsd.mak
@@ -0,0 +1,31 @@
+--- ../../src/dmd/freebsd.mak.orig	2011-07-09 11:27:44.000000000 -0700
++++ ../../src/dmd/freebsd.mak	2011-08-06 21:26:42.816062642 -0700
+@@ -3,9 +3,7 @@
+ TK=tk
+ ROOT=root
+ 
+-MODEL=32
+-
+-CC=g++ -m$(MODEL)
++CC=c++
+ 
+ #OPT=-g -g3
+ #OPT=-O2
+@@ -95,7 +93,7 @@
+ all: dmd
+ 
+ dmd: $(DMD_OBJS)
+-	gcc -m$(MODEL) -lstdc++ -lpthread $(COV) $(DMD_OBJS) -o dmd
++	cc -lstdc++ -lpthread $(COV) $(DMD_OBJS) -o dmd
+ 
+ clean:
+ 	rm -f $(DMD_OBJS) dmd optab.o id.o impcnvgen idgen id.c id.h \
+@@ -468,7 +466,7 @@
+ 	$(CC) -c $(GFLAGS) -I$(ROOT) $<
+ 
+ strtold.o: $C/strtold.c
+-	gcc -m$(MODEL) -c $C/strtold.c
++	cc -c $C/strtold.c
+ 
+ struct.o: struct.c
+ 	$(CC) -c $(CFLAGS) $<
diff --git a/lang/dmd/files/patch-src-phobos-freebsd.mak b/lang/dmd/files/patch-src-phobos-freebsd.mak
new file mode 100644
index 000000000000..9d5f757d8268
--- /dev/null
+++ b/lang/dmd/files/patch-src-phobos-freebsd.mak
@@ -0,0 +1,42 @@
+--- ../../src/phobos/freebsd.mak.orig	2011-06-24 17:47:13.431230979 -0700
++++ ../../src/phobos/freebsd.mak	2011-06-24 17:49:46.357713495 -0700
+@@ -12,12 +12,11 @@
+ LIB=libphobos.a
+ 
+ MAKEFILE=freebsd.mak
+-MODEL=32
+ 
+-CFLAGS=-O -m$(MODEL)
++CFLAGS=-O
+ #CFLAGS=-g -m$(MODEL)
+ 
+-DFLAGS=-O -release -w -m$(MODEL)
++DFLAGS=-O -release -w
+ #DFLAGS=-unittest -w -m$(MODEL)
+ 
+ RM=rm -f
+@@ -248,7 +247,7 @@
+ 	./unittest
+ 
+ cov : $(SRCS) $(LIB)
+-	$(DMD) -cov -unittest -ofcov -m$(MODEL) unittest.d $(SRCS) $(LIB)
++	$(DMD) -cov -unittest -ofcov unittest.d $(SRCS) $(LIB)
+ 	./cov
+ 
+ 
+@@ -258,13 +257,13 @@
+ #	cd internal/gc
+ #	make -f $(MAKEFILE) dmgc.a
+ #	cd ../..
+-	make DMD=$(DMD) MODEL=$(MODEL) -C ./internal/gc -f $(MAKEFILE)
++	make DMD=$(DMD) -C ./internal/gc -f $(MAKEFILE)
+ 
+ $(ZLIB_OBJS):
+ #	cd etc/c/zlib
+ #	make -f $(MAKEFILE)
+ #	cd ../../..
+-	make -C ./etc/c/zlib -f $(MAKEFILE) MODEL=$(MODEL)
++	make -C ./etc/c/zlib -f $(MAKEFILE)
+ 
+ ###
+ 
diff --git a/lang/dmd/pkg-plist b/lang/dmd/pkg-plist
index e4ec21be0ba3..d6ca19f7d8b2 100644
--- a/lang/dmd/pkg-plist
+++ b/lang/dmd/pkg-plist
@@ -51,6 +51,9 @@ include/d/phobos/std/c/linux/pthread.d
 include/d/phobos/std/c/linux/socket.d
 include/d/phobos/std/c/locale.d
 include/d/phobos/std/c/math.d
+include/d/phobos/std/c/openbsd/openbsd.d
+include/d/phobos/std/c/openbsd/pthread.d
+include/d/phobos/std/c/openbsd/socket.d
 include/d/phobos/std/c/osx/dyld.d
 include/d/phobos/std/c/osx/getsect.d
 include/d/phobos/std/c/osx/loader.d
@@ -170,6 +173,7 @@ include/d/phobos/unittest.d
 @dirrm include/d/phobos/std/c/solaris
 @dirrm include/d/phobos/std/c/posix
 @dirrm include/d/phobos/std/c/osx
+@dirrm include/d/phobos/std/c/openbsd
 @dirrm include/d/phobos/std/c/linux
 @dirrm include/d/phobos/std/c/freebsd
 @dirrm include/d/phobos/std/c