From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 16 18:10:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2786767F for ; Mon, 16 Dec 2013 18:10:02 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 06C091907 for ; Mon, 16 Dec 2013 18:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGIA1Rp015804 for ; Mon, 16 Dec 2013 18:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBGIA1Fg015803; Mon, 16 Dec 2013 18:10:01 GMT (envelope-from gnats) Resent-Date: Mon, 16 Dec 2013 18:10:01 GMT Resent-Message-Id: <201312161810.rBGIA1Fg015803@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru 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 808C1389 for ; Mon, 16 Dec 2013 18:02:15 +0000 (UTC) Received: from omta02.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67]) by mx1.freebsd.org (Postfix) with ESMTP id 55115185D for ; Mon, 16 Dec 2013 18:02:15 +0000 (UTC) Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106]) by omta02.auone-net.jp (au one net mail) with ESMTP id 90CB2156001E for ; Tue, 17 Dec 2013 03:02:13 +0900 (JST) Message-Id: <20131217024757.875789d9cb9c227678d3c07f@yahoo.com> Date: Tue, 17 Dec 2013 02:47:57 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184814: ftp/multiget: Fix build with clang X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:10:02 -0000 >Number: 184814 >Category: ports >Synopsis: ftp/multiget: Fix build with clang >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 16 18:10:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Fix build with clang - Add DESKTOP_ENTRIES New file: files/patch-common.cpp files/patch-mgftpbase.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/ftp/multiget/Makefile ftp/multiget/Makefile --- /usr/ports/ftp/multiget/Makefile 2013-11-06 21:49:12.000000000 +0900 +++ ftp/multiget/Makefile 2013-12-17 00:00:00.000000000 +0900 @@ -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 diff -urN /usr/ports/ftp/multiget/files/patch-common.cpp ftp/multiget/files/patch-common.cpp --- /usr/ports/ftp/multiget/files/patch-common.cpp 1970-01-01 09:00:00.000000000 +0900 +++ ftp/multiget/files/patch-common.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -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 ++ + #include "common.h" + #include "speedctrl.h" + #include "mirroradmin.h" diff -urN /usr/ports/ftp/multiget/files/patch-mgftpbase.cpp ftp/multiget/files/patch-mgftpbase.cpp --- /usr/ports/ftp/multiget/files/patch-mgftpbase.cpp 1970-01-01 09:00:00.000000000 +0900 +++ ftp/multiget/files/patch-mgftpbase.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -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 ++ + #ifdef WIN32 + #include + #endif >Release-Note: >Audit-Trail: >Unformatted: