Attachment 48991 Details for Bug 74943 – file.diff

[patch] file.diff

file.diff (text/plain), 3.39 KB, created by tkato432 on 2004-12-11 15:10:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2004-12-11 15:10:24 UTC

Size: 3.39 KB

patch

obsolete

>diff -urN /usr/ports/audio/glame/Makefile audio/glame/Makefile
>--- /usr/ports/audio/glame/Makefile	Sat Jun  5 14:15:44 2004
>+++ audio/glame/Makefile	Sat Dec 11 22:03:25 2004
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	glame
>-PORTVERSION=	1.0.2
>+PORTVERSION=	1.0.3
> CATEGORIES=	audio gnome
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -15,13 +15,14 @@
> COMMENT=	A powerful, fast, stable, and easily extensible sound editor for GNOME
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
>-LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
>+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
>+		vorbis.3:${PORTSDIR}/audio/libvorbis
> 
>-USE_LIBLTDL=	yes
> USE_X_PREFIX=	yes
>-USE_GNOME=	gnomehack gnomeprefix gnometarget libglade lthack
>+USE_GNOME=	gnomehack gnomeprefix gnometarget libglade
>+USE_LIBLTDL=	yes
> USE_GMAKE=	yes
>-USE_LIBTOOL_VER=	13
>+USE_LIBTOOL_VER=	15
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
> 		LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \
> 		MAKEINFO="makeinfo --no-split"
>diff -urN /usr/ports/audio/glame/distinfo audio/glame/distinfo
>--- /usr/ports/audio/glame/distinfo	Wed Mar 17 18:19:31 2004
>+++ audio/glame/distinfo	Fri Oct 29 21:28:19 2004
>@@ -1,2 +1,2 @@
>-MD5 (glame-1.0.2.tar.gz) = 6d4c76891257dab0d9cee18d21a5db9a
>-SIZE (glame-1.0.2.tar.gz) = 1587125
>+MD5 (glame-1.0.3.tar.gz) = 9dc47b94f1d3c64eff36d5e61375ff78
>+SIZE (glame-1.0.3.tar.gz) = 1638755
>diff -urN /usr/ports/audio/glame/files/patch-Makefile.in audio/glame/files/patch-Makefile.in
>--- /usr/ports/audio/glame/files/patch-Makefile.in	Wed Jul  2 00:24:15 2003
>+++ audio/glame/files/patch-Makefile.in	Sat Dec 11 22:14:22 2004
>@@ -1,14 +1,14 @@
> 
> $FreeBSD: ports/audio/glame/files/patch-Makefile.in,v 1.2 2003/07/01 12:34:21 sobomax Exp $
> 
>---- Makefile.in.orig	Tue Jul  1 15:01:06 2003
>-+++ Makefile.in	Tue Jul  1 15:01:55 2003
>-@@ -147,7 +147,7 @@
>- install_sh = @install_sh@
>- pkgpixmapsdir = @pkgpixmapsdir@
>- pkgscriptsdir = @pkgscriptsdir@
>+--- Makefile.in.orig	Fri Oct 29 03:53:30 2004
>++++ Makefile.in	Fri Oct 29 21:29:55 2004
>+@@ -280,7 +280,7 @@
>+ subdirs = @subdirs@
>+ sysconfdir = @sysconfdir@
>+ target_alias = @target_alias@
> -SUBDIRS = intl libltdl macros src doc data po
> +SUBDIRS = intl macros src doc data po
>- 
>  ACLOCAL_AMFLAGS = -I macros -I .
>- 
>+ EXTRA_DIST = TODO MAINTAINERS CREDITS BUGS autogen.sh glame.spec
>+ all: config.h
>diff -urN /usr/ports/audio/glame/files/patch-src::hash::glsignal.c audio/glame/files/patch-src::hash::glsignal.c
>--- /usr/ports/audio/glame/files/patch-src::hash::glsignal.c	Fri Mar 26 17:13:03 2004
>+++ audio/glame/files/patch-src::hash::glsignal.c	Sat Dec 11 21:32:50 2004
>@@ -1,11 +1,14 @@
>---- src/hash/glsignal.c.orig	Wed Mar 24 12:49:38 2004
>-+++ src/hash/glsignal.c	Wed Mar 24 12:59:16 2004
>-@@ -35,6 +35,8 @@
>- 	va_list vax;
>- #if defined HAVE_GCC && defined __va_copy
>- 	__va_copy(vax, va);
>-+#elif (defined(__FreeBSD__) && __FreeBSD__ >= 5)
>-+	va_copy(vax, va);
>- #elif !(defined OS_BSD && defined CPU_X86 && defined HAVE_GCC)
>- 	memcpy(vax, va, sizeof(va_list));
>- #endif
>+--- src/hash/glsignal.c.orig	Sat Oct 23 22:14:22 2004
>++++ src/hash/glsignal.c	Sat Dec 11 21:30:33 2004
>+@@ -63,7 +63,11 @@
>+ 
>+ 	glame_list_foreach(&dest->handlers, glsig_handler_t, list, h) {
>+ 		va_list vac;
>++#if defined(__FreeBSD__) && defined(__GNUC__) && (__GNUC__ < 3)
>++		vac = va;
>++#else
>+ 		va_copy(vac, va);
>++#endif
>+ 		_glsig_handler_exec(h, sig, vac);
>+ 		va_end(vac);
>+ 	}

Actions: View | Diff

Attachments on bug 74943: 48991