From owner-svn-ports-all@FreeBSD.ORG Sun Mar 22 19:33:10 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52D38D4C; Sun, 22 Mar 2015 19:33:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3BB63A4F; Sun, 22 Mar 2015 19:33:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MJXAXe071718; Sun, 22 Mar 2015 19:33:10 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MJX929071715; Sun, 22 Mar 2015 19:33:09 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201503221933.t2MJX929071715@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 22 Mar 2015 19:33:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381949 - in head/x11-fm/doublecmd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2015 19:33:10 -0000 Author: riggs Date: Sun Mar 22 19:33:08 2015 New Revision: 381949 URL: https://svnweb.freebsd.org/changeset/ports/381949 QAT: https://qat.redports.org/buildarchive/r381949/ Log: Update to upstream version 0.6.0 PR: 198439 Submitted by: bbtruk@users.sourceforge.net (maintainer) Added: head/x11-fm/doublecmd/files/patch-src_platform_uosforms.pas (contents, props changed) Modified: head/x11-fm/doublecmd/Makefile head/x11-fm/doublecmd/distinfo Modified: head/x11-fm/doublecmd/Makefile ============================================================================== --- head/x11-fm/doublecmd/Makefile Sun Mar 22 19:21:43 2015 (r381948) +++ head/x11-fm/doublecmd/Makefile Sun Mar 22 19:33:08 2015 (r381949) @@ -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/ Modified: head/x11-fm/doublecmd/distinfo ============================================================================== --- head/x11-fm/doublecmd/distinfo Sun Mar 22 19:21:43 2015 (r381948) +++ head/x11-fm/doublecmd/distinfo Sun Mar 22 19:33:08 2015 (r381949) @@ -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 Added: head/x11-fm/doublecmd/files/patch-src_platform_uosforms.pas ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/doublecmd/files/patch-src_platform_uosforms.pas Sun Mar 22 19:33:08 2015 (r381949) @@ -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