Attachment 136619 Details for Bug 181877 – file.diff

[patch] file.diff

file.diff (text/plain), 5.34 KB, created by tkato432 on 2013-09-06 19:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-09-06 19:10:01 UTC

Size: 5.34 KB

patch

obsolete

>diff -urN /usr/ports/audio/pd/Makefile audio/pd/Makefile
>--- /usr/ports/audio/pd/Makefile	2013-09-05 01:46:43.000000000 +0900
>+++ audio/pd/Makefile	2013-09-07 00:00:00.000000000 +0900
>@@ -2,11 +2,10 @@
> # $FreeBSD: head/audio/pd/Makefile 325727 2013-08-30 23:01:05Z bapt $
> 
> PORTNAME=	pd
>-DISTVERSION=	0.44-3
>+DISTVERSION=	0.45-2
> DISTVERSIONSUFFIX=	.src
> CATEGORIES=	audio
>-#MASTER_SITES=	SF/pure-data/pure-data/${PORTVERSION}
>-MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
>+MASTER_SITES=	http://msp.ucsd.edu/Software/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	MIDI-capable real-time audio processor/synthesizer
>@@ -27,11 +26,12 @@
> ACLOCAL_ARGS=	-I m4/generated -I m4
> LIBTOOLIZE_ARGS=--install --force
> AUTOMAKE_ARGS=	--add-missing --copy --force-missing
>+CONFIGURE_ENV=	ac_cv_lib_pthread_pthread_create=no
> 
> MAN1=		pd.1 pdreceive.1 pdsend.1
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
> 
> .include <bsd.port.options.mk>
> 
>@@ -60,15 +60,15 @@
> post-patch:
> 	@${FIND} ${PATCH_WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|__FreeBSD_kernel__|__FreeBSD__|g ; \
>+		 s|__x86_64__|__amd64__|g ; \
> 		 s|<alloca\.h>|<stdlib.h>|g'
> 	@${REINPLACE_CMD} -e \
>-		's|kFreeBSD)|kFreeBSD\|*freebsd*)| ; \
>+		's|\*kfreebsd\*gnu\*)|*freebsd*)| ; \
> 		 s|portaudio=yes|portaudio=no| ; \
>-		 s|-O6|| ; \
>+		 s|-O3|| ; \
> 		 s|fftw,|fftw3f,| ; \
> 		 s|fftw_one,|fftwf_execute,| ; \
>-		 s|fftw"|fftw3f"| ; \
>-		 s|-lpthread ||' ${WRKSRC}/configure.ac
>+		 s|fftw"|fftw3f"|' ${WRKSRC}/configure.ac
> 	@${REINPLACE_CMD} -e \
> 		'/^pkgconfigdir/s|=.*|= $$(prefix)/libdata/pkgconfig| ; \
> 		 /^libpddir/s|=.*|= $$(pkglibdir)| ; \
>@@ -86,6 +86,8 @@
> 		's|-O2 |$$(CFLAGS) | ; \
> 		 s|-g ||g ; \
> 		 s|-lc ||g' ${WRKSRC}/extra/expr~/makefile
>+	@${REINPLACE_CMD} -e \
>+		'/libpthread/s|_ERROR|_WARN|' ${WRKSRC}/portaudio/configure.in
> 
> pre-configure:
> 	@(cd ${WRKSRC}/portaudio \
>diff -urN /usr/ports/audio/pd/distinfo audio/pd/distinfo
>--- /usr/ports/audio/pd/distinfo	2013-09-05 01:46:43.000000000 +0900
>+++ audio/pd/distinfo	2013-09-07 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (pd-0.44-3.src.tar.gz) = 242745f16bf27838150120022a8f5b63ea5c69441c305dcf637242686f615317
>-SIZE (pd-0.44-3.src.tar.gz) = 2200542
>+SHA256 (pd-0.45-2.src.tar.gz) = ad3f3bee30b581b8d8ca8712bee031dba498cfc9f57926b354fef957244d171a
>+SIZE (pd-0.45-2.src.tar.gz) = 2251139
>diff -urN /usr/ports/audio/pd/files/patch-extra_pd_pd.c audio/pd/files/patch-extra_pd_pd.c
>--- /usr/ports/audio/pd/files/patch-extra_pd_pd.c	2013-09-05 01:46:44.000000000 +0900
>+++ audio/pd/files/patch-extra_pd_pd.c	2013-09-07 00:00:00.000000000 +0900
>@@ -1,10 +1,10 @@
> --- extra/pd~/pd~.c.orig	2010-07-29 05:55:17.000000000 +0900
> +++ extra/pd~/pd~.c	2011-04-06 19:18:20.000000000 +0900
>-@@ -11,6 +11,7 @@
>+@@ -19,6 +19,7 @@
>  #include <stdlib.h>
>  #include <errno.h>
>  #include <ctype.h>
> +#include <signal.h>
>- #include <sys/types.h>
>- #include <sys/stat.h>
>  #include <sys/wait.h>
>+ #include <fcntl.h>
>+ #endif
>diff -urN /usr/ports/audio/pd/pkg-descr audio/pd/pkg-descr
>--- /usr/ports/audio/pd/pkg-descr	2013-09-05 01:46:43.000000000 +0900
>+++ audio/pd/pkg-descr	2013-09-07 00:00:00.000000000 +0900
>@@ -7,4 +7,4 @@
> 
> Unofficial web site: http://puredata.org/
> 
>-WWW: http://www-crca.ucsd.edu/~msp/software.html
>+WWW: http://msp.ucsd.edu/software.html
>diff -urN /usr/ports/audio/pd/pkg-plist audio/pd/pkg-plist
>--- /usr/ports/audio/pd/pkg-plist	2013-09-05 01:46:43.000000000 +0900
>+++ audio/pd/pkg-plist	2013-09-07 00:00:00.000000000 +0900
>@@ -359,6 +359,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/acoustics~-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/adc~_dac~-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/append-help.pd
>+%%PORTDOCS%%%%DOCSDIR%%/5.reference/array-object-help.pd
>+%%PORTDOCS%%%%DOCSDIR%%/5.reference/array-object-help.txt
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/bag-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/bang-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/bang~-help.pd
>@@ -442,6 +444,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/rzero~-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/samphold~-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/savepanel-help.pd
>+%%PORTDOCS%%%%DOCSDIR%%/5.reference/scalar-object-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/select-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/send-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/send~-help.pd
>@@ -456,9 +459,9 @@
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/sqrt~-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/stripnote-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/struct-help.pd
>-%%PORTDOCS%%%%DOCSDIR%%/5.reference/sublist-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/swap-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/switch~-help.pd
>+%%PORTDOCS%%%%DOCSDIR%%/5.reference/symbol-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/table.txt
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/tabosc4~-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/tabplay~-help.pd
>@@ -471,6 +474,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/tabwrite-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/tabwrite~-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/text-help.pd
>+%%PORTDOCS%%%%DOCSDIR%%/5.reference/text-object-help.pd
>+%%PORTDOCS%%%%DOCSDIR%%/5.reference/text-object-help.txt
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/textfile-help.pd
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/textfile.txt
> %%PORTDOCS%%%%DOCSDIR%%/5.reference/threshold~-help.pd

Actions: View | Diff

Attachments on bug 181877: 136619 | 136620