Attachment 125043 Details for Bug 168590 – file.diff

[patch] file.diff

file.diff (text/plain), 6.03 KB, created by tkato432 on 2012-06-02 19:40:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-06-02 19:40:14 UTC

Size: 6.03 KB

patch

obsolete

>diff -urN /usr/ports/audio/muse/Makefile audio/muse/Makefile
>--- /usr/ports/audio/muse/Makefile	2012-06-01 20:56:11.000000000 +0900
>+++ audio/muse/Makefile	2012-06-03 02:22:59.000000000 +0900
>@@ -8,34 +8,38 @@
> 
> PORTNAME=	MuSE
> PORTVERSION=	0.9.2
>-PORTREVISION=	12
>+PORTREVISION=	13
> CATEGORIES=	audio
>-MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
>-		http://www.ljudmila.org/~jaromil/muse/releases/
>+MASTER_SITES=	http://files.dyne.org/muse/releases/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Multiple Streaming Engine
> 
>+LICENSE=	GPLv2
>+
> LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
> 		ogg.7:${PORTSDIR}/audio/libogg
> 
>+OPTIONS_DEFINE=	X11 LAME SNDFILE DOCS
>+OPTIONS_DEFAULT=X11
>+
> USE_GETTEXT=	yes
> USE_GMAKE=	yes
>-WANT_GNOME=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-debug --disable-lubrify --disable-rpath
>-CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
>-		${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
>+MAKE_JOBS_SAFE=	yes
> 
>-OPTIONS_DEFINE=	X11 LAME SNDFILE
>-OPTIONS_DEFAULT=	X11
>+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_SYS_UIO_H ${PTHREAD_CFLAGS}
>+LDFLAGS+=	-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}
> 
>-.include <bsd.port.pre.mk>
>+MAN1=		muse.1
>+PORTDOCS=	AUTHORS ChangeLog NEWS KNOWN-BUGS README TODO USAGE
>+PLIST_FILES=	bin/muse
>+.for lang in es it
>+PLIST_FILES+=	share/locale/${lang}/LC_MESSAGES/muse.mo
>+.endfor
> 
>-.if ${OSVERSION} < 800501
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-broken-scandir
>-.endif
>+.include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MX11}
> USE_GNOME+=	gtk20
>@@ -44,20 +48,30 @@
> CONFIGURE_ARGS+=--without-x --with-rubik
> .endif
> 
>-.if ${PORT_OPTIONS:MMP3} || exists(${LOCALBASE}/lib/libmp3lame.so.0)
>+.if ${PORT_OPTIONS:MLAME}
> LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
>+.else
>+CONFIGURE_ENV+=	ac_cv_header_lame_lame_h=no
> .endif
> 
>-.if ${PORT_OPTIONS:MSNDFILE} || exists(${LOCALBASE}/lib/libsndfile.so.1)
>+.if ${PORT_OPTIONS:MSNDFILE}
> LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
> .endif
> 
>-MAN1=		muse.1
>-
> post-patch:
>-.if exists(/usr/include/sys/soundcard.h)
>-	${REINPLACE_CMD} -e "s,machine/soundcard.h,sys/soundcard.h,g" \
>+	@${REINPLACE_CMD} -e 's|machine/soundcard.h|sys/soundcard.h|' \
> 		${WRKSRC}/src/portaudio/pa_unix_oss.c
>+.if empty(PORT_OPTIONS:MSNDFILE)
>+	@${REINPLACE_CMD} -e '/sndfile >=/s|$$PKG_CONFIG|${FALSE}|' \
>+		${WRKSRC}/configure
>+.endif
>+
>+post-install:
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${DOCSDIR}
>+.for file in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
>+.endfor
> .endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/audio/muse/files/extra-patch-broken-scandir audio/muse/files/extra-patch-broken-scandir
>--- /usr/ports/audio/muse/files/extra-patch-broken-scandir	2010-08-23 06:38:19.000000000 +0900
>+++ audio/muse/files/extra-patch-broken-scandir	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/jmixer.cpp.orig	2004-12-16 03:04:31.000000000 -0800
>-+++ src/jmixer.cpp	2010-08-22 14:15:03.000000000 -0700
>-@@ -640,7 +640,7 @@
>- /* this is the function selecting files for the scandir
>-    on freebsd systems you should change the following line to:
>-    int selector(struct dirent *dir) {    */
>--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
>diff -urN /usr/ports/audio/muse/files/patch-Makefile.in audio/muse/files/patch-Makefile.in
>--- /usr/ports/audio/muse/files/patch-Makefile.in	2006-08-07 12:34:42.000000000 +0900
>+++ audio/muse/files/patch-Makefile.in	2012-06-02 04:49:47.000000000 +0900
>@@ -1,11 +1,11 @@
>---- Makefile.in.orig	Fri Aug  4 12:11:20 2006
>-+++ Makefile.in	Fri Aug  4 12:11:27 2006
>-@@ -240,7 +240,7 @@
>- target_vendor = @target_vendor@
>- SUBDIRS = po intl src
>- docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
>--docsdir = ${prefix}/doc/MuSE
>-+docsdir = ${prefix}/share/doc/MuSE
>- man_MANS = muse.1
>- ACLOCAL_AMFLAGS = -I . -I m4
>- EXTRA_DIST = autogen.sh config.rpath
>+--- Makefile.in.orig	2005-12-27 22:09:38.000000000 +0900
>++++ Makefile.in	2012-06-02 04:45:45.000000000 +0900
>+@@ -690,7 +690,7 @@
>+ 
>+ info-am:
>+ 
>+-install-data-am: install-docsDATA install-man
>++install-data-am: install-man
>+ 
>+ install-exec-am:
>+ 
>diff -urN /usr/ports/audio/muse/files/patch-src::jmixer.cpp audio/muse/files/patch-src::jmixer.cpp
>--- /usr/ports/audio/muse/files/patch-src::jmixer.cpp	2010-04-11 15:45:51.000000000 +0900
>+++ audio/muse/files/patch-src::jmixer.cpp	2012-05-29 07:39:38.000000000 +0900
>@@ -1,6 +1,6 @@
>---- src/jmixer.cpp.orig	Fri Aug  4 11:44:33 2006
>-+++ src/jmixer.cpp	Fri Aug  4 11:46:02 2006
>-@@ -20,18 +20,18 @@
>+--- src/jmixer.cpp.orig	2004-12-16 20:04:31.000000000 +0900
>++++ src/jmixer.cpp	2012-05-29 07:39:23.000000000 +0900
>+@@ -20,18 +20,19 @@
>   */
>  
>  #include <iostream>
>@@ -15,6 +15,7 @@
>  #include <sys/ioctl.h>
>  #include <sys/stat.h>
> -#include <errno.h>
>++#include <sys/param.h>
> +#include <cerrno>
>  #include <fcntl.h>
>  
>@@ -25,3 +26,15 @@
>  #include <sys/types.h>
>  #include <sys/wait.h>
>  #include <termios.h>
>+@@ -640,7 +641,11 @@
>+ /* this is the function selecting files for the scandir
>+    on freebsd systems you should change the following line to:
>+    int selector(struct dirent *dir) {    */
>++#if defined(__FreeBSD__) && __FreeBSD_version < 800501
>++int selector(struct dirent *dir) {
>++#else
>+ int selector(const struct dirent *dir) {
>++#endif
>+   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
>diff -urN /usr/ports/audio/muse/pkg-plist audio/muse/pkg-plist
>--- /usr/ports/audio/muse/pkg-plist	2008-06-15 01:17:10.000000000 +0900
>+++ audio/muse/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>@@ -1,12 +0,0 @@
>-bin/muse
>-%%DOCSDIR%%/AUTHORS
>-%%DOCSDIR%%/COPYING
>-%%DOCSDIR%%/ChangeLog
>-%%DOCSDIR%%/KNOWN-BUGS
>-%%DOCSDIR%%/NEWS
>-%%DOCSDIR%%/README
>-%%DOCSDIR%%/TODO
>-%%DOCSDIR%%/USAGE
>-share/locale/es/LC_MESSAGES/muse.mo
>-share/locale/it/LC_MESSAGES/muse.mo
>-@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 168590: 125043