svn commit: r337065 - in head/graphics/gtimelapse: . files

[Pawel Pekala]

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 at 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 at 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);