Attachment #189229 for bug #224736

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




# $FreeBSD$

PORTNAME=	doublecmd
PORTVERSION=	0.8.1
PORTREVISION=	5
CATEGORIES=	x11-fm
MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
DISTNAME=	${PORTNAME}-${PORTVERSION}-src


LICENSE=	GPLv2

ONLY_FOR_ARCHS=	amd64 i386

BUILD_DEPENDS=	lazbuild:editors/lazarus \
		fpcres:lang/fpc-utils

ONLY_FOR_ARCHS=	i386 amd64

PORTDOCS=	*

USES=		dos2unix desktop-file-utils
USE_FPC=	cairo fcl-base fcl-db fcl-image fcl-json fcl-registry \
		fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr
USE_XORG=	x11
DOS2UNIX_FILES=	src/dmhelpmanager.pas


			WCX_UNBZ2 \
			WCX_UNRAR \
			WCX_ZIP
OPTIONS_GROUP_WDX=	WDX_AUDIOINFO \
			WDX_RPM \
			WDX_DEB \
			WDX_SVN \
			WDX_XPI \
			WDX_SCRIPTS \
			WDX_TEXTLINE
OPTIONS_GROUP_WFX=	WFX_FTP \
			WFX_SAMBA
OPTIONS_GROUP_WLX=	WLX_MPLAYER

WCX_ZIP_DESC=	ZIP format support

WDX_DESC=	Plugins to display and search extended file attributes
WDX_AUDIOINFO_DESC=	Information about audio files
WDX_DEB_DESC=	Debian package file information
WDX_RPM_DESC=	Red Hat package file information
WDX_SCRIPTS_DESC=	Add support to use custom Lua scripts
WDX_SVN_DESC=	Subversion repository information
WDX_XPI_DESC=	Mozilla plugin file information
WDX_TEXTLINE_DESC=	Show and replace single lines in text files

WFX_DESC=	File system plugins
WFX_FTP_DESC=	FTP protocol support

			WCX_RPM \
			WCX_UNRAR \
			WCX_ZIP \
			WDX_AUDIOINFO \
			WDX_RPM \
			WDX_DEB \
			WDX_SVN \
			WDX_SCRIPTS \
			WDX_TEXTLINE \
			WDX_XPI \
			WFX_FTP \
			WFX_SAMBA \


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

LCL_PLATFORM=	gtk2
USE_GNOME+=	cairo gdkpixbuf2
.elif ${PORT_OPTIONS:MQT4}
BROKEN=		Does not build
LCL_PLATFORM=	qt
.endif


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

		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "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"
.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"

	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "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"
.endif

.if ${PORT_OPTIONS:MWFX_FTP}
	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \

	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/zip/zip.wcx" >> ${PLIST}
.endif

.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/audioinfo/audioinfo.wdx" >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWDX_RPM}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/rpm_wdx/rpm_wdx.wdx" >> ${PLIST}
.endif

	@cd ${WRKSRC}/plugins/wdx/scripts && \
		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/plugins/wdx/scripts/|' >> ${PLIST}
.endif
.if ${PORT_OPTIONS:MWDX_TEXTLINE}
	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/textline/textline.wdx" >> ${PLIST}
.endif

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


	@cd ${WRKSRC}/pixmaps && \
		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/pixmaps/|' >> ${PLIST}
	@${ECHO_CMD} "@dir %%DATADIR%%/pixmaps/dctheme/20x20/apps" >> ${PLIST}

	@cd ${WRKSRC}/sdk && \
		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/sdk/|' >> ${PLIST}

.endif
.if ${PORT_OPTIONS:MWCX_ZIP}
	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/zip.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
.endif

