Date: Tue, 17 Dec 2013 02:46:15 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184863: audio/mp3stat: Fix build with clang Message-ID: <20131217024615.f0579146d54a12c8fd244320@yahoo.com> Resent-Message-ID: <201312161810.rBGIAHmh016307@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184863
>Category: ports
>Synopsis: audio/mp3stat: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 16 18:10:17 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Update MASTER_SITES
New file:
files/patch-base.cpp
files/patch-input__vorbis__oggstat.cpp
files/patch-ui__console__cli.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/mp3stat/Makefile audio/mp3stat/Makefile
--- /usr/ports/audio/mp3stat/Makefile 2013-12-12 02:41:43.000000000 +0900
+++ audio/mp3stat/Makefile 2013-12-17 00:00:00.000000000 +0900
@@ -19,12 +19,12 @@
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 @@
@${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>
diff -urN /usr/ports/audio/mp3stat/files/patch-base.cpp audio/mp3stat/files/patch-base.cpp
--- /usr/ports/audio/mp3stat/files/patch-base.cpp 1970-01-01 09:00:00.000000000 +0900
+++ audio/mp3stat/files/patch-base.cpp 2013-12-17 00:00:00.000000000 +0900
@@ -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>
+
diff -urN /usr/ports/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp audio/mp3stat/files/patch-input__vorbis__oggstat.cpp
--- /usr/ports/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp 1970-01-01 09:00:00.000000000 +0900
+++ audio/mp3stat/files/patch-input__vorbis__oggstat.cpp 2013-12-17 00:00:00.000000000 +0900
@@ -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;
diff -urN /usr/ports/audio/mp3stat/files/patch-ui__console__cli.cpp audio/mp3stat/files/patch-ui__console__cli.cpp
--- /usr/ports/audio/mp3stat/files/patch-ui__console__cli.cpp 1970-01-01 09:00:00.000000000 +0900
+++ audio/mp3stat/files/patch-ui__console__cli.cpp 2013-12-17 00:00:00.000000000 +0900
@@ -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;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024615.f0579146d54a12c8fd244320>