From tkato432@yahoo.com  Mon Dec 16 18:05:35 2013
Return-Path: <tkato432@yahoo.com>
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 5EDDE3C2
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:04:31 +0000 (UTC)
Received: from omta03.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145])
	by mx1.freebsd.org (Postfix) with ESMTP id 33BDE1886
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 16 Dec 2013 18:04:31 +0000 (UTC)
Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106])
	by omta03.auone-net.jp (au one net mail) with ESMTP id 831941880004
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 17 Dec 2013 03:04:29 +0900 (JST)
Message-Id: <20131217024936.3e530f831f5effefbdc3cf92@yahoo.com>
Date: Tue, 17 Dec 2013 02:49:36 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/gtimelapse: Fix build with clang

>Number:         184874
>Category:       ports
>Synopsis:       graphics/gtimelapse: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 18:10:20 UTC 2013
>Closed-Date:    Fri Dec 20 18:34:29 UTC 2013
>Last-Modified:  Fri Dec 20 18:50:04 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add DESKTOP_ENTRIES

New file:
files/patch-src__gtimelapse.cpp

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/gtimelapse/Makefile graphics/gtimelapse/Makefile
--- /usr/ports/graphics/gtimelapse/Makefile	2013-11-06 22:02:09.000000000 +0900
+++ graphics/gtimelapse/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -8,19 +8,23 @@
 MASTER_SITES=	SF/${PORTNAME}/Relase	# yes, this is not a typo (here)
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An application for capturing images to generate timelapse videos
+COMMENT=	Application for capturing images to generate timelapse videos
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
 USES=		pkgconfig
 USE_WX=		2.8+
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WX_CONF_ARGS=	absolute
+USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
+LIBTOOLIZE_ARGS=--copy --force
+AUTOMAKE_ARGS=	--add-missing --copy
 
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
+DESKTOP_ENTRIES="gTimelapse" "" "" "${PORTNAME}" "Graphics;GTK;" ""
+
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/gtimelapse/files/patch-src__gtimelapse.cpp graphics/gtimelapse/files/patch-src__gtimelapse.cpp
--- /usr/ports/graphics/gtimelapse/files/patch-src__gtimelapse.cpp	1970-01-01 09:00:00.000000000 +0900
+++ graphics/gtimelapse/files/patch-src__gtimelapse.cpp	2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,25 @@
+--- src/gtimelapse.cpp.orig
++++ src/gtimelapse.cpp
+@@ -155,7 +155,11 @@
+ 					//cout << "type: RADIO" << endl;
+ 					//cout << "current: " << current << endl;
+ 
++#ifdef __clang__
++					wxString *choices = new wxString[cnt];
++#else
+ 					wxString choices[cnt];
++#endif
+ 					
+ 					for ( i=0; i<cnt; i++) {
+ 						const char *choice;
+@@ -165,6 +169,10 @@
+ 						choices[i] = mystring;
+ 					}
+ 			
++#ifdef __clang__
++					delete [] choices;
++#endif
++
+ 					wxString title(label, wxConvUTF8);
+ 					wxString default_choice(current, wxConvUTF8);
+ 					wxString choice_label(uselabel, wxConvUTF8);
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Fri Dec 20 18:25:22 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184874 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Fri Dec 20 18:34:29 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184874 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184874: commit references a PR
Date: Fri, 20 Dec 2013 18:34:27 +0000 (UTC)

 Author: pawel
 Date: Fri Dec 20 18:34:20 2013
 New Revision: 337065
 URL: http://svnweb.freebsd.org/changeset/ports/337065
 
 Log:
   - Fix build with clang
   - Add DESKTOP_ENTRIES
   - Port supports staging
   
   PR:		ports/184874
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
 
 Added:
   head/graphics/gtimelapse/files/
   head/graphics/gtimelapse/files/patch-src__gtimelapse.cpp   (contents, props changed)
 Modified:
   head/graphics/gtimelapse/Makefile   (contents, props changed)
 
 Modified: head/graphics/gtimelapse/Makefile
 ==============================================================================
 --- head/graphics/gtimelapse/Makefile	Fri Dec 20 18:30:53 2013	(r337064)
 +++ head/graphics/gtimelapse/Makefile	Fri Dec 20 18:34:20 2013	(r337065)
 @@ -3,24 +3,28 @@
  
  PORTNAME=	gtimelapse
  DISTVERSION=	0.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/${PORTNAME}/Relase	# yes, this is not a typo (here)
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	An application for capturing images to generate timelapse videos
 +COMMENT=	Application for capturing images to generate timelapse videos
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +WRKSRC=		${WRKDIR}/${PORTNAME}
  
 -GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
  USES=		pkgconfig
  USE_WX=		2.8+
 -WRKSRC=		${WRKDIR}/${PORTNAME}
 +WX_CONF_ARGS=	absolute
 +USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
 +LIBTOOLIZE_ARGS=--copy --force
 +AUTOMAKE_ARGS=	--add-missing --copy
  
  PLIST_FILES=	bin/${PORTNAME}
  
 -NO_STAGE=	yes
 +DESKTOP_ENTRIES="gTimelapse" "" "" "${PORTNAME}" "Graphics;GTK;" ""
 +
  .include <bsd.port.mk>
 
 Added: head/graphics/gtimelapse/files/patch-src__gtimelapse.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/gtimelapse/files/patch-src__gtimelapse.cpp	Fri Dec 20 18:34:20 2013	(r337065)
 @@ -0,0 +1,25 @@
 +--- src/gtimelapse.cpp.orig
 ++++ src/gtimelapse.cpp
 +@@ -155,7 +155,11 @@
 + 					//cout << "type: RADIO" << endl;
 + 					//cout << "current: " << current << endl;
 + 
 ++#ifdef __clang__
 ++					wxString *choices = new wxString[cnt];
 ++#else
 + 					wxString choices[cnt];
 ++#endif
 + 					
 + 					for ( i=0; i<cnt; i++) {
 + 						const char *choice;
 +@@ -165,6 +169,10 @@
 + 						choices[i] = mystring;
 + 					}
 + 			
 ++#ifdef __clang__
 ++					delete [] choices;
 ++#endif
 ++
 + 					wxString title(label, wxConvUTF8);
 + 					wxString default_choice(current, wxConvUTF8);
 + 					wxString choice_label(uselabel, wxConvUTF8);
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184874: commit references a PR
Date: Fri, 20 Dec 2013 18:43:25 +0000 (UTC)

 Author: mat
 Date: Fri Dec 20 18:43:17 2013
 New Revision: 337068
 URL: http://svnweb.freebsd.org/changeset/ports/337068
 
 Log:
   MFH: r337065
   
   - Fix build with clang
   - Add DESKTOP_ENTRIES
   - Port supports staging
   
   PR:		ports/184874
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
   Approved by:	portmgr (implicit)
 
 Added:
   branches/2014Q1/graphics/gtimelapse/files/
      - copied from r337065, head/graphics/gtimelapse/files/
 Modified:
   branches/2014Q1/graphics/gtimelapse/Makefile   (contents, props changed)
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/graphics/gtimelapse/Makefile
 ==============================================================================
 --- branches/2014Q1/graphics/gtimelapse/Makefile	Fri Dec 20 18:41:56 2013	(r337067)
 +++ branches/2014Q1/graphics/gtimelapse/Makefile	Fri Dec 20 18:43:17 2013	(r337068)
 @@ -3,24 +3,28 @@
  
  PORTNAME=	gtimelapse
  DISTVERSION=	0.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	graphics
  MASTER_SITES=	SF/${PORTNAME}/Relase	# yes, this is not a typo (here)
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	An application for capturing images to generate timelapse videos
 +COMMENT=	Application for capturing images to generate timelapse videos
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 +LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
 +
 +WRKSRC=		${WRKDIR}/${PORTNAME}
  
 -GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
  USES=		pkgconfig
  USE_WX=		2.8+
 -WRKSRC=		${WRKDIR}/${PORTNAME}
 +WX_CONF_ARGS=	absolute
 +USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
 +LIBTOOLIZE_ARGS=--copy --force
 +AUTOMAKE_ARGS=	--add-missing --copy
  
  PLIST_FILES=	bin/${PORTNAME}
  
 -NO_STAGE=	yes
 +DESKTOP_ENTRIES="gTimelapse" "" "" "${PORTNAME}" "Graphics;GTK;" ""
 +
  .include <bsd.port.mk>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
