Date: Tue, 18 Feb 2014 17:58:16 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344932 - in head/audio/zinf: . files Message-ID: <201402181758.s1IHwGh0070445@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Tue Feb 18 17:58:16 2014 New Revision: 344932 URL: http://svnweb.freebsd.org/changeset/ports/344932 QAT: https://qat.redports.org/buildarchive/r344932/ Log: - Fix build with clang - Support staging - Convert to new options framework PR: ports/186803 (based on) Submitted by: Mathias Monnerville <mathias@monnerville.com> MFH: 2014Q1 Added: head/audio/zinf/files/patch-ftc-kjofol-kjofol.cpp (contents, props changed) head/audio/zinf/files/patch-lib-http-src-Http.cpp (contents, props changed) Modified: head/audio/zinf/Makefile head/audio/zinf/files/patch-ui-zinf-unix-src-GTKFileSelector.cpp head/audio/zinf/pkg-plist Modified: head/audio/zinf/Makefile ============================================================================== --- head/audio/zinf/Makefile Tue Feb 18 17:19:25 2014 (r344931) +++ head/audio/zinf/Makefile Tue Feb 18 17:58:16 2014 (r344932) @@ -13,17 +13,25 @@ COMMENT= GTK-based MP3 player LIB_DEPENDS= libid3-3.8.so:${PORTSDIR}/audio/id3lib \ libgdbm.so:${PORTSDIR}/databases/gdbm -USES= pathfix gettext gmake perl5 -NO_STAGE= yes +USES= pathfix pkgconfig gettext gmake perl5 USE_GNOME= gtk20 lthack -WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-ipv6 \ --disable-arts -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +OPTIONS_DEFINE= ESOUND VORBIS +OPTIONS_DEFAULT=VORBIS +OPTIONS_SUB= yes + +ESOUND_CONFIGURE_OFF= --disable-esd +ESOUND_USE= GNOME=esound + +VORBIS_CONFIGURE_OFF= --disable-vorbis +VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis + .include <bsd.port.pre.mk> .if ${ARCH} == "i386" @@ -37,40 +45,13 @@ CONFIGURE_ARGS+= --disable-x86opts CPPFLAGS+= "-D_M_ALPHA" .endif -.if ${HAVE_GNOME:Mesound}!="" || defined(WITH_ALL_PLUGINS) -USE_GNOME+= esound -PLIST_SUB+= ESOUND="" -.else -CONFIGURE_ARGS+= --disable-esd -PLIST_SUB+= ESOUND="@comment " -.endif - -.if !defined(WITHOUT_VORBIS) || defined(WITH_ALL_PLUGINS) -LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis -PLIST_SUB+= VORBIS="" -.else -CONFIGURE_ARGS+= --disable-vorbis -PLIST_SUB+= VORBIS="@comment " -.endif - -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} - @${ECHO_MSG} "WITHOUT_GNOME=esound do NOT build with esd support" - @${ECHO_MSG} "WITHOUT_VORBIS=yes do NOT build with Ogg/Vorbis codec plugin" - @${ECHO_MSG} - @${ECHO_MSG} "WITH_ALL_PLUGINS=yes build with all plugins" - @${ECHO_MSG} - post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|Player::||' ${WRKSRC}/base/include/player.h post-install: - @${MKDIR} ${PREFIX}/etc/sdr/plugins + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/sdr/plugins ${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.zinf \ - ${PREFIX}/etc/sdr/plugins - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} + ${STAGEDIR}${PREFIX}/etc/sdr/plugins .include <bsd.port.post.mk> Added: head/audio/zinf/files/patch-ftc-kjofol-kjofol.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/zinf/files/patch-ftc-kjofol-kjofol.cpp Tue Feb 18 17:58:16 2014 (r344932) @@ -0,0 +1,10 @@ +--- ftc/kjofol/kjofol.cpp.orig 2014-02-18 17:48:40.481824991 +0100 ++++ ftc/kjofol/kjofol.cpp 2014-02-18 17:49:16.578764197 +0100 +@@ -47,6 +47,7 @@ + + #include <sys/types.h> + #include <sys/stat.h> ++#include <stdlib.h> + + #include "path_max.h" + Added: head/audio/zinf/files/patch-lib-http-src-Http.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/zinf/files/patch-lib-http-src-Http.cpp Tue Feb 18 17:58:16 2014 (r344932) @@ -0,0 +1,10 @@ +--- lib/http/src/Http.cpp.orig 2014-02-15 18:56:59.580491668 +0100 ++++ lib/http/src/Http.cpp 2014-02-15 18:57:10.490545507 +0100 +@@ -31,6 +31,7 @@ + + #include "config.h" + #include <stdio.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <sys/stat.h> + #ifndef WIN32 Modified: head/audio/zinf/files/patch-ui-zinf-unix-src-GTKFileSelector.cpp ============================================================================== --- head/audio/zinf/files/patch-ui-zinf-unix-src-GTKFileSelector.cpp Tue Feb 18 17:19:25 2014 (r344931) +++ head/audio/zinf/files/patch-ui-zinf-unix-src-GTKFileSelector.cpp Tue Feb 18 17:58:16 2014 (r344932) @@ -1,11 +1,12 @@ ---- ui/zinf/unix/src/GTKFileSelector.cpp.orig Wed Feb 19 16:39:23 2003 -+++ ui/zinf/unix/src/GTKFileSelector.cpp Sat Sep 13 03:02:14 2003 -@@ -25,7 +25,7 @@ +--- ui/zinf/unix/src/GTKFileSelector.cpp.orig 2003-09-16 19:36:23.000000000 +0200 ++++ ui/zinf/unix/src/GTKFileSelector.cpp 2014-02-18 17:46:56.364931015 +0100 +@@ -25,7 +25,8 @@ #include <unistd.h> #include <dirent.h> -#if defined(solaris) +#if defined(solaris) || defined(__FreeBSD__) ++#include <stdlib.h> #include <sys/types.h> #include <sys/param.h> /* for MAXPATHLEN */ #include <sys/stat.h> Modified: head/audio/zinf/pkg-plist ============================================================================== --- head/audio/zinf/pkg-plist Tue Feb 18 17:19:25 2014 (r344931) +++ head/audio/zinf/pkg-plist Tue Feb 18 17:58:16 2014 (r344932) @@ -32,11 +32,11 @@ share/locale/ru/LC_MESSAGES/zinf.mo %%DATADIR%%/themes/Aquatica.fat %%DATADIR%%/themes/Zinf.fat %%DATADIR%%/themes/ZinfClassic.fat -@dirrm share/zinf/themes -@dirrm share/zinf +@dirrm %%DATADIR%%/themes +@dirrm %%DATADIR%% +@dirrm share/locale/ca_ES/LC_MESSAGES +@dirrm share/locale/ca_ES @dirrm lib/zinf/plugins @dirrm lib/zinf -@dirrmtry etc/sdr/plugins +@dirrm etc/sdr/plugins @dirrmtry etc/sdr -@dirrmtry share/locale/ca_ES/LC_MESSAGES -@dirrmtry share/locale/ca_ES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402181758.s1IHwGh0070445>