Attachment #136125 for bug #181217

View | Details | Raw Unified | Return to bug 181217
Collapse All | Expand All




# Created by: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
# $FreeBSD: head/x11-fm/doublecmd/Makefile 327780 2013-09-20 23:49:39Z bapt $

PORTNAME=	doublecmd
PORTVERSION=	0.5.7
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-${HELPVERSION}-src.tar.gz

MAINTAINER=	bbtruk@users.sourceforge.net
COMMENT=	Total Commander like file manager for the X Window System

LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild -d
LAZARUS_DIR=	${LOCALBASE}/share/lazarus

HELPVERSION=	0.5.5
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
DOCSRC=		${WRKDIR}/${PORTNAME}-help-${HELPVERSION}

OPTIONS_DEFINE=		DOCS DEBUG
OPTIONS_SINGLE=		LCL
OPTIONS_SINGLE_LCL=	GTK2 QT4
OPTIONS_GROUP=		WCX WDX WFX WLX DSX
WCX_DESC=	Packer plugins
WDX_DESC=	Content plugins
WFX_DESC=	File sytem plugins
WLX_DESC=	Lister plugins
DSX_DESC=	Search plugins
OPTIONS_GROUP_WCX=	WCX_CPIO \
			WCX_DEB \
			WCX_LZMA \
			WCX_RPM \
			WCX_UNRAR \
			WCX_ZIP
OPTIONS_GROUP_WDX=	WDX_RPM \
			WDX_DEB \
			WDX_SVN \
			WDX_XPI \
			WDX_SCRIPTS
OPTIONS_GROUP_WFX=	WFX_FTP \
			WFX_SAMBA
OPTIONS_GROUP_WLX=	WLX_MPLAYER
OPTIONS_GROUP_DSX=	DSX_LOCATE

OPTIONS_DEFAULT=	GTK2 \
			WCX_CPIO \
			WCX_DEB \
			WCX_LZMA \
			WCX_RPM \
			WDX_RPM \
			WDX_DEB \
			WDX_SVN \
			WDX_SCRIPTS \
			WDX_XPI \
			DSX_LOCATE

NO_STAGE=	yes

.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MGTK2}

BUILD_DEPENDS+=	${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
.endif

.if ${PORT_OPTIONS:MWCX_UNRAR}
LIB_DEPENDS+=	unrar:${PORTSDIR}/archivers/libunrar
.endif

.if ${PORT_OPTIONS:MWFX_SAMBA}
LIB_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-libsmbclient
.endif

.if ${PORT_OPTIONS:MWLX_MPLAYER}
RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
.endif

.if ${PORT_OPTIONS:MDEBUG}
BUILD_MODE=	Debug
.else
BUILD_MODE=	NoDebug Full Optimizations
.endif

.if ${ARCH} == "amd64" && ( ${PORT_OPTIONS:MWCX_UNRAR} || ${PORT_OPTIONS:MWCX_ZIP} || ${PORT_OPTIONS:MWFX_FTP} || ${PORT_OPTIONS:MWFX_SAMBA} || ${PORT_OPTIONS:MWLX_MPLAYER} )
IGNORE=		the following plugins are currently broken in amd64: wcx_unrar, wcx_zip, wfx_ftp, wfx_samba and wlx_mplayer
.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 dcpcrypt/dcpcrypt.lpk \

		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"
.endfor

.if ${PORT_OPTIONS:MWCX_CPIO}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/cpio/src/cpio.lpi"
.endif
.if ${PORT_OPTIONS:MWCX_DEB}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/deb/src/deb.lpi"
.endif
.if ${PORT_OPTIONS:MWCX_LZMA}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/lzma/src/lzma.lpi"
.endif
.if ${PORT_OPTIONS:MWCX_RPM}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/rpm/src/rpm.lpi"
.endif
.if ${PORT_OPTIONS:MWCX_UNRAR}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unrar/src/unrar.lpi"
.endif
.if ${PORT_OPTIONS:MWCX_ZIP}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi"
.endif

.if ${PORT_OPTIONS:MWDX_RPM}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi"
.endif
.if ${PORT_OPTIONS:MWDX_DEB}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/deb_wdx/src/deb_wdx.lpi"
.endif
.if ${PORT_OPTIONS:MWDX_SVN}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/svn_wdx/src/svn_wdx.lpi"
.endif
.if ${PORT_OPTIONS:MWDX_XPI}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi"
.endif

.if ${PORT_OPTIONS:MWFX_FTP}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/ftp/src/ftp.lpi"
.endif
.if ${PORT_OPTIONS:MWFX_SAMBA}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/samba/src/samba.lpi"
.endif

.if ${PORT_OPTIONS:MWLX_MPLAYER}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wlx/WlxMplayer/src/wlxMplayer.lpi"
.endif

.if ${PORT_OPTIONS:MDSX_LOCATE}
	@cd ${WRKSRC}/plugins && \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "dsx/DSXLocate/src/DSXLocate.lpi"
.endif

	@cd ${WRKSRC} && \
		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}


