* Update to 0.2.2

* Conditionalize festival support


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@777 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 68 insertions, 48 deletions

diff --git a/accessibility/gnome-speech/Makefile b/accessibility/gnome-speech/Makefile
index 787d6e3a7..ee57b5753 100644
--- a/accessibility/gnome-speech/Makefile
+++ b/accessibility/gnome-speech/Makefile
@@ -6,19 +6,16 @@
 #
 
 PORTNAME=	gnomespeech
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome_speech/0.2
-DISTNAME=	gnome_speech-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/gnome-speech/0.2
+DISTNAME=	gnome-speech-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME text-to-speech API
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
@@ -29,8 +26,21 @@ CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/festival)
+WITH_FESTIVAL=	yes
+.endif
+
+.if defined(WITH_FESTIVAL)
+RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
+.endif
+
+pre-build:
+	@cd ${WRKSRC}/gnome-speech && ${GMAKE} clean
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/accessibility/gnome-speech/distinfo b/accessibility/gnome-speech/distinfo
index de0201b6c..38fa9d2ac 100644
--- a/accessibility/gnome-speech/distinfo
+++ b/accessibility/gnome-speech/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome_speech-0.2.1.tar.bz2) = 5d75860d9e5cc9f5434437af6cd33bf9
+MD5 (gnome2/gnome-speech-0.2.2.tar.bz2) = 7346431b9ccf196eea0d332a10fbb8ea
diff --git a/accessibility/gnome-speech/files/patch-ltmain.sh b/accessibility/gnome-speech/files/patch-ltmain.sh
index 8afc42e39..be26a38ad 100644
--- a/accessibility/gnome-speech/files/patch-ltmain.sh
+++ b/accessibility/gnome-speech/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
-+++ ltmain.sh	Sun May 11 02:27:13 2003
-@@ -1061,7 +1061,7 @@
+--- ltmain.sh.orig	Fri May  2 16:51:22 2003
++++ ltmain.sh	Tue May 20 15:31:37 2003
+@@ -1277,7 +1277,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1071,8 +1071,16 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1287,8 +1287,16 @@
  	continue
  	;;
  
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2471,6 +2479,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -2997,6 +3005,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4280,10 +4291,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5425,10 +5436,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/accessibility/gnome-speech/pkg-plist b/accessibility/gnome-speech/pkg-plist
index b47effaa4..a94d0603c 100644
--- a/accessibility/gnome-speech/pkg-plist
+++ b/accessibility/gnome-speech/pkg-plist
@@ -5,7 +5,7 @@ include/gnome-speech-1.0/gnome-speech/gnome-speech.h
 include/gnome-speech-1.0/gnome-speech/speaker.h
 lib/libgnomespeech.a
 lib/libgnomespeech.so
-lib/libgnomespeech.so.0
+lib/libgnomespeech.so.1
 lib/orbit-2.0/GNOME_Speech_SynthesisDriver_module.so
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Dectalk.server
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server
diff --git a/accessibility/gnomespeech/Makefile b/accessibility/gnomespeech/Makefile
index 787d6e3a7..ee57b5753 100644
--- a/accessibility/gnomespeech/Makefile
+++ b/accessibility/gnomespeech/Makefile
@@ -6,19 +6,16 @@
 #
 
 PORTNAME=	gnomespeech
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	0.2.2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome_speech/0.2
-DISTNAME=	gnome_speech-${PORTVERSION}
+MASTER_SITE_SUBDIR=	sources/gnome-speech/0.2
+DISTNAME=	gnome-speech-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME text-to-speech API
 
-RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
@@ -29,8 +26,21 @@ CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/festival)
+WITH_FESTIVAL=	yes
+.endif
+
+.if defined(WITH_FESTIVAL)
+RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
+.endif
+
+pre-build:
+	@cd ${WRKSRC}/gnome-speech && ${GMAKE} clean
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/accessibility/gnomespeech/distinfo b/accessibility/gnomespeech/distinfo
index de0201b6c..38fa9d2ac 100644
--- a/accessibility/gnomespeech/distinfo
+++ b/accessibility/gnomespeech/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome_speech-0.2.1.tar.bz2) = 5d75860d9e5cc9f5434437af6cd33bf9
+MD5 (gnome2/gnome-speech-0.2.2.tar.bz2) = 7346431b9ccf196eea0d332a10fbb8ea
diff --git a/accessibility/gnomespeech/files/patch-ltmain.sh b/accessibility/gnomespeech/files/patch-ltmain.sh
index 8afc42e39..be26a38ad 100644
--- a/accessibility/gnomespeech/files/patch-ltmain.sh
+++ b/accessibility/gnomespeech/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Fri Apr 25 15:18:44 2003
-+++ ltmain.sh	Sun May 11 02:27:13 2003
-@@ -1061,7 +1061,7 @@
+--- ltmain.sh.orig	Fri May  2 16:51:22 2003
++++ ltmain.sh	Tue May 20 15:31:37 2003
+@@ -1277,7 +1277,7 @@
  	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -1071,8 +1071,16 @@
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1287,8 +1287,16 @@
  	continue
  	;;
  
@@ -26,17 +26,17 @@
  	continue
  	;;
  
-@@ -2471,6 +2479,9 @@
- 	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -2997,6 +3005,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4280,10 +4291,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5425,10 +5436,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/accessibility/gnomespeech/pkg-plist b/accessibility/gnomespeech/pkg-plist
index b47effaa4..a94d0603c 100644
--- a/accessibility/gnomespeech/pkg-plist
+++ b/accessibility/gnomespeech/pkg-plist
@@ -5,7 +5,7 @@ include/gnome-speech-1.0/gnome-speech/gnome-speech.h
 include/gnome-speech-1.0/gnome-speech/speaker.h
 lib/libgnomespeech.a
 lib/libgnomespeech.so
-lib/libgnomespeech.so.0
+lib/libgnomespeech.so.1
 lib/orbit-2.0/GNOME_Speech_SynthesisDriver_module.so
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Dectalk.server
 libdata/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server