From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 19 14:11:31 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 764C5257;
 Thu, 19 Dec 2013 14:11:31 +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 483441469;
 Thu, 19 Dec 2013 14:11:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBJEBVrh052448;
 Thu, 19 Dec 2013 14:11:31 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBJEBVSH052447;
 Thu, 19 Dec 2013 14:11:31 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312191411.rBJEBVSH052447@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 19 Dec 2013 14:11:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r336914 - in branches/2014Q1/ftp/multiget: . files
X-SVN-Group: ports-branches
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Dec 2013 14:11:31 -0000

Author: bapt
Date: Thu Dec 19 14:11:30 2013
New Revision: 336914
URL: http://svnweb.freebsd.org/changeset/ports/336914

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

Added:
  branches/2014Q1/ftp/multiget/files/
     - copied from r336908, head/ftp/multiget/files/
Modified:
  branches/2014Q1/ftp/multiget/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/ftp/multiget/Makefile
==============================================================================
--- branches/2014Q1/ftp/multiget/Makefile	Thu Dec 19 14:10:15 2013	(r336913)
+++ branches/2014Q1/ftp/multiget/Makefile	Thu Dec 19 14:11:30 2013	(r336914)
@@ -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>