pre-install:
	@${RM} -f ${PLIST}

.if ${PORT_OPTIONS:MWCX_CPIO}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/cpio/cpio.wcx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/cpio" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_DEB}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/deb/deb.wcx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/deb" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_LZMA}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/lzma/lzma.wcx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/lzma" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_RPM}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/rpm/rpm.wcx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/rpm" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_UNRAR}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unrar/unrar.wcx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/unrar" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWCX_ZIP}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/zip/zip.wcx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/zip" >> ${PLIST}
.endif

.if ${PORT_OPTIONS:MWDX_RPM}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/rpm_wdx/rpm_wdx.wdx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/rpm_wdx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWDX_DEB}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/deb_wdx/deb_wdx.wdx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/deb_wdx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWDX_SVN}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/svn_wdx/svn_wdx.wdx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/svn_wdx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWDX_XPI}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/xpi_wdx/xpi_wdx.wdx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/xpi_wdx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWDX_SCRIPTS}
	@cd ${WRKSRC}/plugins/wdx/scripts && \
		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/plugins/wdx/scripts/|' >> ${PLIST} && \
			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/plugins/wdx/scripts/|' >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/scripts" >> ${PLIST}
.endif

.if ${PORT_OPTIONS:MWFX_FTP}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/ftp/ftp.wfx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wfx/ftp" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWFX_SAMBA}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/samba/samba.wfx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wfx/samba" >> ${PLIST}
.endif

.if ${PORT_OPTIONS:MWLX_MPLAYER}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wlx/wlxmplayer/wlxmplayer.wlx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wlx/wlxmplayer" >> ${PLIST}
.endif

.if ${PORT_OPTIONS:MDSX_LOCATE}
	@${ECHO_CMD} "%%DATADIR%%/plugins/dsx/dsxlocate/dsxlocate.dsx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/dsx/dsxlocate" >> ${PLIST}
.endif

	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wfx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wlx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/dsx" >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins" >> ${PLIST}

.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 \
	%%DATADIR%%/doublecmd.xml
	@${ECHO_CMD} ${FILE} >> ${PLIST}
.endfor


	@${ECHO_CMD} "@dirrmtry share/applications" >> ${PLIST}

do-install:
	@${MKDIR} ${DATADIR}/plugins
	@${MKDIR} ${DATADIR}/plugins/wcx
	@${MKDIR} ${DATADIR}/plugins/wdx
	@${MKDIR} ${DATADIR}/plugins/wfx
	@${MKDIR} ${DATADIR}/plugins/wlx
	@${MKDIR} ${DATADIR}/plugins/dsx
.if ${PORT_OPTIONS:MWCX_CPIO}
	@${MKDIR} ${DATADIR}/plugins/wcx/cpio
	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/cpio/lib/cpio.wcx ${DATADIR}/plugins/wcx/cpio/
.endif
.if ${PORT_OPTIONS:MWCX_DEB}
	@${MKDIR} ${DATADIR}/plugins/wcx/deb
	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/deb/lib/deb.wcx ${DATADIR}/plugins/wcx/deb/
.endif
.if ${PORT_OPTIONS:MWCX_LZMA}
	@${MKDIR} ${DATADIR}/plugins/wcx/lzma/
	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/lzma/lib/lzma.wcx ${DATADIR}/plugins/wcx/lzma/
.endif
.if ${PORT_OPTIONS:MWCX_RPM}
	@${MKDIR} ${DATADIR}/plugins/wcx/rpm/
	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/rpm/lib/rpm.wcx ${DATADIR}/plugins/wcx/rpm/
.endif
.if ${PORT_OPTIONS:MWCX_UNRAR}
	@${MKDIR} ${DATADIR}/plugins/wcx/unrar/
	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unrar/lib/unrar.wcx ${DATADIR}/plugins/wcx/unrar/
.endif
.if ${PORT_OPTIONS:MWCX_ZIP}
	@${MKDIR} ${DATADIR}/plugins/wcx/zip/
	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/lib/zip.wcx ${DATADIR}/plugins/wcx/zip/
