From owner-svn-ports-head@FreeBSD.ORG  Thu Dec 19 14:02:51 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CD95EA4E;
 Thu, 19 Dec 2013 14:02:51 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AE2DF1357;
 Thu, 19 Dec 2013 14:02:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJE2pSv047360;
 Thu, 19 Dec 2013 14:02:51 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJE2p8I047356;
 Thu, 19 Dec 2013 14:02:51 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201312191402.rBJE2p8I047356@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 19 Dec 2013 14:02:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336908 - in head/ftp/multiget: . 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Dec 2013 14:02:52 -0000

Author: pawel
Date: Thu Dec 19 14:02:50 2013
New Revision: 336908
URL: http://svnweb.freebsd.org/changeset/ports/336908

Log:
  - Fix build with clang
  - Add desktop entry file
  - Support staging
  
  PR:		ports/184814
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/ftp/multiget/files/
  head/ftp/multiget/files/patch-common.cpp   (contents, props changed)
  head/ftp/multiget/files/patch-mgftpbase.cpp   (contents, props changed)
Modified:
  head/ftp/multiget/Makefile   (contents, props changed)

Modified: head/ftp/multiget/Makefile
==============================================================================
--- head/ftp/multiget/Makefile	Thu Dec 19 13:53:30 2013	(r336907)
+++ head/ftp/multiget/Makefile	Thu Dec 19 14:02:50 2013	(r336908)
@@ -3,29 +3,40 @@
 
 PORTNAME=	multiget
 PORTVERSION=	1.1.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	ftp www
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An http/ftp downloader with a nice GUI
+COMMENT=	HTTP/FTP downloader with a nice GUI
 
+WRKSRC_SUBDIR=	src
+
+USES=		dos2unix
 USE_WX=		2.6+
 MAKEFILE=	makefile
 ALL_TARGET=	MultiGet
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} share/pixmaps/MultiGet.png
+
+DESKTOP_ENTRIES="MultiGet" "" "${PREFIX}/share/pixmaps/MultiGet.png" \
+		"${PORTNAME}" "" ""
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|g++|${CXX}|; \
-		 s|\(CFLAGS\) =|\1 +=|; \
-		 s|wx-config|${WX_CONFIG}|' \
+		's|$$(CC)|$$(CXX)| ; \
+		 s|$$(CFLAGS)|$$(CXXFLAGS)| ; \
+		 s|^CC =|CXX ?=| ; \
+		 s|^CFLAGS =|CXXFLAGS +=| ; \
+		 s| -O2 | | ; \
+		 s| -s | | ; \
+		 s|wx-config|$${WX_CONFIG}|' \
 		 ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/MultiGet ${PREFIX}/bin/${PORTNAME}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} MultiGet \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME})
+	(cd ${WRKSRC}/.. && ${INSTALL_DATA} MultiGet.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps)
 
 .include <bsd.port.mk>

Added: head/ftp/multiget/files/patch-common.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/multiget/files/patch-common.cpp	Thu Dec 19 14:02:50 2013	(r336908)
@@ -0,0 +1,11 @@
+--- common.cpp.orig
++++ common.cpp
+@@ -22,6 +22,8 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include <cstdlib>
++
+ #include "common.h"
+ #include "speedctrl.h"
+ #include "mirroradmin.h"

Added: head/ftp/multiget/files/patch-mgftpbase.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/multiget/files/patch-mgftpbase.cpp	Thu Dec 19 14:02:50 2013	(r336908)
@@ -0,0 +1,11 @@
+--- mgftpbase.cpp.orig
++++ mgftpbase.cpp
+@@ -22,6 +22,8 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include <cstdlib>
++
+ #ifdef WIN32
+ #include <winsock2.h>
+ #endif