Attachment #48991 for bug #74943

View | Details | Raw Unified | Return to bug 74943
Collapse All | Expand All




#

PORTNAME=	glame
PORTVERSION=	1.0.3
CATEGORIES=	audio gnome
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

COMMENT=	A powerful, fast, stable, and easily extensible sound editor for GNOME

BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
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
USE_LIBLTDL=	yes
USE_GMAKE=	yes
USE_LIBTOOL_VER=	15
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
		LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \
		MAKEINFO="makeinfo --no-split"

Lines 1-2 Link Here

(-)audio/glame/distinfo (-2 / +2 lines)
1	MD5 (glame-1.0.2.tar.gz) = 6d4c76891257dab0d9cee18d21a5db9a	1	MD5 (glame-1.0.3.tar.gz) = 9dc47b94f1d3c64eff36d5e61375ff78
2	SIZE (glame-1.0.2.tar.gz) = 1587125	2	SIZE (glame-1.0.3.tar.gz) = 1638755





$FreeBSD: ports/audio/glame/files/patch-Makefile.in,v 1.2 2003/07/01 12:34:21 sobomax Exp $

--- 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




--- 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);
 	}

Return to bug 74943

Lines 6-12 Link Here

(-)audio/glame/Makefile (-5 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= glame	8	PORTNAME= glame
9	PORTVERSION= 1.0.2	9	PORTVERSION= 1.0.3
10	CATEGORIES= audio gnome	10	CATEGORIES= audio gnome
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 15-27 Link Here
15	COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME	15	COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa	17	BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
18	LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis	18	LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
		19	vorbis.3:${PORTSDIR}/audio/libvorbis
19		20
20	USE_LIBLTDL= yes
21	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
22	USE_GNOME= gnomehack gnomeprefix gnometarget libglade lthack	22	USE_GNOME= gnomehack gnomeprefix gnometarget libglade
		23	USE_LIBLTDL= yes
23	USE_GMAKE= yes	24	USE_GMAKE= yes
24	USE_LIBTOOL_VER= 13	25	USE_LIBTOOL_VER= 15
25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \	26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
26	LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \	27	LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" \
27	MAKEINFO="makeinfo --no-split"	28	MAKEINFO="makeinfo --no-split"

Lines 1-14 Link Here

(-)audio/glame/files/patch-Makefile.in (-8 / +8 lines)
1		1
2	$FreeBSD: ports/audio/glame/files/patch-Makefile.in,v 1.2 2003/07/01 12:34:21 sobomax Exp $	2	$FreeBSD: ports/audio/glame/files/patch-Makefile.in,v 1.2 2003/07/01 12:34:21 sobomax Exp $
3		3
4	--- Makefile.in.orig Tue Jul 1 15:01:06 2003	4	--- Makefile.in.orig Fri Oct 29 03:53:30 2004
5	+++ Makefile.in Tue Jul 1 15:01:55 2003	5	+++ Makefile.in Fri Oct 29 21:29:55 2004
6	@@ -147,7 +147,7 @@	6	@@ -280,7 +280,7 @@
7	install_sh = @install_sh@	7	subdirs = @subdirs@
8	pkgpixmapsdir = @pkgpixmapsdir@	8	sysconfdir = @sysconfdir@
9	pkgscriptsdir = @pkgscriptsdir@	9	target_alias = @target_alias@
10	-SUBDIRS = intl libltdl macros src doc data po	10	-SUBDIRS = intl libltdl macros src doc data po
11	+SUBDIRS = intl macros src doc data po	11	+SUBDIRS = intl macros src doc data po
12
13	ACLOCAL_AMFLAGS = -I macros -I .	12	ACLOCAL_AMFLAGS = -I macros -I .
14		13	EXTRA_DIST = TODO MAINTAINERS CREDITS BUGS autogen.sh glame.spec
		14	all: config.h

Lines 1-11 Link Here

(-)audio/glame/files/patch-src::hash::glsignal.c (-11 / +14 lines)
1	--- src/hash/glsignal.c.orig Wed Mar 24 12:49:38 2004	1	--- src/hash/glsignal.c.orig Sat Oct 23 22:14:22 2004
2	+++ src/hash/glsignal.c Wed Mar 24 12:59:16 2004	2	+++ src/hash/glsignal.c Sat Dec 11 21:30:33 2004
3	@@ -35,6 +35,8 @@	3	@@ -63,7 +63,11 @@
4	va_list vax;	4
5	#if defined HAVE_GCC && defined __va_copy	5	glame_list_foreach(&dest->handlers, glsig_handler_t, list, h) {
6	__va_copy(vax, va);	6	va_list vac;
7	+#elif (defined(__FreeBSD__) && __FreeBSD__ >= 5)	7	+#if defined(__FreeBSD__) && defined(__GNUC__) && (__GNUC__ < 3)
8	+ va_copy(vax, va);	8	+ vac = va;
9	#elif !(defined OS_BSD && defined CPU_X86 && defined HAVE_GCC)	9	+#else
10	memcpy(vax, va, sizeof(va_list));	10	va_copy(vac, va);
11	#endif	11	+#endif
		12	_glsig_handler_exec(h, sig, vac);
		13	va_end(vac);
		14	}