mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00
Code Issues Releases Activity

- Add new RUN_DEPENDS (dfmt and dlang-tools )

Browse Source 
- Fix a problem detecting compiler path.
- Fix typos
- Bump PORTREVISION
This commit is contained in:
Jose Alonso Cardenas Marquez 2017-07-23 05:38:08 +00:00
parent 8d5d6c50aa
commit b91179cd4c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=446450
3 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/coedit/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= coedit
DISTVERSION= 3_update_3
PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= https://github.com/BBasile/Coedit/archive/
DISTNAME= ${DISTVERSION}
@ -19,7 +20,9 @@ BUILD_DEPENDS= lazbuild:editors/lazarus \
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 \
@ -65,7 +68,8 @@ post-patch:
-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
@ -75,7 +79,7 @@ pre-build:
@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

4
editors/coedit/files/patch-dastworx_build.sh
View File

@ -1,4 +1,4 @@
--- 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
@ -22,7 +22,7 @@
+%%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

57
editors/coedit/files/patch-src_ce__compilers.pas Normal file
View File

@ -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];