Index: head/editors/coedit/Makefile =================================================================== --- head/editors/coedit/Makefile (revision 446449) +++ head/editors/coedit/Makefile (revision 446450) @@ -1,90 +1,94 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= coedit DISTVERSION= 3_update_3 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= https://github.com/BBasile/Coedit/archive/ DISTNAME= ${DISTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= IDE for the D programming language LICENSE= BSL BUILD_DEPENDS= lazbuild:editors/lazarus \ ldmd2:lang/ldc \ ${LOCALBASE}/lib/d/libiz.a:devel/iz \ ${LOCALBASE}/lib/d/libdparse.a:devel/libdparse RUN_DEPENDS= ldmd2:lang/ldc \ dscanner:devel/d-scanner \ dcd-client:devel/dcd-client \ - dcd-server:devel/dcd-server + dcd-server:devel/dcd-server \ + dfmt:devel/dfmt \ + ddemangle:lang/dlang-tools USE_FPC= cairo 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 WRKSRC= ${WRKDIR}/${PORTNAME:S/c/C/}-${DISTVERSION} DESKTOP_ENTRIES="Coedit" \ "IDE for the D programming language" \ "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ "${PREFIX}/bin/${PORTNAME}" \ "Application;IDE;Development;" \ ${TRUE} OPTIONS_SINGLE= LCL OPTIONS_SINGLE_LCL= GTK2 QT4 GTK2_DESC= Use gtk20 interface QT4_DESC= Use qt4 interface OPTIONS_DEFAULT= GTK2 D_LIB_DIR= ${LOCALBASE}/lib/d D_INCLUDE_DIR= ${LOCALBASE}/include/d PROJECT_FILE= lazproj/coedit.lpi LAZARUS_VER= 1.6.4 LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild LAZARUS_DIR= ${WRKSRC}/lazarus-${LAZARUS_VER} LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} LDMD2_CMD= ${LOCALBASE}/bin/ldmd2 GTK2_BUILD_DEPENDS= ${LCL_UNITS_DIR}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2 GTK2_USE= GNOME=gtk20 FPC=gtk2 GTK2_MAKE_ENV= GUI=gtk2 GTK2_VARS= LCL_PLATFORM=gtk2 QT4_BUILD_DEPENDS= ${LCL_UNITS_DIR}/qt/interfaces.ppu:editors/lazarus-lcl-qt QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas QT4_MAKE_ENV= GUI=qt QT4_VARS= LCL_PLATFORM=qt 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|FREEBSD|g' ${WRKSRC}/src/ce_common.pas + ${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 pre-build: @${MKDIR} ${WRKSRC}/tmppcp @${MKDIR} ${LAZARUS_DIR} @cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \ ${FIND} * -type d -exec ${MKDIR} ${LAZARUS_DIR}/{} \; @cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \ ${FIND} * -type f -exec ${LN} -fs ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/{} ${LAZARUS_DIR}/{} \; @${FIND} ${LAZARUS_DIR} -type d -name ${BUILDNAME} -type d -print0 | \ - ${XARGS} -0 ${RM} -R + ${XARGS} -0 ${RM} -R do-build: @cd ${WRKSRC}/dastworx && ${SH} build.sh @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} --pcp=${WRKSRC}/tmppcp ${PROJECT_FILE} 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/files/patch-dastworx_build.sh =================================================================== --- head/editors/coedit/files/patch-dastworx_build.sh (revision 446449) +++ head/editors/coedit/files/patch-dastworx_build.sh (revision 446450) @@ -1,33 +1,33 @@ ---- dastworx/build.sh 2017-07-21 05:32:58 UTC +--- dastworx/build.sh.orig 2017-07-14 05:55:36 UTC +++ dastworx/build.sh @@ -1,13 +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 - #dast sources cd src/ dast=$(find `pwd` -type f -name \*.d) @@ -16,12 +6,12 @@ cd ../ echo building... #build -dmd ${dast[@]} ${dparse[@]} ${iz[@]} \ +%%LDMD2_CMD%% ${dast} \ -O -release -inline -boundscheck=off \ --Isrc -I../etc/iz/import -I../etc/libdparse/src \ -+-Isrc -I%%D_INCLUDE_DIR%% -L%%D_LIB_DIR%%/libiz.a -L%%D_LIB_DIR%%/libdparse.a \ ++-Isrc -I%%D_INCLUDE_DIR%% -L%%D_LIB_DIR%%/libiz.a -L%%D_INCLUDE_DIR%%/libdparse.a \ -of../bin/dastworx #cleanup rm ../bin/dastworx.o -echo ...done \ No newline at end of file +echo ...done Index: head/editors/coedit/files/patch-src_ce__compilers.pas =================================================================== --- head/editors/coedit/files/patch-src_ce__compilers.pas (nonexistent) +++ head/editors/coedit/files/patch-src_ce__compilers.pas (revision 446450) @@ -0,0 +1,57 @@ +--- src/ce_compilers.pas 2017-07-14 05:55:36 UTC ++++ src/ce_compilers.pas +@@ -674,6 +674,7 @@ begin + fPaths.DmdPhobosPath := path + '\src\phobos'; + end; + {$ENDIF} ++ {$IFDEF UNIX} + {$IFDEF LINUX} + if '/usr/bin/dmd'.fileExists then + fPaths.DmdExeName:='/usr/bin/dmd'; +@@ -682,6 +683,15 @@ begin + if '/usr/include/dmd/phobos'.dirExists then + fPaths.DmdPhobosPath:='/usr/include/dmd/phobos'; + {$ENDIF} ++ {$IFDEF BSD} ++ if '%%LOCALBASE%%/bin/dmd'.fileExists then ++ fPaths.DmdExeName:='%%LOCALBASE%%/bin/dmd'; ++ if '%%LOCALBASE%%/include/dmd/druntime/import'.dirExists then ++ fPaths.DmdRuntimePath:='%%LOCALBASE%%/include/dmd/druntime/import'; ++ if '%%LOCALBASE%%/include/dmd/phobos'.dirExists then ++ fPaths.DmdPhobosPath:='%%LOCALBASE%%/include/dmd/phobos'; ++ {$ENDIF} ++ {$ENDIF} + {$IFDEF DARWIN} + if '/usr/local/bin/dmd'.fileExists then + fPaths.DmdExeName:='/usr/local/bin/dmd'; +@@ -703,7 +713,11 @@ begin + fPaths.GdcExeName:= path; + str := TStringList.Create; + try +- path := path.extractFileDir.extractFilePath; ++{$IFDEF BSD} ++ path:= path.extractFileDir.extractFilePath+'/include'; ++{$ELSE} ++ path:= path.extractFileDir.extractFilePath; ++{$ENDIF} + FindAllDirectories(str, path, true); + for path in str do + if pos('include' + DirectorySeparator + 'd', path) > 0 then +@@ -729,11 +743,15 @@ begin + fPaths.LdcExeName:= path; + str := TStringList.Create; + try +- path := path.extractFileDir.extractFilePath; ++{$IFDEF BSD} ++ path:= path.extractFileDir.extractFilePath+'/include'; ++{$ELSE} ++ path:= path.extractFileDir.extractFilePath; ++{$ENDIF} + FindAllDirectories(str, path, true); + for path in str do + begin +- i := pos('import' + DirectorySeparator + 'ldc', path); ++ i := pos('d' + DirectorySeparator + 'ldc', path); + if i > 0 then + begin + fPaths.LdcRuntimePath:= path[1..i + 5]; Property changes on: head/editors/coedit/files/patch-src_ce__compilers.pas ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property