svn commit: r325586 - in head/audio/easytag: . files

[Guido Falsi]

Author: madpilot
Date: Thu Aug 29 12:02:49 2013
New Revision: 325586
URL: http://svnweb.freebsd.org/changeset/ports/325586

Log:
  - Fix build with clang
  - Convert to new LIB_DEPENDS format
  - Convert to USES=gmake
  - Add OPTIONS support for WAVPACK option
  
  PR:		ports/181211
  Submitted by:	me
  Approved by:	novel (maintainer, via email)

Added:
  head/audio/easytag/files/
  head/audio/easytag/files/patch-src-log.c   (contents, props changed)
Modified:
  head/audio/easytag/Makefile

Modified: head/audio/easytag/Makefile
==============================================================================
--- head/audio/easytag/Makefile	Thu Aug 29 11:15:12 2013	(r325585)
+++ head/audio/easytag/Makefile	Thu Aug 29 12:02:49 2013	(r325586)
@@ -10,25 +10,28 @@ MASTER_SITES=	GNOME
 MAINTAINER=	novel at FreeBSD.org
 COMMENT=	GTK2 Tag editor for MP3 and OGG files
 
-LIB_DEPENDS=	id3:${PORTSDIR}/audio/id3lib \
-		id3tag:${PORTSDIR}/audio/libid3tag \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		FLAC:${PORTSDIR}/audio/flac \
-		mp4v2:${PORTSDIR}/multimedia/mp4v2
+LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
+		libid3tag.so:${PORTSDIR}/audio/libid3tag \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libFLAC.so:${PORTSDIR}/audio/flac \
+		libmp4v2.so:${PORTSDIR}/multimedia/mp4v2
 
 MAN1=		easytag.1
 CONFLICTS=	easytag-devel-[0-9]*
 
 USE_XZ=		yes
-USES=		gettext
-USE_GMAKE=	yes
+USES=		gettext gmake
 USE_GNOME=	gnomehack gnomeprefix gtk20 desktopfileutils
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_GTK
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_WAVPACK)
+OPTIONS_DEFINE=	WAVPACK
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MWAVPACK}
 LIB_DEPENDS+=		wavpack:${PORTSDIR}/audio/wavpack
 CONFIGURE_ARGS+=	--enable-wavpack
 .else

Added: head/audio/easytag/files/patch-src-log.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/easytag/files/patch-src-log.c	Thu Aug 29 12:02:49 2013	(r325586)
@@ -0,0 +1,14 @@
+--- src/log.c.orig	2013-02-05 23:42:37.000000000 +0100
++++ src/log.c	2013-08-07 10:52:19.934047139 +0200
+@@ -39,6 +39,11 @@
+ #include "win32/win32dep.h"
+ #endif /* G_OS_WIN32 */
+ 
++/* Disable -Wformat-nonliteral warning for this source file, since
++** all calls have safe format strings coming. */
++#ifdef __clang__
++#pragma clang diagnostic ignored "-Wformat-nonliteral"
++#endif
+ 
+ /****************
+  * Declarations *