Index: head/lang/dmd2/Makefile =================================================================== --- head/lang/dmd2/Makefile (revision 401682) +++ head/lang/dmd2/Makefile (revision 401683) @@ -1,92 +1,100 @@ # Created by: Ruben # $FreeBSD$ PORTNAME= dmd PKGNAMESUFFIX= 2 PORTVERSION= 2.069.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://ftp.digitalmars.com/ DISTNAME= dmd.${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + dmd.2.067.1${EXTRACT_SUFX} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cy@FreeBSD.org COMMENT= D 2.0 compiler, not officially validated for FreeBSD USES= gmake zip MAKEFILE= posix.mak MAKE_ARGS= AUTO_BOOTSTRAP=1 MAKE_ENV+= WRKDIR=${WRKDIR} EXAMPLESDIR= ${PREFIX}/share/examples/dmd2 DOCSDIR= ${PREFIX}/share/doc/dmd2 PORTDOCS= *.txt html/ WRKSRC= ${WRKDIR}/dmd2/src/${PORTNAME} LICENSE_COMB= multi LICENSE= ART10 DMD BSL 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 OPTIONS_DEFINE= DOCS .include NOT_FOR_ARCHS= powerpc NOT_FOR_ARCHS_REASON= not yet ported to this architecture .if ${ARCH} == "sparc64" BROKEN= Does not install on sparc64: divide-by-zero error .endif .if ${ARCH} == "amd64" MAKE_ARGS+= MODEL=64 MODEL= 64 .else MAKE_ARGS+= MODEL=32 MODEL= 32 .endif .if defined(WITH_DEBUG) BUILD= debug MAKE_ARGS+= DEBUG_FLAGS=-g\ -DDEBUG=1\ -DUNITTEST .endif MODULEDIR= ${PREFIX}/include/d/phobos2 post-patch: @${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" \ -e "s|\\\BR|.BR|" \ ${WRKDIR}/dmd2/man/man1/dmd.1 \ ${WRKDIR}/dmd2/man/man5/dmd.conf.5 @${REINPLACE_CMD} -e '/^SYSCONFDIR=/s|/etc/|${PREFIX}/etc/|' ${WRKSRC}/posix.mak @${REINPLACE_CMD} -e "s|%@P%/../../src/phobos|${MODULEDIR}|" \ -e "s|%@P%/../lib|${PREFIX}/lib|" \ -e "s|%@P%/../../src/druntime|${PREFIX}/include/d/druntime|" \ ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf @${ECHO_CMD} >> ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf 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 ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd.conf.sample ${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd ${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib${MODEL}/libphobos2.a ${STAGEDIR}${PREFIX}/lib ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd32.conf ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin64/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd64.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 ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/curl.d ${STAGEDIR}${MODULEDIR}/etc/c ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/sqlite3.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 ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR} cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} + +.if !exists(${LOCALBASE}/bin/dmd) +pre-configure: + ${MAKE} -f Makefile.bootstrap BOOTDIR=${WRKDIR} +.endif .include Index: head/lang/dmd2/Makefile.bootstrap =================================================================== --- head/lang/dmd2/Makefile.bootstrap (nonexistent) +++ head/lang/dmd2/Makefile.bootstrap (revision 401683) @@ -0,0 +1,83 @@ +# Created by: Ruben +# $FreeBSD$ + +PORTNAME= dmd +PKGNAMESUFFIX= 2 +PORTVERSION= 2.067.1 +CATEGORIES= lang +DISTNAME= dmd.${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + +COMMENT= D 2.0 compiler bootstrap + +WRKDIR= ${BOOTDIR}/.host_dmd-2.067.1 +PATCHDIR= ${MASTERDIR}/bootstrap +USES= gmake zip +MAKEFILE= posix.mak +EXAMPLESDIR= ${PREFIX}/share/examples/dmd2 +DOCSDIR= ${PREFIX}/share/doc/dmd2 +PORTDOCS= *.txt html/ +WRKSRC= ${WRKDIR}/dmd2/src/${PORTNAME} +.undef DEVELOPER + +.include + +NOT_FOR_ARCHS= powerpc +NOT_FOR_ARCHS_REASON= not yet ported to this architecture + +.if ${ARCH} == "sparc64" +BROKEN= Does not install on sparc64: divide-by-zero error +.endif + +.if ${ARCH} == "amd64" +MAKE_ARGS+= MODEL=64 +MODEL= 64 +.else +MAKE_ARGS+= MODEL=32 +MODEL= 32 +.endif + +MODULEDIR= ${PREFIX}/include/d/phobos2 + +post-patch: + @${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" \ + -e "s|\\\BR|.BR|" \ + ${WRKDIR}/dmd2/man/man1/dmd.1 \ + ${WRKDIR}/dmd2/man/man5/dmd.conf.5 + @${REINPLACE_CMD} -e '/^SYSCONFDIR=/s|/etc/|${STAGEDIR}${PREFIX}/etc/|' ${WRKSRC}/posix.mak + @${REINPLACE_CMD} -e "s|%@P%/../../src/phobos|${STAGEDIR}${MODULEDIR}|" \ + -e "s|%@P%/../lib32|${STAGEDIR}${PREFIX}/lib|" \ + -e "s|%@P%/../lib64|${STAGEDIR}${PREFIX}/lib|" \ + -e "s|%@P%/../../src/druntime|${STAGEDIR}${PREFIX}/include/d/druntime|" \ + ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf + @${ECHO_CMD} >> ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf + +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 + ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd.conf.sample + ${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd + ${INSTALL_DATA} ${WRKSRC}/../../freebsd/lib${MODEL}/libphobos2.a ${STAGEDIR}${PREFIX}/lib + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd32.conf + ${INSTALL_DATA} ${WRKDIR}/dmd2/freebsd/bin64/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd64.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 + ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/curl.d ${STAGEDIR}${MODULEDIR}/etc/c + ${INSTALL_DATA} ${WRKSRC}/../phobos/etc/c/sqlite3.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 + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR} + cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} + +post-stage: + ${LN} -sf ${STAGEDIR}/${PREFIX}/bin/dmd ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd + +.include Property changes on: head/lang/dmd2/Makefile.bootstrap ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/dmd2/distinfo =================================================================== --- head/lang/dmd2/distinfo (revision 401682) +++ head/lang/dmd2/distinfo (revision 401683) @@ -1,2 +1,4 @@ SHA256 (dmd.2.069.1.zip) = 8c73f29fccce71bea02bdfa2521a945178e11c804e72e768fe96a1fb8d733abc SIZE (dmd.2.069.1.zip) = 76383062 +SHA256 (dmd.2.067.1.zip) = 24fd32d3b1401309187a3fcd235014e38c651beb3af29b0e656f6f4add4ec95b +SIZE (dmd.2.067.1.zip) = 56083735 Index: head/lang/dmd2/files/patch-src__dmd__posix.mak =================================================================== --- head/lang/dmd2/files/patch-src__dmd__posix.mak (revision 401682) +++ head/lang/dmd2/files/patch-src__dmd__posix.mak (revision 401683) @@ -1,20 +1,43 @@ --- ../../src/dmd/posix.mak.orig 2015-11-11 02:36:12.000000000 -0800 -+++ ../../src/dmd/posix.mak 2015-11-14 11:37:37.628381337 -0800 -@@ -57,7 +57,7 @@ ++++ ../../src/dmd/posix.mak 2015-11-15 01:40:55.280252455 -0800 +@@ -57,13 +57,13 @@ else # Auto-bootstrapping, will download dmd automatically HOST_DMD_VER=2.067.1 - HOST_DMD_ROOT=/tmp/.host_dmd-$(HOST_DMD_VER) + HOST_DMD_ROOT=${WRKDIR}/.host_dmd-$(HOST_DMD_VER) # dmd.2.067.1.osx.zip or dmd.2.067.1.freebsd-64.zip HOST_DMD_ZIP=dmd.$(HOST_DMD_VER).$(OS)$(if $(filter $(OS),freebsd),-$(MODEL),).zip # http://downloads.dlang.org/releases/2.x/2.067.1/dmd.2.067.1.osx.zip -@@ -423,7 +423,7 @@ + HOST_DMD_URL=http://downloads.dlang.org/releases/2.x/$(HOST_DMD_VER)/$(HOST_DMD_ZIP) + HOST_DMD=$(HOST_DMD_ROOT)/dmd2/$(OS)/$(if $(filter $(OS),osx),bin,bin$(MODEL))/dmd +- HOST_DMD_PATH=$(HOST_DMD) ++ HOST_DMD_PATH=$(HOST_DMD_ROOT)/stage/usr/local/bin/dmd + HOST_DMD_RUN=$(HOST_DMD) -conf=$(dir $(HOST_DMD))dmd.conf + endif + +@@ -308,15 +308,6 @@ + verstr.h SYSCONFDIR.imp core *.cov *.deps *.gcda *.gcno *.a + @[ ! -d ${PGO_DIR} ] || echo You should issue manually: rm -rf ${PGO_DIR} + +-######## Download and install the last dmd buildable without dmd +- +-ifneq (,$(AUTO_BOOTSTRAP)) +-$(HOST_DMD_PATH): +- mkdir -p ${HOST_DMD_ROOT} +- TMPFILE=$$(mktemp deleteme.XXXXXXXX) && curl -fsSL ${HOST_DMD_URL} > $${TMPFILE}.zip && \ +- unzip -qd ${HOST_DMD_ROOT} $${TMPFILE}.zip && rm $${TMPFILE}.zip +-endif +- + ######## generate a default dmd.conf + + define DEFAULT_DMD_CONF +@@ -423,7 +392,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 boostlicense.txt $(INSTALL_DIR)/dmd-boostlicense.txt