From owner-svn-ports-head@freebsd.org Sat Apr 9 07:23:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05B0FB08722; Sat, 9 Apr 2016 07:23:47 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B910715CF; Sat, 9 Apr 2016 07:23:46 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u397NjLh056083; Sat, 9 Apr 2016 07:23:45 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u397NjCA056080; Sat, 9 Apr 2016 07:23:45 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201604090723.u397NjCA056080@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 9 Apr 2016 07:23:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412798 - in head/lang/dmd2: . files.bootstrap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Apr 2016 07:23:47 -0000 Author: cy Date: Sat Apr 9 07:23:45 2016 New Revision: 412798 URL: https://svnweb.freebsd.org/changeset/ports/412798 Log: Previously this port used library files packaged in the distribution tarball. However the latest tarball released by Digital Mars contains library files for only the O/S-architecture supported by the tarball. The port now builds all libraries and files required to build the port from source, installing the library needed to run compiled D programs. The advantage to this is that previously only i386 and amd64 were supported whereas now this port should install on all architectures. Added: head/lang/dmd2/files.bootstrap/ head/lang/dmd2/files.bootstrap/patch-src__phobos__posix.mak (contents, props changed) Modified: head/lang/dmd2/Makefile head/lang/dmd2/Makefile.bootstrap Modified: head/lang/dmd2/Makefile ============================================================================== --- head/lang/dmd2/Makefile Sat Apr 9 06:07:39 2016 (r412797) +++ head/lang/dmd2/Makefile Sat Apr 9 07:23:45 2016 (r412798) @@ -4,6 +4,7 @@ PORTNAME= dmd PKGNAMESUFFIX= 2 PORTVERSION= 2.071.0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://ftp.digitalmars.com/ DISTNAME= dmd.${PORTVERSION} @@ -61,6 +62,10 @@ MAKE_ARGS+= DEBUG_FLAGS=-g\ -DDEBUG=1\ - MODULEDIR= ${PREFIX}/include/d/phobos2 post-patch: + @${MKDIR} ${WRKDIR}/dmd2/freebsd/bin32 \ + ${WRKDIR}/dmd2/freebsd/bin64 \ + ${WRKDIR}/dmd2/freebsd/lib32 \ + ${WRKDIR}/dmd2/freebsd/lib64 @${REINPLACE_CMD} -e "s|g++|${CXX}|" \ -e "s|/etc|${PREFIX}/etc|" \ ${WRKSRC}/posix.mak @@ -77,12 +82,23 @@ post-patch: ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf @${ECHO_CMD} >> ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf +make-phobos: + cd ${WRKSRC}/../phobos && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} + +make-druntime: + cd ${WRKSRC}/../druntime && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} + +make-dmd: + cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} + +do-build: make-dmd make-phobos make-druntime + 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 + ${INSTALL_DATA} ${WRKSRC}/../../src/phobos/generated/freebsd/release/${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 Modified: head/lang/dmd2/Makefile.bootstrap ============================================================================== --- head/lang/dmd2/Makefile.bootstrap Sat Apr 9 06:07:39 2016 (r412797) +++ head/lang/dmd2/Makefile.bootstrap Sat Apr 9 07:23:45 2016 (r412798) @@ -11,7 +11,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} COMMENT= D 2.0 compiler bootstrap WRKDIR= ${BOOTDIR}/.host_dmd-2.067.1 -PATCHDIR= ${MASTERDIR}/bootstrap +PATCHDIR= ${MASTERDIR}/files.bootstrap USES= gmake zip MAKEFILE= posix.mak EXAMPLESDIR= ${PREFIX}/share/examples/dmd2 @@ -55,6 +55,17 @@ post-patch: ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf @${ECHO_CMD} >> ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd.conf +make-phobos: + cd ${WRKSRC}/../phobos && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} + +make-druntime: + cd ${WRKSRC}/../druntime && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} + +make-dmd: + cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -f ${MAKEFILE} ${BUILD} + +do-build: make-dmd make-phobos make-druntime + 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 Added: head/lang/dmd2/files.bootstrap/patch-src__phobos__posix.mak ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd2/files.bootstrap/patch-src__phobos__posix.mak Sat Apr 9 07:23:45 2016 (r412798) @@ -0,0 +1,11 @@ +--- ../../src/phobos/posix.mak.orig 2016-04-08 22:04:38.300872000 -0700 ++++ ../../src/phobos/posix.mak 2016-04-08 22:11:33.637271000 -0700 +@@ -121,7 +121,7 @@ + DMD = wine dmd.exe + RUN = wine + else +- DMD = ../dmd/src/dmd ++ DMD = ../dmd/dmd + ifeq ($(OS),win32) + CC = dmc + else