.endif

.if ${PORT_OPTIONS:MWDX_RPM}
	@${MKDIR} ${DATADIR}/plugins/wdx/rpm_wdx/
	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx ${DATADIR}/plugins/wdx/rpm_wdx/
.endif
.if ${PORT_OPTIONS:MWDX_DEB}
	@${MKDIR} ${DATADIR}/plugins/wdx/deb_wdx/
	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/deb_wdx/lib/deb_wdx.wdx ${DATADIR}/plugins/wdx/deb_wdx/
.endif
.if ${PORT_OPTIONS:MWDX_SVN}
	@${MKDIR} ${DATADIR}/plugins/wdx/svn_wdx/
	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/svn_wdx/lib/svn_wdx.wdx ${DATADIR}/plugins/wdx/svn_wdx/
.endif
.if ${PORT_OPTIONS:MWDX_XPI}
	@${MKDIR} ${DATADIR}/plugins/wdx/xpi_wdx/
	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/xpi_wdx/lib/xpi_wdx.wdx ${DATADIR}/plugins/wdx/xpi_wdx/
.endif
.if ${PORT_OPTIONS:MWDX_SCRIPTS}
	@${MKDIR} ${DATADIR}/plugins/wdx/scripts/
	${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${DATADIR}/plugins/wdx/scripts/
.endif

.if ${PORT_OPTIONS:MWFX_FTP}
	@${MKDIR} ${DATADIR}/plugins/wfx/ftp/
	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/lib/ftp.wfx ${DATADIR}/plugins/wfx/ftp/
.endif
.if ${PORT_OPTIONS:MWFX_SAMBA}
	@${MKDIR} ${DATADIR}/plugins/wfx/samba/
	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/samba/lib/samba.wfx ${DATADIR}/plugins/wfx/samba/
.endif

.if ${PORT_OPTIONS:MWLX_MPLAYER}
	@${MKDIR} ${DATADIR}/plugins/wlx/wlxmplayer/
	${INSTALL_LIB} ${WRKSRC}/plugins/wlx/WlxMplayer/lib/wlxmplayer.wlx ${DATADIR}/plugins/wlx/wlxmplayer/
.endif

.if ${PORT_OPTIONS:MDSX_LOCATE}
	@${MKDIR} ${DATADIR}/plugins/dsx/dsxlocate/
	${INSTALL_LIB} ${WRKSRC}/plugins/dsx/DSXLocate/lib/dsxlocate.dsx ${DATADIR}/plugins/dsx/dsxlocate/
.endif

.for DIRE in language pixmaps sdk
	@${MKDIR} ${DATADIR}/${DIRE}
	@cd ${WRKSRC}/${DIRE} && \

			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/${DIRE}/{}" \;
.endfor

.for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini install/linux/doublecmd.xml
	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}
.endfor


Lines 1-4 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (doublecmd-0.5.5-src.tar.gz) = 253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434	1	SHA256 (doublecmd-0.5.7-src.tar.gz) = 8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343
2	SIZE (doublecmd-0.5.5-src.tar.gz) = 4401472	2	SIZE (doublecmd-0.5.7-src.tar.gz) = 4456886
3	SHA256 (doublecmd-help-0.5.5-src.tar.gz) = 5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf	3	SHA256 (doublecmd-help-0.5.5-src.tar.gz) = 5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf
4	SIZE (doublecmd-help-0.5.5-src.tar.gz) = 10762769	4	SIZE (doublecmd-help-0.5.5-src.tar.gz) = 10762769




--- ./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;

Line 0 Link Here

(-)./files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr (+11 lines)
	1	--- ./plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2013-03-10 11:26:35.000000000 +0100
	2	+++ ./plugins/wlx/WlxMplayer/src/wlxMplayer.lpr 2013-07-22 22:43:52.577214000 +0200
	3	@@ -258,7 +258,7 @@
	4	sPlayerPath: String;
	5	p: TMPlayer;
	6	begin
	7	- pf:= TExProcess.Create('which mplayer');
	8	+ pf:= TExProcess.Create('%%LOCALBASE%%/bin/mplayer');
	9	try
	10	pf.Execute;
	11	if (pf.RezList.Count <> 0) then




--- ./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

Lines 8-16 Link Here

