Date: Wed, 3 Jul 2013 16:19:19 GMT From: Beņat Gonzalez Etxepare <bbtruk@users.sourceforge.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180240: [maintainer update] x11-fm/doublecmd: update to version 0.5.5 Message-ID: <201307031619.r63GJJwG072831@oldred.freebsd.org> Resent-Message-ID: <201307031620.r63GK0jT083379@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180240 >Category: ports >Synopsis: [maintainer update] x11-fm/doublecmd: update to version 0.5.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 03 16:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Beņat Gonzalez Etxepare >Release: >Organization: >Environment: >Description: Changelog: - Update to version 0.5.5 Renamed files (with changes): - files/patch-src-dmhelpmanager.pas to files/patch-src__dmhelpmanager.pas - files/patch-src-uGlobsPaths.pas to files/patch-src__uGlobsPaths.pas New files: - files/patch-components__doublecmd__dcosutils.pas - files/patch-src__ucmdlineparams.pas Deleted files: - files/patch-install-linux-doublecmd.desktop - files/patch-src-foptions.pas - files/patch-src-ftweakplugin.pas Patch tested in RedPorts (rev. 14327): http://redports.org/buildarchive/20130703141802-89527/ >How-To-Repeat: >Fix: Patch attached with submission follows: ===> Generating patch ===> Viewing diff with more diff -ruN /usr/ports/x11-fm/doublecmd/Makefile ./Makefile --- /usr/ports/x11-fm/doublecmd/Makefile 2013-06-11 09:45:34.000000000 +0200 +++ ./Makefile 2013-07-03 13:40:04.463553000 +0200 @@ -2,13 +2,12 @@ # $FreeBSD: x11-fm/doublecmd/Makefile 320539 2013-06-11 07:45:34Z ak $ PORTNAME= doublecmd -PORTVERSION= 0.5.4 -PORTREVISION= 4 +PORTVERSION= 0.5.5 CATEGORIES= x11-fm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}/Double%20Commander%20Source DISTNAME= ${PORTNAME}-${PORTVERSION}-src -DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-0.5.1-src.tar.gz +DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-${PORTVERSION}-src.tar.gz MAINTAINER= bbtruk@users.sourceforge.net COMMENT= Total Commander like file manager for the X Window System @@ -21,8 +20,8 @@ ONLY_FOR_ARCHS= i386 amd64 MAN1= ${PORTNAME}.1 -USE_DOS2UNIX= yes -DOS2UNIX_REGEX= .*\.(pas) +PORTDOCS= * +USE_DOS2UNIX= src/dmhelpmanager.pas USE_FPC= yes WANT_GNOME= yes PLIST= ${WRKDIR}/pkg-plist @@ -31,7 +30,7 @@ LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d LAZARUS_DIR= ${LOCALBASE}/share/lazarus WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -DOCSRC= ${WRKDIR}/${PORTNAME}-help-0.5.1 +DOCSRC= ${WRKDIR}/${PORTNAME}-help-${PORTVERSION} OPTIONS_DEFINE= DEBUG OPTIONS_SINGLE= LCL @@ -60,31 +59,32 @@ BUILD_MODE= NoDebug Full Optimizations .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' ${WRKSRC}/src/dmhelpmanager.pas - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ + @${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ ${WRKSRC}/src/uGlobsPaths.pas - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - ${WRKSRC}/install/linux/doublecmd.desktop - @${REINPLACE_CMD} -e 's|.GetSize|.Size|g' ${WRKSRC}/src/platform/uClipboard.pas - @${REINPLACE_CMD} -e '176d' ${WRKSRC}/src/uxmlconfig.pas do-build: +.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk dcpcrypt/dcpcrypt.lpk \ + doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \ + viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk \ + ZVDateTimeCtrls/zvdatetimectrls.lpk @cd ${WRKSRC}/components && \ - ${FIND} * -name *.lpk -exec ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "{}" \; + ${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}" +.endfor + @cd ${WRKSRC} && \ ${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE} -post-build: - @${RM} -rf ${DOCSRC}/*/dev-help - pre-install: @${RM} -f ${PLIST} -.for FILE in %%DATADIR%%/doublecmd.png %%DATADIR%%/doublecmd.ext.example \ - %%DATADIR%%/editor.col %%DATADIR%%/twilight.col %%DATADIR%%/pixmaps.txt \ - %%DATADIR%%/default.bar %%DATADIR%%/multiarc.ini bin/doublecmd \ - share/applications/doublecmd.desktop +.for FILE in %%DATADIR%%/doublecmd.ext.example %%DATADIR%%/pixmaps.txt \ + %%DATADIR%%/multiarc.ini bin/doublecmd share/applications/doublecmd.desktop \ + share/pixmaps/doublecmd.png share/pixmaps/doublecmd.xpm @${ECHO_CMD} ${FILE} >> ${PLIST} .endfor @@ -104,13 +104,7 @@ @${ECHO_CMD} "@dirrm %%DATADIR%%/sdk" >> ${PLIST} @${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST} -.if ${PORT_OPTIONS:MDOCS} - @cd ${DOCSRC} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST} && \ - ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DOCSDIR%%/|' >> ${PLIST} - @${ECHO} "@dirrm %%DOCSDIR%%" >> ${PLIST} -.endif - + @${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} @${ECHO_CMD} "@dirrmtry share/applications" >> ${PLIST} do-install: @@ -121,21 +115,26 @@ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/${DIRE}/{}" \; .endfor -.if ${PORT_OPTIONS:MDOCS} - @cd ${DOCSRC} && \ - ${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \ - ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; -.endif - -.for FILE in doublecmd.png doublecmd.ext.example editor.col twilight.col pixmaps.txt default.bar multiarc.ini +.for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR} .endfor + + @${MKDIR} ${PREFIX}/share/pixmaps +.for FILE in doublecmd.png install/linux/doublecmd.xpm + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/pixmaps/ +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/doublecmd ${PREFIX}/bin/${PORTNAME} @${MKDIR} ${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${DESKTOPDIR}/ post-install: +.if ${PORT_OPTIONS:MDOCS} + @cd ${DOCSRC} && \ + ${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \ + ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \; ${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/ +.endif @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff -ruN /usr/ports/x11-fm/doublecmd/distinfo ./distinfo --- /usr/ports/x11-fm/doublecmd/distinfo 2012-07-14 16:29:18.000000000 +0200 +++ ./distinfo 2013-06-30 12:56:14.215533882 +0200 @@ -1,4 +1,4 @@ -SHA256 (doublecmd-0.5.4-src.tar.gz) = 480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7 -SIZE (doublecmd-0.5.4-src.tar.gz) = 2658473 -SHA256 (doublecmd-help-0.5.1-src.tar.gz) = d9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5 -SIZE (doublecmd-help-0.5.1-src.tar.gz) = 10757382 +SHA256 (doublecmd-0.5.5-src.tar.gz) = 253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434 +SIZE (doublecmd-0.5.5-src.tar.gz) = 4401472 +SHA256 (doublecmd-help-0.5.5-src.tar.gz) = 5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf +SIZE (doublecmd-help-0.5.5-src.tar.gz) = 10762769 diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-components__doublecmd__dcosutils.pas ./files/patch-components__doublecmd__dcosutils.pas --- /usr/ports/x11-fm/doublecmd/files/patch-components__doublecmd__dcosutils.pas 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-components__doublecmd__dcosutils.pas 2013-06-30 21:33:32.903395000 +0200 @@ -0,0 +1,16 @@ +--- ./components/doublecmd/dcosutils.pas.orig 2013-06-30 21:33:09.530448529 +0200 ++++ ./components/doublecmd/dcosutils.pas 2013-06-30 21:33:24.841789000 +0200 +@@ -184,11 +184,11 @@ + Windows, JwaWinNetWk; + {$ENDIF} + {$IF DEFINED(UNIX)} +- {$IF DEFINED(DARWIN)} ++ {$IF DEFINED(BSD)} + {$DEFINE FPC_USE_LIBC} + {$ENDIF} + uses +- {$IF NOT DEFINED(FPC_USE_LIBC)} ++ {$IF (NOT DEFINED(FPC_USE_LIBC)) OR (DEFINED(BSD) AND NOT DEFINED(DARWIN))} + SysCall, + {$ENDIF} + BaseUnix, Unix, dl, DCStrUtils; diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-install-linux-doublecmd.desktop ./files/patch-install-linux-doublecmd.desktop --- /usr/ports/x11-fm/doublecmd/files/patch-install-linux-doublecmd.desktop 2013-06-09 20:10:45.000000000 +0200 +++ ./files/patch-install-linux-doublecmd.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ ---- install/linux/doublecmd.desktop 2010-06-13 10:24:46.000000000 +0200 -+++ install/linux/doublecmd.desktop 2013-06-02 01:02:42.000000000 +0200 -@@ -1,8 +1,8 @@ - [Desktop Entry] - Name=Double Commander - Comment=Double Commander is a cross platform open source file manager with two panels side by side. --Exec=/usr/bin/doublecmd -+Exec=%%PREFIX%%/bin/doublecmd - Terminal=false - Type=Application --Icon=/usr/share/pixmaps/doublecmd.png -+Icon=%%DATADIR%%/doublecmd.png - Categories=Application;Utility;FileManager; diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src-dmhelpmanager.pas ./files/patch-src-dmhelpmanager.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src-dmhelpmanager.pas 2012-07-14 16:29:18.000000000 +0200 +++ ./files/patch-src-dmhelpmanager.pas 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ ---- src/dmhelpmanager.pas 2012-03-31 17:53:05.000000000 -0500 -+++ src/dmhelpmanager.pas 2012-03-31 17:53:05.000000000 -0500 -@@ -62,11 +62,11 @@ - else - begin - gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']); -- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then -+ if not mbDirectoryExists('/usr/local/share/doc/doublecmd' + PathDelim + gHelpLang) then - gHelpLang:= 'en'; - end; - -- HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang; -+ HTMLHelpDatabase.BaseURL:= 'file:///usr/local/share/doc/doublecmd' + PathDelim + gHelpLang; - HTMLHelpDatabase.KeywordPrefix:= '/'; - end; - diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src-foptions.pas ./files/patch-src-foptions.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src-foptions.pas 2012-12-12 22:15:58.000000000 +0100 +++ ./files/patch-src-foptions.pas 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/foptions.pas 2012-12-12 14:41:07.000000000 -0500 -+++ src/foptions.pas 2012-12-12 14:41:39.000000000 -0500 -@@ -580,7 +580,7 @@ - - // Below needed until after we switch to Lazarus 0.9.31. - nbNotebook.TabStop := True; -- {$if (lcl_release) < 31} -+ {$if (lcl_major < 1) and (lcl_release < 31)} - nbNotebook.ShowTabs := False; - nbNotebook.OnPageChanged := @nbNotebookPageChanged; - {$endif} diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src-ftweakplugin.pas ./files/patch-src-ftweakplugin.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src-ftweakplugin.pas 2012-12-12 22:15:58.000000000 +0100 +++ ./files/patch-src-ftweakplugin.pas 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- src/ftweakplugin.pas 2012-12-12 14:39:03.000000000 -0500 -+++ src/ftweakplugin.pas 2012-12-12 14:39:40.000000000 -0500 -@@ -276,7 +276,7 @@ - - procedure TfrmTweakPlugin.FormCreate(Sender: TObject); - begin -- {$if (lcl_release) < 31} -+ {$if (lcl_major < 1) and (lcl_release < 31)} - nbTweakAll.ShowTabs := False; - nbTweakAll.TabStop := True; - {$endif} diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src-uGlobsPaths.pas ./files/patch-src-uGlobsPaths.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src-uGlobsPaths.pas 2012-07-14 16:29:18.000000000 +0200 +++ ./files/patch-src-uGlobsPaths.pas 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ ---- src/uGlobsPaths.pas.old 2012-02-14 04:46:22.000000000 +0100 -+++ src/uGlobsPaths.pas 2012-04-24 20:34:12.000000000 +0200 -@@ -3,9 +3,9 @@ - interface - - var -- gpExePath : String = ''; // executable directory -+ gpExePath : String = '%%PREFIX%%/bin'; // executable directory - gpCfgDir : String = ''; // directory from which configuration files are used -- gpGlobalCfgDir : String = ''; // config dir global for all user -+ gpGlobalCfgDir : String = '%%DATADIR%%'; // config dir global for all user - gpCmdLineCfgDir : String = ''; // config dir passed on the command line - gpLngDir : String = ''; // path to language *.po files - gpPixmapPath : String = ''; // path to pixmaps -@@ -29,7 +29,7 @@ - gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0))); - DCDebug('Executable directory: ', gpExePath); - -- gpGlobalCfgDir := gpExePath; -+ //gpGlobalCfgDir := gpExePath; - if gpCmdLineCfgDir <> EmptyStr then - begin - if GetPathType(gpCmdLineCfgDir) <> ptAbsolute then -@@ -48,13 +48,13 @@ - end; - - gpCfgDir := IncludeTrailingPathDelimiter(gpCfgDir); -- gpLngDir := gpExePath + 'language' + DirectorySeparator; -- gpPixmapPath := gpExePath + 'pixmaps' + DirectorySeparator; -+ gpLngDir := '%%DATADIR%%/' + 'language' + DirectorySeparator; -+ gpPixmapPath := '%%DATADIR%%/' + 'pixmaps' + DirectorySeparator; - gpCacheDir := GetAppCacheDir; - - // set up environment variables -- mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir(gpExePath)); -- mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash(gpExePath)); -+ mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir('%%DATADIR%%')); -+ mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash('%%DATADIR%%')); - end; - - end. diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas ./files/patch-src__dmhelpmanager.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-src__dmhelpmanager.pas 2013-06-30 19:29:27.950399000 +0200 @@ -0,0 +1,16 @@ +--- ./src/dmhelpmanager.pas.orig 2013-06-30 19:27:17.154825000 +0200 ++++ ./src/dmhelpmanager.pas 2013-06-30 19:28:32.591981000 +0200 +@@ -69,11 +69,11 @@ + else + begin + gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']); +- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then ++ if not mbDirectoryExists(gpDocsDir + PathDelim + gHelpLang) then + gHelpLang:= 'en'; + end; + +- HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang; ++ HTMLHelpDatabase.BaseURL:= 'file://' + gpDocsDir + PathDelim + gHelpLang; + HTMLHelpDatabase.KeywordPrefix:= '/'; + + {$IFDEF MSWindows} diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas ./files/patch-src__uGlobsPaths.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-src__uGlobsPaths.pas 2013-07-03 13:47:40.745837000 +0200 @@ -0,0 +1,29 @@ +--- ./src/uGlobsPaths.pas.orig 2013-06-30 19:29:19.097919000 +0200 ++++ ./src/uGlobsPaths.pas 2013-06-30 19:22:37.387062000 +0200 +@@ -3,14 +3,15 @@ + interface + + var +- gpExePath : String = ''; // executable directory ++ gpExePath : String = '%%DATADIR%%/'; // executable directory + gpCfgDir : String = ''; // directory from which configuration files are used + gpGlobalCfgDir : String = ''; // config dir global for all user + gpCmdLineCfgDir : String = ''; // config dir passed on the command line + gpLngDir : String = ''; // path to language *.po files + gpPixmapPath : String = ''; // path to pixmaps + gpCacheDir : UTF8String = ''; // cache directory +- ++ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files ++ + procedure LoadPaths; + + implementation +@@ -26,7 +27,7 @@ + procedure LoadPaths; + begin + OnGetApplicationName := @GetAppName; +- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0))); ++ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0))); + DCDebug('Executable directory: ', gpExePath); + + gpGlobalCfgDir := gpExePath; diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src__ucmdlineparams.pas ./files/patch-src__ucmdlineparams.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src__ucmdlineparams.pas 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-src__ucmdlineparams.pas 2013-06-30 21:42:36.041398086 +0200 @@ -0,0 +1,14 @@ +--- ./src/ucmdlineparams.pas.orig 2013-06-08 17:54:12.000000000 +0200 ++++ ./src/ucmdlineparams.pas 2013-06-30 21:42:23.609940000 +0200 +@@ -20,10 +20,7 @@ + implementation + + uses +- {$IF DEFINED(NIGHTLY_BUILD)} +- uOSUtils, +- {$ENDIF} +- Forms, Dialogs, SysUtils, uDCUtils, uGlobsPaths, getopts, uDebug, uLng; ++ uOSUtils, Forms, Dialogs, SysUtils, uDCUtils, uGlobsPaths, getopts, uDebug, uLng; + + procedure ProcessCommandLineParams; + var diff -ruN /usr/ports/x11-fm/doublecmd/files/pkg-message.in ./files/pkg-message.in --- /usr/ports/x11-fm/doublecmd/files/pkg-message.in 2012-07-14 16:29:18.000000000 +0200 +++ ./files/pkg-message.in 2013-06-14 23:14:50.750000000 +0200 @@ -9,7 +9,7 @@ # doublecmd 3) Plugins are currently not available for FreeBSD. For more information see: - http://sourceforge.net/apps/mediawiki/doublecmd/index.php?title=Issues_with_FPC,_Lazarus + http://doublecmd.sourceforge.net/mediawiki/index.php/Issues_with_FPC,_Lazarus in "Loading shared libraries on FreeBSD doesn't work" section 4) Enjoy it ;) ===> Done >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307031619.r63GJJwG072831>