Easytag fails to build on recent current with clang: http://beefy1.isc.freebsd.org/bulk/head-default/2013-08-07_18h21m15s/logs/easytag-2.1.8_1.log Attached patch makes it compile. Disabling the check for format strings in that source file should be safe here, since all format strings coming into the wrapper function Log_Print() are generated oor hardcoded in the other sourcefiles anyway. While here I also added options support, update LIB_DEPENDS to the new format and converted to USES=gmake. Fix: Property changes on: files/patch-src-log.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property--AhPyLpCBmDWSEPculHM8SJrv71WCfsPxGJ4fmfelSTzzgQG0 Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: Makefile =================================================================== --- Makefile (revision 324471) +++ Makefile (working copy) @@ -10,18 +10,17 @@ MAINTAINER= novel@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 @@ -28,7 +27,11 @@ 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 Index: files/patch-src-log.c =================================================================== --- files/patch-src-log.c (revision 0) +++ files/patch-src-log.c (working copy) @@ -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 *
Responsible Changed From-To: freebsd-ports-bugs->novel Over to maintainer (via the GNATS Auto Assign Tool)
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@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 * _______________________________________________ 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"
State Changed From-To: open->closed Committed. Thanks!