Date: Thu, 4 Jul 2013 23:01:34 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322297 - in head/x11-fm/doublecmd: . files Message-ID: <201307042301.r64N1Yp2079687@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Thu Jul 4 23:01:34 2013 New Revision: 322297 URL: http://svnweb.freebsd.org/changeset/ports/322297 Log: x11-fm/doublecmd: update to 0.5.5 - Update to 0.5.5 Changes: http://doublecmd.sourceforge.net/mediawiki/index.php/Changes_in_version_0.5.5 PR: ports/180240 Submitted by: Beñat Etxepare <bbtruk@users.sourceforge.net> (maintainer) Added: head/x11-fm/doublecmd/files/patch-components__doublecmd__dcosutils.pas (contents, props changed) head/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas (contents, props changed) head/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas (contents, props changed) head/x11-fm/doublecmd/files/patch-src__ucmdlineparams.pas (contents, props changed) Deleted: head/x11-fm/doublecmd/files/patch-install-linux-doublecmd.desktop head/x11-fm/doublecmd/files/patch-src-dmhelpmanager.pas head/x11-fm/doublecmd/files/patch-src-foptions.pas head/x11-fm/doublecmd/files/patch-src-ftweakplugin.pas head/x11-fm/doublecmd/files/patch-src-uGlobsPaths.pas Modified: head/x11-fm/doublecmd/Makefile head/x11-fm/doublecmd/distinfo head/x11-fm/doublecmd/files/pkg-message.in Modified: head/x11-fm/doublecmd/Makefile ============================================================================== --- head/x11-fm/doublecmd/Makefile Thu Jul 4 22:49:22 2013 (r322296) +++ head/x11-fm/doublecmd/Makefile Thu Jul 4 23:01:34 2013 (r322297) @@ -2,13 +2,12 @@ # $FreeBSD$ 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,19 +20,23 @@ BUILD_DEPENDS= lazbuild:${PORTSDIR}/edit 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 SUB_FILES= pkg-message + PROJECT_FILE= src/doublecmd.lpi 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_DEFINE= DOCS DEBUG OPTIONS_SINGLE= LCL OPTIONS_SINGLE_LCL= GTK2 QT4 @@ -60,18 +63,23 @@ BUILD_MODE= Debug 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} @@ -81,10 +89,9 @@ post-build: 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 +111,7 @@ pre-install: @${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 +122,26 @@ do-install: ${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> Modified: head/x11-fm/doublecmd/distinfo ============================================================================== --- head/x11-fm/doublecmd/distinfo Thu Jul 4 22:49:22 2013 (r322296) +++ head/x11-fm/doublecmd/distinfo Thu Jul 4 23:01:34 2013 (r322297) @@ -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 Added: head/x11-fm/doublecmd/files/patch-components__doublecmd__dcosutils.pas ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/doublecmd/files/patch-components__doublecmd__dcosutils.pas Thu Jul 4 23:01:34 2013 (r322297) @@ -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; Added: head/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas Thu Jul 4 23:01:34 2013 (r322297) @@ -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} Added: head/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas Thu Jul 4 23:01:34 2013 (r322297) @@ -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; Added: head/x11-fm/doublecmd/files/patch-src__ucmdlineparams.pas ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/doublecmd/files/patch-src__ucmdlineparams.pas Thu Jul 4 23:01:34 2013 (r322297) @@ -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 Modified: head/x11-fm/doublecmd/files/pkg-message.in ============================================================================== --- head/x11-fm/doublecmd/files/pkg-message.in Thu Jul 4 22:49:22 2013 (r322296) +++ head/x11-fm/doublecmd/files/pkg-message.in Thu Jul 4 23:01:34 2013 (r322297) @@ -9,7 +9,7 @@ Double Commander was installed # 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 ;)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307042301.r64N1Yp2079687>