Update to upstream version 0.6.0

PR:		198439
Submitted by:	bbtruk@users.sourceforge.net (maintainer)
This commit is contained in:
Thomas Zander 2015-03-22 19:33:08 +00:00
parent b4de3a0cdf
commit ea52a4dba6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=381949
3 changed files with 51 additions and 18 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= doublecmd
PORTVERSION= 0.5.11
PORTREVISION= 1
PORTVERSION= 0.6.0
CATEGORIES= x11-fm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}/Double%20Commander%20Source
@ -34,7 +33,7 @@ LAZARUS_VER= 1.2.6
LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp
LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}
HELPVERSION= 0.5.5
HELPVERSION= 0.6.0
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
DOCSRC= ${WRKDIR}/${PORTNAME}-help-${HELPVERSION}
@ -49,8 +48,8 @@ WLX_DESC= Lister plugins
DSX_DESC= Search plugins
OPTIONS_GROUP_WCX= WCX_CPIO \
WCX_DEB \
WCX_LZMA \
WCX_RPM \
WCX_UNBZ2 \
WCX_UNRAR \
WCX_ZIP
OPTIONS_GROUP_WDX= WDX_RPM \
@ -66,7 +65,6 @@ OPTIONS_GROUP_DSX= DSX_LOCATE
OPTIONS_DEFAULT= GTK2 \
WCX_CPIO \
WCX_DEB \
WCX_LZMA \
WCX_RPM \
WCX_UNRAR \
WCX_ZIP \
@ -139,9 +137,9 @@ do-build:
@cd ${WRKSRC}/plugins && \
${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/deb/src/deb.lpi"
.endif
.if ${PORT_OPTIONS:MWCX_LZMA}
.if ${PORT_OPTIONS:MWCX_UNBZ2}
@cd ${WRKSRC}/plugins && \
${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/lzma/src/lzma.lpi"
${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unbz2/src/unbz2.lpi"
.endif
.if ${PORT_OPTIONS:MWCX_RPM}
@cd ${WRKSRC}/plugins && \
@ -201,18 +199,24 @@ post-build:
pre-install:
@${RM} -f ${PLIST}
@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wcx" >> ${PLIST}
@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wdx" >> ${PLIST}
@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wfx" >> ${PLIST}
@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wlx" >> ${PLIST}
@${ECHO_CMD} "@dir %%DATADIR%%/plugins/dsx" >> ${PLIST}
.if ${PORT_OPTIONS:MWCX_CPIO}
@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/cpio/cpio.wcx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_DEB}
@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/deb/deb.wcx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_LZMA}
@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/lzma/lzma.wcx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_RPM}
@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/rpm/rpm.wcx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_UNBZ2}
@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unbz2/unbz2.wcx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_UNRAR}
@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unrar/unrar.wcx" >> ${PLIST}
.endif
@ -285,14 +289,14 @@ do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/deb
${INSTALL_LIB} ${WRKSRC}/plugins/wcx/deb/lib/deb.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/deb/
.endif
.if ${PORT_OPTIONS:MWCX_LZMA}
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/lzma/
${INSTALL_LIB} ${WRKSRC}/plugins/wcx/lzma/lib/lzma.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/lzma/
.endif
.if ${PORT_OPTIONS:MWCX_RPM}
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/
${INSTALL_LIB} ${WRKSRC}/plugins/wcx/rpm/lib/rpm.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/
.endif
.if ${PORT_OPTIONS:MWCX_UNBZ2}
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unbz2/
${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unbz2/lib/unbz2.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unbz2/
.endif
.if ${PORT_OPTIONS:MWCX_UNRAR}
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/
${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unrar/lib/unrar.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/

View file

@ -1,4 +1,4 @@
SHA256 (doublecmd-0.5.11-src.tar.gz) = a7d31243f9e8fc69ed6854a264d78ee59bfe3dd89e2bb19043c715e3b3d114ea
SIZE (doublecmd-0.5.11-src.tar.gz) = 4753635
SHA256 (doublecmd-help-0.5.5-src.tar.gz) = 5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf
SIZE (doublecmd-help-0.5.5-src.tar.gz) = 10762769
SHA256 (doublecmd-0.6.0-src.tar.gz) = 809b182eb03ed3a07f21d6690f0289ab80eefbe3ca0a998efe65742d5f0c4a4f
SIZE (doublecmd-0.6.0-src.tar.gz) = 6443975
SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996

View file

@ -0,0 +1,29 @@
--- src/platform/uosforms.pas.orig 2014-07-27 14:35:14 UTC
+++ src/platform/uosforms.pas
@@ -96,7 +96,7 @@ procedure ShowDriveContextMenu(Parent: T
}
function ShowOpenIconDialog(Owner: TCustomControl; var sFileName : String) : Boolean;
-{$IF DEFINED(LINUX)}
+{$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN)}
{en
Show open with dialog
@param(FileList List of files to open with)
@@ -121,7 +121,7 @@ uses
{$ELSE}
, MacOSAll
{$ENDIF}
- {$IFDEF LINUX}
+ {$IF NOT DEFINED(DARWIN)}
, fOpenWith, uKde
{$ENDIF}
{$ENDIF};
@@ -547,7 +547,7 @@ begin
FreeAndNil(opdDialog);
end;
-{$IF DEFINED(LINUX)}
+{$IF DEFINED(UNIX) AND NOT DEFINED(DARWIN)}
procedure ShowOpenWithDialog(const FileList: TStringList);
begin
if not (UseKde and uKde.ShowOpenWithDialog(FileList)) then begin