Date: Fri, 20 Dec 2013 16:32:17 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337034 - in branches/2014Q1/audio/mp3stat: . files Message-ID: <201312201632.rBKGWHXr035548@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Dec 20 16:32:17 2013 New Revision: 337034 URL: http://svnweb.freebsd.org/changeset/ports/337034 Log: MFH: r337033 - Fix build with clang - Update MASTER_SITES - Support staging PR: ports/184863 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Approved by: portmgr (implicit) Added: branches/2014Q1/audio/mp3stat/files/patch-base.cpp - copied unchanged from r337033, head/audio/mp3stat/files/patch-base.cpp branches/2014Q1/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp - copied unchanged from r337033, head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp branches/2014Q1/audio/mp3stat/files/patch-ui__console__cli.cpp - copied unchanged from r337033, head/audio/mp3stat/files/patch-ui__console__cli.cpp Modified: branches/2014Q1/audio/mp3stat/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/mp3stat/Makefile ============================================================================== --- branches/2014Q1/audio/mp3stat/Makefile Fri Dec 20 16:21:19 2013 (r337033) +++ branches/2014Q1/audio/mp3stat/Makefile Fri Dec 20 16:32:17 2013 (r337034) @@ -19,12 +19,12 @@ OPTIONS_DEFAULT= VORBIS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USES= gmake pkgconfig -NO_STAGE= yes +USES= dos2unix gmake pkgconfig +DOS2UNIX_FILES= ui/console/cli.cpp USE_GNOME= gtk20 -CXX+= -I${LOCALBASE}/include -L${LOCALBASE}/lib \ - -Wl,--rpath,${LOCALBASE}/lib +CXXFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -Wl,--rpath,${LOCALBASE}/lib PORTDOCS= README PLIST_FILES= bin/mp3stat \ @@ -46,23 +46,25 @@ post-patch: @${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e \ 's|@$${CXX}|$${CXX}|g ; \ s|-ldl|-lz|g ; \ - s|-lc||g ; \ + s|-lc|$${LDFLAGS}|g ; \ s|-Wl,-soname,.*\.so\.1||g ; \ s|-fpic|-fPIC|g ; \ s|^CXX|#CXX|g' do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mp3stat ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/mp3stat - ${INSTALL_DATA} ${WRKSRC}/ui/gtk/ui_gtk2.so ${PREFIX}/lib/mp3stat - ${INSTALL_DATA} ${WRKSRC}/ui/console/ui_console.so ${PREFIX}/lib/mp3stat - ${INSTALL_DATA} ${WRKSRC}/input/mp3/input_mp3.so ${PREFIX}/lib/mp3stat + (cd ${WRKSRC} && ${INSTALL_PROGRAM} mp3stat ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/mp3stat + (cd ${WRKSRC}/ui/gtk && ${INSTALL_DATA} ui_gtk2.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) + (cd ${WRKSRC}/ui/console && ${INSTALL_DATA} ui_console.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) + (cd ${WRKSRC}/input/mp3 && ${INSTALL_DATA} input_mp3.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) .if ${PORT_OPTIONS:MVORBIS} - ${INSTALL_DATA} ${WRKSRC}/input/vorbis/input_vorb.so ${PREFIX}/lib/mp3stat -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + (cd ${WRKSRC}/input/vorbis && ${INSTALL_DATA} input_vorb.so \ + ${STAGEDIR}${PREFIX}/lib/mp3stat) .endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Copied: branches/2014Q1/audio/mp3stat/files/patch-base.cpp (from r337033, head/audio/mp3stat/files/patch-base.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/mp3stat/files/patch-base.cpp Fri Dec 20 16:32:17 2013 (r337034, copy of r337033, head/audio/mp3stat/files/patch-base.cpp) @@ -0,0 +1,9 @@ +--- base.cpp.orig ++++ base.cpp +@@ -1,4 +1,5 @@ +-#include <stdio.h> ++#include <cstdio> ++#include <cstdlib> + #include <dlfcn.h> + #include <dirent.h> + Copied: branches/2014Q1/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp (from r337033, head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp Fri Dec 20 16:32:17 2013 (r337034, copy of r337033, head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp) @@ -0,0 +1,7 @@ +--- input/vorbis/oggstat.cpp.orig ++++ input/vorbis/oggstat.cpp +@@ -1,3 +1,4 @@ ++#include <cstdlib> + #include "oggstat.h" + + using namespace std; Copied: branches/2014Q1/audio/mp3stat/files/patch-ui__console__cli.cpp (from r337033, head/audio/mp3stat/files/patch-ui__console__cli.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/mp3stat/files/patch-ui__console__cli.cpp Fri Dec 20 16:32:17 2013 (r337034, copy of r337033, head/audio/mp3stat/files/patch-ui__console__cli.cpp) @@ -0,0 +1,9 @@ +--- ui/console/cli.cpp.orig ++++ ui/console/cli.cpp +@@ -1,4 +1,5 @@ +-#include <stdio.h> ++#include <cstdio> ++#include <cstdlib> + #include "cli.h" + + using namespace std;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312201632.rBKGWHXr035548>