svn commit: r558109 - in head/cad/zcad: . files
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Mon Dec 14 20:39:46 UTC 2020
Author: acm
Date: Mon Dec 14 20:39:44 2020
New Revision: 558109
URL: https://svnweb.freebsd.org/changeset/ports/558109
Log:
- Update to 0.9.8.5
PR: 251365
Submitted by: acm
Approved by: danfe (timeout)
Modified:
head/cad/zcad/Makefile
head/cad/zcad/distinfo
head/cad/zcad/files/patch-cad__source_components_zebase_uzbpaths.pas
head/cad/zcad/files/patch-cad__source_zcad_uzclog.pas
head/cad/zcad/pkg-plist
Modified: head/cad/zcad/Makefile
==============================================================================
--- head/cad/zcad/Makefile Mon Dec 14 20:37:09 2020 (r558108)
+++ head/cad/zcad/Makefile Mon Dec 14 20:39:44 2020 (r558109)
@@ -2,19 +2,19 @@
# $FreeBSD$
PORTNAME= zcad
-PORTVERSION= 0.9.8.4
-PORTREVISION= 5
+PORTVERSION= 0.9.8.5
CATEGORIES= cad
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
MAINTAINER= danfe at FreeBSD.org
COMMENT= Simple CAD program
-USES= fpc lazarus:flavors tar:xz
+USES= dos2unix fpc lazarus:flavors tar:xz
USE_GITHUB= yes
GH_ACCOUNT= zamtmn
+GH_TAGNAME= 8b8a693
USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \
- pasjpeg rtl-extra rtl-objpas x11
+ pasjpeg rtl-extra rtl-generics rtl-objpas x11
MAKE_ENV= LAZBUILD_CMD="${LAZBUILD_CMD}" \
LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
@@ -22,14 +22,15 @@ MAKE_ENV= LAZBUILD_CMD="${LAZBUILD_CMD}" \
LAZARUS_DIR="${LAZARUS_DIR}" \
INSTANTFPCCACHE="${WRKSRC}/.cache"
+DOS2UNIX_GLOB= *.pas *.lpi
BUILD_WRKSRC= ${WRKSRC}/cad_source
INSTALL_WRKSRC= ${WRKSRC}/cad
LAZARUS_PROJECT_FILES= anchordocking/anchordocking.lpk \
fpvectorial/fpvectorialpkg.lpk \
lclextensions/lclextensions_package.lpk \
- virtualtreeview/virtualtreeview_package.lpk \
- other/rtl-generics_for_FPC304/rtl_generics.lpk \
+ other/laz.virtualtreeview_package/laz.virtualtreeview_package.lpk \
+ components/zmacros/zmacros.lpk \
components/zebase/zebase.lpk \
components/zcontainers/zcontainers.lpk \
components/zcontrols/zcontrols.lpk \
@@ -67,6 +68,10 @@ post-patch:
${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFStream.pas \
${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFileSys.pas \
${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VStrm64.pas
+ @${REINPLACE_CMD} -e 's|LazOpenGLContext|openglcontext.pas|g' \
+ ${BUILD_WRKSRC}/zcad.lpi
+ @${REINPLACE_CMD} -e "s|'|'|g" \
+ ${BUILD_WRKSRC}/other/laz.virtualtreeview_package/laz.virtualtreeview_package.lpk
@${REINPLACE_CMD} '1,6d' ${WRKSRC}/environment/makeenv_zcad.sh
post-configure:
@@ -81,11 +86,11 @@ post-configure:
${BUILD_WRKSRC}
${CP} -a ${LAZARUS_DIR}/components/fpvectorial \
${LAZARUS_DIR}/components/anchordocking \
- ${LAZARUS_DIR}/components/virtualtreeview \
${LAZARUS_DIR}/components/lclextensions ${BUILD_WRKSRC}
post-build:
@${MKDIR} ${WRKSRC}/cad
+ @${MKDIR} ${WRKSRC}/cad_source/autogenerated
@${CP} -a ${WRKSRC}/environment/runtimefiles/common/* ${WRKSRC}/cad
@${CP} -a ${WRKSRC}/environment/runtimefiles/zcad/* ${WRKSRC}/cad
@cd ${WRKSRC}/environment && ${SH} makeenv_zcad.sh
@@ -96,7 +101,7 @@ post-build:
do-install:
# Not ready for hier(7)-conforming installation yet
@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
- ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
+ ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${BUILDNAME}/${PORTNAME} \
${STAGEDIR}${PREFIX}/${PORTNAME}
cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "autosave components \
fonts images languages log menu plugins rtl sample \
Modified: head/cad/zcad/distinfo
==============================================================================
--- head/cad/zcad/distinfo Mon Dec 14 20:37:09 2020 (r558108)
+++ head/cad/zcad/distinfo Mon Dec 14 20:39:44 2020 (r558109)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540234218
-SHA256 (zamtmn-zcad-0.9.8.4_GH0.tar.gz) = ba26a7d181712af104ae1c447b08ce48a3eb727c73d53e6cf80e1f4c2e3687f6
-SIZE (zamtmn-zcad-0.9.8.4_GH0.tar.gz) = 10040591
+TIMESTAMP = 1602194927
+SHA256 (zamtmn-zcad-0.9.8.5-8b8a693_GH0.tar.gz) = bf2ef76f23b12f0f63a8bcacb52e40b3bf2688614e8136572314c375cf34860a
+SIZE (zamtmn-zcad-0.9.8.5-8b8a693_GH0.tar.gz) = 11348052
Modified: head/cad/zcad/files/patch-cad__source_components_zebase_uzbpaths.pas
==============================================================================
--- head/cad/zcad/files/patch-cad__source_components_zebase_uzbpaths.pas Mon Dec 14 20:37:09 2020 (r558108)
+++ head/cad/zcad/files/patch-cad__source_components_zebase_uzbpaths.pas Mon Dec 14 20:39:44 2020 (r558109)
@@ -1,16 +1,16 @@
---- cad_source/components/zebase/uzbpaths.pas.orig 2017-05-01 09:50:10 UTC
-+++ cad_source/components/zebase/uzbpaths.pas
+--- cad_source/components/zebase/uzbpaths.pas 2020-10-08 17:19:01.329618000 -0500
++++ cad_source/components/zebase/uzbpaths.pas 2020-10-08 17:38:21.065846000 -0500
@@ -19,7 +19,8 @@
unit uzbpaths;
{$INCLUDE def.inc}
interface
--uses uzbtypes,Masks,LCLProc,uzbtypesbase,{$IFNDEF DELPHI}LazUTF8,{$ENDIF}sysutils;
+-uses uzbtypes,Masks,LCLProc,uzbtypesbase,{$IFNDEF DELPHI}LazUTF8,{$ENDIF}sysutils,uzmacros;
+uses uzbtypes,Masks,LCLProc,uzbtypesbase,{$IFNDEF DELPHI}LazUTF8,{$ENDIF}
-+{$IFDEF UNIX}baseunix,{$ENDIF}sysutils;
++{$IFDEF UNIX}baseunix,{$ENDIF}sysutils,uzmacros;
type
- TFromDirIterator=procedure (filename:GDBString);
- TFromDirIteratorObj=procedure (filename:GDBString) of object;
-@@ -35,7 +36,7 @@ function GetPartOfPath(out part:GDBStrin
+ TFromDirIterator=procedure (filename:String);
+ TFromDirIteratorObj=procedure (filename:String) of object;
+@@ -35,7 +36,7 @@
procedure FromDirIterator(const path,mask,firstloadfilename:GDBSTring;proc:TFromDirIterator;method:TFromDirIteratorObj);
procedure FromDirsIterator(const path,mask,firstloadfilename:GDBString;proc:TFromDirIterator;method:TFromDirIteratorObj);
@@ -19,12 +19,13 @@
implementation
//uses log;
function FindInPaths(Paths,FileName:GDBString):GDBString;
-@@ -147,11 +148,19 @@ begin
+@@ -147,12 +148,20 @@
DebugLn(sysutils.Format('[FILEOPS]FindInSupportPath: file not found:"%s"',[{$IFNDEF DELPHI}utf8tosys{$ENDIF}(FileName)]));
end;
function ExpandPath(path:GDBString):GDBString;
+{$IFDEF UNIX}var sb:stat;{$ENDIF}
begin
+ DefaultMacros.SubstituteMacros(path);
if path='' then
result:=programpath
else if path[1]='*' then
@@ -40,7 +41,7 @@
else result:=path;
result:=StringReplace(result,'/', PathDelim,[rfReplaceAll, rfIgnoreCase]);
if DirectoryExists({$IFNDEF DELPHI}utf8tosys{$ENDIF}(result)) then
-@@ -242,4 +251,10 @@ initialization
+@@ -243,4 +252,10 @@
if (TempPath[length(TempPath)]<>PathDelim)
then
TempPath:=TempPath+PathDelim;
Modified: head/cad/zcad/files/patch-cad__source_zcad_uzclog.pas
==============================================================================
--- head/cad/zcad/files/patch-cad__source_zcad_uzclog.pas Mon Dec 14 20:37:09 2020 (r558108)
+++ head/cad/zcad/files/patch-cad__source_zcad_uzclog.pas Mon Dec 14 20:39:44 2020 (r558109)
@@ -1,37 +1,26 @@
---- cad_source/zcad/uzclog.pas.orig 2017-05-01 09:49:46 UTC
-+++ cad_source/zcad/uzclog.pas
-@@ -21,10 +21,11 @@ unit uzclog;
+--- cad_source/zcad/uzclog.pas 2020-10-08 18:33:43.730231000 -0500
++++ cad_source/zcad/uzclog.pas 2020-10-08 18:36:24.422328000 -0500
+@@ -21,10 +21,11 @@
{$mode objfpc}{$H+}
interface
uses UGDBOpenArrayOfByte,gzctnrvectordata,gzctnrstl,LazLoggerBase,
-+ {$IFDEF UNIX}uzbpaths,{$ENDIF}
++{$IFDEF UNIX}uzbpaths,{$ENDIF}
LazLogger,strutils,sysutils{$IFNDEF DELPHI},LazUTF8{$ENDIF};
const {$IFDEF DELPHI}filelog='log/zcad_delphi.log';{$ENDIF}
{$IFDEF FPC}
-- {$IFDEF LINUX}filelog='log/zcad_linux.log';{$ENDIF}
-+ {$IFDEF UNIX}filelog='zcad_unix.log';{$ENDIF}
- {$IFDEF WINDOWS}filelog='log/zcad_windows.log';{$ENDIF}
+- {$IFDEF LINUX}filelog='../../log/zcad_linux.log';{$ENDIF}
++ {$IFDEF UNIX}filelog='zcad_unix.log';{$ENDIF}
+ {$IFDEF WINDOWS}filelog='../../log/zcad_windows.log';{$ENDIF}
{$ENDIF}
lp_IncPos=1;
-@@ -131,7 +132,9 @@ var
+@@ -135,7 +136,9 @@
begin
if assigned(SplashTextOut) then
SplashTextOut(s,true);
- logname:={$IFNDEF DELPHI}SysToUTF8{$ENDIF}(ExtractFilePath(paramstr(0)))+filelog+'hard';
+ logname:={$IFNDEF DELPHI}SysToUTF8{$ENDIF}
-+ ({$IFDEF UNIX}UserPath{$ELSE}ExtractFilePath(paramstr(0)){$ENDIF})
-+ +filelog+'hard';
++ ({$IFDEF UNIX}UserPath{$ELSE}ExtractFilePath(paramstr(0)){$ENDIF})
++ +filelog+'hard';
FileHandle:=0;
if not fileexists({$IFNDEF DELPHI}UTF8ToSys{$ENDIF}(logname)) then
FileHandle:=FileCreate({$IFNDEF DELPHI}UTF8ToSys{$ENDIF}(logname))
-@@ -496,7 +499,9 @@ begin
- end;
- initialization
- begin
-- programlog.init({$IFNDEF DELPHI}SysToUTF8{$ENDIF}(ExtractFilePath(paramstr(0)))+filelog,LM_Error);
-+ programlog.init({$IFNDEF DELPHI}SysToUTF8{$ENDIF}
-+ ({$IFDEF UNIX}UserPath{$ELSE}ExtractFilePath(paramstr(0)){$ENDIF})
-+ +filelog,LM_Error);
- end;
- finalization
- programlog.done;
Modified: head/cad/zcad/pkg-plist
==============================================================================
--- head/cad/zcad/pkg-plist Mon Dec 14 20:37:09 2020 (r558108)
+++ head/cad/zcad/pkg-plist Mon Dec 14 20:39:44 2020 (r558109)
@@ -12,6 +12,7 @@ zcad/components/myfulscreen.xml
zcad/components/oldpalette.rgb
zcad/components/palette.rgb
zcad/components/stage0.cmd
+zcad/components/suppressedshortcuts.xml
zcad/components/testlayout.xml
zcad/components/zcad.lin
zcad/fonts/GEWIND.SHX
@@ -108,6 +109,7 @@ zcad/images/actions/zelectro/csel.png
zcad/images/actions/zelectro/leader.png
zcad/images/actions/zelectro/ps.png
zcad/images/actions/zelectro/removeautocables.png
+zcad/images/actions/zelectro/smokefiresensor.png
zcad/images/actions/zelectro/wire.png
zcad/images/actions/zoomall.png
zcad/images/actions/zoomin.png
@@ -156,8 +158,8 @@ zcad/menu/BMP/noimage.bmp
zcad/menu/BMP/spec.bmp
zcad/menu/actionscontent.xml
zcad/menu/default.cla
-zcad/menu/menus.xml
zcad/menu/menuscontent.xml
+zcad/menu/palettescontent.xml
zcad/menu/toolbarscontent.xml
zcad/plugins/empty.txt
zcad/rtl/devicebase.pas
More information about the svn-ports-head
mailing list