--- b/devel/dub/Makefile +++ b/devel/dub/Makefile @@ -1,5 +1,6 @@ PORTNAME= dub PORTVERSION= 1.14.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -17,8 +18,15 @@ GH_ACCOUNT= dlang PLIST_FILES= bin/${PORTNAME} +.include + post-patch: @${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/source/dub/version_.d +.if (${OSVERSION} >= 1400042) + @${REINPLACE_CMD} -e 's|%%LDFLAGS%%|-L=-Wl,-z,nostart-stop-gc|g' ${WRKSRC}/build.sh +.else + @${REINPLACE_CMD} -e 's|%%LDFLAGS%%||g' ${WRKSRC}/build.sh +.endif do-build: @cd ${WRKSRC} && ${SH} build.sh @@ -26,4 +34,4 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} -.include +.include --- b/devel/dub/files/patch-build.sh +++ b/devel/dub/files/patch-build.sh @@ -21,7 +21,7 @@ echo Running $DMD... -$DMD -ofbin/dub -g -O -w -version=DubUseCurl -version=DubApplication -Isource $* $LIBS @build-files.txt -+$DMD -ofbin/dub -O -w -version=DubUseCurl -version=DubApplication -Isource $* $LIBS @build-files.txt ++$DMD -ofbin/dub -O -w -version=DubUseCurl -version=DubApplication -Isource %%LDFLAGS%% $* $LIBS @build-files.txt bin/dub --version echo DUB has been built as bin/dub. echo