From tkato432@yahoo.com  Mon Jan  4 18:30:49 2010
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 89D4A1065692
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon,  4 Jan 2010 18:30:49 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169])
	by mx1.freebsd.org (Postfix) with ESMTP id 43EB38FC2D
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon,  4 Jan 2010 18:30:49 +0000 (UTC)
Received: from localhost.localdomain (ZT046126.ppp.dion.ne.jp [59.128.46.126])
	by msa106lp.auone-net.jp (au one net msa) with ESMTP id C157323C031
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue,  5 Jan 2010 03:30:41 +0900 (JST)
Message-Id: <20100105033007.5f92179a.tkato432@yahoo.com>
Date: Tue, 5 Jan 2010 03:30:07 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: audio/fluidsynth to 1.1.1

>Number:         142312
>Category:       ports
>Synopsis:       Update port: audio/fluidsynth to 1.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 04 18:40:01 UTC 2010
>Closed-Date:    Mon Jan 04 23:13:52 UTC 2010
>Last-Modified:  Mon Jan  4 23:20:13 UTC 2010
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.1

New file:
files/patch-src__Makefile.in

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/fluidsynth/Makefile audio/fluidsynth/Makefile
--- /usr/ports/audio/fluidsynth/Makefile	2008-03-20 19:43:34.000000000 +0900
+++ audio/fluidsynth/Makefile	2009-12-21 18:13:24.000000000 +0900
@@ -6,30 +6,33 @@
 #
 
 PORTNAME=	fluidsynth
-PORTVERSION=	1.0.8
+PORTVERSION=	1.1.1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	fluid
+MASTER_SITES=	SAVANNAH/fluid
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Real-time software synthesizer based on the SoundFont 2 specifications
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
+OPTIONS=	JACK "Enable Jack audio support" On \
+		LADSPA "Enable LADSPA audio support" Off \
+		PORTAUDIO "Enable PortAudio support" Off \
+		PULSEAUDIO "Enable PulseAudio support" Off \
+		SNDFILE "Enable Libsndfile support" Off
 