(-)./files/pkg-message.in (-3 / +2 lines)
8		8
9	# doublecmd	9	# doublecmd
10		10
11	3) Plugins are currently not available for FreeBSD. For more information see:	11	3) The following plugins are currently not available under amd64:
12	http://doublecmd.sourceforge.net/mediawiki/index.php/Issues_with_FPC,_Lazarus	12	wcx_unrar, wcx_zip, wfx_ftp, wfx_samba and wlx_mplayer
13	in "Loading shared libraries on FreeBSD doesn't work" section
14		13
15	4) Enjoy it ;)	14	4) Enjoy it ;)
16		15

Return to bug 181217

Lines 1-13 Link Here

(-)./Makefile (-8 / +266 lines)
1	# Created by: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>	1	# Created by: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
2	# $FreeBSD: x11-fm/doublecmd/Makefile 327780 2013-09-20 23:49:39Z bapt $	2	# $FreeBSD: head/x11-fm/doublecmd/Makefile 327780 2013-09-20 23:49:39Z bapt $
3		3
4	PORTNAME= doublecmd	4	PORTNAME= doublecmd
5	PORTVERSION= 0.5.5	5	PORTVERSION= 0.5.7
6	CATEGORIES= x11-fm	6	CATEGORIES= x11-fm
7	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	7	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
8	MASTER_SITE_SUBDIR= ${PORTNAME}/Double%20Commander%20Source	8	MASTER_SITE_SUBDIR= ${PORTNAME}/Double%20Commander%20Source
9	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
10	DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-${PORTVERSION}-src.tar.gz	10	DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz
11		11
12	MAINTAINER= bbtruk@users.sourceforge.net	12	MAINTAINER= bbtruk@users.sourceforge.net
13	COMMENT= Total Commander like file manager for the X Window System	13	COMMENT= Total Commander like file manager for the X Window System
Lines 33-48 Link Here
33	LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d	33	LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d
34	LAZARUS_DIR= ${LOCALBASE}/share/lazarus	34	LAZARUS_DIR= ${LOCALBASE}/share/lazarus
35		35
		36	HELPVERSION= 0.5.5
36	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	37	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
37	DOCSRC= ${WRKDIR}/${PORTNAME}-help-${PORTVERSION}	38	DOCSRC= ${WRKDIR}/${PORTNAME}-help-${HELPVERSION}
38		39
39	OPTIONS_DEFINE= DOCS DEBUG	40	OPTIONS_DEFINE= DOCS DEBUG
40	OPTIONS_SINGLE= LCL	41	OPTIONS_SINGLE= LCL
41	OPTIONS_SINGLE_LCL= GTK2 QT4	42	OPTIONS_SINGLE_LCL= GTK2 QT4
42		43	OPTIONS_GROUP= WCX WDX WFX WLX DSX
43	OPTIONS_DEFAULT= GTK2	44	WCX_DESC= Packer plugins
		45	WDX_DESC= Content plugins
		46	WFX_DESC= File sytem plugins
		47	WLX_DESC= Lister plugins
		48	DSX_DESC= Search plugins
		49	OPTIONS_GROUP_WCX= WCX_CPIO \
		50	WCX_DEB \
		51	WCX_LZMA \
		52	WCX_RPM \
		53	WCX_UNRAR \
		54	WCX_ZIP
		55	OPTIONS_GROUP_WDX= WDX_RPM \
		56	WDX_DEB \
		57	WDX_SVN \
		58	WDX_XPI \
		59	WDX_SCRIPTS
		60	OPTIONS_GROUP_WFX= WFX_FTP \
		61	WFX_SAMBA
		62	OPTIONS_GROUP_WLX= WLX_MPLAYER
		63	OPTIONS_GROUP_DSX= DSX_LOCATE
		64
		65	OPTIONS_DEFAULT= GTK2 \
		66	WCX_CPIO \
		67	WCX_DEB \
		68	WCX_LZMA \
		69	WCX_RPM \
		70	WDX_RPM \
		71	WDX_DEB \
		72	WDX_SVN \
		73	WDX_SCRIPTS \
		74	WDX_XPI \
		75	DSX_LOCATE
44		76
45	NO_STAGE= yes	77	NO_STAGE= yes
		78
