Date: Sun, 29 Dec 2002 06:00:56 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46581: Update port: audio/muse Message-ID: <20021229060056.6b34429a.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46581
>Category: ports
>Synopsis: Update port: audio/muse
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 28 13:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on 5-current
New file:
files/patch-jmixer.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/muse/Makefile audio/muse/Makefile
--- /usr/ports/audio/muse/Makefile Thu Dec 26 23:10:35 2002
+++ audio/muse/Makefile Sat Dec 28 12:59:49 2002
@@ -16,8 +16,7 @@
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_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 -urN /usr/ports/audio/muse/files/patch-jmixer.cpp audio/muse/files/patch-jmixer.cpp
--- /usr/ports/audio/muse/files/patch-jmixer.cpp Thu Jan 1 09:00:00 1970
+++ audio/muse/files/patch-jmixer.cpp Sat Dec 28 12:55:49 2002
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021229060056.6b34429a.tkato>