-USE_GNOME=	gnomehack gnometarget pkgconfig
+USE_GNOME=	glib20 gnomehack pkgconfig
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--disable-lash --disable-ladcca
+CONFIGURE_ARGS=	--disable-alsa-support --disable-midishare \
+		--disable-coreaudio --disable-coremidi \
+		--disable-dart --disable-lash \
+		--disable-ladcca
 USE_LDCONFIG=	yes
 
 MAN1=		fluidsynth.1
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-OPTIONS=	JACK "Enable Jack audio support" On \
-		LADSPA "Enable LADSPA audio support" Off
+CPPFLAGS=	${PA2_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	${PA2_LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
@@ -45,6 +48,27 @@
 CONFIGURE_ARGS+=	--enable-ladspa
 .endif
 
+.if defined(WITH_PORTAUDIO)
+BUILD_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
+RUN_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
+PA2_CFLAGS=	`pkg-config --cflags-only-I portaudio-2.0`
+PA2_LIBS=	`pkg-config --libs-only-L portaudio-2.0`
+.else
+CONFIGURE_ARGS+=	--disable-portaudio-support
+.endif
+
+.if defined(WITH_PULSEAUDIO)
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+=	--disable-pulse-support
+.endif
+
+.if defined(WITH_SNDFILE)
+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+.else
+CONFIGURE_ARGS+=	--disable-libsndfile-support
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's| -O2 | |g ; \
 		 s|== "yes"|= "yes"|g' ${WRKSRC}/configure
diff -urN /usr/ports/audio/fluidsynth/distinfo audio/fluidsynth/distinfo
--- /usr/ports/audio/fluidsynth/distinfo	2007-12-20 03:07:33.000000000 +0900
+++ audio/fluidsynth/distinfo	2009-12-21 18:21:42.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (fluidsynth-1.0.8.tar.gz) = e2abfd2e69fd8b28d965df968d7d44ee
-SHA256 (fluidsynth-1.0.8.tar.gz) = 45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320
-SIZE (fluidsynth-1.0.8.tar.gz) = 1267922
+MD5 (fluidsynth-1.1.1.tar.gz) = 0db3da78028d255026230809c6e21b44
+SHA256 (fluidsynth-1.1.1.tar.gz) = 55638cb04f39f4df76c081e22ca7feeea58ddd20ebf779a7db2d38b1ff374cd6
+SIZE (fluidsynth-1.1.1.tar.gz) = 756184
diff -urN /usr/ports/audio/fluidsynth/files/patch-src__Makefile.in audio/fluidsynth/files/patch-src__Makefile.in
--- /usr/ports/audio/fluidsynth/files/patch-src__Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ audio/fluidsynth/files/patch-src__Makefile.in	2009-11-03 15:45:05.000000000 +0900
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig	2009-10-31 04:23:15.000000000 +0900
++++ src/Makefile.in	2009-11-03 15:44:55.000000000 +0900
+@@ -397,13 +397,15 @@
+ 	fluid_filerenderer.c \
+ 	fluid_aufile.c 
+ 
+-INCLUDES = -I$(top_srcdir)/include $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
++INCLUDES = -I$(top_srcdir)/include \
++  $(PORTAUDIO_CFLAGS) $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
+   $(READLINE_CFLAGS) $(JACK_CFLAGS) $(ALSA_CFLAGS) $(PULSE_CFLAGS) \
+-  $(PORTAUDIO_CFLAGS) $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS)
++  $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS)
+ 
+-libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \
++libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) \
++  $(PORTAUDIO_LIBS) $(LASH_LIBS) $(LADCCA_LIBS) \
+   $(READLINE_LIBS) $(COREAUDIO_LIBS) $(COREMIDI_LIBS) $(JACK_LIBS) \
+-  $(ALSA_LIBS) $(PULSE_LIBS) $(PORTAUDIO_LIBS) $(DART_LIBS)  \
++  $(ALSA_LIBS) $(PULSE_LIBS) $(DART_LIBS)  \
+   $(GLIB_LIBS) $(LIBSNDFILE_LIBS)
+ 
+ libfluidsynth_la_LDFLAGS = \
diff -urN /usr/ports/audio/fluidsynth/pkg-plist audio/fluidsynth/pkg-plist
--- /usr/ports/audio/fluidsynth/pkg-plist	2006-02-23 19:34:27.000000000 +0900
+++ audio/fluidsynth/pkg-plist	2009-12-25 02:46:31.000000000 +0900
@@ -20,6 +20,6 @@
 lib/libfluidsynth.a
 lib/libfluidsynth.la
 lib/libfluidsynth.so
-lib/libfluidsynth.so.2
+lib/libfluidsynth.so.4
 libdata/pkgconfig/fluidsynth.pc
 @dirrm include/fluidsynth
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jan 4 18:40:10 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142312 
Responsible-Changed-From-To: freebsd-multimedia->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Jan 4 18:43:20 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142312 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jan 4 23:13:51 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=142312 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/142312: commit references a PR
Date: Mon,  4 Jan 2010 23:15:27 +0000 (UTC)

 miwi        2010-01-04 23:14:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/fluidsynth     Makefile distinfo pkg-plist 
   Added files:
     audio/fluidsynth/files patch-src__Makefile.in 
   Log:
   - Update to 1.1.1
   
   PR:             142312
   Submitted by:   Ports Fury
   
   Revision  Changes    Path
   1.18      +36 -12    ports/audio/fluidsynth/Makefile
   1.8       +3 -3      ports/audio/fluidsynth/distinfo
   1.1       +22 -0     ports/audio/fluidsynth/files/patch-src__Makefile.in (new)
   1.4       +1 -1      ports/audio/fluidsynth/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
