Date: Mon, 14 Apr 2014 19:28:06 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351279 - in head/lang/dmd2: . files Message-ID: <201404141928.s3EJS65u096279@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Mon Apr 14 19:28:06 2014 New Revision: 351279 URL: http://svnweb.freebsd.org/changeset/ports/351279 QAT: https://qat.redports.org/buildarchive/r351279/ Log: Update 2.064.2 --> 2.065.0 Added: head/lang/dmd2/files/patch-src-druntime-posix.mak (contents, props changed) head/lang/dmd2/files/patch-src-phobos-posix.mak (contents, props changed) Deleted: head/lang/dmd2/files/patch-src-dmd-root-port.c Modified: head/lang/dmd2/Makefile head/lang/dmd2/distinfo head/lang/dmd2/pkg-plist Modified: head/lang/dmd2/Makefile ============================================================================== --- head/lang/dmd2/Makefile Mon Apr 14 19:25:25 2014 (r351278) +++ head/lang/dmd2/Makefile Mon Apr 14 19:28:06 2014 (r351279) @@ -3,7 +3,7 @@ PORTNAME= dmd PKGNAMESUFFIX= 2 -PORTVERSION= 2.064.2 +PORTVERSION= 2.065.0 CATEGORIES= lang MASTER_SITES= http://ftp.digitalmars.com/ DISTNAME= dmd.${PORTVERSION} @@ -13,9 +13,9 @@ COMMENT= D 2.0 compiler, not officially USES= gmake zip MAKEFILE= posix.mak -EXAMPLESDIR= ${PREFIX}/share/examples/dmd2 -DOCSDIR= ${PREFIX}/share/doc/dmd2 -PORTDOCS= *.txt druntime/ html/ phobos/ +EXAMPLESDIR= ${PREFIX}/share/examples/dmd +DOCSDIR= ${PREFIX}/share/doc/dmd +PORTDOCS= *.txt druntime/ html/ WRKSRC= ${WRKDIR}/dmd2/src/${PORTNAME} LICENSE_COMB= multi LICENSE= ART10 DMD BSL @@ -58,9 +58,8 @@ post-patch: -e "s|\(dmd\)|\12|gI" \ -e "s|\\\BR|.BR|" \ ${WRKDIR}/dmd2/man/man1/dmd.1 \ - ${WRKDIR}/dmd2/man/man1/dmd.conf.5 + ${WRKDIR}/dmd2/man/man5/dmd.conf.5 @${REINPLACE_CMD} -e 's|"/etc/"|"${PREFIX}/etc/"|' ${WRKSRC}/inifile.c - @${REINPLACE_CMD} -e 's|dmd.conf|dmd2.conf|' ${WRKSRC}/mars.c @${REINPLACE_CMD} -e "s|%@P%/../../src/phobos|${MODULEDIR}|" \ -e "s|%@P%/../lib|${PREFIX}/lib|" \ -e "s|%@P%/../../src/druntime|${PREFIX}/include/d/druntime|" \ @@ -73,19 +72,19 @@ 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 ${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 + ${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 +.if !exists(${STAGEDIR}${PREFIX}/etc/dmd.conf) + ${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${PREFIX}/etc/dmd.conf .endif - ${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd2 + ${INSTALL_PROGRAM} ${WRKSRC}/dmd ${STAGEDIR}${PREFIX}/bin/dmd .if ${ARCH} == "amd64" ${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/64/libphobos2.a ${STAGEDIR}${PREFIX}/lib .else ${INSTALL_DATA} ${WRKSRC}/../phobos/generated/freebsd/${BUILD}/32/libphobos2.a ${STAGEDIR}${PREFIX}/lib .endif ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd2.conf + ${INSTALL_DATA} ${WRKDIR}/dmd2/linux/bin32/dmd.conf ${STAGEDIR}${EXAMPLESDIR}/dmd.conf cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} samples ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${MODULEDIR}/etc/c ${INSTALL_DATA} ${WRKSRC}/../phobos/*.d ${STAGEDIR}${MODULEDIR} @@ -101,10 +100,8 @@ do-install: 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 + ${INSTALL_DATA} ${WRKSRC}/../druntime/README.md ${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> Modified: head/lang/dmd2/distinfo ============================================================================== --- head/lang/dmd2/distinfo Mon Apr 14 19:25:25 2014 (r351278) +++ head/lang/dmd2/distinfo Mon Apr 14 19:28:06 2014 (r351279) @@ -1,2 +1,2 @@ -SHA256 (dmd.2.064.2.zip) = f51a10a137e0be6fb8ef32e3ff475aa377af1461400ec2cef2dcb917976f12c4 -SIZE (dmd.2.064.2.zip) = 33349115 +SHA256 (dmd.2.065.0.zip) = f3f4c8f6c2e5cdd0ac335e56613663bee075a1e797ffbb55035d6c767d7bc585 +SIZE (dmd.2.065.0.zip) = 50532001 Added: head/lang/dmd2/files/patch-src-druntime-posix.mak ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd2/files/patch-src-druntime-posix.mak Mon Apr 14 19:28:06 2014 (r351279) @@ -0,0 +1,11 @@ +--- ../../src/druntime/posix.mak.orig 2014-02-24 05:23:06.000000000 -0800 ++++ ../../src/druntime/posix.mak 2014-04-13 22:55:07.300878843 -0700 +@@ -43,7 +43,7 @@ + endif + endif + +-DMD=../dmd/src/dmd ++DMD=../../../dmd2/src/dmd/dmd + INSTALL_DIR=../install + + DOCDIR=doc Added: head/lang/dmd2/files/patch-src-phobos-posix.mak ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/dmd2/files/patch-src-phobos-posix.mak Mon Apr 14 19:28:06 2014 (r351279) @@ -0,0 +1,11 @@ +--- ../../src/phobos/posix.mak.orig 2014-04-13 22:44:09.100845919 -0700 ++++ ../../src/phobos/posix.mak 2014-04-13 22:56:05.441324581 -0700 +@@ -108,7 +108,7 @@ + DMD = wine dmd.exe + RUN = wine + else +- DMD = ../dmd/src/dmd ++ DMD = ../../../dmd2/src/dmd/dmd + ifeq ($(OS),win32) + CC = dmc + else Modified: head/lang/dmd2/pkg-plist ============================================================================== --- head/lang/dmd2/pkg-plist Mon Apr 14 19:25:25 2014 (r351278) +++ head/lang/dmd2/pkg-plist Mon Apr 14 19:28:06 2014 (r351279) @@ -1,8 +1,8 @@ -bin/dmd2 +bin/dmd lib/libphobos2.a -@unexec if cmp -s %D/%%EXAMPLESDIR%%/dmd2.conf %D/etc/dmd2.conf; then rm -f %D/etc/dmd2.conf; fi -%%EXAMPLESDIR%%/dmd2.conf -@exec if [ ! -f %D/etc/dmd2.conf ]; then cp -p %D/%%EXAMPLESDIR%%/dmd2.conf %D/etc/dmd2.conf; fi +@unexec if cmp -s %D/%%EXAMPLESDIR%%/dmd.conf %D/etc/dmd.conf; then rm -f %D/etc/dmd.conf; fi +%%EXAMPLESDIR%%/dmd.conf +@exec if [ ! -f %D/etc/dmd.conf ]; then cp -p %D/%%EXAMPLESDIR%%/dmd.conf %D/etc/dmd.conf; fi %%EXAMPLESDIR%%/samples/d/all.sh %%EXAMPLESDIR%%/samples/d/build.bat %%EXAMPLESDIR%%/samples/d/chello.d @@ -33,6 +33,8 @@ include/d/druntime/import/core/atomic.d include/d/druntime/import/core/bitop.d include/d/druntime/import/core/cpuid.d include/d/druntime/import/core/demangle.d +include/d/druntime/import/core/internal/convert.d +include/d/druntime/import/core/internal/hash.d include/d/druntime/import/core/exception.d include/d/druntime/import/core/math.d include/d/druntime/import/core/memory.d @@ -85,6 +87,7 @@ include/d/druntime/import/core/sys/linux include/d/druntime/import/core/sys/linux/sys/mman.d include/d/druntime/import/core/sys/linux/sys/signalfd.d include/d/druntime/import/core/sys/linux/sys/xattr.d +include/d/druntime/import/core/sys/linux/termios.d include/d/druntime/import/core/sys/osx/execinfo.d include/d/druntime/import/core/sys/osx/mach/kern_return.d include/d/druntime/import/core/sys/osx/mach/port.d @@ -141,7 +144,6 @@ include/d/druntime/import/core/time.d include/d/druntime/import/core/vararg.d include/d/druntime/import/etc/linux/memoryerror.d include/d/druntime/import/object.di -include/d/phobos2/crc32.d include/d/phobos2/etc/c/curl.d include/d/phobos2/etc/c/sqlite3.d include/d/phobos2/etc/c/zlib.d @@ -155,6 +157,7 @@ include/d/phobos2/std/bitmanip.d include/d/phobos2/std/c/fenv.d include/d/phobos2/std/c/freebsd/socket.d include/d/phobos2/std/c/linux/linux.d +include/d/phobos2/std/c/linux/linuxextern.d include/d/phobos2/std/c/linux/pthread.d include/d/phobos2/std/c/linux/socket.d include/d/phobos2/std/c/linux/termios.d @@ -212,7 +215,6 @@ include/d/phobos2/std/internal/windows/a include/d/phobos2/std/json.d include/d/phobos2/std/math.d include/d/phobos2/std/mathspecial.d -include/d/phobos2/std/md5.d include/d/phobos2/std/metastrings.d include/d/phobos2/std/mmfile.d include/d/phobos2/std/net/curl.d @@ -237,6 +239,7 @@ include/d/phobos2/std/syserror.d include/d/phobos2/std/system.d include/d/phobos2/std/traits.d include/d/phobos2/std/typecons.d +include/d/phobos2/std/typelist.d include/d/phobos2/std/typetuple.d include/d/phobos2/std/uni.d include/d/phobos2/std/uri.d @@ -251,8 +254,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 +man/man1/dmd.1.gz +man/man5/dmd.conf.5.gz @dirrm %%EXAMPLESDIR%%/samples/d/mydll @dirrm %%EXAMPLESDIR%%/samples/d @dirrm %%EXAMPLESDIR%%/samples @@ -290,6 +293,7 @@ man/man5/dmd2.conf.5.gz @dirrm include/d/druntime/import/core/sys @dirrm include/d/druntime/import/core/sync @dirrm include/d/druntime/import/core/stdc +@dirrm include/d/druntime/import/core/internal @dirrm include/d/druntime/import/core @dirrm include/d/druntime/import @dirrm include/d/druntime
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404141928.s3EJS65u096279>