Update 2.063.2 --> 2.064

Support staging.

3 files changed, 30 insertions, 32 deletions

diff --git a/lang/dmd2/Makefile b/lang/dmd2/Makefile
index f1e7be1677ac..ed8163184409 100644
--- a/lang/dmd2/Makefile
+++ b/lang/dmd2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dmd
 PKGNAMESUFFIX=	2
-PORTVERSION=	2.063.2
+PORTVERSION=	2.064
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.digitalmars.com/
 DISTNAME=	dmd.${PORTVERSION}
@@ -14,8 +14,6 @@ COMMENT=	D 2.0 compiler, not officially validated for FreeBSD
 USE_ZIP=	yes
 USE_GMAKE=	yes
 MAKEFILE=	posix.mak
-MAN1=		dmd2.1
-MAN5=		dmd2.conf.5
 EXAMPLESDIR=	${PREFIX}/share/examples/dmd2
 DOCSDIR=	${PREFIX}/share/doc/dmd2
 PORTDOCS=	*.txt druntime/ html/ phobos/
@@ -26,7 +24,6 @@ LICENSE_NAME_DMD=	Digital Mars license
 LICENSE_FILE_DMD=	${WRKSRC}/backendlicense.txt
 LICENSE_PERMS_DMD=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800000
@@ -77,37 +74,36 @@ post-build:
 		${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
-	${INSTALL_MAN} ${WRKDIR}/dmd2/man/man1/dmd.conf.5 ${MANPREFIX}/man/man5/dmd2.conf.5
-.if !exists(${PREFIX}/etc/dmd2.conf)
-	${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${PREFIX}/etc/dmd2.conf
+	${INSTALL_MAN} ${WRKDIR}/dmd2/man/man1/dmd.1 ${STAGEDIR}${MANPREFIX}/man/man1/dmd2.1
+	${INSTALL_MAN} ${WRKDIR}/dmd2/man/man1/dmd.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/dmd2.conf.5
+.if !exists(${STAGEDIR}${PREFIX}/etc/dmd2.conf)
+	${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd2.conf
 .endif
-	${INSTALL_PROGRAM} ${WRKSRC}/dmd ${PREFIX}/bin/dmd2
+	${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd2
 .if ${ARCH} == "amd64"
-	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/64/libphobos2.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/64/libphobos2.a ${STAGEDIR}${PREFIX}/lib
 .else
-	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/32/libphobos2.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/32/libphobos2.a ${STAGEDIR}${PREFIX}/lib
 .endif
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${EXAMPLESDIR}/dmd2.conf
-	cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} samples ${EXAMPLESDIR}
-	${MKDIR} ${MODULEDIR}
-	${INSTALL_DATA} ${WRKSRC}/../phobos/*.d ${MODULEDIR}
-	${MKDIR} ${MODULEDIR}/etc/c
-	${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/zlib.d ${MODULEDIR}/etc/c
-	cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${MODULEDIR}
-	${MKDIR} ${MODULEDIR}/../druntime
-	cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} import ${MODULEDIR}/../druntime
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd2.conf
+	cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} samples ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${MODULEDIR}/etc/c
+	${INSTALL_DATA} ${WRKSRC}/../phobos/*.d ${STAGEDIR}${MODULEDIR}
+	${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/zlib.d ${STAGEDIR}${MODULEDIR}/etc/c
+	cd ${WRKSRC}/../phobos && ${COPYTREE_SHARE} std ${STAGEDIR}${MODULEDIR}
+	${MKDIR} ${STAGEDIR}${MODULEDIR}/../druntime
+	cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} import ${STAGEDIR}${MODULEDIR}/../druntime
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
-	cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} html ${DOCSDIR}
-	${MKDIR} ${DOCSDIR}/druntime
-	${INSTALL_DATA} ${WRKSRC}/../druntime/LICENSE ${DOCSDIR}/druntime
-	${INSTALL_DATA} ${WRKSRC}/../druntime/README ${DOCSDIR}/druntime
-	cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} doc ${DOCSDIR}/druntime
-	${MKDIR} ${DOCSDIR}/phobos
-	${INSTALL_DATA} ${WRKSRC}/../phobos/std.ddoc ${DOCSDIR}/phobos
+	${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 ${STAGEDIR}${DOCSDIR}/druntime
+	cd ${WRKSRC}/../druntime && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}/druntime
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/phobos
+	${INSTALL_DATA} ${WRKSRC}/../phobos/std.ddoc ${STAGEDIR}${DOCSDIR}/phobos
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/dmd2/distinfo b/lang/dmd2/distinfo
index 2489c43c046c..bdddbf4cc003 100644
--- a/lang/dmd2/distinfo
+++ b/lang/dmd2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dmd.2.063.2.zip) = ddb8fc86377fbfc15509801664ecbbc66fd6386ff5c0f415c2b9993add1bea75
-SIZE (dmd.2.063.2.zip) = 33144090
+SHA256 (dmd.2.064.zip) = acbe4aa9e8bee75f2272e1b2dc147956b22f03decc6af61b9b8890fe5e1913cf
+SIZE (dmd.2.064.zip) = 36987095
diff --git a/lang/dmd2/pkg-plist b/lang/dmd2/pkg-plist
index 15e14302bac6..f065170f0aa4 100644
--- a/lang/dmd2/pkg-plist
+++ b/lang/dmd2/pkg-plist
@@ -235,6 +235,8 @@ include/d/phobos2/std/xml.d
 include/d/phobos2/std/zip.d
 include/d/phobos2/std/zlib.d
 include/d/phobos2/unittest.d
+man/man1/dmd2.1.gz
+man/man5/dmd2.conf.5.gz
 @dirrm %%EXAMPLESDIR%%/samples/d/mydll
 @dirrm %%EXAMPLESDIR%%/samples/d
 @dirrm %%EXAMPLESDIR%%/samples