Date: Fri, 25 May 2018 16:31:21 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470851 - in head: archivers/peazip cad/zcad cad/zcad/files comms/cqrlog comms/cqrlog/files multimedia/winff multimedia/winff/files net-p2p/transmission-remote-gui russian/emkatic x11-f... Message-ID: <201805251631.w4PGVL7G095417@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Fri May 25 16:31:21 2018 New Revision: 470851 URL: https://svnweb.freebsd.org/changeset/ports/470851 Log: - Moved ports to Uses/lazarus.mk - Add FLAVORS Approved by: portmgr Differential Revision: https://reviews.freebsd.org/D14661 Modified: head/archivers/peazip/Makefile head/archivers/peazip/distinfo head/cad/zcad/Makefile head/cad/zcad/files/makefile head/comms/cqrlog/Makefile head/comms/cqrlog/files/patch-Makefile head/comms/cqrlog/files/patch-src_cqrlog.lpi head/multimedia/winff/Makefile head/multimedia/winff/files/patch-winff_unit1.pas head/net-p2p/transmission-remote-gui/Makefile head/net-p2p/transmission-remote-gui/distinfo head/net-p2p/transmission-remote-gui/pkg-descr head/russian/emkatic/Makefile head/russian/emkatic/distinfo head/x11-fm/doublecmd/Makefile head/x11-fm/doublecmd/distinfo Modified: head/archivers/peazip/Makefile ============================================================================== --- head/archivers/peazip/Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/archivers/peazip/Makefile Fri May 25 16:31:21 2018 (r470851) @@ -1,9 +1,9 @@ -# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ PORTNAME= peazip -PORTVERSION= 6.5.0 +PORTVERSION= 6.5.1 CATEGORIES= archivers +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -12,58 +12,38 @@ COMMENT= Free archiver and file compressor LICENSE= LGPL3 -BUILD_DEPENDS= lazbuild:editors/lazarus \ - fpcres:lang/fpc-utils - -USES= dos2unix fpc zip +USES= dos2unix fpc lazarus:flavors zip USE_FPC= cairo chm fcl-base fcl-image pasjpeg rtl-objpas x11 -USE_GNOME= # +USE_XORG= x11 SUB_FILES= pea pealauncher peazip DOS2UNIX_REGEX= .*\.([txt]|pas|lpi|txt) + LAZARUS_PROJECT_FILES= project_pea.lpi project_peach.lpi project_gwrap.lpi -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d -LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +LAZBUILD_ARGS= -d + +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4 + ARCHIVER_FILES= # OPTIONS_DEFINE= 7Z ARC ZPAQ UNACE -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 QT5 7Z_DESC= 7z file archiver support ARC_DESC= Arc file archiver support ZPAQ_DESC= Zpaq file archiver support UNACE_DESC= Unace file archiver support -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface -QT5_DESC= Use qt5 interface -OPTIONS_DEFAULT= GTK2 7Z +OPTIONS_DEFAULT= 7Z -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGTK2} -USE_FPC+= gtk2 -USE_GNOME= gtk20 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 +.if ${FLAVOR:Ugtk2:Mgtk2} +USE_GNOME+= cairo .endif -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -.endif +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MQT5} -LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas -LCL_PLATFORM= qt5 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -.endif - .if ${PORT_OPTIONS:M7Z} RUN_DEPENDS+= 7z:archivers/p7zip ARCHIVER_FILES+=7z @@ -98,12 +78,6 @@ PLIST_SUB+= UNACE="@comment " post-patch: ${REINPLACE_CMD} 's|GetSelectedNodePath|Path|g' ${WRKSRC}/peach.pas - -do-build: -.for PROJECT_FILE in ${LAZARUS_PROJECT_FILES} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE} -.endfor pre-install: @${ECHO_CMD} "#" > ${WRKSRC}/altconf.txt Modified: head/archivers/peazip/distinfo ============================================================================== --- head/archivers/peazip/distinfo Fri May 25 16:08:27 2018 (r470850) +++ head/archivers/peazip/distinfo Fri May 25 16:31:21 2018 (r470851) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513107866 -SHA256 (peazip-6.5.0.src.zip) = 1c19c7d6c346b511c635c95d6ff0277ee0811873133757d3c06c26fec558e7bf -SIZE (peazip-6.5.0.src.zip) = 4181167 +TIMESTAMP = 1520457314 +SHA256 (peazip-6.5.1.src.zip) = b106811311fbaf42ad5374520df2be8b20a545b80e6f8713a1f10e2e5a79d01e +SIZE (peazip-6.5.1.src.zip) = 4289282 Modified: head/cad/zcad/Makefile ============================================================================== --- head/cad/zcad/Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/cad/zcad/Makefile Fri May 25 16:31:21 2018 (r470851) @@ -3,52 +3,51 @@ PORTNAME= zcad PORTVERSION= 0.9.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= LOCAL/danfe DISTNAME= ${PORTNAME}-trunk-r2259 MAINTAINER= danfe@FreeBSD.org COMMENT= Simple CAD program -BUILD_DEPENDS= lazbuild:editors/lazarus - -USES= fpc tar:xz +USES= fpc lazarus:flavors tar:xz USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \ pasjpeg rtl-extra rtl-objpas x11 -LAZARUS_VER= 1.8.0 -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp \ - --lazarusdir=${LAZARUS_DIR} -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} -LCL_UNITS_DIR= ${LAZARUS_DIR}/lcl/units/${BUILDNAME} - EXTRACT_CMD= LC_ALL=en_US.UTF-8 ${TAR} # for non-ASCII filenames -MAKE_ENV= LAZBUILD_CMD="${LAZBUILD_CMD}" +MAKE_ENV= LAZBUILD_CMD="${LAZBUILD_CMD}" \ + LAZBUILD_ARGS="${LAZBUILD_ARGS}" \ + LCL_PLATFORM="${LCL_PLATFORM}" \ + LAZARUS_DIR="${LAZARUS_DIR}" \ + INSTANTFPCCACHE="${WRKSRC}/.cache" +NO_LAZBUILD= yes WRKSRC= ${WRKDIR}/trunk BUILD_WRKSRC= ${WRKSRC}/cad_source INSTALL_WRKSRC= ${WRKSRC}/cad +LAZBUILD_ARGS= -d --pcp=${WRKSRC}/tmppcp +LAZARUS_NO_FLAVORS=qt5 + +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 + MAKE_JOBS_UNSAFE= yes PORTDOCS= UserGuide.odt UserGuide.pdf OPTIONS_DEFINE= DOCS -OPTIONS_SINGLE= GUI -OPTIONS_SINGLE_GUI= GTK2 QT4 -OPTIONS_DEFAULT= GTK2 -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= LAZBUILD_CMD+=--ws=gtk2 +.if ${FLAVOR:Ugtk2:Mgtk2} +MAKE_ENV+= GUI=gtk2 +.endif -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= LAZBUILD_CMD+=--ws=qt +.if ${FLAVOR:Uqt4:Mqt4} +MAKE_ENV+= GUI=qt +.endif post-patch: @${EGREP} -lR 'IFN?DEF LINUX' ${BUILD_WRKSRC} | ${XARGS} \ @@ -74,8 +73,12 @@ pre-build: # copy them locally first for the same reason as above) ${CP} -a ${LAZARUS_DIR}/components/fpvectorial \ ${LAZARUS_DIR}/components/anchordocking ${WRKSRC} - ${LAZBUILD_CMD} ${WRKSRC}/fpvectorial/fpvectorialpkg.lpk - ${LAZBUILD_CMD} ${WRKSRC}/anchordocking/anchordocking.lpk + ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \ + --lazarusdir=${LAZARUS_DIR} \ + ${WRKSRC}/fpvectorial/fpvectorialpkg.lpk + ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \ + --lazarusdir=${LAZARUS_DIR} \ + ${WRKSRC}/anchordocking/anchordocking.lpk do-install: # Not ready for hier(7)-conforming installation yet Modified: head/cad/zcad/files/makefile ============================================================================== --- head/cad/zcad/files/makefile Fri May 25 16:08:27 2018 (r470850) +++ head/cad/zcad/files/makefile Fri May 25 16:31:21 2018 (r470851) @@ -6,7 +6,7 @@ OUTSUFX= lib/$(ARCH)-$(OPSYS:tl) # at $0814EBB3'' message (EAccessViolation: Access violation). It might # be some concurrency issue, but it occurs even with MAKE_JOBS_UNSAFE, so # use the following simple workaround for the time being. -ZEALOUS_BUILD= sh -c 'i=0 ; until $(LAZBUILD_CMD) $$0 ; do \ +ZEALOUS_BUILD= sh -c 'i=0 ; until $(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) $$0 ; do \ test $$i -lt 4 || return ; i=$$((i+1)) ; done' all: ../$(OUTSUFX)/zcad.compiled Modified: head/comms/cqrlog/Makefile ============================================================================== --- head/comms/cqrlog/Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/comms/cqrlog/Makefile Fri May 25 16:31:21 2018 (r470851) @@ -3,22 +3,22 @@ PORTNAME= cqrlog PORTVERSION= 2.2.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= comms hamradio +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio logging application LICENSE= GPLv2 -BUILD_DEPENDS= lazbuild:editors/lazarus -PATCH_DEPENDS= ${LAZARUS_DIR}/tools/lazres:editors/lazarus LIB_DEPENDS= libhamlib.so:comms/hamlib USE_GITHUB= yes GH_ACCOUNT= ok2cqr -USES= fpc shebangfix +USES= fpc lazarus:flavors shebangfix SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh @@ -28,24 +28,19 @@ USE_FPC= cairo fcl-base chm fcl-db fcl-image fcl-json ALL_TARGET= ${PORTNAME} -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +MAKE_ENV+= LAZBUILD_CMD="${LAZBUILD_CMD}" \ + LAZBUILD_ARGS="${LAZBUILD_ARGS}" \ + LCL_PLATFORM="${LCL_PLATFORM}" \ + LAZARUS_DIR="${LAZARUS_DIR}" -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 -OPTIONS_DEFAULT= GTK2 - USE_XORG+= x11 -USE_GNOME+= gdkpixbuf2 cairo +NO_LAZBUILD= yes +LAZBUILD_ARGS= -d --pcp=. +LAZARUS_NO_FLAVORS=qt5 -GTK2_USE= fpc=gtk2 gnome=gtk20 -GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2 -GTK2_MAKE_ARGS= PLATFORM=gtk2 +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 -QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas -QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:editors/lazarus-lcl-qt -QT4_MAKE_ARGS= PLATFORM=qt - post-extract: @${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas @@ -67,8 +62,6 @@ post-patch: ${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas ${REINPLACE_CMD} -e s!Linux!FreeBSD!g \ ${WRKSRC}/src/fMain.lfm - ${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \ - ${WRKSRC}/Makefile ${RM} -r ${WRKSRC}/src/mysql .include <bsd.port.mk> Modified: head/comms/cqrlog/files/patch-Makefile ============================================================================== --- head/comms/cqrlog/files/patch-Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/comms/cqrlog/files/patch-Makefile Fri May 25 16:31:21 2018 (r470851) @@ -2,7 +2,7 @@ +++ Makefile 2018-01-05 12:34:28.752177000 -0500 @@ -1,12 +1,13 @@ -CC=lazbuild -+CC=lazbuild -d ++LAZBUILD_CMD?=lazbuild -d ST=strip -datadir = $(DESTDIR)/usr/share/cqrlog -bindir = $(DESTDIR)/usr/bin @@ -15,7 +15,7 @@ cqrlog: src/cqrlog.lpi - $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi -+ $(CC) --pcp=. --ws=${PLATFORM} src/cqrlog.lpi --lazarusdir=%%LAZARUSDIR%% ++ $(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) src/cqrlog.lpi $(ST) src/cqrlog gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz Modified: head/comms/cqrlog/files/patch-src_cqrlog.lpi ============================================================================== --- head/comms/cqrlog/files/patch-src_cqrlog.lpi Fri May 25 16:08:27 2018 (r470850) +++ head/comms/cqrlog/files/patch-src_cqrlog.lpi Fri May 25 16:31:21 2018 (r470851) @@ -1,11 +1,20 @@ ---- src/cqrlog.lpi.orig 2016-04-20 16:06:15 UTC -+++ src/cqrlog.lpi -@@ -32,7 +32,7 @@ +--- src/cqrlog.lpi.orig 2017-12-30 02:10:01.000000000 -0500 ++++ src/cqrlog.lpi 2018-04-07 19:17:15.225110000 -0500 +@@ -35,7 +35,7 @@ <local> <FormatVersion Value="1"/> <CommandLineParams Value="--DEBUG=1"/> - <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> -+ <LaunchingApplication PathPlusParams="%%LOCALBASE%%/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> ++ <LaunchingApplication PathPlusParams="/usr/local/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> <environment> <UserOverrides Count="2"> +@@ -748,7 +748,7 @@ + <Version Value="11"/> + <SearchPaths> + <Libraries Value="$(LazarusDir)/lcl"/> +- <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;synapse"/> ++ <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;richmemo/qt;synapse"/> + </SearchPaths> + <Parsing> + <SyntaxOptions> Modified: head/multimedia/winff/Makefile ============================================================================== --- head/multimedia/winff/Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/multimedia/winff/Makefile Fri May 25 16:31:21 2018 (r470851) @@ -3,8 +3,9 @@ PORTNAME= WinFF PORTVERSION= 1.5.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= http://winff.org/docs/source/ DISTNAME= ${_PORTNAME}-${PORTVERSION}-source @@ -13,20 +14,15 @@ COMMENT= Convert your videos quickly, easily, and all LICENSE= GPLv3 -BROKEN= fails to build - -BUILD_DEPENDS= lazbuild:editors/lazarus LIB_DEPENDS= libavutil.so:multimedia/ffmpeg NO_WRKSUBDIR= yes -USES= fpc USE_XORG= x11 -USE_FPC= cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11 -USE_GNOME= cairo +USES= fpc lazarus:flavors +USE_FPC= chm fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11 _PORTNAME= ${PORTNAME:tl} DATADIR= ${PREFIX}/share/${_PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${_PORTNAME} -INSTALLS_ICONS= yes DESKTOP_ENTRIES= "${PORTNAME}" \ "${COMMENT}" \ @@ -35,45 +31,26 @@ DESKTOP_ENTRIES= "${PORTNAME}" \ "AudioVideo;" \ true -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} -LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} +LAZARUS_NO_FLAVORS= qt5 +LAZARUS_PROJECT_FILES= winff.lpr +LAZBUILD_ARGS= -d +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 + BUILD_WRKSRC= ${WRKDIR}/${PKGNAME}/${_PORTNAME} -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 - -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface - -OPTIONS_DEFAULT= GTK2 - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGTK2} -USE_FPC+= gtk2 -USE_GNOME+= gtk20 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 +.if ${FLAVOR:Ugtk2:Mgtk2} +USE_FPC+= cairo +USE_GNOME+= cairo +INSTALLS_ICONS=yes .endif -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -.endif - pre-configure: ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${BUILD_WRKSRC}/unit1.pas .for fp in unit1.pas unit4.pas scripts/check_presets.sh ${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${BUILD_WRKSRC}/${fp} .endfor - -do-build: - cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} -B winff.lpr do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin Modified: head/multimedia/winff/files/patch-winff_unit1.pas ============================================================================== --- head/multimedia/winff/files/patch-winff_unit1.pas Fri May 25 16:08:27 2018 (r470850) +++ head/multimedia/winff/files/patch-winff_unit1.pas Fri May 25 16:31:21 2018 (r470851) @@ -1,7 +1,16 @@ ---- winff/unit1.pas.orig 2013-08-16 03:55:46 UTC -+++ winff/unit1.pas -@@ -1228,13 +1228,13 @@ end; +--- winff/unit1.pas 2016-09-21 16:40:54.000000000 -0500 ++++ winff/unit1.pas 2018-03-07 17:35:42.310241000 -0500 +@@ -27,7 +27,7 @@ + {$IFDEF WINDOWS} windows, shellapi, dos,{$endif} + {$IFDEF unix} baseunix, unix, {$endif} + laz_xmlcfg, dom, xmlread, xmlwrite, StdCtrls, Buttons, ActnList, Menus, unit2, unit3, +- unit4, unit5, gettext, translations, process ++ unit4, unit5, gettext, translations, process, LazFileUtils, LazUTF8 + {$IFDEF TRANSLATESTRING}, DefaultTranslator{$ENDIF}, ExtCtrls, ComCtrls, Spin, UTF8Process, + PoTranslator, types, FileUtil, regexpr; +@@ -1241,13 +1241,13 @@ + // launch browser procedure TfrmMain.launchbrowser(URL:string); -{$IFDEF linux} @@ -16,7 +25,7 @@ s:=''; if fileexists('/usr/bin/konqueror') then s:='/usr/bin/konqueror'; if fileexists('/usr/bin/mozilla-firefox') then s:='/usr/bin/mozilla-firefox'; -@@ -1369,13 +1369,13 @@ end; +@@ -1382,13 +1382,13 @@ // launch pdf procedure TfrmMain.LaunchPdf(pdffile:string); @@ -32,7 +41,7 @@ s:=''; if fileexists('/usr/bin/evince') then s:='/usr/bin/evince'; if fileexists('/usr/bin/kpdf') then s:='/usr/bin/kpdf'; -@@ -1953,7 +1953,7 @@ var s : string; +@@ -1982,7 +1982,7 @@ language: string; begin language:=leftstr(lang,2); Modified: head/net-p2p/transmission-remote-gui/Makefile ============================================================================== --- head/net-p2p/transmission-remote-gui/Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/net-p2p/transmission-remote-gui/Makefile Fri May 25 16:31:21 2018 (r470851) @@ -1,65 +1,36 @@ -# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ PORTNAME= transmission-remote-gui -PORTVERSION= 5.0.1 -PORTREVISION= 13 +PORTVERSION= 5.14.0 +DISTVERSIONPREFIX= v CATEGORIES= net-p2p -MASTER_SITES= SF/${PROJECTNAME}/${PORTVERSION}/ -DISTNAME= transgui-${PORTVERSION}-src +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} +USE_GITHUB= yes +GH_ACCOUNT= transmission-remote-gui +GH_PROJECT= transgui + MAINTAINER= acm@FreeBSD.org COMMENT= Remote GUI for transmission daemon -BROKEN= fails to build +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= lazbuild:editors/lazarus \ - fpcres:lang/fpc-utils -RUN_DEPENDS= transmission-daemon:net-p2p/transmission-daemon +USES= fpc iconv lazarus:flavors +USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-net pasjpeg rtl-objpas \ + rtl-extra x11 -USES= fpc -USE_FPC= cairo fcl-base fcl-image fcl-net pasjpeg rtl-objpas rtl-extra \ - x11 -USES= iconv zip -USE_GNOME= # - -WRKSRC= ${WRKDIR}/TransGUI +WRKSRC= ${WRKDIR}/transgui-${PORTVERSION} PLIST_FILES= bin/transgui SUB_FILES= pkg-message -LAZARUS_PROJECT_FILE= transgui.lpi -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d -LCL_UNITS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME} -LAZARUS_VER= 1.8.0 -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +LAZARUS_PROJECT_FILES= transgui.lpi +LAZBUILD_ARGS= -d PROJECT_NAME= transgui -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 - -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface - -OPTIONS_DEFAULT= GTK2 - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGTK2} -USE_FPC+= gtk2 -USE_GNOME= gtk20 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -.endif - -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -.endif - -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${LAZARUS_PROJECT_FILE} +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 ${PORTNAME}-qt5 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt5 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 ${PORTNAME}-qt4 do-install: @cd ${WRKSRC}/units && \ Modified: head/net-p2p/transmission-remote-gui/distinfo ============================================================================== --- head/net-p2p/transmission-remote-gui/distinfo Fri May 25 16:08:27 2018 (r470850) +++ head/net-p2p/transmission-remote-gui/distinfo Fri May 25 16:31:21 2018 (r470851) @@ -1,2 +1,3 @@ -SHA256 (transgui-5.0.1-src.zip) = 9f59ca89169bd59c63c0c8bc30c3e32b654319ef53a117787fa99eff08ac1278 -SIZE (transgui-5.0.1-src.zip) = 947645 +TIMESTAMP = 1520359617 +SHA256 (transmission-remote-gui-transgui-v5.14.0_GH0.tar.gz) = 30c0bdd9ede5b11fdc3abf8768e4d52d28614c180e4d08e649bf9ce7b4230df2 +SIZE (transmission-remote-gui-transgui-v5.14.0_GH0.tar.gz) = 1699886 Modified: head/net-p2p/transmission-remote-gui/pkg-descr ============================================================================== --- head/net-p2p/transmission-remote-gui/pkg-descr Fri May 25 16:08:27 2018 (r470850) +++ head/net-p2p/transmission-remote-gui/pkg-descr Fri May 25 16:31:21 2018 (r470851) @@ -2,4 +2,4 @@ Transmission Remote GUI is feature rich cross platform control Transmission daemon via its RPC protocol. It is faster and has more functionality than build-in Transmission web interface. -WWW: http://code.google.com/p/transmisson-remote-gui/ +WWW: https://github.com/transmission-remote-gui/transgui Modified: head/russian/emkatic/Makefile ============================================================================== --- head/russian/emkatic/Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/russian/emkatic/Makefile Fri May 25 16:31:21 2018 (r470851) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= emkatic -PORTVERSION= 0.28 -PORTREVISION= 3 +PORTVERSION= 0.36 CATEGORIES= russian emulators +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= SF/${PORTNAME}/eMKatic%20Source DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -14,44 +14,30 @@ COMMENT= Emulator of Elektronika RPN programmable calc LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= lazbuild:editors/lazarus \ - fpcres:lang/fpc-utils +USES= fpc lazarus:flavors +USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-registry fcl-xml \ + pasjpeg regexpr rtl-extra x11 +USE_XORG= x11 -USES= fpc -USE_FPC= cairo chm fcl-base fcl-image fcl-json fcl-xml pasjpeg rtl-extra x11 +LAZARUS_PROJECT_FILES= emkatic.lpi +LAZBUILD_ARGS= -d --pcp=${WRKSRC}/tmppcp -PROJECT_FILE= emkatic.lpi -LAZARUS_VER= 1.8.0 -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} -LCL_UNITS_DIR= ${LAZARUS_DIR}/lcl/units/${BUILDNAME} - PLIST_FILES= bin/${PORTNAME} PORTDATA= * PORTDOCS= CHANGELOG.*.txt README.*.txt +gtk2_CONFLICTS_INSTALL= ru-${PORTNAME}-qt4 ru-${PORTNAME}-qt5 +qt4_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt5 +qt5_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt4 + OPTIONS_DEFINE= DOCS PORTAUDIO -OPTIONS_SINGLE= GUI -OPTIONS_SINGLE_GUI= GTK2 QT4 -OPTIONS_DEFAULT= GTK2 PORTAUDIO +OPTIONS_DEFAULT= PORTAUDIO -GTK2_DESC= Build with GTK+ 2 interface -QT4_DESC= Build with Qt 4 interface - -GTK2_BUILD_DEPENDS= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -GTK2_USE= GNOME=gtk20 FPC=gtk2 -GTK2_VARS= LCL_PLATFORM=gtk2 - -QT4_BUILD_DEPENDS= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas -QT4_VARS= LCL_PLATFORM=qt - PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio -do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws="${LCL_PLATFORM}" \ - --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE} +.if ${FLAVOR:Ugtk2:Mgtk2} +USE_GNOME+= cairo +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin Modified: head/russian/emkatic/distinfo ============================================================================== --- head/russian/emkatic/distinfo Fri May 25 16:08:27 2018 (r470850) +++ head/russian/emkatic/distinfo Fri May 25 16:31:21 2018 (r470851) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479326115 -SHA256 (emkatic-0.28-src.tar.gz) = 449aad9358e3f3433ced59b396f3104cf1af020d13116bc0862c81526c5b256f -SIZE (emkatic-0.28-src.tar.gz) = 573493 +TIMESTAMP = 1520360250 +SHA256 (emkatic-0.36-src.tar.gz) = 10df44162d0a31a2a23fd1a79d82e933d16add796802275cc9d3b8e797ae786a +SIZE (emkatic-0.36-src.tar.gz) = 665151 Modified: head/x11-fm/doublecmd/Makefile ============================================================================== --- head/x11-fm/doublecmd/Makefile Fri May 25 16:08:27 2018 (r470850) +++ head/x11-fm/doublecmd/Makefile Fri May 25 16:31:21 2018 (r470851) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= doublecmd -PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTVERSION= 0.8.2 CATEGORIES= x11-fm +PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source DISTNAME= ${PORTNAME}-${PORTVERSION}-src DISTFILES= ${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz @@ -16,12 +16,9 @@ LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= lazbuild:editors/lazarus \ - fpcres:lang/fpc-utils - PORTDOCS= * -USES= dos2unix desktop-file-utils fpc +USES= dos2unix desktop-file-utils fpc lazarus:flavors USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \ fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr USE_XORG= x11 @@ -29,19 +26,28 @@ DOS2UNIX_FILES= src/dmhelpmanager.pas PLIST= ${WRKDIR}/pkg-plist -PROJECT_FILE= src/doublecmd.lpi -LAZARUS_VER= 1.8.0 -LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp -LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} +LAZARUS_PROJECT_FILES= components/chsdet/chsdet.lpk +LAZARUS_PROJECT_FILES+= components/CmdLine/cmdbox.lpk +LAZARUS_PROJECT_FILES+= components/multithreadprocs/multithreadprocslaz.lpk +LAZARUS_PROJECT_FILES+= components/dcpcrypt/dcpcrypt.lpk +LAZARUS_PROJECT_FILES+= components/doublecmd/doublecmd_common.lpk +LAZARUS_PROJECT_FILES+= components/KASToolBar/kascomp.lpk +LAZARUS_PROJECT_FILES+= components/viewer/viewerpackage.lpk +LAZARUS_PROJECT_FILES+= components/gifanim/pkg_gifanim.lpk +LAZARUS_PROJECT_FILES+= components/synunihighlighter/synuni.lpk + +LAZARUS_NO_FLAVORS=qt5 +LAZBUILD_ARGS= -d --pcp=${WRKSRC}/tmppcp MAKE_ENV+= LDVER=ld.bfd # for DragonFly HELPVERSION= 0.6.0 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DOCSRC= ${WRKDIR}/${PORTNAME}-help-${HELPVERSION} +gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4 +qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 + OPTIONS_DEFINE= DOCS DEBUG -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 OPTIONS_GROUP= WCX WDX WFX WLX DSX OPTIONS_GROUP_WCX= WCX_CPIO \ WCX_DEB \ @@ -88,8 +94,7 @@ WLX_MPLAYER_DESC= Use MPlayer for multimedia files DSX_DESC= Search plugins DSX_LOCATE_DESC= Support locate command -OPTIONS_DEFAULT= GTK2 \ - WCX_CPIO \ +OPTIONS_DEFAULT= WCX_CPIO \ WCX_DEB \ WCX_RPM \ WCX_UNRAR \ @@ -105,126 +110,96 @@ OPTIONS_DEFAULT= GTK2 \ WFX_SAMBA \ DSX_LOCATE -GTK2_USE= fpc=gtk2 gnome=gtk20 -GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 - -QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas -QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -QT4_BROKEN= Does not build - WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar5 WFX_SAMBA_USES= samba:lib WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MGTK2} -LCL_PLATFORM= gtk2 -USE_GNOME+= cairo gdkpixbuf2 -.elif ${PORT_OPTIONS:MQT4} -LCL_PLATFORM= qt -.endif - .if ${PORT_OPTIONS:MDEBUG} -BUILD_MODE= Debug +LAZBUILD_ARGS+= -bm="Debug" .else -BUILD_MODE= NoDebug Full Optimizations +LAZBUILD_ARGS+= -bm="NoDebug Full Optimizations" .endif .if ${PORT_OPTIONS:MWFX_FTP} USE_FPC+= fcl-net +LAZARUS_PROJECT_FILES+= plugins/wfx/ftp/src/ftp.lpi .endif -pre-patch: - ${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix - ${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas - -post-patch: - @${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - ${WRKSRC}/src/uGlobsPaths.pas - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr - -do-build: -.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk multithreadprocs/multithreadprocslaz.lpk \ - dcpcrypt/dcpcrypt.lpk doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \ - viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk synunihighlighter/synuni.lpk - @cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}" -.endfor - .if ${PORT_OPTIONS:MWCX_CPIO} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/cpio/src/cpio.lpi" +LAZARUS_PROJECT_FILES+= plugins/wcx/cpio/src/cpio.lpi .endif + .if ${PORT_OPTIONS:MWCX_DEB} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/deb/src/deb.lpi" +LAZARUS_PROJECT_FILES+= plugins/wcx/deb/src/deb.lpi .endif + .if ${PORT_OPTIONS:MWCX_UNBZ2} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unbz2/src/unbz2.lpi" +LAZARUS_PROJECT_FILES+= plugins/wcx/unbz2/src/unbz2.lpi .endif + .if ${PORT_OPTIONS:MWCX_RPM} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/rpm/src/rpm.lpi" +LAZARUS_PROJECT_FILES+= plugins/wcx/rpm/src/rpm.lpi .endif + .if ${PORT_OPTIONS:MWCX_UNRAR} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unrar/src/unrar.lpi" +LAZARUS_PROJECT_FILES+= plugins/wcx/unrar/src/unrar.lpi .endif + .if ${PORT_OPTIONS:MWCX_ZIP} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi" +LAZARUS_PROJECT_FILES+= plugins/wcx/zip/src/Zip.lpi .endif .if ${PORT_OPTIONS:MWDX_AUDIOINFO} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/audioinfo/src/AudioInfo.lpi" +LAZARUS_PROJECT_FILES+= plugins/wdx/audioinfo/src/AudioInfo.lpi .endif + .if ${PORT_OPTIONS:MWDX_RPM} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi" +LAZARUS_PROJECT_FILES+= plugins/wdx/rpm_wdx/src/rpm_wdx.lpi .endif + .if ${PORT_OPTIONS:MWDX_DEB} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/deb_wdx/src/deb_wdx.lpi" +LAZARUS_PROJECT_FILES+= plugins/wdx/deb_wdx/src/deb_wdx.lpi .endif + .if ${PORT_OPTIONS:MWDX_SVN} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/svn_wdx/src/svn_wdx.lpi" +LAZARUS_PROJECT_FILES+= plugins/wdx/svn_wdx/src/svn_wdx.lpi .endif + .if ${PORT_OPTIONS:MWDX_XPI} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi" +LAZARUS_PROJECT_FILES+= plugins/wdx/xpi_wdx/src/xpi_wdx.lpi .endif + .if ${PORT_OPTIONS:MWDX_TEXTLINE} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/textline/src/TextLine.lpi" +LAZARUS_PROJECT_FILES+= plugins/wdx/textline/src/TextLine.lpi .endif -.if ${PORT_OPTIONS:MWFX_FTP} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/ftp/src/ftp.lpi" -.endif .if ${PORT_OPTIONS:MWFX_SAMBA} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/samba/src/samba.lpi" +LAZARUS_PROJECT_FILES+= plugins/wfx/samba/src/samba.lpi .endif .if ${PORT_OPTIONS:MWLX_MPLAYER} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wlx/WlxMplayer/src/wlxMplayer.lpi" +LAZARUS_PROJECT_FILES+= plugins/wlx/WlxMplayer/src/wlxMplayer.lpi .endif .if ${PORT_OPTIONS:MDSX_LOCATE} - @cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "dsx/DSXLocate/src/DSXLocate.lpi" +LAZARUS_PROJECT_FILES+= plugins/dsx/DSXLocate/src/DSXLocate.lpi .endif - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE} +LAZARUS_PROJECT_FILES+= src/doublecmd.lpi +pre-patch: + ${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix + ${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas + +post-patch: + @${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ + ${WRKSRC}/src/uGlobsPaths.pas + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr + @${REINPLACE_CMD} -e '3632d' ${WRKSRC}/src/fmain.pas + post-build: @${RM} -r ${DOCSRC}/*/dev-help @@ -375,7 +350,7 @@ do-install: .if ${PORT_OPTIONS:MWFX_FTP} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/lib/ftp.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/ftp.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/ .endif .if ${PORT_OPTIONS:MWFX_SAMBA} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/samba/ Modified: head/x11-fm/doublecmd/distinfo ============================================================================== --- head/x11-fm/doublecmd/distinfo Fri May 25 16:08:27 2018 (r470850) +++ head/x11-fm/doublecmd/distinfo Fri May 25 16:31:21 2018 (r470851) @@ -1,5 +1,5 @@ -TIMESTAMP = 1514048041 -SHA256 (doublecmd-0.8.1-src.tar.gz) = 7d6e26460b1e57c0af4b26f6fab0c9a38287672f8d5d92d84e2dc5d0e25e75a8 -SIZE (doublecmd-0.8.1-src.tar.gz) = 7566344 +TIMESTAMP = 1520360222 +SHA256 (doublecmd-0.8.2-src.tar.gz) = 57a3dd94e9aa00b381f2b844a9000fbc7f28dae1bdd6409b170b1c26b7b4ba43 +SIZE (doublecmd-0.8.2-src.tar.gz) = 7570292 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805251631.w4PGVL7G095417>