Bug 184863 - audio/mp3stat: Fix build with clang
Summary: audio/mp3stat: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2013-12-20 16:40 UTC (History)
0 users

See Also:


Attachments
file.diff (3.39 KB, patch)
2013-12-16 18:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-16 18:10:17 UTC
- 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
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-20 16:08:44 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-20 16:21:28 UTC
Author: pawel
Date: Fri Dec 20 16:21:19 2013
New Revision: 337033
URL: http://svnweb.freebsd.org/changeset/ports/337033

Log:
  - Fix build with clang
  - Update MASTER_SITES
  - Support staging
  
  PR:		ports/184863
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/audio/mp3stat/files/patch-base.cpp   (contents, props changed)
  head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp   (contents, props changed)
  head/audio/mp3stat/files/patch-ui__console__cli.cpp   (contents, props changed)
Modified:
  head/audio/mp3stat/Makefile

Modified: head/audio/mp3stat/Makefile
==============================================================================
--- head/audio/mp3stat/Makefile	Fri Dec 20 16:10:52 2013	(r337032)
+++ head/audio/mp3stat/Makefile	Fri Dec 20 16:21:19 2013	(r337033)
@@ -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>

Added: head/audio/mp3stat/files/patch-base.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/mp3stat/files/patch-base.cpp	Fri Dec 20 16:21:19 2013	(r337033)
@@ -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>
+ 

Added: head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/mp3stat/files/patch-input__vorbis__oggstat.cpp	Fri Dec 20 16:21:19 2013	(r337033)
@@ -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;

Added: head/audio/mp3stat/files/patch-ui__console__cli.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/mp3stat/files/patch-ui__console__cli.cpp	Fri Dec 20 16:21:19 2013	(r337033)
@@ -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;
_______________________________________________
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"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-20 16:21:31 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-20 16:32:25 UTC
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;
_______________________________________________
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"