46	.include <bsd.port.pre.mk>	79	.include <bsd.port.pre.mk>
47		80
48	.if ${PORT_OPTIONS:MGTK2}	81	.if ${PORT_OPTIONS:MGTK2}
Lines 58-69 Link Here
58	BUILD_DEPENDS+= ${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt	91	BUILD_DEPENDS+= ${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
59	.endif	92	.endif
60		93
		94	.if ${PORT_OPTIONS:MWCX_UNRAR}
		95	LIB_DEPENDS+= unrar:${PORTSDIR}/archivers/libunrar
		96	.endif
		97
		98	.if ${PORT_OPTIONS:MWFX_SAMBA}
		99	LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
		100	.endif
		101
		102	.if ${PORT_OPTIONS:MWLX_MPLAYER}
		103	RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer
		104	.endif
		105
61	.if ${PORT_OPTIONS:MDEBUG}	106	.if ${PORT_OPTIONS:MDEBUG}
62	BUILD_MODE= Debug	107	BUILD_MODE= Debug
63	.else	108	.else
64	BUILD_MODE= NoDebug Full Optimizations	109	BUILD_MODE= NoDebug Full Optimizations
65	.endif	110	.endif
66		111
		112	.if ${ARCH} == "amd64" && ( ${PORT_OPTIONS:MWCX_UNRAR} \|\| ${PORT_OPTIONS:MWCX_ZIP} \|\| ${PORT_OPTIONS:MWFX_FTP} \|\| ${PORT_OPTIONS:MWFX_SAMBA} \|\| ${PORT_OPTIONS:MWLX_MPLAYER} )
		113	IGNORE= the following plugins are currently broken in amd64: wcx_unrar, wcx_zip, wfx_ftp, wfx_samba and wlx_mplayer
		114	.endif
		115
67	pre-patch:	116	pre-patch:
68	${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix	117	${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix
69	${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas	118	${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas
Lines 71-76 Link Here
71	post-patch:	120	post-patch:
72	@${REINPLACE_CMD} -e 's\|%%DOCSDIR%%\|${DOCSDIR}\|g' -e 's\|%%DATADIR%%\|${DATADIR}\|g' \	121	@${REINPLACE_CMD} -e 's\|%%DOCSDIR%%\|${DOCSDIR}\|g' -e 's\|%%DATADIR%%\|${DATADIR}\|g' \
73	${WRKSRC}/src/uGlobsPaths.pas	122	${WRKSRC}/src/uGlobsPaths.pas
		123	@${REINPLACE_CMD} -e 's\|%%LOCALBASE%%\|${LOCALBASE}\|g' \
		124	${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
74		125
75	do-build:	126	do-build:
76	.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk dcpcrypt/dcpcrypt.lpk \	127	.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk dcpcrypt/dcpcrypt.lpk \
Lines 81-86 Link Here
81	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"	132	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"
82	.endfor	133	.endfor
83		134
		135	.if ${PORT_OPTIONS:MWCX_CPIO}
		136	@cd ${WRKSRC}/plugins && \
		137	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/cpio/src/cpio.lpi"
		138	.endif
		139	.if ${PORT_OPTIONS:MWCX_DEB}
		140	@cd ${WRKSRC}/plugins && \
		141	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/deb/src/deb.lpi"
		142	.endif
		143	.if ${PORT_OPTIONS:MWCX_LZMA}
		144	@cd ${WRKSRC}/plugins && \
		145	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/lzma/src/lzma.lpi"
		146	.endif
		147	.if ${PORT_OPTIONS:MWCX_RPM}
		148	@cd ${WRKSRC}/plugins && \
		149	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/rpm/src/rpm.lpi"
		150	.endif
		151	.if ${PORT_OPTIONS:MWCX_UNRAR}
		152	@cd ${WRKSRC}/plugins && \
		153	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unrar/src/unrar.lpi"
		154	.endif
		155	.if ${PORT_OPTIONS:MWCX_ZIP}
		156	@cd ${WRKSRC}/plugins && \
		157	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi"
		158	.endif
		159
		160	.if ${PORT_OPTIONS:MWDX_RPM}
		161	@cd ${WRKSRC}/plugins && \
		162	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi"
		163	.endif
		164	.if ${PORT_OPTIONS:MWDX_DEB}
		165	@cd ${WRKSRC}/plugins && \
		166	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/deb_wdx/src/deb_wdx.lpi"
		167	.endif
		168	.if ${PORT_OPTIONS:MWDX_SVN}
		169	@cd ${WRKSRC}/plugins && \
		170	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/svn_wdx/src/svn_wdx.lpi"
		171	.endif
		172	.if ${PORT_OPTIONS:MWDX_XPI}
		173	@cd ${WRKSRC}/plugins && \
		174	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi"
		175	.endif
		176
		177	.if ${PORT_OPTIONS:MWFX_FTP}
		178	@cd ${WRKSRC}/plugins && \
		179	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/ftp/src/ftp.lpi"
		180	.endif
		181	.if ${PORT_OPTIONS:MWFX_SAMBA}
		182	@cd ${WRKSRC}/plugins && \
		183	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/samba/src/samba.lpi"
		184	.endif
		185
		186	.if ${PORT_OPTIONS:MWLX_MPLAYER}
		187	@cd ${WRKSRC}/plugins && \
		188	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wlx/WlxMplayer/src/wlxMplayer.lpi"
		189	.endif
		190
		191	.if ${PORT_OPTIONS:MDSX_LOCATE}
		192	@cd ${WRKSRC}/plugins && \
		193	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "dsx/DSXLocate/src/DSXLocate.lpi"
		194	.endif
		195
84	@cd ${WRKSRC} && \	196	@cd ${WRKSRC} && \
85	${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}	197	${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}
86		198
Lines 90-98 Link Here
90	pre-install:	202	pre-install:
91	@${RM} -f ${PLIST}	203	@${RM} -f ${PLIST}
92		204
		205	.if ${PORT_OPTIONS:MWCX_CPIO}
		206	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/cpio/cpio.wcx" >> ${PLIST}
		207	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/cpio" >> ${PLIST}
		208	.endif
		209	.if ${PORT_OPTIONS:MWCX_DEB}
		210	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/deb/deb.wcx" >> ${PLIST}
		211	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/deb" >> ${PLIST}
		212	.endif
		213	.if ${PORT_OPTIONS:MWCX_LZMA}
		214	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/lzma/lzma.wcx" >> ${PLIST}
		215	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/lzma" >> ${PLIST}
		216	.endif
		217	.if ${PORT_OPTIONS:MWCX_RPM}
		218	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/rpm/rpm.wcx" >> ${PLIST}
		219	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/rpm" >> ${PLIST}
		220	.endif
		221	.if ${PORT_OPTIONS:MWCX_UNRAR}
		222	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unrar/unrar.wcx" >> ${PLIST}
		223	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/unrar" >> ${PLIST}
		224	.endif
		225	.if ${PORT_OPTIONS:MWCX_ZIP}
		226	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/zip/zip.wcx" >> ${PLIST}
		227	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx/zip" >> ${PLIST}
		228	.endif
		229
		230	.if ${PORT_OPTIONS:MWDX_RPM}
		231	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/rpm_wdx/rpm_wdx.wdx" >> ${PLIST}
		232	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/rpm_wdx" >> ${PLIST}
		233	.endif
		234	.if ${PORT_OPTIONS:MWDX_DEB}
		235	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/deb_wdx/deb_wdx.wdx" >> ${PLIST}
		236	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/deb_wdx" >> ${PLIST}
		237	.endif
		238	.if ${PORT_OPTIONS:MWDX_SVN}
		239	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/svn_wdx/svn_wdx.wdx" >> ${PLIST}
		240	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/svn_wdx" >> ${PLIST}
		241	.endif
		242	.if ${PORT_OPTIONS:MWDX_XPI}
		243	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/xpi_wdx/xpi_wdx.wdx" >> ${PLIST}
		244	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/xpi_wdx" >> ${PLIST}
		245	.endif
		246	.if ${PORT_OPTIONS:MWDX_SCRIPTS}
		247	@cd ${WRKSRC}/plugins/wdx/scripts && \
		248	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/plugins/wdx/scripts/\|' >> ${PLIST} && \
		249	${FIND} * -type d \| ${SORT} -r \| ${SED} -e 's\|^\|@dirrm %%DATADIR%%/plugins/wdx/scripts/\|' >> ${PLIST}
		250	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx/scripts" >> ${PLIST}
		251	.endif
		252
		253	.if ${PORT_OPTIONS:MWFX_FTP}
		254	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/ftp/ftp.wfx" >> ${PLIST}
		255	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wfx/ftp" >> ${PLIST}
		256	.endif
		257	.if ${PORT_OPTIONS:MWFX_SAMBA}
		258	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/samba/samba.wfx" >> ${PLIST}
		259	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wfx/samba" >> ${PLIST}
		260	.endif
		261
		262	.if ${PORT_OPTIONS:MWLX_MPLAYER}
		263	@${ECHO_CMD} "%%DATADIR%%/plugins/wlx/wlxmplayer/wlxmplayer.wlx" >> ${PLIST}
		264	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wlx/wlxmplayer" >> ${PLIST}
		265	.endif
		266
		267	.if ${PORT_OPTIONS:MDSX_LOCATE}
		268	@${ECHO_CMD} "%%DATADIR%%/plugins/dsx/dsxlocate/dsxlocate.dsx" >> ${PLIST}
269	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/dsx/dsxlocate" >> ${PLIST}
270	.endif
271
272	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wcx" >> ${PLIST}
273	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wdx" >> ${PLIST}
274	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wfx" >> ${PLIST}
275	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/wlx" >> ${PLIST}
276	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins/dsx" >> ${PLIST}
277	@${ECHO_CMD} "@dirrm %%DATADIR%%/plugins" >> ${PLIST}
278
93	.for FILE in %%DATADIR%%/doublecmd.ext.example %%DATADIR%%/pixmaps.txt \	279	.for FILE in %%DATADIR%%/doublecmd.ext.example %%DATADIR%%/pixmaps.txt \
94	%%DATADIR%%/multiarc.ini bin/doublecmd share/applications/doublecmd.desktop \	280	%%DATADIR%%/multiarc.ini bin/doublecmd share/applications/doublecmd.desktop \
95	share/pixmaps/doublecmd.png share/pixmaps/doublecmd.xpm	281	share/pixmaps/doublecmd.png share/pixmaps/doublecmd.xpm \
		282	%%DATADIR%%/doublecmd.xml
96	@${ECHO_CMD} ${FILE} >> ${PLIST}	283	@${ECHO_CMD} ${FILE} >> ${PLIST}
97	.endfor	284	.endfor
98		285
Lines 116-121 Link Here
116	@${ECHO_CMD} "@dirrmtry share/applications" >> ${PLIST}	303	@${ECHO_CMD} "@dirrmtry share/applications" >> ${PLIST}
117		304
118	do-install:	305	do-install:
		306	@${MKDIR} ${DATADIR}/plugins
		307	@${MKDIR} ${DATADIR}/plugins/wcx
		308	@${MKDIR} ${DATADIR}/plugins/wdx
		309	@${MKDIR} ${DATADIR}/plugins/wfx
		310	@${MKDIR} ${DATADIR}/plugins/wlx
		311	@${MKDIR} ${DATADIR}/plugins/dsx
		312	.if ${PORT_OPTIONS:MWCX_CPIO}
		313	@${MKDIR} ${DATADIR}/plugins/wcx/cpio
		314	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/cpio/lib/cpio.wcx ${DATADIR}/plugins/wcx/cpio/
		315	.endif
		316	.if ${PORT_OPTIONS:MWCX_DEB}
		317	@${MKDIR} ${DATADIR}/plugins/wcx/deb
		318	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/deb/lib/deb.wcx ${DATADIR}/plugins/wcx/deb/
		319	.endif
		320	.if ${PORT_OPTIONS:MWCX_LZMA}
		321	@${MKDIR} ${DATADIR}/plugins/wcx/lzma/
		322	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/lzma/lib/lzma.wcx ${DATADIR}/plugins/wcx/lzma/
		323	.endif
		324	.if ${PORT_OPTIONS:MWCX_RPM}
		325	@${MKDIR} ${DATADIR}/plugins/wcx/rpm/
		326	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/rpm/lib/rpm.wcx ${DATADIR}/plugins/wcx/rpm/
		327	.endif
		328	.if ${PORT_OPTIONS:MWCX_UNRAR}
		329	@${MKDIR} ${DATADIR}/plugins/wcx/unrar/
		330	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unrar/lib/unrar.wcx ${DATADIR}/plugins/wcx/unrar/
		331	.endif
		332	.if ${PORT_OPTIONS:MWCX_ZIP}
		333	@${MKDIR} ${DATADIR}/plugins/wcx/zip/
		334	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/lib/zip.wcx ${DATADIR}/plugins/wcx/zip/
		335	.endif
		336
		337	.if ${PORT_OPTIONS:MWDX_RPM}
		338	@${MKDIR} ${DATADIR}/plugins/wdx/rpm_wdx/
		339	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx ${DATADIR}/plugins/wdx/rpm_wdx/
		340	.endif
		341	.if ${PORT_OPTIONS:MWDX_DEB}
		342	@${MKDIR} ${DATADIR}/plugins/wdx/deb_wdx/
		343	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/deb_wdx/lib/deb_wdx.wdx ${DATADIR}/plugins/wdx/deb_wdx/
		344	.endif
		345	.if ${PORT_OPTIONS:MWDX_SVN}
		346	@${MKDIR} ${DATADIR}/plugins/wdx/svn_wdx/
		347	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/svn_wdx/lib/svn_wdx.wdx ${DATADIR}/plugins/wdx/svn_wdx/
		348	.endif
		349	.if ${PORT_OPTIONS:MWDX_XPI}
		350	@${MKDIR} ${DATADIR}/plugins/wdx/xpi_wdx/
		351	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/xpi_wdx/lib/xpi_wdx.wdx ${DATADIR}/plugins/wdx/xpi_wdx/
		352	.endif
		353	.if ${PORT_OPTIONS:MWDX_SCRIPTS}
		354	@${MKDIR} ${DATADIR}/plugins/wdx/scripts/
		355	${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${DATADIR}/plugins/wdx/scripts/
		356	.endif
		357
		358	.if ${PORT_OPTIONS:MWFX_FTP}
		359	@${MKDIR} ${DATADIR}/plugins/wfx/ftp/
		360	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/lib/ftp.wfx ${DATADIR}/plugins/wfx/ftp/
		361	.endif
		362	.if ${PORT_OPTIONS:MWFX_SAMBA}
		363	@${MKDIR} ${DATADIR}/plugins/wfx/samba/
		364	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/samba/lib/samba.wfx ${DATADIR}/plugins/wfx/samba/
		365	.endif
		366
		367	.if ${PORT_OPTIONS:MWLX_MPLAYER}
		368	@${MKDIR} ${DATADIR}/plugins/wlx/wlxmplayer/
		369	${INSTALL_LIB} ${WRKSRC}/plugins/wlx/WlxMplayer/lib/wlxmplayer.wlx ${DATADIR}/plugins/wlx/wlxmplayer/
370	.endif
371
372	.if ${PORT_OPTIONS:MDSX_LOCATE}
373	@${MKDIR} ${DATADIR}/plugins/dsx/dsxlocate/
374	${INSTALL_LIB} ${WRKSRC}/plugins/dsx/DSXLocate/lib/dsxlocate.dsx ${DATADIR}/plugins/dsx/dsxlocate/
375	.endif
376
119	.for DIRE in language pixmaps sdk	377	.for DIRE in language pixmaps sdk
120	@${MKDIR} ${DATADIR}/${DIRE}	378	@${MKDIR} ${DATADIR}/${DIRE}
121	@cd ${WRKSRC}/${DIRE} && \	379	@cd ${WRKSRC}/${DIRE} && \
Lines 123-129 Link Here
123	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/${DIRE}/{}" \;	381	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/${DIRE}/{}" \;
124	.endfor	382	.endfor
125		383
126	.for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini	384	.for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini install/linux/doublecmd.xml
127	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}	385	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}
128	.endfor	386	.endfor
129		387

Lines 1-16 Link Here

(-)./files/patch-components__doublecmd__dcosutils.pas (-16 lines)
1	--- ./components/doublecmd/dcosutils.pas.orig 2013-06-30 21:33:09.530448529 +0200
2	+++ ./components/doublecmd/dcosutils.pas 2013-06-30 21:33:24.841789000 +0200
3	@@ -184,11 +184,11 @@
4	Windows, JwaWinNetWk;
5	{$ENDIF}
6	{$IF DEFINED(UNIX)}
7	- {$IF DEFINED(DARWIN)}
8	+ {$IF DEFINED(BSD)}
9	{$DEFINE FPC_USE_LIBC}
10	{$ENDIF}
11	uses
12	- {$IF NOT DEFINED(FPC_USE_LIBC)}
13	+ {$IF (NOT DEFINED(FPC_USE_LIBC)) OR (DEFINED(BSD) AND NOT DEFINED(DARWIN))}
14	SysCall,
15	{$ENDIF}
16	BaseUnix, Unix, dl, DCStrUtils;

Lines 1-14 Link Here

(-)./files/patch-src__ucmdlineparams.pas (-14 lines)
1	--- ./src/ucmdlineparams.pas.orig 2013-06-08 17:54:12.000000000 +0200
2	+++ ./src/ucmdlineparams.pas 2013-06-30 21:42:23.609940000 +0200
3	@@ -20,10 +20,7 @@
4	implementation
5
6	uses
7	- {$IF DEFINED(NIGHTLY_BUILD)}
8	- uOSUtils,
9	- {$ENDIF}
10	- Forms, Dialogs, SysUtils, uDCUtils, uGlobsPaths, getopts, uDebug, uLng;
11	+ uOSUtils, Forms, Dialogs, SysUtils, uDCUtils, uGlobsPaths, getopts, uDebug, uLng;
12
13	procedure ProcessCommandLineParams;
14	var