diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-12-29 04:39:22 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-12-29 04:39:22 +0000 |
| commit | 8fe607b62853157af1e9acbfba69abb92d36fa54 (patch) | |
| tree | 6e5d3b48cd78b083a4d30f36ce567653e4808493 /audio/muse | |
| parent | fix build on -current (diff) | |
fix build on -current
PR: 46581
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=71965
Diffstat (limited to 'audio/muse')
| -rw-r--r-- | audio/muse/Makefile | 20 | ||||
| -rw-r--r-- | audio/muse/files/patch-jmixer.cpp | 11 |
2 files changed, 24 insertions, 7 deletions
diff --git a/audio/muse/Makefile b/audio/muse/Makefile index f3851875c4b0..2df08483c45f 100644 --- a/audio/muse/Makefile +++ b/audio/muse/Makefile @@ -16,8 +16,7 @@ DISTNAME= MuSE-${PORTVERSION} MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ - vorbis.2:${PORTSDIR}/audio/libvorbis \ - gnugetopt.1:${PORTSDIR}/devel/libgnugetopt + vorbis.2:${PORTSDIR}/audio/libvorbis USE_REINPLACE= yes USE_GNOMENG= yes @@ -25,14 +24,21 @@ USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-debug +CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +LDFLAGS= -L${LOCALBASE}/lib + +.if !exists(/usr/include/getopt.h) +LIB_DEPENDS+= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +LDFLAGS+= -lgnugetopt +.endif + post-patch: - @${REINPLACE_CMD} -e 's|-O3|\$$CFLAGS|g ; \ - s|[\$$]GTK_LIBS -lgthread|\$$GTK_LIBS \$$GLIB_LIBS|g ; \ - s|[\$$]GTK_FLAGS|\$$GTK_CFLAGS \$$GLIB_CFLAGS|g' \ + @${REINPLACE_CMD} -e 's|^CFLAGS=.*$$|CFLAGS="\$$CFLAGS"|g ; \ + s|[$$]GTK_LIBS -lgthread|\$$GTK_LIBS \$$GLIB_LIBS|g ; \ + s|[$$]GTK_FLAGS|\$$GTK_CFLAGS \$$GLIB_CFLAGS|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/Makefile.in diff --git a/audio/muse/files/patch-jmixer.cpp b/audio/muse/files/patch-jmixer.cpp new file mode 100644 index 000000000000..e5190231d46e --- /dev/null +++ b/audio/muse/files/patch-jmixer.cpp @@ -0,0 +1,11 @@ +--- jmixer.cpp.orig Tue Jul 23 04:48:56 2002 ++++ jmixer.cpp Sat Dec 28 09:41:10 2002 +@@ -808,7 +808,7 @@ + } + + /* this is the function selecting files for the scandir */ +-int selector(const struct dirent *dir) { ++int selector(struct dirent *dir) { + if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0 + #ifdef HAVE_VORBIS + || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0 |