1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

- 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
This commit is contained in:
Pawel Pekala 2014-02-18 17:58:16 +00:00
parent 67bfc3b798
commit bcccbdfaf8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=344932
5 changed files with 43 additions and 41 deletions

View File

@ -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>

View File

@ -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"

View File

@ -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

View File

@ -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>

View File

@ -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