Index: head/lang/dmd2/Makefile =================================================================== --- head/lang/dmd2/Makefile (revision 408997) +++ head/lang/dmd2/Makefile (revision 408998) @@ -1,100 +1,100 @@ # Created by: Ruben # $FreeBSD$ PORTNAME= dmd PKGNAMESUFFIX= 2 PORTVERSION= 2.070.0 -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}|" \ -e "s|/etc|${PREFIX}/etc|" \ ${WRKSRC}/posix.mak @${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/link.d @${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 "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} pre-configure: ${MAKE} -f Makefile.bootstrap BOOTDIR=${WRKDIR} .include Index: head/lang/dmd2/files/patch-src__dmd__posix.mak =================================================================== --- head/lang/dmd2/files/patch-src__dmd__posix.mak (revision 408997) +++ head/lang/dmd2/files/patch-src__dmd__posix.mak (revision 408998) @@ -1,106 +1,97 @@ --- ../../src/dmd/posix.mak.orig 2016-01-27 07:22:54.000000000 -0800 +++ ../../src/dmd/posix.mak 2016-01-28 12:32:14.044394178 -0800 -@@ -19,7 +19,7 @@ - endif - - INSTALL_DIR=../../install --SYSCONFDIR=/etc -+SYSCONFDIR=/usr/local/etc - PGO_DIR=$(abspath pgo) - - C=backend @@ -31,9 +31,9 @@ endif #ifeq (osx,$(OS)) -# HOST_CC=clang++ +# HOST_CC=clanc++ #else - HOST_CC=g++ + HOST_CC=c++ #endif CC=$(HOST_CC) AR=ar @@ -56,14 +56,11 @@ HOST_DMD_RUN:=$(HOST_DMD) else # Auto-bootstrapping, will download dmd automatically - HOST_DMD_VER=2.068.2 - HOST_DMD_ROOT=/tmp/.host_dmd-$(HOST_DMD_VER) - # dmd.2.068.2.osx.zip or dmd.2.068.2.linux.tar.xz + HOST_DMD_VER=2.067.1 + HOST_DMD_ROOT=${WRKDIR}/.host_dmd-$(HOST_DMD_VER) HOST_DMD_BASENAME=dmd.$(HOST_DMD_VER).$(OS)$(if $(filter $(OS),freebsd),-$(MODEL),) - # http://downloads.dlang.org/releases/2.x/2.068.2/dmd.2.068.2.linux.tar.xz - HOST_DMD_URL=http://downloads.dlang.org/releases/2.x/$(HOST_DMD_VER)/$(HOST_DMD_BASENAME) 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 @@ -92,7 +89,7 @@ -Wno-unused-value \ -Wno-unused-variable # GCC Specific -ifeq ($(HOST_CC), g++) +ifeq ($(HOST_CC), c++) WARNINGS := $(WARNINGS) \ -Wno-logical-op \ -Wno-narrowing \ @@ -100,7 +97,7 @@ -Wno-uninitialized endif # Clang Specific -ifeq ($(HOST_CC), clang++) +ifeq ($(HOST_CC), clanc++) WARNINGS := $(WARNINGS) \ -Wno-tautological-constant-out-of-range-compare \ -Wno-tautological-compare \ @@ -112,7 +109,7 @@ # Default Warnings WARNINGS := -Wno-deprecated -Wstrict-aliasing # Clang Specific -ifeq ($(HOST_CC), clang++) +ifeq ($(HOST_CC), clanc++) WARNINGS := $(WARNINGS) \ -Wno-logical-op-parentheses \ -Wno-dynamic-class-memaccess \ @@ -130,7 +127,7 @@ -D__pascal= -DMARS=1 -DTARGET_$(OS_UPCASE)=1 -DDM_TARGET_CPU_$(TARGET_CPU)=1 \ $(MODEL_FLAG) # GCC Specific -ifeq ($(HOST_CC), g++) +ifeq ($(HOST_CC), c++) CFLAGS := $(CFLAGS) \ -std=gnu++98 endif @@ -321,19 +318,6 @@ verstr.h SYSCONFDIR.imp core *.cov *.deps *.gcda *.gcno *.a *.lst @[ ! -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} -ifneq (,$(shell which xz 2>/dev/null)) - curl -fsSL ${HOST_DMD_URL}.tar.xz | tar -C ${HOST_DMD_ROOT} -Jxf - || rm -rf ${HOST_DMD_ROOT} -else - TMPFILE=$$(mktemp deleteme.XXXXXXXX) && curl -fsSL ${HOST_DMD_URL}.zip > $${TMPFILE}.zip && \ - unzip -qd ${HOST_DMD_ROOT} $${TMPFILE}.zip && rm $${TMPFILE}.zip; -endif -endif - ######## generate a default dmd.conf define DEFAULT_DMD_CONF @@ -440,7 +424,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