.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/audioinfo/audioinfo.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
.endif
.if ${PORT_OPTIONS:MWDX_RPM}
	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/
	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/

	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
	${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
.endif
.if ${PORT_OPTIONS:MWDX_TEXTLINE}
	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/textline/textline.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
.endif

.if ${PORT_OPTIONS:MWFX_FTP}
	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1487956233	1	TIMESTAMP = 1514048041
2	SHA256 (doublecmd-0.7.8-src.tar.gz) = 5249557df3715588f379292258b937e37a097bf584602711bc211dfd6427e9a3	2	SHA256 (doublecmd-0.8.1-src.tar.gz) = 7d6e26460b1e57c0af4b26f6fab0c9a38287672f8d5d92d84e2dc5d0e25e75a8
3	SIZE (doublecmd-0.7.8-src.tar.gz) = 6784400	3	SIZE (doublecmd-0.8.1-src.tar.gz) = 7566344
4	SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39	4	SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
5	SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996	5	SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996

Line 0 Link Here

(-)files/patch-src_platform_udefaultplugins.pas (+11 lines)
	1	--- src/platform/udefaultplugins.pas.orig 2017-02-11 15:03:56 UTC
	2	+++ src/platform/udefaultplugins.pas
	3	@@ -287,7 +287,7 @@ begin
	4
	5	if gWdxPlugins.IndexOfName('audioinfo') < 0 then
	6	begin
	7	- gWdxPlugins.Add(GetCmdDirFromEnvVar(Folder) + 'audioinfo' + PathDelim + 'audioinfo.wdx');
	8	+ gWdxPlugins.Add(Folder + 'audioinfo' + PathDelim + 'audioinfo.wdx');
	9	end;
	10
	11	// Wfx plugins




--- src/uGlobsPaths.pas.orig	2017-12-11 10:45:31 UTC
+++ src/uGlobsPaths.pas
@@ -3,7 +3,7 @@ unit uGlobsPaths;
 interface
 
 var

   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
@@ -11,6 +11,7 @@ var
   gpPixmapPath : String = '';  // path to pixmaps
   gpHighPath : String = ''; // editor highlighter directory
   gpThumbCacheDir : String = ''; // thumbnails cache directory
+  gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files
 
 //Global Configuration Filename
 const
@@ -37,7 +38,7 @@ end;
 procedure LoadPaths;
 begin
   OnGetApplicationName := @GetAppName;

Return to bug 224736

Lines 2-9 Link Here

(-)Makefile (-10 / +38 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doublecmd	4	PORTNAME= doublecmd
5	PORTVERSION= 0.7.8	5	PORTVERSION= 0.8.1
6	PORTREVISION= 5
7	CATEGORIES= x11-fm	6	CATEGORIES= x11-fm
8	MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source	7	MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source
9	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	8	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
Lines 14-29 Link Here
14		13
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16		15
		16	ONLY_FOR_ARCHS= amd64 i386
		17
17	BUILD_DEPENDS= lazbuild:editors/lazarus \	18	BUILD_DEPENDS= lazbuild:editors/lazarus \
18	fpcres:lang/fpc-utils	19	fpcres:lang/fpc-utils
19		20
20	ONLY_FOR_ARCHS= i386 amd64
21
22	PORTDOCS= *	21	PORTDOCS= *
23		22
24	USES= dos2unix desktop-file-utils	23	USES= dos2unix desktop-file-utils
25	USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-registry \	24	USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-registry \
26	fcl-xml iconvenc pasjpeg rtl-extra x11	25	fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr
27	USE_XORG= x11	26	USE_XORG= x11
28	DOS2UNIX_FILES= src/dmhelpmanager.pas	27	DOS2UNIX_FILES= src/dmhelpmanager.pas
29		28
Lines 49-59 Link Here
49	WCX_UNBZ2 \	48	WCX_UNBZ2 \
50	WCX_UNRAR \	49	WCX_UNRAR \
51	WCX_ZIP	50	WCX_ZIP
52	OPTIONS_GROUP_WDX= WDX_RPM \	51	OPTIONS_GROUP_WDX= WDX_AUDIOINFO \
		52	WDX_RPM \
53	WDX_DEB \	53	WDX_DEB \
54	WDX_SVN \	54	WDX_SVN \
55	WDX_XPI \	55	WDX_XPI \
56	WDX_SCRIPTS	56	WDX_SCRIPTS \
		57	WDX_TEXTLINE
57	OPTIONS_GROUP_WFX= WFX_FTP \	58	OPTIONS_GROUP_WFX= WFX_FTP \
58	WFX_SAMBA	59	WFX_SAMBA
59	OPTIONS_GROUP_WLX= WLX_MPLAYER	60	OPTIONS_GROUP_WLX= WLX_MPLAYER
Lines 68-78 Link Here
68	WCX_ZIP_DESC= ZIP format support	69	WCX_ZIP_DESC= ZIP format support
69		70
70	WDX_DESC= Plugins to display and search extended file attributes	71	WDX_DESC= Plugins to display and search extended file attributes
		72	WDX_AUDIOINFO_DESC= Information about audio files
71	WDX_DEB_DESC= Debian package file information	73	WDX_DEB_DESC= Debian package file information
72	WDX_RPM_DESC= Red Hat package file information	74	WDX_RPM_DESC= Red Hat package file information
73	WDX_SCRIPTS_DESC= Add support to use custom Lua scripts	75	WDX_SCRIPTS_DESC= Add support to use custom Lua scripts
74	WDX_SVN_DESC= Subversion repository information	76	WDX_SVN_DESC= Subversion repository information
75	WDX_XPI_DESC= Mozilla plugin file information	77	WDX_XPI_DESC= Mozilla plugin file information
		78	WDX_TEXTLINE_DESC= Show and replace single lines in text files
76		79
77	WFX_DESC= File system plugins	80	WFX_DESC= File system plugins
78	WFX_FTP_DESC= FTP protocol support	81	WFX_FTP_DESC= FTP protocol support
Lines 90-99 Link Here
90	WCX_RPM \	93	WCX_RPM \
91	WCX_UNRAR \	94	WCX_UNRAR \
92	WCX_ZIP \	95	WCX_ZIP \
		96	WDX_AUDIOINFO \
93	WDX_RPM \	97	WDX_RPM \
94	WDX_DEB \	98	WDX_DEB \
95	WDX_SVN \	99	WDX_SVN \
96	WDX_SCRIPTS \	100	WDX_SCRIPTS \
		101	WDX_TEXTLINE \
97	WDX_XPI \	102	WDX_XPI \
98	WFX_FTP \	103	WFX_FTP \
99	WFX_SAMBA \	104	WFX_SAMBA \
Lines 104-109 Link Here
104		109
105	QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas	110	QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas
106	QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt	111	QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
		112	QT4_BROKEN= Does not build
107		113
108	WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar5	114	WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar5
109	WFX_SAMBA_USES= samba:lib	115	WFX_SAMBA_USES= samba:lib
Lines 115-121 Link Here
115	LCL_PLATFORM= gtk2	121	LCL_PLATFORM= gtk2
116	USE_GNOME+= cairo gdkpixbuf2	122	USE_GNOME+= cairo gdkpixbuf2
117	.elif ${PORT_OPTIONS:MQT4}	123	.elif ${PORT_OPTIONS:MQT4}
118	BROKEN= Does not build
119	LCL_PLATFORM= qt	124	LCL_PLATFORM= qt
120	.endif	125	.endif
121		126
Lines 142-148 Link Here
142	do-build:	147	do-build:
143	.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk multithreadprocs/multithreadprocslaz.lpk \	148	.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk multithreadprocs/multithreadprocslaz.lpk \
144	dcpcrypt/dcpcrypt.lpk doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \	149	dcpcrypt/dcpcrypt.lpk doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \
145	viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk	150	viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk synunihighlighter/synuni.lpk
146	@cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \	151	@cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \
147	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"	152	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"
148	.endfor	153	.endfor
Lines 172-177 Link Here
172	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi"	177	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi"
173	.endif	178	.endif
174		179
		180	.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
		181	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
		182	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/audioinfo/src/AudioInfo.lpi"
		183	.endif
175	.if ${PORT_OPTIONS:MWDX_RPM}	184	.if ${PORT_OPTIONS:MWDX_RPM}
176	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \	185	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
177	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi"	186	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi"
Lines 188-193 Link Here
188	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \	197	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
189	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi"	198	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi"
190	.endif	199	.endif
		200	.if ${PORT_OPTIONS:MWDX_TEXTLINE}
		201	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
		202	${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/textline/src/TextLine.lpi"
		203	.endif
191		204
192	.if ${PORT_OPTIONS:MWFX_FTP}	205	.if ${PORT_OPTIONS:MWFX_FTP}
193	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \	206	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
Lines 242-247 Link Here
242	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/zip/zip.wcx" >> ${PLIST}	255	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/zip/zip.wcx" >> ${PLIST}
243	.endif	256	.endif
244		257
		258	.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
		259	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/audioinfo/audioinfo.wdx" >> ${PLIST}
		260	.endif
245	.if ${PORT_OPTIONS:MWDX_RPM}	261	.if ${PORT_OPTIONS:MWDX_RPM}
246	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/rpm_wdx/rpm_wdx.wdx" >> ${PLIST}	262	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/rpm_wdx/rpm_wdx.wdx" >> ${PLIST}
247	.endif	263	.endif
Lines 258-263 Link Here
258	@cd ${WRKSRC}/plugins/wdx/scripts && \	274	@cd ${WRKSRC}/plugins/wdx/scripts && \
259	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/plugins/wdx/scripts/\|' >> ${PLIST}	275	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/plugins/wdx/scripts/\|' >> ${PLIST}
260	.endif	276	.endif
		277	.if ${PORT_OPTIONS:MWDX_TEXTLINE}
		278	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/textline/textline.wdx" >> ${PLIST}
		279	.endif
261		280
262	.if ${PORT_OPTIONS:MWFX_FTP}	281	.if ${PORT_OPTIONS:MWFX_FTP}
263	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/ftp/ftp.wfx" >> ${PLIST}	282	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/ftp/ftp.wfx" >> ${PLIST}
Lines 286-291 Link Here
286		305
287	@cd ${WRKSRC}/pixmaps && \	306	@cd ${WRKSRC}/pixmaps && \
288	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/pixmaps/\|' >> ${PLIST}	307	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/pixmaps/\|' >> ${PLIST}
		308	@${ECHO_CMD} "@dir %%DATADIR%%/pixmaps/dctheme/20x20/apps" >> ${PLIST}
289		309
290	@cd ${WRKSRC}/sdk && \	310	@cd ${WRKSRC}/sdk && \
291	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/sdk/\|' >> ${PLIST}	311	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/sdk/\|' >> ${PLIST}
Lines 320-328 Link Here
320	.endif	340	.endif
321	.if ${PORT_OPTIONS:MWCX_ZIP}	341	.if ${PORT_OPTIONS:MWCX_ZIP}
322	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/zip/	342	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
323	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/lib/zip.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/zip/	343	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/zip.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
324	.endif	344	.endif
325		345
		346	.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
		347	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
		348	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/audioinfo/audioinfo.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
		349	.endif
326	.if ${PORT_OPTIONS:MWDX_RPM}	350	.if ${PORT_OPTIONS:MWDX_RPM}
327	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/	351	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/
328	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/	352	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/
Lines 343-348 Link Here
343	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/	367	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
344	${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/	368	${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
345	.endif	369	.endif
		370	.if ${PORT_OPTIONS:MWDX_TEXTLINE}
		371	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
		372	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/textline/textline.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
		373	.endif
346		374
347	.if ${PORT_OPTIONS:MWFX_FTP}	375	.if ${PORT_OPTIONS:MWFX_FTP}
348	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/	376	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/

Lines 1-6 Link Here

(-)files/patch-src_uGlobsPaths.pas (-5 / +6 lines)
1	--- src/uGlobsPaths.pas.orig 2016-01-13 13:34:19 UTC	1	--- src/uGlobsPaths.pas.orig 2017-12-11 10:45:31 UTC
2	+++ src/uGlobsPaths.pas	2	+++ src/uGlobsPaths.pas
3	@@ -3,13 +3,14 @@ unit uGlobsPaths;	3	@@ -3,7 +3,7 @@ unit uGlobsPaths;
4	interface	4	interface
5		5
6	var	6	var
Lines 9-22 Link Here
9	gpCfgDir : String = ''; // directory from which configuration files are used	9	gpCfgDir : String = ''; // directory from which configuration files are used
10	gpGlobalCfgDir : String = ''; // config dir global for all user	10	gpGlobalCfgDir : String = ''; // config dir global for all user
11	gpCmdLineCfgDir : String = ''; // config dir passed on the command line	11	gpCmdLineCfgDir : String = ''; // config dir passed on the command line
12	gpLngDir : String = ''; // path to language *.po files	12	@@ -11,6 +11,7 @@ var
13	gpPixmapPath : String = ''; // path to pixmaps	13	gpPixmapPath : String = ''; // path to pixmaps
14	gpCacheDir : String = ''; // cache directory	14	gpHighPath : String = ''; // editor highlighter directory
		15	gpThumbCacheDir : String = ''; // thumbnails cache directory
15	+ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files	16	+ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files
16		17
17	//Global Configuration Filename	18	//Global Configuration Filename
18	const	19	const
19	@@ -36,7 +37,7 @@ end;	20	@@ -37,7 +38,7 @@ end;
20	procedure LoadPaths;	21	procedure LoadPaths;
21	begin	22	begin
22	OnGetApplicationName := @GetAppName;	23	OnGetApplicationName := @GetAppName;