ports/186803: [broken port fix] audio/zinf 2.2.5 (clang error)

[Mathias Monnerville]

>Number:         186803
>Category:       ports
>Synopsis:       [broken port fix] audio/zinf 2.2.5 (clang error)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 16 00:20:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Mathias Monnerville
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
University of Montpellier 2, France
>Environment:
System: FreeBSD 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	- clang build error fix
	- StageDir
	- pkg-plist fix

	portsmon's error log at http://portsmon.freebsd.org/portoverview.py?category=audio&portname=zinf
	
>How-To-Repeat:
	
>Fix:

	

--- zinf-2.2.5_19.patch begins here ---
diff -r 67fe9a65908d Makefile
--- a/Makefile	Sat Feb 15 21:35:22 2014 +0100
+++ b/Makefile	Sat Feb 15 21:46:07 2014 +0100
@@ -3,7 +3,7 @@
 
 PORTNAME=	zinf
 PORTVERSION=	2.2.5
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF
 
@@ -14,7 +14,6 @@
 		libgdbm.so:${PORTSDIR}/databases/gdbm
 
 USES=		pathfix gettext gmake perl5
-NO_STAGE=	yes
 USE_GNOME=	gtk20 lthack
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -68,9 +67,9 @@
 	@${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
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>
diff -r 67fe9a65908d files/patch-lib-http-src-Http.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/files/patch-lib-http-src-Http.cpp	Sat Feb 15 21:46:07 2014 +0100
@@ -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
diff -r 67fe9a65908d pkg-plist
--- a/pkg-plist	Sat Feb 15 21:35:22 2014 +0100
+++ b/pkg-plist	Sat Feb 15 21:46:07 2014 +0100
@@ -1,42 +1,35 @@
 bin/zinf
 etc/sdr/plugins/sdr2.plugin.S100.audio.rtp.mpa.zinf
-lib/zinf/plugins/albumart.ui
 lib/zinf/plugins/cd.lmc
 lib/zinf/plugins/cd.pmo
 lib/zinf/plugins/cmdline.ui
-lib/zinf/plugins/download.ui
-%%ESOUND%%lib/zinf/plugins/esound.pmo
 lib/zinf/plugins/http.pmi
 lib/zinf/plugins/id3lib.mdf
 lib/zinf/plugins/irman.ui
-lib/zinf/plugins/kjofol.ftf
 lib/zinf/plugins/lcd.ui
 lib/zinf/plugins/local.pmi
 lib/zinf/plugins/m3u.plf
 lib/zinf/plugins/misc.mdf
 lib/zinf/plugins/mpg123.ui
-lib/zinf/plugins/musicbrowser.ui
 lib/zinf/plugins/ncurses.ui
 lib/zinf/plugins/obs.pmi
 lib/zinf/plugins/pls.plf
 lib/zinf/plugins/soundcard.pmo
-%%VORBIS%%lib/zinf/plugins/vorbis.lmc
-%%VORBIS%%lib/zinf/plugins/vorbis.mdf
+lib/zinf/plugins/vorbis.lmc
+lib/zinf/plugins/vorbis.mdf
 lib/zinf/plugins/wav.lmc
 lib/zinf/plugins/wavout.pmo
-lib/zinf/plugins/winamp.ftf
 lib/zinf/plugins/xingmp3.lmc
-lib/zinf/plugins/zinf.ui
 share/locale/ca_ES/LC_MESSAGES/zinf.mo
 share/locale/ru/LC_MESSAGES/zinf.mo
-%%DATADIR%%/themes/Aquatica.fat
-%%DATADIR%%/themes/Zinf.fat
-%%DATADIR%%/themes/ZinfClassic.fat
+share/zinf/themes/Aquatica.fat
+share/zinf/themes/Zinf.fat
+share/zinf/themes/ZinfClassic.fat
 @dirrm share/zinf/themes
 @dirrm share/zinf
+ at dirrm share/locale/ca_ES/LC_MESSAGES
+ at dirrm share/locale/ca_ES
 @dirrm lib/zinf/plugins
 @dirrm lib/zinf
- at dirrmtry etc/sdr/plugins
+ at dirrm etc/sdr/plugins
 @dirrmtry etc/sdr
- at dirrmtry share/locale/ca_ES/LC_MESSAGES
- at dirrmtry share/locale/ca_ES
--- zinf-2.2.5_19.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: