Index: head/editors/coedit/Makefile =================================================================== --- head/editors/coedit/Makefile (revision 471472) +++ head/editors/coedit/Makefile (revision 471473) @@ -1,79 +1,80 @@ # $FreeBSD$ PORTNAME= coedit -PORTVERSION= 3.6.4 +PORTVERSION= 3.6.15 DISTVERSIONPREFIX=v CATEGORIES= editors PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MAINTAINER= acm@FreeBSD.org COMMENT= IDE for the D programming language LICENSE= BSL BUILD_DEPENDS= ldmd2:lang/ldc \ ${LOCALBASE}/lib/d/libiz.a:devel/iz \ - ${LOCALBASE}/lib/d/libdparse.a:devel/libdparse + ${LOCALBASE}/lib/d/libdparse.a:devel/libdparse \ + ${LOCALBASE}/lib/d/libstdx-allocator.a:devel/stdx-allocator RUN_DEPENDS= ldmd2:lang/ldc \ dscanner:devel/d-scanner \ dcd-client:devel/dcd-client \ dcd-server:devel/dcd-server \ dfmt:devel/dfmt \ ddemangle:lang/dlang-tools USE_GITHUB= yes GH_ACCOUNT= BBasile GH_PROJECT= Coedit USES= fpc lazarus:flavors USE_FPC= chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \ fcl-stl fcl-web fcl-xml numlib openssl pasjpeg rtl-objpas \ regexpr rtl-extra x11 USE_XORG= x11 DESKTOP_ENTRIES="Coedit" \ "IDE for the D programming language" \ "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ "${PREFIX}/bin/${PORTNAME}" \ "Application;IDE;Development;" \ ${TRUE} D_LIB_DIR= ${LOCALBASE}/lib/d D_INCLUDE_DIR= ${LOCALBASE}/include/d LAZARUS_PROJECT_FILES= anchordocking/anchordocking.lpk lazproj/coedit.lpi LAZBUILD_ARGS= -d LDMD2_CMD= ${LOCALBASE}/bin/ldmd2 gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5 qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4 .if ${FLAVOR:Ugtk2:Mgtk2} USE_FPC+= cairo USE_GNOME+= cairo .endif post-patch: ${REINPLACE_CMD} -e 's|%%LDMD2_CMD%%|${LDMD2_CMD}|g' \ -e 's|%%D_LIB_DIR%%|${D_LIB_DIR}|g' \ -e 's|%%D_INCLUDE_DIR%%|${D_INCLUDE_DIR}|g' \ ${WRKSRC}/dastworx/build.sh ${REINPLACE_CMD} -e 's|LINUX|UNIX|g' ${WRKSRC}/src/ce_common.pas ${WRKSRC}/src/ce_dcd.pas ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/ce_compilers.pas post-configure: @${MKDIR} ${WRKSRC}/tmppcp ${CP} -a ${LAZARUS_DIR}/components/anchordocking ${WRKSRC} pre-build: @cd ${WRKSRC}/dastworx && ${SH} build.sh do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/coedit ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/bin/dastworx ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/logo/coedit.png ${STAGEDIR}${PREFIX}/share/pixmaps/ .include Index: head/editors/coedit/distinfo =================================================================== --- head/editors/coedit/distinfo (revision 471472) +++ head/editors/coedit/distinfo (revision 471473) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520727939 -SHA256 (BBasile-Coedit-v3.6.4_GH0.tar.gz) = afed9234facf9683e0de3620f97d2f00e4b35aae38e7b39b3bd5333ba3278052 -SIZE (BBasile-Coedit-v3.6.4_GH0.tar.gz) = 3862290 +TIMESTAMP = 1528011225 +SHA256 (BBasile-Coedit-v3.6.15_GH0.tar.gz) = 0ba71193560784460a7b36ae24e96be211f91aec14776b2bcafeb0597f0fdedd +SIZE (BBasile-Coedit-v3.6.15_GH0.tar.gz) = 3879879 Index: head/editors/coedit/files/patch-dastworx_build.sh =================================================================== --- head/editors/coedit/files/patch-dastworx_build.sh (revision 471472) +++ head/editors/coedit/files/patch-dastworx_build.sh (revision 471473) @@ -1,33 +1,35 @@ ---- dastworx/build.sh 2018-02-11 21:48:35.000000000 -0500 -+++ dastworx/build.sh 2018-02-12 12:01:10.311013000 -0500 +--- dastworx/build.sh 2018-06-03 02:41:09.063965000 -0500 ++++ dastworx/build.sh 2018-06-03 02:42:21.888100000 -0500 @@ -1,18 +1,3 @@ -#iz sources -cd ../etc/iz/import/ -iz=$(find `pwd` -type f -name \*.d) -cd ../../../dastworx - -#dparse sources -cd ../etc/libdparse/src/ -dparse=$(find `pwd` -type f -name \*.d) -cd ../../../dastworx - -#stdx-alloc sources -cd ../etc/stdx-allocator/source/ -stdxalloc=$(find `pwd` -type f -name \*.d) -cd ../../../dastworx - #dast sources cd src/ dast=$(find `pwd` -type f -name \*.d) -@@ -21,9 +6,9 @@ +@@ -21,10 +6,10 @@ echo building... #build -dmd ${dast[@]} ${dparse[@]} ${iz[@]} ${stdxalloc[@]} \ -+%%LDMD2_CMD%% ${dast} \ ++%%LDMD2_CMD%% ${dast} \ -O -release -inline -boundscheck=off \ --Isrc -I../etc/iz/import -I../etc/libdparse/src -I../etc/stdx-allocator/source \ +--of../bin/dastworx +-Isrc -I%%D_INCLUDE_DIR%% -L%%D_LIB_DIR%%/libiz.a -L%%D_LIB_DIR%%/libdparse.a \ - -of../bin/dastworx ++-L%%D_LIB_DIR%%/libstdx-allocator.a -of../bin/dastworx #cleanup + rm ../bin/dastworx.o